@djb25/digit-ui-module-ws 1.0.41 → 1.0.43

package/dist/index.modern.js

@@ -1,7 +1,7 @@
-import React, { useState, useEffect, useRef, useMemo, Fragment as Fragment$1, useReducer, useCallback } from 'react';
+import React, { useState, useMemo, useEffect, useRef, 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 { Loader, Card, KeyNote, SubmitBar, InfoBannerIcon, Header, Banner, CardText, ActionBar, HomeIcon, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, PrintBtnCommon, MultiLink, LinkButton, Toast, TickMark, FormStep, CardLabel, TextInput, RadioOrSelect, CardHeader, CitizenInfoLabel, CardSubHeader, LabelFieldPair, DatePicker, CollapsibleCardPage, Dropdown, RadioButtons, UploadFile, ViewsIcon, Modal, DeleteIcon, CardLabelError, WrapUnMaskComponent, MobileNumber, CheckBox, 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, GenericFileIcon, EditIcon, Label, AddressDetails, CardSectionSubText, DownloadIcon, CardLabelDesc, VerticalTimeline, FormComposer, MultiUploadWrapper, Close as Close$e, BreakLine, AddIcon, Menu, ButtonSelector, CitizenHomeCard } from '@djb25/digit-ui-react-components';
+import { Loader, Card, KeyNote, SubmitBar, InfoBannerIcon, Table, Banner, CardText, ActionBar, HomeIcon, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, PrintBtnCommon, MultiLink, LinkButton, Toast, TickMark, FormStep, CardLabel, TextInput, RadioOrSelect, CardHeader, CitizenInfoLabel, CardSubHeader, LabelFieldPair, DatePicker, CollapsibleCardPage, Dropdown, RadioButtons, UploadFile, ViewsIcon, Modal, DeleteIcon, CardLabelError, WrapUnMaskComponent, MobileNumber, CheckBox, StatusTable, Row, Header, 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, GenericFileIcon, EditIcon, Label, CardSectionSubText, DownloadIcon, CardLabelDesc, VerticalTimeline, FormComposer, MultiUploadWrapper, Close as Close$e, BreakLine, AddIcon, Menu, ButtonSelector, 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';
@@ -7836,7 +7836,7 @@ const WSInfoLabel = _ref2 => {
 };
 
 const WSMyApplications = () => {
-  var _user$info, _user$info$userName, _user$info2, _user$info3, _data$WaterConnection, _SWdata$SewerageConne, _data$WaterConnection2, _SWdata$SewerageConne2, _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;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const user = Digit.UserService.getUser();
@@ -7892,15 +7892,114 @@ const WSMyApplications = () => {
     }),
     PTisLoading = _Digit$Hooks$pt$usePr.isLoading,
     PTdata = _Digit$Hooks$pt$usePr.data;
+  const _useState = useState(0),
+    pageOffset = _useState[0],
+    setPageOffset = _useState[1];
+  const _useState2 = useState(10),
+    pageSize = _useState2[0],
+    setPageSize = _useState2[1];
+  const isMobile = window.Digit.Utils.browser.isMobile();
+  const GetCell = value => /*#__PURE__*/React.createElement("span", {
+    className: "cell-text"
+  }, value);
+  const columns = useMemo(() => {
+    return [{
+      Header: t("WS_MYCONNECTIONS_APPLICATION_NO"),
+      disableSortBy: true,
+      Cell: _ref => {
+        var _row$original, _row$original2;
+        let row = _ref.row;
+        return /*#__PURE__*/React.createElement("span", {
+          className: "link"
+        }, /*#__PURE__*/React.createElement(Link, {
+          to: "/digit-ui/citizen/ws/connection/application/" + encodeURI((_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.applicationNo)
+        }, ((_row$original2 = row.original) === null || _row$original2 === void 0 ? void 0 : _row$original2.applicationNo) || "NA"));
+      }
+    }, {
+      Header: t("WS_SERVICE_NAME"),
+      disableSortBy: true,
+      Cell: _ref2 => {
+        var _row$original3;
+        let row = _ref2.row;
+        return GetCell(t("WS_APPLICATION_TYPE_" + ((_row$original3 = row.original) === null || _row$original3 === void 0 ? void 0 : _row$original3.applicationType)));
+      }
+    }, {
+      Header: t("WS_CONSUMER_NAME"),
+      disableSortBy: true,
+      Cell: _ref3 => {
+        var _row$original4, _row$original4$connec, _row$original5, _row$original5$proper, _row$original5$proper2;
+        let row = _ref3.row;
+        const names = ((_row$original4 = row.original) === null || _row$original4 === void 0 ? void 0 : (_row$original4$connec = _row$original4.connectionHolders) === null || _row$original4$connec === void 0 ? void 0 : _row$original4$connec.map(owner => owner.name).join(",")) || ((_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : (_row$original5$proper = _row$original5.property) === null || _row$original5$proper === void 0 ? void 0 : (_row$original5$proper2 = _row$original5$proper.owners) === null || _row$original5$proper2 === void 0 ? void 0 : _row$original5$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");
+        return GetCell(names);
+      }
+    }, {
+      Header: t("WS_PROPERTY_ID"),
+      disableSortBy: true,
+      Cell: _ref4 => {
+        var _row$original6;
+        let row = _ref4.row;
+        return GetCell(((_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : _row$original6.propertyId) || t("CS_NA"));
+      }
+    }, {
+      Header: t("WS_STATUS"),
+      disableSortBy: true,
+      Cell: _ref5 => {
+        var _row$original7;
+        let row = _ref5.row;
+        return GetCell(t("CS_" + ((_row$original7 = row.original) === null || _row$original7 === void 0 ? void 0 : _row$original7.applicationStatus)) || t("CS_NA"));
+      }
+    }, {
+      Header: t("WS_SLA"),
+      disableSortBy: true,
+      Cell: _ref6 => {
+        var _row$original8;
+        let row = _ref6.row;
+        const slaDays = Math.round(((_row$original8 = row.original) === null || _row$original8 === void 0 ? void 0 : _row$original8.sla) / (24 * 60 * 60 * 1000));
+        return GetCell(slaDays ? slaDays + " Days" : t("CS_NA"));
+      }
+    }, {
+      Header: t("WS_VIEW_DETAILS"),
+      disableSortBy: true,
+      Cell: _ref7 => {
+        let row = _ref7.row;
+        const application = row.original;
+        return /*#__PURE__*/React.createElement("span", {
+          className: "link"
+        }, /*#__PURE__*/React.createElement(Link, {
+          to: "/digit-ui/citizen/ws/connection/application/" + encodeURI(application === null || application === void 0 ? void 0 : application.applicationNo)
+        }, t("WS_VIEW_DETAILS_LABEL")));
+      }
+    }, {
+      Header: t("MAKE_PAYMENT"),
+      disableSortBy: true,
+      Cell: _ref8 => {
+        var _application$applicat, _application$applicat2, _application$applicat3, _application$applicat4, _application$connecti, _application$connecti2, _application$property, _application$property2, _application$applicat5;
+        let row = _ref8.row;
+        const application = row.original;
+        const businessService = application !== null && application !== void 0 && (_application$applicat = application.applicationNo) !== null && _application$applicat !== void 0 && _application$applicat.includes("SW") ? application !== null && application !== void 0 && (_application$applicat2 = application.applicationNo) !== null && _application$applicat2 !== void 0 && _application$applicat2.includes("DC") ? "SW" : "SW.ONE_TIME_FEE" : application !== null && application !== void 0 && (_application$applicat3 = application.applicationNo) !== null && _application$applicat3 !== void 0 && _application$applicat3.includes("DC") ? "WS" : "WS.ONE_TIME_FEE";
+        return (application === null || application === void 0 ? void 0 : application.applicationStatus) === "PENDING_FOR_PAYMENT" ? /*#__PURE__*/React.createElement("span", {
+          className: "link"
+        }, /*#__PURE__*/React.createElement(Link, {
+          to: {
+            pathname: "/digit-ui/citizen/payment/my-bills/" + businessService + "/" + (application !== null && application !== void 0 && (_application$applicat4 = application.applicationNo) !== null && _application$applicat4 !== void 0 && _application$applicat4.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$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$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$property = application.property) === null || _application$property === void 0 ? void 0 : (_application$property2 = _application$property.owners) === null || _application$property2 === void 0 ? void 0 : _application$property2.map(owner => owner.name).join(","))) + "&isDisoconnectFlow=" + (application !== null && application !== void 0 && (_application$applicat5 = application.applicationNo) !== null && _application$applicat5 !== void 0 && _application$applicat5.includes("DC") ? true : false),
+            state: {}
+          }
+        }, t("MAKE_PAYMENT"))) : null;
+      }
+    }];
+  }, [t]);
   if (isLoading || isSWLoading || PTisLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
-  let _ref = data || {},
-    _ref$WaterConnection = _ref.WaterConnection,
-    WSapplicationsList = _ref$WaterConnection === void 0 ? [] : _ref$WaterConnection;
-  let _ref2 = SWdata || {},
-    _ref2$SewerageConnect = _ref2.SewerageConnections,
-    SWapplicationsList = _ref2$SewerageConnect === void 0 ? [] : _ref2$SewerageConnect;
+  let _ref9 = data || {},
+    _ref9$WaterConnection = _ref9.WaterConnection,
+    WSapplicationsList = _ref9$WaterConnection === void 0 ? [] : _ref9$WaterConnection;
+  let _ref0 = SWdata || {},
+    _ref0$SewerageConnect = _ref0.SewerageConnections,
+    SWapplicationsList = _ref0$SewerageConnect === void 0 ? [] : _ref0$SewerageConnect;
   WSapplicationsList = ((_WSapplicationsList = WSapplicationsList) === null || _WSapplicationsList === void 0 ? void 0 : _WSapplicationsList.map(ob => {
     var _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3;
     return _extends({}, ob, {
@@ -7922,16 +8021,28 @@ const WSMyApplications = () => {
       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]
     });
   });
-  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, ((_applicationsList = applicationsList) === null || _applicationsList === void 0 ? void 0 : _applicationsList.length) > 0 && applicationsList.sort((a, b) => {
+  const sortedApplications = ((_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", {
+  }) : [];
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(WSInfoLabel, {
+    t: t
+  }), /*#__PURE__*/React.createElement("div", null, (sortedApplications === null || sortedApplications === void 0 ? void 0 : sortedApplications.length) > 0 ? isMobile ? sortedApplications.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", {
+  }))) : /*#__PURE__*/React.createElement(Table, {
+    t: t,
+    data: sortedApplications.slice(pageOffset, pageOffset + pageSize),
+    totalRecords: sortedApplications.length,
+    columns: columns,
+    onPageSizeChange: e => setPageSize(Number(e.target.value)),
+    currentPage: Math.floor(pageOffset / pageSize),
+    onNextPage: () => setPageOffset(pageOffset + pageSize),
+    onPrevPage: () => setPageOffset(pageOffset - pageSize),
+    pageSizeLimit: pageSize,
+    disableSort: true
+  }) : /*#__PURE__*/React.createElement("p", {
     style: {
       marginLeft: "16px",
       marginTop: "16px"
@@ -8341,7 +8452,7 @@ const getWSAcknowledgementData$1 = function (newApplication, property, tenantInf
 };
 
 const WSResponse = props => {
-  var _waterApplicationData, _waterApplicationData2, _waterApplicationData3, _sewerageApplicationD, _sewerageApplicationD2, _sewerageApplicationD3, _oldDataWater$WaterCo, _oldDataWater$WaterCo2, _oldDataSew$SewerageC, _oldDataSew$SewerageC2;
+  var _waterApplicationData, _waterApplicationData2, _waterApplicationData3, _sewerageApplicationD, _sewerageApplicationD2, _sewerageApplicationD3, _oldDataWater$WaterCo, _oldDataWater$WaterCo2, _oldDataSew$SewerageC, _oldDataSew$SewerageC2, _waterApplicationData8, _waterApplicationData9, _waterApplicationData0, _waterApplicationData1, _waterApplicationData10, _waterApplicationData11, _waterApplicationData12, _waterApplicationData13, _waterApplicationData14, _waterApplicationData15, _waterApplicationData16, _waterApplicationData17, _waterApplicationData18, _waterApplicationData19, _waterApplicationData20, _waterApplicationData21, _waterApplicationData22, _waterApplicationData23, _sewerageApplicationD8, _sewerageApplicationD9, _sewerageApplicationD0, _sewerageApplicationD1, _sewerageApplicationD10, _sewerageApplicationD11, _sewerageApplicationD12, _sewerageApplicationD13, _sewerageApplicationD14, _sewerageApplicationD15, _sewerageApplicationD16, _sewerageApplicationD17, _sewerageApplicationD18, _sewerageApplicationD19, _sewerageApplicationD20, _sewerageApplicationD21, _sewerageApplicationD22, _sewerageApplicationD23;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const tenantId = Digit.ULBService.getCurrentTenantId();
@@ -8493,7 +8604,30 @@ const WSResponse = props => {
   }, /*#__PURE__*/React.createElement("path", {
     d: "M19.3334 8H14V0H6.00002V8H0.666687L10 17.3333L19.3334 8ZM0.666687 20V22.6667H19.3334V20H0.666687Z",
     fill: "#a82227"
-  })), t("WS_PRINT_SEWERAGE_APPLICATION_LABEL"))), /*#__PURE__*/React.createElement(ActionBar, {
+  })), t("WS_PRINT_SEWERAGE_APPLICATION_LABEL"))), /*#__PURE__*/React.createElement("div", null, (waterApplicationData === null || waterApplicationData === void 0 ? void 0 : (_waterApplicationData8 = waterApplicationData.applicationData) === null || _waterApplicationData8 === void 0 ? void 0 : _waterApplicationData8.applicationStatus) === "PENDING_FOR_PAYMENT" ? /*#__PURE__*/React.createElement(Link, {
+    to: {
+      pathname: "/digit-ui/citizen/payment/my-bills/" + (waterApplicationData !== null && waterApplicationData !== void 0 && (_waterApplicationData9 = waterApplicationData.applicationData) !== null && _waterApplicationData9 !== void 0 && (_waterApplicationData0 = _waterApplicationData9.applicationNo) !== null && _waterApplicationData0 !== void 0 && _waterApplicationData0.includes("SW") ? waterApplicationData !== null && waterApplicationData !== void 0 && (_waterApplicationData1 = waterApplicationData.applicationData) !== null && _waterApplicationData1 !== void 0 && (_waterApplicationData10 = _waterApplicationData1.applicationNo) !== null && _waterApplicationData10 !== void 0 && _waterApplicationData10.includes("DC") ? "SW" : "SW.ONE_TIME_FEE" : waterApplicationData !== null && waterApplicationData !== void 0 && (_waterApplicationData11 = waterApplicationData.applicationData) !== null && _waterApplicationData11 !== void 0 && (_waterApplicationData12 = _waterApplicationData11.applicationNo) !== null && _waterApplicationData12 !== void 0 && _waterApplicationData12.includes("DC") ? "WS" : "WS.ONE_TIME_FEE") + "/" + (waterApplicationData !== null && waterApplicationData !== void 0 && (_waterApplicationData13 = waterApplicationData.applicationData) !== null && _waterApplicationData13 !== void 0 && (_waterApplicationData14 = _waterApplicationData13.applicationNo) !== null && _waterApplicationData14 !== void 0 && _waterApplicationData14.includes("DC") ? stringReplaceAll(waterApplicationData === null || waterApplicationData === void 0 ? void 0 : (_waterApplicationData15 = waterApplicationData.applicationData) === null || _waterApplicationData15 === void 0 ? void 0 : _waterApplicationData15.connectionNo, "/", "+") : stringReplaceAll(waterApplicationData === null || waterApplicationData === void 0 ? void 0 : (_waterApplicationData16 = waterApplicationData.applicationData) === null || _waterApplicationData16 === void 0 ? void 0 : _waterApplicationData16.applicationNo, "/", "+")) + "?workflow=WNS&tenantId=" + (waterApplicationData === null || waterApplicationData === void 0 ? void 0 : (_waterApplicationData17 = waterApplicationData.applicationData) === null || _waterApplicationData17 === void 0 ? void 0 : _waterApplicationData17.tenantId) + "&ConsumerName=" + ((waterApplicationData === null || waterApplicationData === void 0 ? void 0 : (_waterApplicationData18 = waterApplicationData.applicationData) === null || _waterApplicationData18 === void 0 ? void 0 : (_waterApplicationData19 = _waterApplicationData18.connectionHolders) === null || _waterApplicationData19 === void 0 ? void 0 : _waterApplicationData19.map(owner => owner.name).join(",")) || (waterApplicationData === null || waterApplicationData === void 0 ? void 0 : (_waterApplicationData20 = waterApplicationData.propertyDetails) === null || _waterApplicationData20 === void 0 ? void 0 : (_waterApplicationData21 = _waterApplicationData20.owners) === null || _waterApplicationData21 === void 0 ? void 0 : _waterApplicationData21.map(owner => owner.name).join(","))) + "&isDisconnectFlow=" + (waterApplicationData !== null && waterApplicationData !== void 0 && (_waterApplicationData22 = waterApplicationData.applicationData) !== null && _waterApplicationData22 !== void 0 && (_waterApplicationData23 = _waterApplicationData22.applicationNo) !== null && _waterApplicationData23 !== void 0 && _waterApplicationData23.includes("DC") ? true : false),
+      state: {}
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: "10px"
+    }
+  }, /*#__PURE__*/React.createElement(SubmitBar, {
+    label: t("MAKE_PAYMENT")
+  }))) : null, (sewerageApplicationData === null || sewerageApplicationData === void 0 ? void 0 : (_sewerageApplicationD8 = sewerageApplicationData.applicationData) === null || _sewerageApplicationD8 === void 0 ? void 0 : _sewerageApplicationD8.applicationStatus) === "PENDING_FOR_PAYMENT" ? /*#__PURE__*/React.createElement(Link, {
+    to: {
+      pathname: "/digit-ui/citizen/payment/my-bills/" + (sewerageApplicationData !== null && sewerageApplicationData !== void 0 && (_sewerageApplicationD9 = sewerageApplicationData.applicationData) !== null && _sewerageApplicationD9 !== void 0 && (_sewerageApplicationD0 = _sewerageApplicationD9.applicationNo) !== null && _sewerageApplicationD0 !== void 0 && _sewerageApplicationD0.includes("SW") ? sewerageApplicationData !== null && sewerageApplicationData !== void 0 && (_sewerageApplicationD1 = sewerageApplicationData.applicationData) !== null && _sewerageApplicationD1 !== void 0 && (_sewerageApplicationD10 = _sewerageApplicationD1.applicationNo) !== null && _sewerageApplicationD10 !== void 0 && _sewerageApplicationD10.includes("DC") ? "SW" : "SW.ONE_TIME_FEE" : sewerageApplicationData !== null && sewerageApplicationData !== void 0 && (_sewerageApplicationD11 = sewerageApplicationData.applicationData) !== null && _sewerageApplicationD11 !== void 0 && (_sewerageApplicationD12 = _sewerageApplicationD11.applicationNo) !== null && _sewerageApplicationD12 !== void 0 && _sewerageApplicationD12.includes("DC") ? "WS" : "WS.ONE_TIME_FEE") + "/" + (sewerageApplicationData !== null && sewerageApplicationData !== void 0 && (_sewerageApplicationD13 = sewerageApplicationData.applicationData) !== null && _sewerageApplicationD13 !== void 0 && (_sewerageApplicationD14 = _sewerageApplicationD13.applicationNo) !== null && _sewerageApplicationD14 !== void 0 && _sewerageApplicationD14.includes("DC") ? stringReplaceAll(sewerageApplicationData === null || sewerageApplicationData === void 0 ? void 0 : (_sewerageApplicationD15 = sewerageApplicationData.applicationData) === null || _sewerageApplicationD15 === void 0 ? void 0 : _sewerageApplicationD15.connectionNo, "/", "+") : stringReplaceAll(sewerageApplicationData === null || sewerageApplicationData === void 0 ? void 0 : (_sewerageApplicationD16 = sewerageApplicationData.applicationData) === null || _sewerageApplicationD16 === void 0 ? void 0 : _sewerageApplicationD16.applicationNo, "/", "+")) + "?workflow=WNS&tenantId=" + (sewerageApplicationData === null || sewerageApplicationData === void 0 ? void 0 : (_sewerageApplicationD17 = sewerageApplicationData.applicationData) === null || _sewerageApplicationD17 === void 0 ? void 0 : _sewerageApplicationD17.tenantId) + "&ConsumerName=" + ((sewerageApplicationData === null || sewerageApplicationData === void 0 ? void 0 : (_sewerageApplicationD18 = sewerageApplicationData.applicationData) === null || _sewerageApplicationD18 === void 0 ? void 0 : (_sewerageApplicationD19 = _sewerageApplicationD18.connectionHolders) === null || _sewerageApplicationD19 === void 0 ? void 0 : _sewerageApplicationD19.map(owner => owner.name).join(",")) || (sewerageApplicationData === null || sewerageApplicationData === void 0 ? void 0 : (_sewerageApplicationD20 = sewerageApplicationData.propertyDetails) === null || _sewerageApplicationD20 === void 0 ? void 0 : (_sewerageApplicationD21 = _sewerageApplicationD20.owners) === null || _sewerageApplicationD21 === void 0 ? void 0 : _sewerageApplicationD21.map(owner => owner.name).join(","))) + "&isDisconnectFlow=" + (sewerageApplicationData !== null && sewerageApplicationData !== void 0 && (_sewerageApplicationD22 = sewerageApplicationData.applicationData) !== null && _sewerageApplicationD22 !== void 0 && (_sewerageApplicationD23 = _sewerageApplicationD22.applicationNo) !== null && _sewerageApplicationD23 !== void 0 && _sewerageApplicationD23.includes("DC") ? true : false),
+      state: {}
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: "10px",
+      marginLeft: "10px"
+    }
+  }, /*#__PURE__*/React.createElement(SubmitBar, {
+    label: t("MAKE_PAYMENT")
+  }))) : null), /*#__PURE__*/React.createElement(ActionBar, {
     style: {
       display: "flex",
       justifyContent: "flex-end",
@@ -8509,7 +8643,7 @@ const WSResponse = props => {
 };
 
 const App = _ref => {
-  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;
+  var _Digit, _Digit$ComponentRegis, _Digit2, _Digit2$ComponentRegi, _user$info, _user$info$userName, _user$info2, _user$info3, _wsData$WaterConnecti, _wsData$WaterConnecti2, _swData$SewerageConne, _swData$SewerageConne2, _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;
   let path = _ref.path;
   const location = useLocation();
   const _useTranslation = useTranslation(),
@@ -8519,6 +8653,40 @@ const App = _ref => {
   let isAcknowledgement = window.location.href.includes("/acknowledgement") || window.location.href.includes("/disconnect-acknowledge");
   const WSDisconnectAcknowledgement = (_Digit = Digit) === null || _Digit === void 0 ? void 0 : (_Digit$ComponentRegis = _Digit.ComponentRegistryService) === null || _Digit$ComponentRegis === void 0 ? void 0 : _Digit$ComponentRegis.getComponent("WSDisconnectAcknowledgement");
   const WSRestorationAcknowledgement = (_Digit2 = Digit) === null || _Digit2 === void 0 ? void 0 : (_Digit2$ComponentRegi = _Digit2.ComponentRegistryService) === null || _Digit2$ComponentRegi === void 0 ? void 0 : _Digit2$ComponentRegi.getComponent("WSRestorationAcknowledgement");
+  const user = window.Digit.UserService.getUser();
+  const tenantId = "dl.djb";
+  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 isMyApps = location.pathname.includes("/my-applications");
+  const _window$Digit$Hooks$w = window.Digit.Hooks.ws.useMyApplicationSearch({
+      filters: {
+        tenantId,
+        mobileNumber: userMobileNumber
+      }
+    }, {
+      filters: {
+        tenantId,
+        mobileNumber: userMobileNumber
+      },
+      enabled: isMyApps
+    }),
+    wsData = _window$Digit$Hooks$w.data;
+  const _window$Digit$Hooks$w2 = window.Digit.Hooks.ws.useMyApplicationSearch({
+      filters: {
+        tenantId,
+        mobileNumber: userMobileNumber
+      },
+      BusinessService: "SW"
+    }, {
+      filters: {
+        tenantId,
+        mobileNumber: userMobileNumber
+      },
+      enabled: isMyApps
+    }),
+    swData = _window$Digit$Hooks$w2.data;
+  let wsCount = (wsData === null || wsData === void 0 ? void 0 : (_wsData$WaterConnecti = wsData.WaterConnection) === null || _wsData$WaterConnecti === void 0 ? void 0 : (_wsData$WaterConnecti2 = _wsData$WaterConnecti.filter(ob => (ob === null || ob === void 0 ? void 0 : ob.applicationType) !== "MODIFY_WATER_CONNECTION")) === null || _wsData$WaterConnecti2 === void 0 ? void 0 : _wsData$WaterConnecti2.length) || 0;
+  let swCount = (swData === null || swData === void 0 ? void 0 : (_swData$SewerageConne = swData.SewerageConnections) === null || _swData$SewerageConne === void 0 ? void 0 : (_swData$SewerageConne2 = _swData$SewerageConne.filter(ob => (ob === null || ob === void 0 ? void 0 : ob.applicationType) !== "MODIFY_SEWERAGE_CONNECTION")) === null || _swData$SewerageConne2 === void 0 ? void 0 : _swData$SewerageConne2.length) || 0;
+  let totalAppsCount = wsCount + swCount;
   const crumbs = [{
     path: "/digit-ui/employee",
     show: true,
@@ -8536,11 +8704,11 @@ const App = _ref => {
     show: location.pathname.includes("/search")
   }, {
     path: "/digit-ui/citizen/ws/my-applications",
-    label: t("CS_HOME_MY_APPLICATIONS"),
+    label: t("CS_HOME_MY_APPLICATIONS") + " " + (totalAppsCount ? "(" + totalAppsCount + ")" : ""),
     show: location.pathname.includes("/my-applications")
   }, {
     path: "/digit-ui/citizen/ws/my-connections",
-    label: t("CS_WS_MY_CONNECTIONS"),
+    label: t("WS_MYCONNECTIONS_HEADER"),
     show: location.pathname.includes("/my-connections")
   }, {
     path: "/digit-ui/citizen/ws/my-bills",
@@ -8554,6 +8722,14 @@ const App = _ref => {
     path: "/digit-ui/citizen/ws/old-application",
     label: t("WS_COMMON_APPL_NEW_CONNECTION"),
     show: location.pathname.includes("/old-application")
+  }, {
+    path: location.pathname,
+    label: t("WS_APPLICATION_DETAILS_HEADER"),
+    show: location.pathname.includes("/connection/application")
+  }, {
+    path: location.pathname,
+    label: t("WS_APPLICATION_DETAILS_HEADER"),
+    show: location.pathname.includes("ws-response")
   }];
   const getDynamicBreadcrumbs = () => {
     return crumbs.filter(crumb => crumb.show);
@@ -8579,7 +8755,7 @@ const App = _ref => {
   }, /*#__PURE__*/React.createElement(ModuleHeader, {
     leftContent: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ArrowLeft, {
       className: "icon"
-    }), "Back"),
+    }), t("CS_COMMON_BACK")),
     onLeftClick: () => window.history.back(),
     breadcrumbs: getDynamicBreadcrumbs()
   }), /*#__PURE__*/React.createElement("div", {
@@ -10253,38 +10429,6 @@ const WSDocsRequired = _ref => {
   }))));
 };
 
-// A type of promise-like that resolves synchronously and supports only one observer
-
-const _iteratorSymbol = /*#__PURE__*/ typeof Symbol !== "undefined" ? (Symbol.iterator || (Symbol.iterator = Symbol("Symbol.iterator"))) : "@@iterator";
-
-const _asyncIteratorSymbol = /*#__PURE__*/ typeof Symbol !== "undefined" ? (Symbol.asyncIterator || (Symbol.asyncIterator = Symbol("Symbol.asyncIterator"))) : "@@asyncIterator";
-
-// Asynchronously call a function and send errors to recovery continuation
-function _catch(body, recover) {
-	try {
-		var result = body();
-	} catch(e) {
-		return recover(e);
-	}
-	if (result && result.then) {
-		return result.then(void 0, recover);
-	}
-	return result;
-}
-
-// Asynchronously await a promise and pass the result to a finally continuation
-function _finallyRethrows(body, finalizer) {
-	try {
-		var result = body();
-	} catch (e) {
-		return finalizer(true, e);
-	}
-	if (result && result.then) {
-		return result.then(finalizer.bind(null, false), finalizer.bind(null, true));
-	}
-	return finalizer(false, result);
-}
-
 const WSSewerageConnectionDetails = _ref => {
   var _formData$sewerageCon, _formData$sewerageCon2;
   let t = _ref.t,
@@ -10718,6 +10862,31 @@ const WSActivationDetails = _ref => {
   }))));
 };
 
+const _iteratorSymbol = /*#__PURE__*/typeof Symbol !== "undefined" ? Symbol.iterator || (Symbol.iterator = Symbol("Symbol.iterator")) : "@@iterator";
+const _asyncIteratorSymbol = /*#__PURE__*/typeof Symbol !== "undefined" ? Symbol.asyncIterator || (Symbol.asyncIterator = Symbol("Symbol.asyncIterator")) : "@@asyncIterator";
+function _catch(body, recover) {
+  try {
+    var result = body();
+  } catch (e) {
+    return recover(e);
+  }
+  if (result && result.then) {
+    return result.then(void 0, recover);
+  }
+  return result;
+}
+function _finallyRethrows(body, finalizer) {
+  try {
+    var result = body();
+  } catch (e) {
+    return finalizer(true, e);
+  }
+  if (result && result.then) {
+    return result.then(finalizer.bind(null, false), finalizer.bind(null, true));
+  }
+  return finalizer(false, result);
+}
+
 const createConnectionDetails = () => ({
   water: true,
   sewerage: false,
@@ -20960,14 +21129,6 @@ const useInboxTableConfig = _ref => {
     }];
   });
   return {
-    getCellProps: cellInfo => {
-      return {
-        style: {
-          padding: "20px 18px",
-          fontSize: "16px"
-        }
-      };
-    },
     disableSort: false,
     autoSort: false,
     manualPagination: true,
@@ -21293,12 +21454,6 @@ const WSInbox = _ref => {
       });
     });
   }, [statuses]);
-  let links = [{
-    text: t("WS_APPLY_NEW_CONNECTION_HOME_CARD_LABEL"),
-    link: "/digit-ui/employee/ws/create-application",
-    roles: ["WS_CEMP", "SW_CEMP"]
-  }];
-  links = links.filter(link => link.roles ? checkForEmployee(link.roles) : true);
   const PropsForInboxLinks = {
     logoIcon: /*#__PURE__*/React.createElement(DropIcon, null),
     headerText: checkPathName ? "MODULE_WATER" : "MODULE_SW"
@@ -24213,7 +24368,7 @@ const newConfig = [{
     }
   }, {
     route: "property-location-details",
-    component: "CPTPropertyLocationDetails",
+    component: "WSPropertyLocationDetails",
     key: "propertyLocationDetails",
     nextStep: "property-water-details",
     hideInEmployee: true,
@@ -25176,385 +25331,394 @@ const config = [{
   }]
 }];
 
-/** @license React v16.13.1
- * react-is.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-var b="function"===typeof Symbol&&Symbol.for,c=b?Symbol.for("react.element"):60103,d=b?Symbol.for("react.portal"):60106,e=b?Symbol.for("react.fragment"):60107,f=b?Symbol.for("react.strict_mode"):60108,g=b?Symbol.for("react.profiler"):60114,h=b?Symbol.for("react.provider"):60109,k=b?Symbol.for("react.context"):60110,l=b?Symbol.for("react.async_mode"):60111,m=b?Symbol.for("react.concurrent_mode"):60111,n=b?Symbol.for("react.forward_ref"):60112,p=b?Symbol.for("react.suspense"):60113,q=b?
-Symbol.for("react.suspense_list"):60120,r=b?Symbol.for("react.memo"):60115,t=b?Symbol.for("react.lazy"):60116,v=b?Symbol.for("react.block"):60121,w=b?Symbol.for("react.fundamental"):60117,x=b?Symbol.for("react.responder"):60118,y=b?Symbol.for("react.scope"):60119;
-function z(a){if("object"===typeof a&&null!==a){var u=a.$$typeof;switch(u){case c:switch(a=a.type,a){case l:case m:case e:case g:case f:case p:return a;default:switch(a=a&&a.$$typeof,a){case k:case n:case t:case r:case h:return a;default:return u}}case d:return u}}}function A(a){return z(a)===m}var AsyncMode=l;var ConcurrentMode=m;var ContextConsumer=k;var ContextProvider=h;var Element=c;var ForwardRef=n;var Fragment=e;var Lazy=t;var Memo=r;var Portal=d;
-var Profiler=g;var StrictMode=f;var Suspense=p;var isAsyncMode=function(a){return A(a)||z(a)===l};var isConcurrentMode=A;var isContextConsumer=function(a){return z(a)===k};var isContextProvider=function(a){return z(a)===h};var isElement=function(a){return "object"===typeof a&&null!==a&&a.$$typeof===c};var isForwardRef=function(a){return z(a)===n};var isFragment=function(a){return z(a)===e};var isLazy=function(a){return z(a)===t};
-var isMemo=function(a){return z(a)===r};var isPortal=function(a){return z(a)===d};var isProfiler=function(a){return z(a)===g};var isStrictMode=function(a){return z(a)===f};var isSuspense=function(a){return z(a)===p};
-var isValidElementType=function(a){return "string"===typeof a||"function"===typeof a||a===e||a===m||a===g||a===f||a===p||a===q||"object"===typeof a&&null!==a&&(a.$$typeof===t||a.$$typeof===r||a.$$typeof===h||a.$$typeof===k||a.$$typeof===n||a.$$typeof===w||a.$$typeof===x||a.$$typeof===y||a.$$typeof===v)};var typeOf=z;
-
-var reactIs_production_min = {
-	AsyncMode: AsyncMode,
-	ConcurrentMode: ConcurrentMode,
-	ContextConsumer: ContextConsumer,
-	ContextProvider: ContextProvider,
-	Element: Element,
-	ForwardRef: ForwardRef,
-	Fragment: Fragment,
-	Lazy: Lazy,
-	Memo: Memo,
-	Portal: Portal,
-	Profiler: Profiler,
-	StrictMode: StrictMode,
-	Suspense: Suspense,
-	isAsyncMode: isAsyncMode,
-	isConcurrentMode: isConcurrentMode,
-	isContextConsumer: isContextConsumer,
-	isContextProvider: isContextProvider,
-	isElement: isElement,
-	isForwardRef: isForwardRef,
-	isFragment: isFragment,
-	isLazy: isLazy,
-	isMemo: isMemo,
-	isPortal: isPortal,
-	isProfiler: isProfiler,
-	isStrictMode: isStrictMode,
-	isSuspense: isSuspense,
-	isValidElementType: isValidElementType,
-	typeOf: typeOf
-};
-
-var reactIs_development = createCommonjsModule(function (module, exports) {
-
-
-
-if (process.env.NODE_ENV !== "production") {
-  (function() {
-
-// The Symbol used to tag the ReactElement-like types. If there is no native Symbol
-// nor polyfill, then a plain number is used for performance.
-var hasSymbol = typeof Symbol === 'function' && Symbol.for;
-var REACT_ELEMENT_TYPE = hasSymbol ? Symbol.for('react.element') : 0xeac7;
-var REACT_PORTAL_TYPE = hasSymbol ? Symbol.for('react.portal') : 0xeaca;
-var REACT_FRAGMENT_TYPE = hasSymbol ? Symbol.for('react.fragment') : 0xeacb;
-var REACT_STRICT_MODE_TYPE = hasSymbol ? Symbol.for('react.strict_mode') : 0xeacc;
-var REACT_PROFILER_TYPE = hasSymbol ? Symbol.for('react.profiler') : 0xead2;
-var REACT_PROVIDER_TYPE = hasSymbol ? Symbol.for('react.provider') : 0xeacd;
-var REACT_CONTEXT_TYPE = hasSymbol ? Symbol.for('react.context') : 0xeace; // TODO: We don't use AsyncMode or ConcurrentMode anymore. They were temporary
-// (unstable) APIs that have been removed. Can we remove the symbols?
-
-var REACT_ASYNC_MODE_TYPE = hasSymbol ? Symbol.for('react.async_mode') : 0xeacf;
-var REACT_CONCURRENT_MODE_TYPE = hasSymbol ? Symbol.for('react.concurrent_mode') : 0xeacf;
-var REACT_FORWARD_REF_TYPE = hasSymbol ? Symbol.for('react.forward_ref') : 0xead0;
-var REACT_SUSPENSE_TYPE = hasSymbol ? Symbol.for('react.suspense') : 0xead1;
-var REACT_SUSPENSE_LIST_TYPE = hasSymbol ? Symbol.for('react.suspense_list') : 0xead8;
-var REACT_MEMO_TYPE = hasSymbol ? Symbol.for('react.memo') : 0xead3;
-var REACT_LAZY_TYPE = hasSymbol ? Symbol.for('react.lazy') : 0xead4;
-var REACT_BLOCK_TYPE = hasSymbol ? Symbol.for('react.block') : 0xead9;
-var REACT_FUNDAMENTAL_TYPE = hasSymbol ? Symbol.for('react.fundamental') : 0xead5;
-var REACT_RESPONDER_TYPE = hasSymbol ? Symbol.for('react.responder') : 0xead6;
-var REACT_SCOPE_TYPE = hasSymbol ? Symbol.for('react.scope') : 0xead7;
-
-function isValidElementType(type) {
-  return typeof type === 'string' || typeof type === 'function' || // Note: its typeof might be other than 'symbol' or 'number' if it's a polyfill.
-  type === REACT_FRAGMENT_TYPE || type === REACT_CONCURRENT_MODE_TYPE || type === REACT_PROFILER_TYPE || type === REACT_STRICT_MODE_TYPE || type === REACT_SUSPENSE_TYPE || type === REACT_SUSPENSE_LIST_TYPE || typeof type === 'object' && type !== null && (type.$$typeof === REACT_LAZY_TYPE || type.$$typeof === REACT_MEMO_TYPE || type.$$typeof === REACT_PROVIDER_TYPE || type.$$typeof === REACT_CONTEXT_TYPE || type.$$typeof === REACT_FORWARD_REF_TYPE || type.$$typeof === REACT_FUNDAMENTAL_TYPE || type.$$typeof === REACT_RESPONDER_TYPE || type.$$typeof === REACT_SCOPE_TYPE || type.$$typeof === REACT_BLOCK_TYPE);
-}
-
-function typeOf(object) {
-  if (typeof object === 'object' && object !== null) {
-    var $$typeof = object.$$typeof;
-
-    switch ($$typeof) {
-      case REACT_ELEMENT_TYPE:
-        var type = object.type;
-
-        switch (type) {
-          case REACT_ASYNC_MODE_TYPE:
-          case REACT_CONCURRENT_MODE_TYPE:
-          case REACT_FRAGMENT_TYPE:
-          case REACT_PROFILER_TYPE:
-          case REACT_STRICT_MODE_TYPE:
-          case REACT_SUSPENSE_TYPE:
-            return type;
-
+var b = "function" === typeof Symbol && Symbol.for,
+  c = b ? Symbol.for("react.element") : 60103,
+  d = b ? Symbol.for("react.portal") : 60106,
+  e = b ? Symbol.for("react.fragment") : 60107,
+  f = b ? Symbol.for("react.strict_mode") : 60108,
+  g = b ? Symbol.for("react.profiler") : 60114,
+  h = b ? Symbol.for("react.provider") : 60109,
+  k = b ? Symbol.for("react.context") : 60110,
+  l = b ? Symbol.for("react.async_mode") : 60111,
+  m = b ? Symbol.for("react.concurrent_mode") : 60111,
+  n = b ? Symbol.for("react.forward_ref") : 60112,
+  p = b ? Symbol.for("react.suspense") : 60113,
+  q = b ? Symbol.for("react.suspense_list") : 60120,
+  r = b ? Symbol.for("react.memo") : 60115,
+  t = b ? Symbol.for("react.lazy") : 60116,
+  v = b ? Symbol.for("react.block") : 60121,
+  w = b ? Symbol.for("react.fundamental") : 60117,
+  x = b ? Symbol.for("react.responder") : 60118,
+  y = b ? Symbol.for("react.scope") : 60119;
+function z(a) {
+  if ("object" === typeof a && null !== a) {
+    var u = a.$$typeof;
+    switch (u) {
+      case c:
+        switch (a = a.type, a) {
+          case l:
+          case m:
+          case e:
+          case g:
+          case f:
+          case p:
+            return a;
           default:
-            var $$typeofType = type && type.$$typeof;
-
-            switch ($$typeofType) {
-              case REACT_CONTEXT_TYPE:
-              case REACT_FORWARD_REF_TYPE:
-              case REACT_LAZY_TYPE:
-              case REACT_MEMO_TYPE:
-              case REACT_PROVIDER_TYPE:
-                return $$typeofType;
-
+            switch (a = a && a.$$typeof, a) {
+              case k:
+              case n:
+              case t:
+              case r:
+              case h:
+                return a;
               default:
-                return $$typeof;
+                return u;
             }
-
         }
-
-      case REACT_PORTAL_TYPE:
-        return $$typeof;
+      case d:
+        return u;
     }
   }
-
-  return undefined;
-} // AsyncMode is deprecated along with isAsyncMode
-
-var AsyncMode = REACT_ASYNC_MODE_TYPE;
-var ConcurrentMode = REACT_CONCURRENT_MODE_TYPE;
-var ContextConsumer = REACT_CONTEXT_TYPE;
-var ContextProvider = REACT_PROVIDER_TYPE;
-var Element = REACT_ELEMENT_TYPE;
-var ForwardRef = REACT_FORWARD_REF_TYPE;
-var Fragment = REACT_FRAGMENT_TYPE;
-var Lazy = REACT_LAZY_TYPE;
-var Memo = REACT_MEMO_TYPE;
-var Portal = REACT_PORTAL_TYPE;
-var Profiler = REACT_PROFILER_TYPE;
-var StrictMode = REACT_STRICT_MODE_TYPE;
-var Suspense = REACT_SUSPENSE_TYPE;
-var hasWarnedAboutDeprecatedIsAsyncMode = false; // AsyncMode should be deprecated
-
-function isAsyncMode(object) {
-  {
-    if (!hasWarnedAboutDeprecatedIsAsyncMode) {
-      hasWarnedAboutDeprecatedIsAsyncMode = true; // Using console['warn'] to evade Babel and ESLint
-
-      console['warn']('The ReactIs.isAsyncMode() alias has been deprecated, ' + 'and will be removed in React 17+. Update your code to use ' + 'ReactIs.isConcurrentMode() instead. It has the exact same API.');
-    }
-  }
-
-  return isConcurrentMode(object) || typeOf(object) === REACT_ASYNC_MODE_TYPE;
-}
-function isConcurrentMode(object) {
-  return typeOf(object) === REACT_CONCURRENT_MODE_TYPE;
-}
-function isContextConsumer(object) {
-  return typeOf(object) === REACT_CONTEXT_TYPE;
-}
-function isContextProvider(object) {
-  return typeOf(object) === REACT_PROVIDER_TYPE;
-}
-function isElement(object) {
-  return typeof object === 'object' && object !== null && object.$$typeof === REACT_ELEMENT_TYPE;
-}
-function isForwardRef(object) {
-  return typeOf(object) === REACT_FORWARD_REF_TYPE;
 }
-function isFragment(object) {
-  return typeOf(object) === REACT_FRAGMENT_TYPE;
-}
-function isLazy(object) {
-  return typeOf(object) === REACT_LAZY_TYPE;
-}
-function isMemo(object) {
-  return typeOf(object) === REACT_MEMO_TYPE;
-}
-function isPortal(object) {
-  return typeOf(object) === REACT_PORTAL_TYPE;
-}
-function isProfiler(object) {
-  return typeOf(object) === REACT_PROFILER_TYPE;
-}
-function isStrictMode(object) {
-  return typeOf(object) === REACT_STRICT_MODE_TYPE;
-}
-function isSuspense(object) {
-  return typeOf(object) === REACT_SUSPENSE_TYPE;
+function A(a) {
+  return z(a) === m;
 }
+var AsyncMode = l;
+var ConcurrentMode = m;
+var ContextConsumer = k;
+var ContextProvider = h;
+var Element = c;
+var ForwardRef = n;
+var Fragment = e;
+var Lazy = t;
+var Memo = r;
+var Portal = d;
+var Profiler = g;
+var StrictMode = f;
+var Suspense = p;
+var isAsyncMode = function (a) {
+  return A(a) || z(a) === l;
+};
+var isConcurrentMode = A;
+var isContextConsumer = function (a) {
+  return z(a) === k;
+};
+var isContextProvider = function (a) {
+  return z(a) === h;
+};
+var isElement = function (a) {
+  return "object" === typeof a && null !== a && a.$$typeof === c;
+};
+var isForwardRef = function (a) {
+  return z(a) === n;
+};
+var isFragment = function (a) {
+  return z(a) === e;
+};
+var isLazy = function (a) {
+  return z(a) === t;
+};
+var isMemo = function (a) {
+  return z(a) === r;
+};
+var isPortal = function (a) {
+  return z(a) === d;
+};
+var isProfiler = function (a) {
+  return z(a) === g;
+};
+var isStrictMode = function (a) {
+  return z(a) === f;
+};
+var isSuspense = function (a) {
+  return z(a) === p;
+};
+var isValidElementType = function (a) {
+  return "string" === typeof a || "function" === typeof a || a === e || a === m || a === g || a === f || a === p || a === q || "object" === typeof a && null !== a && (a.$$typeof === t || a.$$typeof === r || a.$$typeof === h || a.$$typeof === k || a.$$typeof === n || a.$$typeof === w || a.$$typeof === x || a.$$typeof === y || a.$$typeof === v);
+};
+var typeOf = z;
+var reactIs_production_min = {
+  AsyncMode: AsyncMode,
+  ConcurrentMode: ConcurrentMode,
+  ContextConsumer: ContextConsumer,
+  ContextProvider: ContextProvider,
+  Element: Element,
+  ForwardRef: ForwardRef,
+  Fragment: Fragment,
+  Lazy: Lazy,
+  Memo: Memo,
+  Portal: Portal,
+  Profiler: Profiler,
+  StrictMode: StrictMode,
+  Suspense: Suspense,
+  isAsyncMode: isAsyncMode,
+  isConcurrentMode: isConcurrentMode,
+  isContextConsumer: isContextConsumer,
+  isContextProvider: isContextProvider,
+  isElement: isElement,
+  isForwardRef: isForwardRef,
+  isFragment: isFragment,
+  isLazy: isLazy,
+  isMemo: isMemo,
+  isPortal: isPortal,
+  isProfiler: isProfiler,
+  isStrictMode: isStrictMode,
+  isSuspense: isSuspense,
+  isValidElementType: isValidElementType,
+  typeOf: typeOf
+};
 
-exports.AsyncMode = AsyncMode;
-exports.ConcurrentMode = ConcurrentMode;
-exports.ContextConsumer = ContextConsumer;
-exports.ContextProvider = ContextProvider;
-exports.Element = Element;
-exports.ForwardRef = ForwardRef;
-exports.Fragment = Fragment;
-exports.Lazy = Lazy;
-exports.Memo = Memo;
-exports.Portal = Portal;
-exports.Profiler = Profiler;
-exports.StrictMode = StrictMode;
-exports.Suspense = Suspense;
-exports.isAsyncMode = isAsyncMode;
-exports.isConcurrentMode = isConcurrentMode;
-exports.isContextConsumer = isContextConsumer;
-exports.isContextProvider = isContextProvider;
-exports.isElement = isElement;
-exports.isForwardRef = isForwardRef;
-exports.isFragment = isFragment;
-exports.isLazy = isLazy;
-exports.isMemo = isMemo;
-exports.isPortal = isPortal;
-exports.isProfiler = isProfiler;
-exports.isStrictMode = isStrictMode;
-exports.isSuspense = isSuspense;
-exports.isValidElementType = isValidElementType;
-exports.typeOf = typeOf;
-  })();
-}
+var reactIs_development = createCommonjsModule(function (module, exports) {
+
+  if (process.env.NODE_ENV !== "production") {
+    (function () {
+      var hasSymbol = typeof Symbol === 'function' && Symbol.for;
+      var REACT_ELEMENT_TYPE = hasSymbol ? Symbol.for('react.element') : 0xeac7;
+      var REACT_PORTAL_TYPE = hasSymbol ? Symbol.for('react.portal') : 0xeaca;
+      var REACT_FRAGMENT_TYPE = hasSymbol ? Symbol.for('react.fragment') : 0xeacb;
+      var REACT_STRICT_MODE_TYPE = hasSymbol ? Symbol.for('react.strict_mode') : 0xeacc;
+      var REACT_PROFILER_TYPE = hasSymbol ? Symbol.for('react.profiler') : 0xead2;
+      var REACT_PROVIDER_TYPE = hasSymbol ? Symbol.for('react.provider') : 0xeacd;
+      var REACT_CONTEXT_TYPE = hasSymbol ? Symbol.for('react.context') : 0xeace;
+      var REACT_ASYNC_MODE_TYPE = hasSymbol ? Symbol.for('react.async_mode') : 0xeacf;
+      var REACT_CONCURRENT_MODE_TYPE = hasSymbol ? Symbol.for('react.concurrent_mode') : 0xeacf;
+      var REACT_FORWARD_REF_TYPE = hasSymbol ? Symbol.for('react.forward_ref') : 0xead0;
+      var REACT_SUSPENSE_TYPE = hasSymbol ? Symbol.for('react.suspense') : 0xead1;
+      var REACT_SUSPENSE_LIST_TYPE = hasSymbol ? Symbol.for('react.suspense_list') : 0xead8;
+      var REACT_MEMO_TYPE = hasSymbol ? Symbol.for('react.memo') : 0xead3;
+      var REACT_LAZY_TYPE = hasSymbol ? Symbol.for('react.lazy') : 0xead4;
+      var REACT_BLOCK_TYPE = hasSymbol ? Symbol.for('react.block') : 0xead9;
+      var REACT_FUNDAMENTAL_TYPE = hasSymbol ? Symbol.for('react.fundamental') : 0xead5;
+      var REACT_RESPONDER_TYPE = hasSymbol ? Symbol.for('react.responder') : 0xead6;
+      var REACT_SCOPE_TYPE = hasSymbol ? Symbol.for('react.scope') : 0xead7;
+      function isValidElementType(type) {
+        return typeof type === 'string' || typeof type === 'function' || type === REACT_FRAGMENT_TYPE || type === REACT_CONCURRENT_MODE_TYPE || type === REACT_PROFILER_TYPE || type === REACT_STRICT_MODE_TYPE || type === REACT_SUSPENSE_TYPE || type === REACT_SUSPENSE_LIST_TYPE || typeof type === 'object' && type !== null && (type.$$typeof === REACT_LAZY_TYPE || type.$$typeof === REACT_MEMO_TYPE || type.$$typeof === REACT_PROVIDER_TYPE || type.$$typeof === REACT_CONTEXT_TYPE || type.$$typeof === REACT_FORWARD_REF_TYPE || type.$$typeof === REACT_FUNDAMENTAL_TYPE || type.$$typeof === REACT_RESPONDER_TYPE || type.$$typeof === REACT_SCOPE_TYPE || type.$$typeof === REACT_BLOCK_TYPE);
+      }
+      function typeOf(object) {
+        if (typeof object === 'object' && object !== null) {
+          var $$typeof = object.$$typeof;
+          switch ($$typeof) {
+            case REACT_ELEMENT_TYPE:
+              var type = object.type;
+              switch (type) {
+                case REACT_ASYNC_MODE_TYPE:
+                case REACT_CONCURRENT_MODE_TYPE:
+                case REACT_FRAGMENT_TYPE:
+                case REACT_PROFILER_TYPE:
+                case REACT_STRICT_MODE_TYPE:
+                case REACT_SUSPENSE_TYPE:
+                  return type;
+                default:
+                  var $$typeofType = type && type.$$typeof;
+                  switch ($$typeofType) {
+                    case REACT_CONTEXT_TYPE:
+                    case REACT_FORWARD_REF_TYPE:
+                    case REACT_LAZY_TYPE:
+                    case REACT_MEMO_TYPE:
+                    case REACT_PROVIDER_TYPE:
+                      return $$typeofType;
+                    default:
+                      return $$typeof;
+                  }
+              }
+            case REACT_PORTAL_TYPE:
+              return $$typeof;
+          }
+        }
+        return undefined;
+      }
+      var AsyncMode = REACT_ASYNC_MODE_TYPE;
+      var ConcurrentMode = REACT_CONCURRENT_MODE_TYPE;
+      var ContextConsumer = REACT_CONTEXT_TYPE;
+      var ContextProvider = REACT_PROVIDER_TYPE;
+      var Element = REACT_ELEMENT_TYPE;
+      var ForwardRef = REACT_FORWARD_REF_TYPE;
+      var Fragment = REACT_FRAGMENT_TYPE;
+      var Lazy = REACT_LAZY_TYPE;
+      var Memo = REACT_MEMO_TYPE;
+      var Portal = REACT_PORTAL_TYPE;
+      var Profiler = REACT_PROFILER_TYPE;
+      var StrictMode = REACT_STRICT_MODE_TYPE;
+      var Suspense = REACT_SUSPENSE_TYPE;
+      var hasWarnedAboutDeprecatedIsAsyncMode = false;
+      function isAsyncMode(object) {
+        {
+          if (!hasWarnedAboutDeprecatedIsAsyncMode) {
+            hasWarnedAboutDeprecatedIsAsyncMode = true;
+            console['warn']('The ReactIs.isAsyncMode() alias has been deprecated, ' + 'and will be removed in React 17+. Update your code to use ' + 'ReactIs.isConcurrentMode() instead. It has the exact same API.');
+          }
+        }
+        return isConcurrentMode(object) || typeOf(object) === REACT_ASYNC_MODE_TYPE;
+      }
+      function isConcurrentMode(object) {
+        return typeOf(object) === REACT_CONCURRENT_MODE_TYPE;
+      }
+      function isContextConsumer(object) {
+        return typeOf(object) === REACT_CONTEXT_TYPE;
+      }
+      function isContextProvider(object) {
+        return typeOf(object) === REACT_PROVIDER_TYPE;
+      }
+      function isElement(object) {
+        return typeof object === 'object' && object !== null && object.$$typeof === REACT_ELEMENT_TYPE;
+      }
+      function isForwardRef(object) {
+        return typeOf(object) === REACT_FORWARD_REF_TYPE;
+      }
+      function isFragment(object) {
+        return typeOf(object) === REACT_FRAGMENT_TYPE;
+      }
+      function isLazy(object) {
+        return typeOf(object) === REACT_LAZY_TYPE;
+      }
+      function isMemo(object) {
+        return typeOf(object) === REACT_MEMO_TYPE;
+      }
+      function isPortal(object) {
+        return typeOf(object) === REACT_PORTAL_TYPE;
+      }
+      function isProfiler(object) {
+        return typeOf(object) === REACT_PROFILER_TYPE;
+      }
+      function isStrictMode(object) {
+        return typeOf(object) === REACT_STRICT_MODE_TYPE;
+      }
+      function isSuspense(object) {
+        return typeOf(object) === REACT_SUSPENSE_TYPE;
+      }
+      exports.AsyncMode = AsyncMode;
+      exports.ConcurrentMode = ConcurrentMode;
+      exports.ContextConsumer = ContextConsumer;
+      exports.ContextProvider = ContextProvider;
+      exports.Element = Element;
+      exports.ForwardRef = ForwardRef;
+      exports.Fragment = Fragment;
+      exports.Lazy = Lazy;
+      exports.Memo = Memo;
+      exports.Portal = Portal;
+      exports.Profiler = Profiler;
+      exports.StrictMode = StrictMode;
+      exports.Suspense = Suspense;
+      exports.isAsyncMode = isAsyncMode;
+      exports.isConcurrentMode = isConcurrentMode;
+      exports.isContextConsumer = isContextConsumer;
+      exports.isContextProvider = isContextProvider;
+      exports.isElement = isElement;
+      exports.isForwardRef = isForwardRef;
+      exports.isFragment = isFragment;
+      exports.isLazy = isLazy;
+      exports.isMemo = isMemo;
+      exports.isPortal = isPortal;
+      exports.isProfiler = isProfiler;
+      exports.isStrictMode = isStrictMode;
+      exports.isSuspense = isSuspense;
+      exports.isValidElementType = isValidElementType;
+      exports.typeOf = typeOf;
+    })();
+  }
 });
 
 var reactIs = createCommonjsModule(function (module) {
 
-if (process.env.NODE_ENV === 'production') {
-  module.exports = reactIs_production_min;
-} else {
-  module.exports = reactIs_development;
-}
+  if (process.env.NODE_ENV === 'production') {
+    module.exports = reactIs_production_min;
+  } else {
+    module.exports = reactIs_development;
+  }
 });
 
-/*
-object-assign
-(c) Sindre Sorhus
-@license MIT
-*/
-/* eslint-disable no-unused-vars */
 var getOwnPropertySymbols = Object.getOwnPropertySymbols;
 var hasOwnProperty$a = Object.prototype.hasOwnProperty;
 var propIsEnumerable = Object.prototype.propertyIsEnumerable;
-
 function toObject(val) {
-	if (val === null || val === undefined) {
-		throw new TypeError('Object.assign cannot be called with null or undefined');
-	}
-
-	return Object(val);
+  if (val === null || val === undefined) {
+    throw new TypeError('Object.assign cannot be called with null or undefined');
+  }
+  return Object(val);
 }
-
 function shouldUseNative() {
-	try {
-		if (!Object.assign) {
-			return false;
-		}
-
-		// Detect buggy property enumeration order in older V8 versions.
-
-		// https://bugs.chromium.org/p/v8/issues/detail?id=4118
-		var test1 = new String('abc');  // eslint-disable-line no-new-wrappers
-		test1[5] = 'de';
-		if (Object.getOwnPropertyNames(test1)[0] === '5') {
-			return false;
-		}
-
-		// https://bugs.chromium.org/p/v8/issues/detail?id=3056
-		var test2 = {};
-		for (var i = 0; i < 10; i++) {
-			test2['_' + String.fromCharCode(i)] = i;
-		}
-		var order2 = Object.getOwnPropertyNames(test2).map(function (n) {
-			return test2[n];
-		});
-		if (order2.join('') !== '0123456789') {
-			return false;
-		}
-
-		// https://bugs.chromium.org/p/v8/issues/detail?id=3056
-		var test3 = {};
-		'abcdefghijklmnopqrst'.split('').forEach(function (letter) {
-			test3[letter] = letter;
-		});
-		if (Object.keys(Object.assign({}, test3)).join('') !==
-				'abcdefghijklmnopqrst') {
-			return false;
-		}
-
-		return true;
-	} catch (err) {
-		// We don't expect any of the above to throw, but better to be safe.
-		return false;
-	}
+  try {
+    if (!Object.assign) {
+      return false;
+    }
+    var test1 = new String('abc');
+    test1[5] = 'de';
+    if (Object.getOwnPropertyNames(test1)[0] === '5') {
+      return false;
+    }
+    var test2 = {};
+    for (var i = 0; i < 10; i++) {
+      test2['_' + String.fromCharCode(i)] = i;
+    }
+    var order2 = Object.getOwnPropertyNames(test2).map(function (n) {
+      return test2[n];
+    });
+    if (order2.join('') !== '0123456789') {
+      return false;
+    }
+    var test3 = {};
+    'abcdefghijklmnopqrst'.split('').forEach(function (letter) {
+      test3[letter] = letter;
+    });
+    if (Object.keys(Object.assign({}, test3)).join('') !== 'abcdefghijklmnopqrst') {
+      return false;
+    }
+    return true;
+  } catch (err) {
+    return false;
+  }
 }
-
 var objectAssign = shouldUseNative() ? Object.assign : function (target, source) {
-	var from;
-	var to = toObject(target);
-	var symbols;
-
-	for (var s = 1; s < arguments.length; s++) {
-		from = Object(arguments[s]);
-
-		for (var key in from) {
-			if (hasOwnProperty$a.call(from, key)) {
-				to[key] = from[key];
-			}
-		}
-
-		if (getOwnPropertySymbols) {
-			symbols = getOwnPropertySymbols(from);
-			for (var i = 0; i < symbols.length; i++) {
-				if (propIsEnumerable.call(from, symbols[i])) {
-					to[symbols[i]] = from[symbols[i]];
-				}
-			}
-		}
-	}
-
-	return to;
+  var from;
+  var to = toObject(target);
+  var symbols;
+  for (var s = 1; s < arguments.length; s++) {
+    from = Object(arguments[s]);
+    for (var key in from) {
+      if (hasOwnProperty$a.call(from, key)) {
+        to[key] = from[key];
+      }
+    }
+    if (getOwnPropertySymbols) {
+      symbols = getOwnPropertySymbols(from);
+      for (var i = 0; i < symbols.length; i++) {
+        if (propIsEnumerable.call(from, symbols[i])) {
+          to[symbols[i]] = from[symbols[i]];
+        }
+      }
+    }
+  }
+  return to;
 };
 
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 var ReactPropTypesSecret = 'SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED';
-
 var ReactPropTypesSecret_1 = ReactPropTypesSecret;
 
 var has = Function.call.bind(Object.prototype.hasOwnProperty);
 
-var printWarning = function() {};
-
+var printWarning = function () {};
 if (process.env.NODE_ENV !== 'production') {
   var ReactPropTypesSecret$1 = ReactPropTypesSecret_1;
   var loggedTypeFailures = {};
   var has$1 = has;
-
-  printWarning = function(text) {
+  printWarning = function (text) {
     var message = 'Warning: ' + text;
     if (typeof console !== 'undefined') {
       console.error(message);
     }
     try {
-      // --- Welcome to debugging React ---
-      // This error was thrown as a convenience so that you can use this stack
-      // to find the callsite that caused this warning to fire.
       throw new Error(message);
-    } catch (x) { /**/ }
+    } catch (x) {}
   };
 }
-
-/**
- * Assert that the values match with the type specs.
- * Error messages are memorized and will only be shown once.
- *
- * @param {object} typeSpecs Map of name to a ReactPropType
- * @param {object} values Runtime values that need to be type-checked
- * @param {string} location e.g. "prop", "context", "child context"
- * @param {string} componentName Name of the component for error messages.
- * @param {?Function} getStack Returns the component stack.
- * @private
- */
 function checkPropTypes(typeSpecs, values, location, componentName, getStack) {
   if (process.env.NODE_ENV !== 'production') {
     for (var typeSpecName in typeSpecs) {
       if (has$1(typeSpecs, typeSpecName)) {
         var error;
-        // Prop type validation may throw. In case they do, we don't want to
-        // fail the render phase where it didn't fail before. So we log it.
-        // After these have been cleaned up, we'll let them throw.
         try {
-          // This is intentionally an invariant that gets caught. It's the same
-          // behavior as without this statement except with a better message.
           if (typeof typeSpecs[typeSpecName] !== 'function') {
-            var err = Error(
-              (componentName || 'React class') + ': ' + location + ' type `' + typeSpecName + '` is invalid; ' +
-              'it must be a function, usually from the `prop-types` package, but received `' + typeof typeSpecs[typeSpecName] + '`.' +
-              'This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`.'
-            );
+            var err = Error((componentName || 'React class') + ': ' + location + ' type `' + typeSpecName + '` is invalid; ' + 'it must be a function, usually from the `prop-types` package, but received `' + typeof typeSpecs[typeSpecName] + '`.' + 'This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`.');
             err.name = 'Invariant Violation';
             throw err;
           }
@@ -25563,142 +25727,49 @@ function checkPropTypes(typeSpecs, values, location, componentName, getStack) {
           error = ex;
         }
         if (error && !(error instanceof Error)) {
-          printWarning(
-            (componentName || 'React class') + ': type specification of ' +
-            location + ' `' + typeSpecName + '` is invalid; the type checker ' +
-            'function must return `null` or an `Error` but returned a ' + typeof error + '. ' +
-            'You may have forgotten to pass an argument to the type checker ' +
-            'creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and ' +
-            'shape all require an argument).'
-          );
+          printWarning((componentName || 'React class') + ': type specification of ' + location + ' `' + typeSpecName + '` is invalid; the type checker ' + 'function must return `null` or an `Error` but returned a ' + typeof error + '. ' + 'You may have forgotten to pass an argument to the type checker ' + 'creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and ' + 'shape all require an argument).');
         }
         if (error instanceof Error && !(error.message in loggedTypeFailures)) {
-          // Only monitor this failure once because there tends to be a lot of the
-          // same error.
           loggedTypeFailures[error.message] = true;
-
           var stack = getStack ? getStack() : '';
-
-          printWarning(
-            'Failed ' + location + ' type: ' + error.message + (stack != null ? stack : '')
-          );
+          printWarning('Failed ' + location + ' type: ' + error.message + (stack != null ? stack : ''));
         }
       }
     }
   }
 }
-
-/**
- * Resets warning cache when testing.
- *
- * @private
- */
-checkPropTypes.resetWarningCache = function() {
+checkPropTypes.resetWarningCache = function () {
   if (process.env.NODE_ENV !== 'production') {
     loggedTypeFailures = {};
   }
 };
-
 var checkPropTypes_1 = checkPropTypes;
 
-var printWarning$1 = function() {};
-
+var printWarning$1 = function () {};
 if (process.env.NODE_ENV !== 'production') {
-  printWarning$1 = function(text) {
+  printWarning$1 = function (text) {
     var message = 'Warning: ' + text;
     if (typeof console !== 'undefined') {
       console.error(message);
     }
     try {
-      // --- Welcome to debugging React ---
-      // This error was thrown as a convenience so that you can use this stack
-      // to find the callsite that caused this warning to fire.
       throw new Error(message);
     } catch (x) {}
   };
 }
-
 function emptyFunctionThatReturnsNull() {
   return null;
 }
-
-var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
-  /* global Symbol */
+var factoryWithTypeCheckers = function (isValidElement, throwOnDirectAccess) {
   var ITERATOR_SYMBOL = typeof Symbol === 'function' && Symbol.iterator;
-  var FAUX_ITERATOR_SYMBOL = '@@iterator'; // Before Symbol spec.
-
-  /**
-   * Returns the iterator method function contained on the iterable object.
-   *
-   * Be sure to invoke the function with the iterable as context:
-   *
-   *     var iteratorFn = getIteratorFn(myIterable);
-   *     if (iteratorFn) {
-   *       var iterator = iteratorFn.call(myIterable);
-   *       ...
-   *     }
-   *
-   * @param {?object} maybeIterable
-   * @return {?function}
-   */
+  var FAUX_ITERATOR_SYMBOL = '@@iterator';
   function getIteratorFn(maybeIterable) {
     var iteratorFn = maybeIterable && (ITERATOR_SYMBOL && maybeIterable[ITERATOR_SYMBOL] || maybeIterable[FAUX_ITERATOR_SYMBOL]);
     if (typeof iteratorFn === 'function') {
       return iteratorFn;
     }
   }
-
-  /**
-   * Collection of methods that allow declaration and validation of props that are
-   * supplied to React components. Example usage:
-   *
-   *   var Props = require('ReactPropTypes');
-   *   var MyArticle = React.createClass({
-   *     propTypes: {
-   *       // An optional string prop named "description".
-   *       description: Props.string,
-   *
-   *       // A required enum prop named "category".
-   *       category: Props.oneOf(['News','Photos']).isRequired,
-   *
-   *       // A prop named "dialog" that requires an instance of Dialog.
-   *       dialog: Props.instanceOf(Dialog).isRequired
-   *     },
-   *     render: function() { ... }
-   *   });
-   *
-   * A more formal specification of how these methods are used:
-   *
-   *   type := array|bool|func|object|number|string|oneOf([...])|instanceOf(...)
-   *   decl := ReactPropTypes.{type}(.isRequired)?
-   *
-   * Each and every declaration produces a function with the same signature. This
-   * allows the creation of custom validation functions. For example:
-   *
-   *  var MyLink = React.createClass({
-   *    propTypes: {
-   *      // An optional string or URI prop named "href".
-   *      href: function(props, propName, componentName) {
-   *        var propValue = props[propName];
-   *        if (propValue != null && typeof propValue !== 'string' &&
-   *            !(propValue instanceof URI)) {
-   *          return new Error(
-   *            'Expected a string or an URI for ' + propName + ' in ' +
-   *            componentName
-   *          );
-   *        }
-   *      }
-   *    },
-   *    render: function() {...}
-   *  });
-   *
-   * @internal
-   */
-
   var ANONYMOUS = '<<anonymous>>';
-
-  // Important!
-  // Keep this list in sync with production version in `./factoryWithThrowingShims.js`.
   var ReactPropTypes = {
     array: createPrimitiveTypeChecker('array'),
     bigint: createPrimitiveTypeChecker('bigint'),
@@ -25708,7 +25779,6 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
     object: createPrimitiveTypeChecker('object'),
     string: createPrimitiveTypeChecker('string'),
     symbol: createPrimitiveTypeChecker('symbol'),
-
     any: createAnyTypeChecker(),
     arrayOf: createArrayOfTypeChecker,
     element: createElementTypeChecker(),
@@ -25719,42 +25789,21 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
     oneOf: createEnumTypeChecker,
     oneOfType: createUnionTypeChecker,
     shape: createShapeTypeChecker,
-    exact: createStrictShapeTypeChecker,
+    exact: createStrictShapeTypeChecker
   };
-
-  /**
-   * inlined Object.is polyfill to avoid requiring consumers ship their own
-   * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
-   */
-  /*eslint-disable no-self-compare*/
   function is(x, y) {
-    // SameValue algorithm
     if (x === y) {
-      // Steps 1-5, 7-10
-      // Steps 6.b-6.e: +0 != -0
       return x !== 0 || 1 / x === 1 / y;
     } else {
-      // Step 6.a: NaN == NaN
       return x !== x && y !== y;
     }
   }
-  /*eslint-enable no-self-compare*/
-
-  /**
-   * We use an Error-like object for backward compatibility as people may call
-   * PropTypes directly and inspect their output. However, we don't use real
-   * Errors anymore. We don't inspect their stack anyway, and creating them
-   * is prohibitively expensive if they are created too often, such as what
-   * happens in oneOfType() for any type before the one that matched.
-   */
   function PropTypeError(message, data) {
     this.message = message;
-    this.data = data && typeof data === 'object' ? data: {};
+    this.data = data && typeof data === 'object' ? data : {};
     this.stack = '';
   }
-  // Make `instanceof Error` still work for returned errors.
   PropTypeError.prototype = Error.prototype;
-
   function createChainableTypeChecker(validate) {
     if (process.env.NODE_ENV !== 'production') {
       var manualPropTypeCallCache = {};
@@ -25763,32 +25812,15 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
     function checkType(isRequired, props, propName, componentName, location, propFullName, secret) {
       componentName = componentName || ANONYMOUS;
       propFullName = propFullName || propName;
-
       if (secret !== ReactPropTypesSecret_1) {
         if (throwOnDirectAccess) {
-          // New behavior only for users of `prop-types` package
-          var err = new Error(
-            'Calling PropTypes validators directly is not supported by the `prop-types` package. ' +
-            'Use `PropTypes.checkPropTypes()` to call them. ' +
-            'Read more at http://fb.me/use-check-prop-types'
-          );
+          var err = new Error('Calling PropTypes validators directly is not supported by the `prop-types` package. ' + 'Use `PropTypes.checkPropTypes()` to call them. ' + 'Read more at http://fb.me/use-check-prop-types');
           err.name = 'Invariant Violation';
           throw err;
         } else if (process.env.NODE_ENV !== 'production' && typeof console !== 'undefined') {
-          // Old behavior for people using React.PropTypes
           var cacheKey = componentName + ':' + propName;
-          if (
-            !manualPropTypeCallCache[cacheKey] &&
-            // Avoid spamming the console because they are often not actionable except for lib authors
-            manualPropTypeWarningCount < 3
-          ) {
-            printWarning$1(
-              'You are manually calling a React.PropTypes validation ' +
-              'function for the `' + propFullName + '` prop on `' + componentName + '`. This is deprecated ' +
-              'and will throw in the standalone `prop-types` package. ' +
-              'You may be seeing this warning due to a third-party PropTypes ' +
-              'library. See https://fb.me/react-warning-dont-call-proptypes ' + 'for details.'
-            );
+          if (!manualPropTypeCallCache[cacheKey] && manualPropTypeWarningCount < 3) {
+            printWarning$1('You are manually calling a React.PropTypes validation ' + 'function for the `' + propFullName + '` prop on `' + componentName + '`. This is deprecated ' + 'and will throw in the standalone `prop-types` package. ' + 'You may be seeing this warning due to a third-party PropTypes ' + 'library. See https://fb.me/react-warning-dont-call-proptypes ' + 'for details.');
             manualPropTypeCallCache[cacheKey] = true;
             manualPropTypeWarningCount++;
           }
@@ -25806,37 +25838,27 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
         return validate(props, propName, componentName, location, propFullName);
       }
     }
-
     var chainedCheckType = checkType.bind(null, false);
     chainedCheckType.isRequired = checkType.bind(null, true);
-
     return chainedCheckType;
   }
-
   function createPrimitiveTypeChecker(expectedType) {
     function validate(props, propName, componentName, location, propFullName, secret) {
       var propValue = props[propName];
       var propType = getPropType(propValue);
       if (propType !== expectedType) {
-        // `propValue` being instance of, say, date/regexp, pass the 'object'
-        // check, but we can offer a more precise error message here rather than
-        // 'of type `object`'.
         var preciseType = getPreciseType(propValue);
-
-        return new PropTypeError(
-          'Invalid ' + location + ' `' + propFullName + '` of type ' + ('`' + preciseType + '` supplied to `' + componentName + '`, expected ') + ('`' + expectedType + '`.'),
-          {expectedType: expectedType}
-        );
+        return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` of type ' + ('`' + preciseType + '` supplied to `' + componentName + '`, expected ') + ('`' + expectedType + '`.'), {
+          expectedType: expectedType
+        });
       }
       return null;
     }
     return createChainableTypeChecker(validate);
   }
-
   function createAnyTypeChecker() {
     return createChainableTypeChecker(emptyFunctionThatReturnsNull);
   }
-
   function createArrayOfTypeChecker(typeChecker) {
     function validate(props, propName, componentName, location, propFullName) {
       if (typeof typeChecker !== 'function') {
@@ -25857,7 +25879,6 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
     }
     return createChainableTypeChecker(validate);
   }
-
   function createElementTypeChecker() {
     function validate(props, propName, componentName, location, propFullName) {
       var propValue = props[propName];
@@ -25869,7 +25890,6 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
     }
     return createChainableTypeChecker(validate);
   }
-
   function createElementTypeTypeChecker() {
     function validate(props, propName, componentName, location, propFullName) {
       var propValue = props[propName];
@@ -25881,7 +25901,6 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
     }
     return createChainableTypeChecker(validate);
   }
-
   function createInstanceTypeChecker(expectedClass) {
     function validate(props, propName, componentName, location, propFullName) {
       if (!(props[propName] instanceof expectedClass)) {
@@ -25893,22 +25912,17 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
     }
     return createChainableTypeChecker(validate);
   }
-
   function createEnumTypeChecker(expectedValues) {
     if (!Array.isArray(expectedValues)) {
       if (process.env.NODE_ENV !== 'production') {
         if (arguments.length > 1) {
-          printWarning$1(
-            'Invalid arguments supplied to oneOf, expected an array, got ' + arguments.length + ' arguments. ' +
-            'A common mistake is to write oneOf(x, y, z) instead of oneOf([x, y, z]).'
-          );
+          printWarning$1('Invalid arguments supplied to oneOf, expected an array, got ' + arguments.length + ' arguments. ' + 'A common mistake is to write oneOf(x, y, z) instead of oneOf([x, y, z]).');
         } else {
           printWarning$1('Invalid argument supplied to oneOf, expected an array.');
         }
       }
       return emptyFunctionThatReturnsNull;
     }
-
     function validate(props, propName, componentName, location, propFullName) {
       var propValue = props[propName];
       for (var i = 0; i < expectedValues.length; i++) {
@@ -25916,7 +25930,6 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
           return null;
         }
       }
-
       var valuesString = JSON.stringify(expectedValues, function replacer(key, value) {
         var type = getPreciseType(value);
         if (type === 'symbol') {
@@ -25928,7 +25941,6 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
     }
     return createChainableTypeChecker(validate);
   }
-
   function createObjectOfTypeChecker(typeChecker) {
     function validate(props, propName, componentName, location, propFullName) {
       if (typeof typeChecker !== 'function') {
@@ -25951,24 +25963,18 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
     }
     return createChainableTypeChecker(validate);
   }
-
   function createUnionTypeChecker(arrayOfTypeCheckers) {
     if (!Array.isArray(arrayOfTypeCheckers)) {
       process.env.NODE_ENV !== 'production' ? printWarning$1('Invalid argument supplied to oneOfType, expected an instance of array.') : void 0;
       return emptyFunctionThatReturnsNull;
     }
-
     for (var i = 0; i < arrayOfTypeCheckers.length; i++) {
       var checker = arrayOfTypeCheckers[i];
       if (typeof checker !== 'function') {
-        printWarning$1(
-          'Invalid argument supplied to oneOfType. Expected an array of check functions, but ' +
-          'received ' + getPostfixForTypeWarning(checker) + ' at index ' + i + '.'
-        );
+        printWarning$1('Invalid argument supplied to oneOfType. Expected an array of check functions, but ' + 'received ' + getPostfixForTypeWarning(checker) + ' at index ' + i + '.');
         return emptyFunctionThatReturnsNull;
       }
     }
-
     function validate(props, propName, componentName, location, propFullName) {
       var expectedTypes = [];
       for (var i = 0; i < arrayOfTypeCheckers.length; i++) {
@@ -25981,12 +25987,11 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
           expectedTypes.push(checkerResult.data.expectedType);
         }
       }
-      var expectedTypesMessage = (expectedTypes.length > 0) ? ', expected one of type [' + expectedTypes.join(', ') + ']': '';
+      var expectedTypesMessage = expectedTypes.length > 0 ? ', expected one of type [' + expectedTypes.join(', ') + ']' : '';
       return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` supplied to ' + ('`' + componentName + '`' + expectedTypesMessage + '.'));
     }
     return createChainableTypeChecker(validate);
   }
-
   function createNodeChecker() {
     function validate(props, propName, componentName, location, propFullName) {
       if (!isNode(props[propName])) {
@@ -25996,14 +26001,9 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
     }
     return createChainableTypeChecker(validate);
   }
-
   function invalidValidatorError(componentName, location, propFullName, key, type) {
-    return new PropTypeError(
-      (componentName || 'React class') + ': ' + location + ' type `' + propFullName + '.' + key + '` is invalid; ' +
-      'it must be a function, usually from the `prop-types` package, but received `' + type + '`.'
-    );
+    return new PropTypeError((componentName || 'React class') + ': ' + location + ' type `' + propFullName + '.' + key + '` is invalid; ' + 'it must be a function, usually from the `prop-types` package, but received `' + type + '`.');
   }
-
   function createShapeTypeChecker(shapeTypes) {
     function validate(props, propName, componentName, location, propFullName) {
       var propValue = props[propName];
@@ -26025,7 +26025,6 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
     }
     return createChainableTypeChecker(validate);
   }
-
   function createStrictShapeTypeChecker(shapeTypes) {
     function validate(props, propName, componentName, location, propFullName) {
       var propValue = props[propName];
@@ -26033,7 +26032,6 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
       if (propType !== 'object') {
         return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` of type `' + propType + '` ' + ('supplied to `' + componentName + '`, expected `object`.'));
       }
-      // We need to check all keys in case some are required but missing from props.
       var allKeys = objectAssign({}, props[propName], shapeTypes);
       for (var key in allKeys) {
         var checker = shapeTypes[key];
@@ -26041,11 +26039,7 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
           return invalidValidatorError(componentName, location, propFullName, key, getPreciseType(checker));
         }
         if (!checker) {
-          return new PropTypeError(
-            'Invalid ' + location + ' `' + propFullName + '` key `' + key + '` supplied to `' + componentName + '`.' +
-            '\nBad object: ' + JSON.stringify(props[propName], null, '  ') +
-            '\nValid keys: ' + JSON.stringify(Object.keys(shapeTypes), null, '  ')
-          );
+          return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` key `' + key + '` supplied to `' + componentName + '`.' + '\nBad object: ' + JSON.stringify(props[propName], null, '  ') + '\nValid keys: ' + JSON.stringify(Object.keys(shapeTypes), null, '  '));
         }
         var error = checker(propValue, key, componentName, location, propFullName + '.' + key, ReactPropTypesSecret_1);
         if (error) {
@@ -26054,10 +26048,8 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
       }
       return null;
     }
-
     return createChainableTypeChecker(validate);
   }
-
   function isNode(propValue) {
     switch (typeof propValue) {
       case 'number':
@@ -26073,7 +26065,6 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
         if (propValue === null || isValidElement(propValue)) {
           return true;
         }
-
         var iteratorFn = getIteratorFn(propValue);
         if (iteratorFn) {
           var iterator = iteratorFn.call(propValue);
@@ -26085,7 +26076,6 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
               }
             }
           } else {
-            // Iterator will provide entry [k,v] tuples rather than values.
             while (!(step = iterator.next()).done) {
               var entry = step.value;
               if (entry) {
@@ -26098,47 +26088,32 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
         } else {
           return false;
         }
-
         return true;
       default:
         return false;
     }
   }
-
   function isSymbol(propType, propValue) {
-    // Native Symbol.
     if (propType === 'symbol') {
       return true;
     }
-
-    // falsy value can't be a Symbol
     if (!propValue) {
       return false;
     }
-
-    // 19.4.3.5 Symbol.prototype[@@toStringTag] === 'Symbol'
     if (propValue['@@toStringTag'] === 'Symbol') {
       return true;
     }
-
-    // Fallback for non-spec compliant Symbols which are polyfilled.
     if (typeof Symbol === 'function' && propValue instanceof Symbol) {
       return true;
     }
-
     return false;
   }
-
-  // Equivalent of `typeof` but with special handling for array and regexp.
   function getPropType(propValue) {
     var propType = typeof propValue;
     if (Array.isArray(propValue)) {
       return 'array';
     }
     if (propValue instanceof RegExp) {
-      // Old webkits (at least until Android 4.0) return 'function' rather than
-      // 'object' for typeof a RegExp. We'll normalize this here so that /bla/
-      // passes PropTypes.object.
       return 'object';
     }
     if (isSymbol(propType, propValue)) {
@@ -26146,9 +26121,6 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
     }
     return propType;
   }
-
-  // This handles more types than `getPropType`. Only used for error messages.
-  // See `createPrimitiveTypeChecker`.
   function getPreciseType(propValue) {
     if (typeof propValue === 'undefined' || propValue === null) {
       return '' + propValue;
@@ -26163,9 +26135,6 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
     }
     return propType;
   }
-
-  // Returns a string that is postfixed to a warning about an invalid type.
-  // For example, "undefined" or "of type array"
   function getPostfixForTypeWarning(value) {
     var type = getPreciseType(value);
     switch (type) {
@@ -26180,44 +26149,34 @@ var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
         return type;
     }
   }
-
-  // Returns class name of the object, if any.
   function getClassName(propValue) {
     if (!propValue.constructor || !propValue.constructor.name) {
       return ANONYMOUS;
     }
     return propValue.constructor.name;
   }
-
   ReactPropTypes.checkPropTypes = checkPropTypes_1;
   ReactPropTypes.resetWarningCache = checkPropTypes_1.resetWarningCache;
   ReactPropTypes.PropTypes = ReactPropTypes;
-
   return ReactPropTypes;
 };
 
 function emptyFunction() {}
 function emptyFunctionWithReset() {}
 emptyFunctionWithReset.resetWarningCache = emptyFunction;
-
-var factoryWithThrowingShims = function() {
+var factoryWithThrowingShims = function () {
   function shim(props, propName, componentName, location, propFullName, secret) {
     if (secret === ReactPropTypesSecret_1) {
-      // It is still safe when called from React.
       return;
     }
-    var err = new Error(
-      'Calling PropTypes validators directly is not supported by the `prop-types` package. ' +
-      'Use PropTypes.checkPropTypes() to call them. ' +
-      'Read more at http://fb.me/use-check-prop-types'
-    );
+    var err = new Error('Calling PropTypes validators directly is not supported by the `prop-types` package. ' + 'Use PropTypes.checkPropTypes() to call them. ' + 'Read more at http://fb.me/use-check-prop-types');
     err.name = 'Invariant Violation';
     throw err;
-  }  shim.isRequired = shim;
+  }
+  shim.isRequired = shim;
   function getShim() {
     return shim;
-  }  // Important!
-  // Keep this list in sync with production version in `./factoryWithTypeCheckers.js`.
+  }
   var ReactPropTypes = {
     array: shim,
     bigint: shim,
@@ -26227,7 +26186,6 @@ var factoryWithThrowingShims = function() {
     object: shim,
     string: shim,
     symbol: shim,
-
     any: shim,
     arrayOf: getShim,
     element: shim,
@@ -26239,36 +26197,21 @@ var factoryWithThrowingShims = function() {
     oneOfType: getShim,
     shape: getShim,
     exact: getShim,
-
     checkPropTypes: emptyFunctionWithReset,
     resetWarningCache: emptyFunction
   };
-
   ReactPropTypes.PropTypes = ReactPropTypes;
-
   return ReactPropTypes;
 };
 
 var propTypes = createCommonjsModule(function (module) {
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-if (process.env.NODE_ENV !== 'production') {
-  var ReactIs = reactIs;
-
-  // By explicitly using `prop-types` you are opting into new development behavior.
-  // http://fb.me/prop-types-in-prod
-  var throwOnDirectAccess = true;
-  module.exports = factoryWithTypeCheckers(ReactIs.isElement, throwOnDirectAccess);
-} else {
-  // By explicitly using `prop-types` you are opting into new production behavior.
-  // http://fb.me/prop-types-in-prod
-  module.exports = factoryWithThrowingShims();
-}
+  if (process.env.NODE_ENV !== 'production') {
+    var ReactIs = reactIs;
+    var throwOnDirectAccess = true;
+    module.exports = factoryWithTypeCheckers(ReactIs.isElement, throwOnDirectAccess);
+  } else {
+    module.exports = factoryWithThrowingShims();
+  }
 });
 
 const SearchConnection = _ref => {
@@ -28043,31 +27986,31 @@ const checkForNA$1 = value => {
   return value ? value : "CS_NA";
 };
 const WSApplicationDetails = () => {
-  var _user$info, _user$info$userName, _user$info2, _user$info3, _Digit$SessionStorage, _user$info4, _data$WaterConnection, _data$WaterConnection2, _data$SewerageConnect, _data$SewerageConnect2, _data$WaterConnection3, _data$WaterConnection4, _data$SewerageConnect3, _data$SewerageConnect4, _data$WaterConnection5, _data$WaterConnection6, _data$SewerageConnect5, _data$SewerageConnect6, _data$WaterConnection7, _data$WaterConnection8, _data$SewerageConnect7, _data$SewerageConnect8, _data$WaterConnection9, _data$WaterConnection0, _data$SewerageConnect9, _data$SewerageConnect0, _data$WaterConnection1, _data$SewerageConnect1, _PTData$Properties, _PTData$Properties$, _data$WaterConnection10, _data$WaterConnection11, _data$WaterConnection12, _data$WaterConnection13, _data$SewerageConnect10, _data$SewerageConnect11, _data$SewerageConnect12, _data$SewerageConnect13, _data$WaterConnection14, _data$WaterConnection15, _data$WaterConnection16, _data$WaterConnection17, _data$SewerageConnect14, _data$SewerageConnect15, _data$SewerageConnect16, _data$SewerageConnect17, _data$WaterConnection36, _data$WaterConnection37, _data$SewerageConnect32, _data$SewerageConnect33, _data$WaterConnection38, _data$WaterConnection39, _data$SewerageConnect34, _data$SewerageConnect35, _data$WaterConnection40, _data$WaterConnection41, _data$SewerageConnect36, _data$SewerageConnect37, _data$WaterConnection42, _data$WaterConnection43, _data$SewerageConnect38, _data$SewerageConnect39, _data$WaterConnection44, _data$WaterConnection45, _data$WaterConnection46, _data$SewerageConnect40, _data$SewerageConnect41, _data$WaterConnection47, _data$WaterConnection48, _data$SewerageConnect42, _data$SewerageConnect43, _data$WaterConnection49, _data$WaterConnection50, _data$SewerageConnect44, _data$SewerageConnect45, _data$WaterConnection51, _data$WaterConnection52, _data$SewerageConnect46, _data$SewerageConnect47, _data$WaterConnection53, _data$WaterConnection54, _data$SewerageConnect48, _data$SewerageConnect49, _data$WaterConnection55, _data$WaterConnection56, _data$SewerageConnect50, _data$SewerageConnect51, _data$WaterConnection57, _data$WaterConnection58, _data$SewerageConnect52, _data$SewerageConnect53, _data$WaterConnection59, _data$WaterConnection60, _data$SewerageConnect54, _data$SewerageConnect55, _data$WaterConnection61, _data$WaterConnection62, _data$SewerageConnect56, _data$SewerageConnect57, _data$WaterConnection63, _data$WaterConnection64, _data$WaterConnection65, _data$WaterConnection66, _data$SewerageConnect58, _data$SewerageConnect59, _data$SewerageConnect60, _data$SewerageConnect61, _paymentDetails$data, _paymentDetails$data$, _paymentDetails$data$2, _paymentDetails$data$3, _paymentDetails$data$4, _paymentDetails$data2, _paymentDetails$data3, _paymentDetails$data4, _paymentDetails$data5, _paymentDetails$data6, _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, _connectionDetails$se, _connectionDetails$se2, _connectionDetails$co, _connectionDetails$co2, _connectionDetails$wa, _connectionDetails$wa2, _connectionDetails$ap, _connectionDetails$ap2, _connectionDetails$do, _connectionDetails$do2, _connectionDetails$do3, _connectionDetails$de, _connectionDetails$de2, _data$WaterConnection67, _data$WaterConnection68, _data$WaterConnection69, _data$SewerageConnect62, _data$SewerageConnect63, _data$SewerageConnect64, _data$WaterConnection70, _data$WaterConnection71, _data$WaterConnection72, _data$WaterConnection73, _data$SewerageConnect65, _data$SewerageConnect66, _data$SewerageConnect67, _data$SewerageConnect68, _data$WaterConnection74, _data$WaterConnection75, _data$WaterConnection76, _data$WaterConnection77, _data$SewerageConnect69, _data$SewerageConnect70, _data$SewerageConnect71, _data$SewerageConnect72, _data$WaterConnection78, _data$WaterConnection79, _data$WaterConnection80, _data$WaterConnection81, _data$SewerageConnect73, _data$SewerageConnect74, _data$SewerageConnect75, _data$SewerageConnect76, _data$WaterConnection82, _data$WaterConnection83, _data$WaterConnection84, _data$WaterConnection85, _data$SewerageConnect77, _data$SewerageConnect78, _data$SewerageConnect79, _data$SewerageConnect80, _data$WaterConnection86, _data$WaterConnection87, _data$WaterConnection88, _data$WaterConnection89, _data$SewerageConnect81, _data$SewerageConnect82, _data$SewerageConnect83, _data$SewerageConnect84, _data$WaterConnection90, _data$WaterConnection91, _data$WaterConnection92, _data$WaterConnection93, _data$SewerageConnect85, _data$SewerageConnect86, _data$SewerageConnect87, _data$SewerageConnect88, _data$WaterConnection94, _data$WaterConnection95, _data$WaterConnection96, _data$WaterConnection97, _data$SewerageConnect89, _data$SewerageConnect90, _data$SewerageConnect91, _data$SewerageConnect92, _data$WaterConnection98, _data$WaterConnection99, _data$WaterConnection100, _data$WaterConnection101, _data$SewerageConnect93, _data$SewerageConnect94, _data$SewerageConnect95, _data$SewerageConnect96, _data$WaterConnection102, _data$WaterConnection103, _data$WaterConnection104, _data$WaterConnection105, _data$SewerageConnect97, _data$SewerageConnect98, _data$SewerageConnect99, _data$SewerageConnect100, _data$WaterConnection106, _data$WaterConnection107, _data$WaterConnection108, _data$WaterConnection109, _data$SewerageConnect101, _data$SewerageConnect102, _data$SewerageConnect103, _data$SewerageConnect104, _data$WaterConnection110, _data$WaterConnection111, _data$WaterConnection112, _data$WaterConnection113, _data$SewerageConnect105, _data$SewerageConnect106, _data$SewerageConnect107, _data$SewerageConnect108, _data$WaterConnection114, _data$WaterConnection115, _data$WaterConnection116, _data$WaterConnection117, _data$WaterConnection118, _data$SewerageConnect109, _data$SewerageConnect110, _data$SewerageConnect111, _data$SewerageConnect112, _data$SewerageConnect113, _data$WaterConnection119, _data$WaterConnection120, _data$WaterConnection121, _data$WaterConnection122, _data$SewerageConnect114, _data$SewerageConnect115, _data$SewerageConnect116, _data$SewerageConnect117, _data$WaterConnection123, _data$WaterConnection124, _data$WaterConnection125, _data$WaterConnection126, _data$SewerageConnect118, _data$SewerageConnect119, _data$SewerageConnect120, _data$SewerageConnect121, _data$WaterConnection127, _data$WaterConnection128, _data$WaterConnection129, _data$WaterConnection130, _data$SewerageConnect122, _data$SewerageConnect123, _data$SewerageConnect124, _data$SewerageConnect125, _data$WaterConnection131, _data$WaterConnection132, _data$WaterConnection133, _data$WaterConnection134, _data$SewerageConnect126, _data$SewerageConnect127, _data$SewerageConnect128, _data$SewerageConnect129, _data$WaterConnection135, _data$WaterConnection136, _data$WaterConnection137, _data$WaterConnection138, _data$SewerageConnect130, _data$SewerageConnect131, _data$SewerageConnect132, _data$SewerageConnect133, _data$WaterConnection139, _data$WaterConnection140, _data$SewerageConnect134, _data$SewerageConnect135, _PTData$Properties4, _PTData$Properties4$, _PTData$Properties4$$, _PTData$Properties4$$2, _PTData$Properties5, _PTData$Properties5$, _PTData$Properties6, _PTData$Properties6$, _PTData$Properties6$$, _PTData$Properties6$$2, _PTData$Properties7, _PTData$Properties7$, _data$WaterConnection141, _data$WaterConnection142, _data$SewerageConnect136, _data$SewerageConnect137, _data$WaterConnection143, _data$WaterConnection144, _data$SewerageConnect138, _data$SewerageConnect139, _propertyAddress$zro, _propertyAddress$addi, _propertyAddress$addr, _propertyAddress$addr2, _propertyAddress$city, _propertyAddress$city2, _propertyAddress$loca, _propertyAddress$loca2, _propertyAddress$subL, _propertyAddress$subL2, _propertyAddress$asse, _propertyAddress$asse2, _propertyAddress$bloc, _propertyAddress$bloc2, _propertyAddress$ward, _propertyAddress$ward2, _propertyAddress$zone, _propertyAddress$zone2, _useDetails$categoryT, _useDetails$categoryT2, _useDetails$propertyC, _useDetails$propertyC2, _useDetails$propertyT, _useDetails$propertyT2, _useDetails$WaterConn, _useDetails$WaterConn2, _useDetails$waterConn, _useDetails$waterConn2, _useDetails$noOfFloor, _useDetails$noOfFloor2, _useDetails$SelectYea, _useDetails$SelectYea2, _useDetails$SelectYea3, _useDetails$construct, _useDetails$construct2, _data$WaterConnection145, _data$WaterConnection146, _data$WaterConnection147, _data$WaterConnection148, _data$SewerageConnect140, _data$SewerageConnect141, _data$SewerageConnect142, _data$SewerageConnect143, _data$WaterConnection153, _data$SewerageConnect148, _data$WaterConnection154, _data$WaterConnection155, _data$SewerageConnect149, _data$SewerageConnect150, _data$WaterConnection156, _data$WaterConnection157, _data$SewerageConnect151, _data$SewerageConnect152, _paymentDetails$data20, _paymentDetails$data21, _paymentDetails$data22, _data$WaterConnection158, _data$WaterConnection159, _data$SewerageConnect153, _data$SewerageConnect154, _data$WaterConnection160, _data$WaterConnection161, _data$SewerageConnect155, _data$SewerageConnect156, _data$WaterConnection162, _data$WaterConnection163, _data$SewerageConnect157, _data$SewerageConnect158, _data$WaterConnection164, _data$WaterConnection165, _data$WaterConnection166, _data$SewerageConnect159, _data$SewerageConnect160, _data$SewerageConnect161, _PTData$Properties8, _PTData$Properties8$, _PTData$Properties8$$, _data$WaterConnection167, _data$WaterConnection168, _data$WaterConnection169, _data$WaterConnection170, _data$SewerageConnect162, _data$SewerageConnect163, _data$SewerageConnect164, _data$SewerageConnect165, _data$WaterConnection171, _data$WaterConnection172, _data$SewerageConnect166, _data$SewerageConnect167, _data$WaterConnection173, _data$WaterConnection174, _data$SewerageConnect168, _data$SewerageConnect169, _data$WaterConnection175, _data$WaterConnection176, _data$WaterConnection177, _data$WaterConnection178, _data$SewerageConnect170, _data$SewerageConnect171, _data$SewerageConnect172, _data$SewerageConnect173, _data$WaterConnection179, _data$WaterConnection180, _data$SewerageConnect174, _data$SewerageConnect175, _data$SewerageConnect176, _data$SewerageConnect177, _data$SewerageConnect178, _data$SewerageConnect179, _data$SewerageConnect180, _data$SewerageConnect181, _data$SewerageConnect182, _data$SewerageConnect183, _data$SewerageConnect184, _data$WaterConnection181, _data$WaterConnection182, _data$WaterConnection183, _data$WaterConnection184, _data$WaterConnection185, _data$WaterConnection186, _data$WaterConnection187, _data$WaterConnection188, _data$WaterConnection189;
+  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$SewerageConnect7, _data$SewerageConnect8, _data$WaterConnection9, _data$WaterConnection0, _data$SewerageConnect9, _data$SewerageConnect0, _data$WaterConnection1, _data$SewerageConnect1, _PTData$Properties, _PTData$Properties$, _data$WaterConnection10, _data$WaterConnection11, _data$WaterConnection12, _data$WaterConnection13, _data$SewerageConnect10, _data$SewerageConnect11, _data$SewerageConnect12, _data$SewerageConnect13, _data$WaterConnection14, _data$WaterConnection15, _data$WaterConnection16, _data$WaterConnection17, _data$SewerageConnect14, _data$SewerageConnect15, _data$SewerageConnect16, _data$SewerageConnect17, _data$WaterConnection36, _data$WaterConnection37, _data$SewerageConnect32, _data$SewerageConnect33, _data$WaterConnection38, _data$WaterConnection39, _data$SewerageConnect34, _data$SewerageConnect35, _data$WaterConnection40, _data$WaterConnection41, _data$SewerageConnect36, _data$SewerageConnect37, _data$WaterConnection42, _data$WaterConnection43, _data$SewerageConnect38, _data$SewerageConnect39, _data$WaterConnection44, _data$WaterConnection45, _data$SewerageConnect40, _data$WaterConnection46, _data$WaterConnection47, _data$SewerageConnect41, _data$SewerageConnect42, _data$WaterConnection48, _data$WaterConnection49, _data$SewerageConnect43, _data$SewerageConnect44, _data$WaterConnection50, _data$WaterConnection51, _data$SewerageConnect45, _data$SewerageConnect46, _data$WaterConnection52, _data$WaterConnection53, _data$SewerageConnect47, _data$SewerageConnect48, _data$WaterConnection54, _data$WaterConnection55, _data$SewerageConnect49, _data$SewerageConnect50, _data$WaterConnection56, _data$WaterConnection57, _data$SewerageConnect51, _data$SewerageConnect52, _data$WaterConnection58, _data$WaterConnection59, _data$SewerageConnect53, _data$SewerageConnect54, _data$WaterConnection60, _data$WaterConnection61, _data$SewerageConnect55, _data$SewerageConnect56, _data$WaterConnection62, _data$WaterConnection63, _data$SewerageConnect57, _data$SewerageConnect58, _data$WaterConnection64, _data$WaterConnection65, _data$SewerageConnect59, _data$SewerageConnect60, _data$WaterConnection66, _data$WaterConnection67, _data$WaterConnection68, _data$WaterConnection69, _data$SewerageConnect61, _data$SewerageConnect62, _data$SewerageConnect63, _data$SewerageConnect64, _paymentDetails$data, _paymentDetails$data$, _paymentDetails$data$2, _paymentDetails$data$3, _paymentDetails$data$4, _paymentDetails$data2, _paymentDetails$data3, _paymentDetails$data4, _paymentDetails$data5, _paymentDetails$data6, _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, _connectionDetails$se, _connectionDetails$se2, _connectionDetails$co, _connectionDetails$co2, _connectionDetails$wa, _connectionDetails$wa2, _connectionDetails$ap, _connectionDetails$ap2, _connectionDetails$do, _connectionDetails$do2, _connectionDetails$do3, _connectionDetails$de, _connectionDetails$de2, _data$WaterConnection70, _data$WaterConnection71, _data$WaterConnection72, _data$SewerageConnect65, _data$SewerageConnect66, _data$SewerageConnect67, _data$WaterConnection73, _data$WaterConnection74, _data$WaterConnection75, _data$WaterConnection76, _data$SewerageConnect68, _data$SewerageConnect69, _data$SewerageConnect70, _data$SewerageConnect71, _data$WaterConnection77, _data$WaterConnection78, _data$WaterConnection79, _data$WaterConnection80, _data$SewerageConnect72, _data$SewerageConnect73, _data$SewerageConnect74, _data$SewerageConnect75, _data$WaterConnection81, _data$WaterConnection82, _data$WaterConnection83, _data$WaterConnection84, _data$SewerageConnect76, _data$SewerageConnect77, _data$SewerageConnect78, _data$SewerageConnect79, _data$WaterConnection85, _data$WaterConnection86, _data$WaterConnection87, _data$WaterConnection88, _data$SewerageConnect80, _data$SewerageConnect81, _data$SewerageConnect82, _data$SewerageConnect83, _data$WaterConnection89, _data$WaterConnection90, _data$WaterConnection91, _data$WaterConnection92, _data$SewerageConnect84, _data$SewerageConnect85, _data$SewerageConnect86, _data$SewerageConnect87, _data$WaterConnection93, _data$WaterConnection94, _data$WaterConnection95, _data$WaterConnection96, _data$SewerageConnect88, _data$SewerageConnect89, _data$SewerageConnect90, _data$SewerageConnect91, _data$WaterConnection97, _data$WaterConnection98, _data$WaterConnection99, _data$WaterConnection100, _data$SewerageConnect92, _data$SewerageConnect93, _data$SewerageConnect94, _data$SewerageConnect95, _data$WaterConnection101, _data$WaterConnection102, _data$WaterConnection103, _data$WaterConnection104, _data$SewerageConnect96, _data$SewerageConnect97, _data$SewerageConnect98, _data$SewerageConnect99, _data$WaterConnection105, _data$WaterConnection106, _data$WaterConnection107, _data$WaterConnection108, _data$SewerageConnect100, _data$SewerageConnect101, _data$SewerageConnect102, _data$SewerageConnect103, _data$WaterConnection109, _data$WaterConnection110, _data$WaterConnection111, _data$WaterConnection112, _data$SewerageConnect104, _data$SewerageConnect105, _data$SewerageConnect106, _data$SewerageConnect107, _data$WaterConnection113, _data$WaterConnection114, _data$WaterConnection115, _data$WaterConnection116, _data$SewerageConnect108, _data$SewerageConnect109, _data$SewerageConnect110, _data$SewerageConnect111, _data$WaterConnection117, _data$WaterConnection118, _data$WaterConnection119, _data$WaterConnection120, _data$SewerageConnect112, _data$SewerageConnect113, _data$SewerageConnect114, _data$SewerageConnect115, _data$WaterConnection121, _data$WaterConnection122, _data$WaterConnection123, _data$WaterConnection124, _data$SewerageConnect116, _data$SewerageConnect117, _data$SewerageConnect118, _data$SewerageConnect119, _data$WaterConnection125, _data$WaterConnection126, _data$SewerageConnect120, _data$SewerageConnect121, _PTData$Properties4, _PTData$Properties4$, _PTData$Properties4$$, _PTData$Properties4$$2, _PTData$Properties5, _PTData$Properties5$, _PTData$Properties6, _PTData$Properties6$, _PTData$Properties6$$, _PTData$Properties6$$2, _PTData$Properties7, _PTData$Properties7$, _data$WaterConnection127, _data$WaterConnection128, _data$SewerageConnect122, _data$SewerageConnect123, _data$WaterConnection129, _data$WaterConnection130, _data$SewerageConnect124, _data$SewerageConnect125, _propertyAddress$zro, _propertyAddress$addi, _propertyAddress$addr, _propertyAddress$addr2, _propertyAddress$city, _propertyAddress$city2, _propertyAddress$loca, _propertyAddress$loca2, _propertyAddress$subL, _propertyAddress$subL2, _propertyAddress$asse, _propertyAddress$asse2, _propertyAddress$bloc, _propertyAddress$bloc2, _propertyAddress$ward, _propertyAddress$ward2, _propertyAddress$zone, _propertyAddress$zone2, _useDetails$categoryT, _useDetails$categoryT2, _useDetails$propertyC, _useDetails$propertyC2, _useDetails$propertyT, _useDetails$propertyT2, _useDetails$WaterConn, _useDetails$WaterConn2, _useDetails$waterConn, _useDetails$waterConn2, _useDetails$noOfFloor, _useDetails$noOfFloor2, _useDetails$SelectYea, _useDetails$SelectYea2, _useDetails$SelectYea3, _useDetails$construct, _useDetails$construct2, _data$WaterConnection131, _data$WaterConnection132, _data$WaterConnection133, _data$WaterConnection134, _data$SewerageConnect126, _data$SewerageConnect127, _data$SewerageConnect128, _data$SewerageConnect129, _data$WaterConnection139, _data$WaterConnection140, _data$SewerageConnect134, _data$SewerageConnect135, _paymentDetails$data20, _paymentDetails$data21, _paymentDetails$data22, _data$WaterConnection141, _data$WaterConnection142, _data$SewerageConnect136, _data$SewerageConnect137, _data$WaterConnection143, _data$WaterConnection144, _data$SewerageConnect138, _data$SewerageConnect139, _data$WaterConnection145, _data$WaterConnection146, _data$SewerageConnect140, _data$SewerageConnect141, _data$WaterConnection147, _data$WaterConnection148, _data$WaterConnection149, _data$SewerageConnect142, _data$SewerageConnect143, _data$SewerageConnect144, _PTData$Properties8, _PTData$Properties8$, _PTData$Properties8$$, _data$WaterConnection150, _data$WaterConnection151, _data$WaterConnection152, _data$WaterConnection153, _data$SewerageConnect145, _data$SewerageConnect146, _data$SewerageConnect147, _data$SewerageConnect148, _data$WaterConnection154, _data$WaterConnection155, _data$SewerageConnect149, _data$SewerageConnect150, _data$WaterConnection156, _data$WaterConnection157, _data$SewerageConnect151, _data$SewerageConnect152, _data$WaterConnection158, _data$WaterConnection159, _data$WaterConnection160, _data$WaterConnection161, _data$SewerageConnect153, _data$SewerageConnect154, _data$SewerageConnect155, _data$SewerageConnect156, _data$WaterConnection162, _data$WaterConnection163, _data$SewerageConnect157, _data$SewerageConnect158, _data$SewerageConnect159, _data$SewerageConnect160, _data$SewerageConnect161, _data$SewerageConnect162, _data$SewerageConnect163, _data$SewerageConnect164, _data$SewerageConnect165, _data$SewerageConnect166, _data$SewerageConnect167, _data$WaterConnection164, _data$WaterConnection165, _data$WaterConnection166, _data$WaterConnection167, _data$WaterConnection168, _data$WaterConnection169, _data$WaterConnection170, _data$WaterConnection171, _data$WaterConnection172;
   const getDisconnectionNoticeSearch = function () {
     try {
-      var _data$WaterConnection191, _data$WaterConnection192, _data$SewerageConnect186, _data$SewerageConnect187;
+      var _data$WaterConnection174, _data$WaterConnection175, _data$SewerageConnect169, _data$SewerageConnect170;
       let key = "ws-waterdisconnectionnotice";
       let details = {};
       if (applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS")) {
-        var _data$WaterConnection190, _PTData$Properties9;
+        var _data$WaterConnection173, _PTData$Properties9;
         details = {
-          WaterConnection: [_extends({}, data === null || data === void 0 ? void 0 : (_data$WaterConnection190 = data.WaterConnection) === null || _data$WaterConnection190 === void 0 ? void 0 : _data$WaterConnection190[0], {
+          WaterConnection: [_extends({}, data === null || data === void 0 ? void 0 : (_data$WaterConnection173 = data.WaterConnection) === null || _data$WaterConnection173 === void 0 ? void 0 : _data$WaterConnection173[0], {
             property: PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties9 = PTData.Properties) === null || _PTData$Properties9 === void 0 ? void 0 : _PTData$Properties9[0]
           })]
         };
       } else {
-        var _data$SewerageConnect185, _PTData$Properties0;
+        var _data$SewerageConnect168, _PTData$Properties0;
         key = "ws-seweragedisconnectionnotice";
         details = {
-          SewerageConnection: [_extends({}, data === null || data === void 0 ? void 0 : (_data$SewerageConnect185 = data.SewerageConnections) === null || _data$SewerageConnect185 === void 0 ? void 0 : _data$SewerageConnect185[0], {
+          SewerageConnection: [_extends({}, data === null || data === void 0 ? void 0 : (_data$SewerageConnect168 = data.SewerageConnections) === null || _data$SewerageConnect168 === void 0 ? void 0 : _data$SewerageConnect168[0], {
             property: PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties0 = PTData.Properties) === null || _PTData$Properties0 === void 0 ? void 0 : _PTData$Properties0[0]
           })]
         };
       }
-      return Promise.resolve(Digit.WSService.WSDisconnectionNotice((data === null || data === void 0 ? void 0 : (_data$WaterConnection191 = data.WaterConnection) === null || _data$WaterConnection191 === void 0 ? void 0 : (_data$WaterConnection192 = _data$WaterConnection191[0]) === null || _data$WaterConnection192 === void 0 ? void 0 : _data$WaterConnection192.tenantId) || (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.tenantId), details, key)).then(function (response) {
-        var _data$WaterConnection193, _data$WaterConnection194, _data$SewerageConnect188, _data$SewerageConnect189;
-        return Promise.resolve(Digit.PaymentService.printReciept((data === null || data === void 0 ? void 0 : (_data$WaterConnection193 = data.WaterConnection) === null || _data$WaterConnection193 === void 0 ? void 0 : (_data$WaterConnection194 = _data$WaterConnection193[0]) === null || _data$WaterConnection194 === void 0 ? void 0 : _data$WaterConnection194.tenantId) || (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.tenantId), {
+      return Promise.resolve(Digit.WSService.WSDisconnectionNotice((data === null || data === void 0 ? void 0 : (_data$WaterConnection174 = data.WaterConnection) === null || _data$WaterConnection174 === void 0 ? void 0 : (_data$WaterConnection175 = _data$WaterConnection174[0]) === null || _data$WaterConnection175 === void 0 ? void 0 : _data$WaterConnection175.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect169 = data.SewerageConnections) === null || _data$SewerageConnect169 === void 0 ? void 0 : (_data$SewerageConnect170 = _data$SewerageConnect169[0]) === null || _data$SewerageConnect170 === void 0 ? void 0 : _data$SewerageConnect170.tenantId), details, key)).then(function (response) {
+        var _data$WaterConnection176, _data$WaterConnection177, _data$SewerageConnect171, _data$SewerageConnect172;
+        return Promise.resolve(Digit.PaymentService.printReciept((data === null || data === void 0 ? void 0 : (_data$WaterConnection176 = data.WaterConnection) === null || _data$WaterConnection176 === void 0 ? void 0 : (_data$WaterConnection177 = _data$WaterConnection176[0]) === null || _data$WaterConnection177 === void 0 ? void 0 : _data$WaterConnection177.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect171 = data.SewerageConnections) === null || _data$SewerageConnect171 === void 0 ? void 0 : (_data$SewerageConnect172 = _data$SewerageConnect171[0]) === null || _data$SewerageConnect172 === void 0 ? void 0 : _data$SewerageConnect172.tenantId), {
           fileStoreIds: response.filestoreIds[0]
         })).then(function (fileStore) {
           window.open(fileStore[response === null || response === void 0 ? void 0 : response.filestoreIds[0]], "_blank");
@@ -28086,8 +28029,7 @@ const WSApplicationDetails = () => {
   const _useState = useState(false),
     showOptions = _useState[0],
     setShowOptions = _useState[1];
-  const _useState2 = useState(false),
-    setViewTimeline = _useState2[1];
+  const _useState2 = 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_"));
   let filter1 = {
     tenantId: tenantId,
@@ -28188,15 +28130,6 @@ const WSApplicationDetails = () => {
       return Promise.reject(e);
     }
   };
-  const handleViewTimeline = () => {
-    const timelineSection = document.getElementById("timeline");
-    if (timelineSection) {
-      timelineSection.scrollIntoView({
-        behavior: "smooth"
-      });
-    }
-    setViewTimeline(true);
-  };
   const printApplicationReceipts = function () {
     try {
       var _data$WaterConnection24, _data$WaterConnection25, _data$WaterConnection26, _data$WaterConnection27, _data$SewerageConnect24, _data$SewerageConnect25;
@@ -28312,12 +28245,34 @@ const WSApplicationDetails = () => {
   let serviceType = data && data !== null && data !== void 0 && (_data$WaterConnection44 = data.WaterConnection) !== null && _data$WaterConnection44 !== void 0 && _data$WaterConnection44[0] ? "WATER" : "SEWERAGE";
   sessionStorage.setItem("ApplicationNoState", applicationNobyData);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "employee-main-application-details",
+    style: {
+      display: "flex",
+      gap: "20px"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "workflow-timeline-wrapper no-scrollbar",
+    style: {
+      flex: "1 1 300px",
+      maxWidth: "400px"
+    }
+  }, /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement("div", {
+    id: "timeline"
+  }, /*#__PURE__*/React.createElement(WSWFApplicationTimeline, {
+    application: (data === null || data === void 0 ? void 0 : (_data$WaterConnection45 = data.WaterConnection) === null || _data$WaterConnection45 === void 0 ? void 0 : _data$WaterConnection45[0]) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect40 = data.SewerageConnections) === null || _data$SewerageConnect40 === void 0 ? void 0 : _data$SewerageConnect40[0]),
+    id: (data === null || data === void 0 ? void 0 : (_data$WaterConnection46 = data.WaterConnection) === null || _data$WaterConnection46 === void 0 ? void 0 : (_data$WaterConnection47 = _data$WaterConnection46[0]) === null || _data$WaterConnection47 === void 0 ? void 0 : _data$WaterConnection47.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect41 = data.SewerageConnections) === null || _data$SewerageConnect41 === void 0 ? void 0 : (_data$SewerageConnect42 = _data$SewerageConnect41[0]) === null || _data$SewerageConnect42 === void 0 ? void 0 : _data$SewerageConnect42.applicationNo),
+    paymentbuttonenabled: false
+  })))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: "2 1 500px"
+    }
+  }, /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement("div", {
     className: "cardHeaderWithOptions",
     style: {
       marginRight: "auto",
       maxWidth: "960px"
     }
-  }, /*#__PURE__*/React.createElement(Header, null, t("WS_APPLICATION_DETAILS_HEADER")), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
     style: {
       zIndex: "10",
       display: "flex",
@@ -28332,88 +28287,63 @@ const WSApplicationDetails = () => {
     onHeadClick: () => setShowOptions(!showOptions),
     displayOptions: showOptions,
     options: downloadOptions
-  })), /*#__PURE__*/React.createElement(LinkButton, {
-    label: t("VIEW_TIMELINE"),
-    style: {
-      color: "#A52A2A"
-    },
-    onClick: handleViewTimeline
-  }))), checkifPrivacyenabled && /*#__PURE__*/React.createElement(WSInfoLabel, {
+  })))), checkifPrivacyenabled && /*#__PURE__*/React.createElement(WSInfoLabel, {
     t: t
   }), /*#__PURE__*/React.createElement("div", {
     className: "hide-seperator"
-  }, /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
+  }, /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
     label: t("WS_MYCONNECTIONS_APPLICATION_NO"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection45 = data.WaterConnection) === null || _data$WaterConnection45 === void 0 ? void 0 : (_data$WaterConnection46 = _data$WaterConnection45[0]) === null || _data$WaterConnection46 === void 0 ? void 0 : _data$WaterConnection46.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect40 = data.SewerageConnections) === null || _data$SewerageConnect40 === void 0 ? void 0 : (_data$SewerageConnect41 = _data$SewerageConnect40[0]) === null || _data$SewerageConnect41 === void 0 ? void 0 : _data$SewerageConnect41.applicationNo),
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection48 = data.WaterConnection) === null || _data$WaterConnection48 === void 0 ? void 0 : (_data$WaterConnection49 = _data$WaterConnection48[0]) === null || _data$WaterConnection49 === void 0 ? void 0 : _data$WaterConnection49.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect43 = data.SewerageConnections) === null || _data$SewerageConnect43 === void 0 ? void 0 : (_data$SewerageConnect44 = _data$SewerageConnect43[0]) === null || _data$SewerageConnect44 === void 0 ? void 0 : _data$SewerageConnect44.applicationNo),
     textStyle: {}
-  }), ((data === null || data === void 0 ? void 0 : (_data$WaterConnection47 = data.WaterConnection) === null || _data$WaterConnection47 === void 0 ? void 0 : (_data$WaterConnection48 = _data$WaterConnection47[0].applicationType) === null || _data$WaterConnection48 === void 0 ? void 0 : _data$WaterConnection48.includes("DISCONNECT")) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect42 = data.SewerageConnections) === null || _data$SewerageConnect42 === void 0 ? void 0 : (_data$SewerageConnect43 = _data$SewerageConnect42[0].applicationType) === null || _data$SewerageConnect43 === void 0 ? void 0 : _data$SewerageConnect43.includes("DISCONNECT"))) && /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
+  }), ((data === null || data === void 0 ? void 0 : (_data$WaterConnection50 = data.WaterConnection) === null || _data$WaterConnection50 === void 0 ? void 0 : (_data$WaterConnection51 = _data$WaterConnection50[0].applicationType) === null || _data$WaterConnection51 === void 0 ? void 0 : _data$WaterConnection51.includes("DISCONNECT")) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect45 = data.SewerageConnections) === null || _data$SewerageConnect45 === void 0 ? void 0 : (_data$SewerageConnect46 = _data$SewerageConnect45[0].applicationType) === null || _data$SewerageConnect46 === void 0 ? void 0 : _data$SewerageConnect46.includes("DISCONNECT"))) && /*#__PURE__*/React.createElement(Row, {
     label: t("WS_MYCONNECTIONS_CONSUMER_NO"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection49 = data.WaterConnection) === null || _data$WaterConnection49 === void 0 ? void 0 : (_data$WaterConnection50 = _data$WaterConnection49[0]) === null || _data$WaterConnection50 === void 0 ? void 0 : _data$WaterConnection50.connectionNo) || (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$SewerageConnect45.connectionNo),
+    text: (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$WaterConnection53.connectionNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect47 = data.SewerageConnections) === null || _data$SewerageConnect47 === void 0 ? void 0 : (_data$SewerageConnect48 = _data$SewerageConnect47[0]) === null || _data$SewerageConnect48 === void 0 ? void 0 : _data$SewerageConnect48.connectionNo),
     textStyle: {
       wordBreak: "break-word"
     }
   }), /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
     label: t("WS_SERVICE_NAME_LABEL"),
-    text: t("WS_APPLICATION_TYPE_" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection51 = data.WaterConnection) === null || _data$WaterConnection51 === void 0 ? void 0 : (_data$WaterConnection52 = _data$WaterConnection51[0]) === null || _data$WaterConnection52 === void 0 ? void 0 : _data$WaterConnection52.applicationType) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect46 = data.SewerageConnections) === null || _data$SewerageConnect46 === void 0 ? void 0 : (_data$SewerageConnect47 = _data$SewerageConnect46[0]) === null || _data$SewerageConnect47 === void 0 ? void 0 : _data$SewerageConnect47.applicationType))),
+    text: t("WS_APPLICATION_TYPE_" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection54 = data.WaterConnection) === null || _data$WaterConnection54 === void 0 ? void 0 : (_data$WaterConnection55 = _data$WaterConnection54[0]) === null || _data$WaterConnection55 === void 0 ? void 0 : _data$WaterConnection55.applicationType) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect49 = data.SewerageConnections) === null || _data$SewerageConnect49 === void 0 ? void 0 : (_data$SewerageConnect50 = _data$SewerageConnect49[0]) === null || _data$SewerageConnect50 === void 0 ? void 0 : _data$SewerageConnect50.applicationType))),
     textStyle: {
       wordBreak: "break-word"
     }
-  }), ((data === null || data === void 0 ? void 0 : (_data$WaterConnection53 = data.WaterConnection) === null || _data$WaterConnection53 === void 0 ? void 0 : (_data$WaterConnection54 = _data$WaterConnection53[0].applicationType) === null || _data$WaterConnection54 === void 0 ? void 0 : _data$WaterConnection54.includes("DISCONNECT")) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect48 = data.SewerageConnections) === null || _data$SewerageConnect48 === void 0 ? void 0 : (_data$SewerageConnect49 = _data$SewerageConnect48[0].applicationType) === null || _data$SewerageConnect49 === void 0 ? void 0 : _data$SewerageConnect49.includes("DISCONNECT"))) && /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
+  }), ((data === null || data === void 0 ? void 0 : (_data$WaterConnection56 = data.WaterConnection) === null || _data$WaterConnection56 === void 0 ? void 0 : (_data$WaterConnection57 = _data$WaterConnection56[0].applicationType) === null || _data$WaterConnection57 === void 0 ? void 0 : _data$WaterConnection57.includes("DISCONNECT")) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect51 = data.SewerageConnections) === null || _data$SewerageConnect51 === void 0 ? void 0 : (_data$SewerageConnect52 = _data$SewerageConnect51[0].applicationType) === null || _data$SewerageConnect52 === void 0 ? void 0 : _data$SewerageConnect52.includes("DISCONNECT"))) && /*#__PURE__*/React.createElement(Row, {
     label: t("WS_DISCONNECTION_PROPOSED_DATE"),
-    text: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? convertEpochToDate(data === null || data === void 0 ? void 0 : (_data$WaterConnection55 = data.WaterConnection) === null || _data$WaterConnection55 === void 0 ? void 0 : (_data$WaterConnection56 = _data$WaterConnection55[0]) === null || _data$WaterConnection56 === void 0 ? void 0 : _data$WaterConnection56.dateEffectiveFrom) : convertEpochToDate(data === null || data === void 0 ? void 0 : (_data$SewerageConnect50 = data.SewerageConnections) === null || _data$SewerageConnect50 === void 0 ? void 0 : (_data$SewerageConnect51 = _data$SewerageConnect50[0]) === null || _data$SewerageConnect51 === void 0 ? void 0 : _data$SewerageConnect51.dateEffectiveFrom),
+    text: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? convertEpochToDate(data === null || data === void 0 ? void 0 : (_data$WaterConnection58 = data.WaterConnection) === null || _data$WaterConnection58 === void 0 ? void 0 : (_data$WaterConnection59 = _data$WaterConnection58[0]) === null || _data$WaterConnection59 === void 0 ? void 0 : _data$WaterConnection59.dateEffectiveFrom) : convertEpochToDate(data === null || data === void 0 ? void 0 : (_data$SewerageConnect53 = data.SewerageConnections) === null || _data$SewerageConnect53 === void 0 ? void 0 : (_data$SewerageConnect54 = _data$SewerageConnect53[0]) === null || _data$SewerageConnect54 === void 0 ? void 0 : _data$SewerageConnect54.dateEffectiveFrom),
     textStyle: {
       wordBreak: "break-word"
     }
-  }), ((data === null || data === void 0 ? void 0 : (_data$WaterConnection57 = data.WaterConnection) === null || _data$WaterConnection57 === void 0 ? void 0 : (_data$WaterConnection58 = _data$WaterConnection57[0].applicationType) === null || _data$WaterConnection58 === void 0 ? void 0 : _data$WaterConnection58.includes("DISCONNECT")) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect52 = data.SewerageConnections) === null || _data$SewerageConnect52 === void 0 ? void 0 : (_data$SewerageConnect53 = _data$SewerageConnect52[0].applicationType) === null || _data$SewerageConnect53 === void 0 ? void 0 : _data$SewerageConnect53.includes("DISCONNECT"))) && /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
+  }), ((data === null || data === void 0 ? void 0 : (_data$WaterConnection60 = data.WaterConnection) === null || _data$WaterConnection60 === void 0 ? void 0 : (_data$WaterConnection61 = _data$WaterConnection60[0].applicationType) === null || _data$WaterConnection61 === void 0 ? void 0 : _data$WaterConnection61.includes("DISCONNECT")) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect55 = data.SewerageConnections) === null || _data$SewerageConnect55 === void 0 ? void 0 : (_data$SewerageConnect56 = _data$SewerageConnect55[0].applicationType) === null || _data$SewerageConnect56 === void 0 ? void 0 : _data$SewerageConnect56.includes("DISCONNECT"))) && /*#__PURE__*/React.createElement(Row, {
     label: t("WS_DISCONNECTION_EXECUTED_DATE"),
-    text: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? convertEpochToDate(data === null || data === void 0 ? void 0 : (_data$WaterConnection59 = data.WaterConnection) === null || _data$WaterConnection59 === void 0 ? void 0 : (_data$WaterConnection60 = _data$WaterConnection59[0]) === null || _data$WaterConnection60 === void 0 ? void 0 : _data$WaterConnection60.disconnectionExecutionDate) : convertEpochToDate(data === null || data === void 0 ? void 0 : (_data$SewerageConnect54 = data.SewerageConnections) === null || _data$SewerageConnect54 === void 0 ? void 0 : (_data$SewerageConnect55 = _data$SewerageConnect54[0]) === null || _data$SewerageConnect55 === void 0 ? void 0 : _data$SewerageConnect55.disconnectionExecutionDate),
+    text: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? convertEpochToDate(data === null || data === void 0 ? void 0 : (_data$WaterConnection62 = data.WaterConnection) === null || _data$WaterConnection62 === void 0 ? void 0 : (_data$WaterConnection63 = _data$WaterConnection62[0]) === null || _data$WaterConnection63 === void 0 ? void 0 : _data$WaterConnection63.disconnectionExecutionDate) : convertEpochToDate(data === null || data === void 0 ? void 0 : (_data$SewerageConnect57 = data.SewerageConnections) === null || _data$SewerageConnect57 === void 0 ? void 0 : (_data$SewerageConnect58 = _data$SewerageConnect57[0]) === null || _data$SewerageConnect58 === void 0 ? void 0 : _data$SewerageConnect58.disconnectionExecutionDate),
     textStyle: {
       wordBreak: "break-word"
     }
-  }), ((data === null || data === void 0 ? void 0 : (_data$WaterConnection61 = data.WaterConnection) === null || _data$WaterConnection61 === void 0 ? void 0 : (_data$WaterConnection62 = _data$WaterConnection61[0].applicationType) === null || _data$WaterConnection62 === void 0 ? void 0 : _data$WaterConnection62.includes("DISCONNECT")) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect56 = data.SewerageConnections) === null || _data$SewerageConnect56 === void 0 ? void 0 : (_data$SewerageConnect57 = _data$SewerageConnect56[0].applicationType) === null || _data$SewerageConnect57 === void 0 ? void 0 : _data$SewerageConnect57.includes("DISCONNECT"))) && /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
+  }), ((data === null || data === void 0 ? void 0 : (_data$WaterConnection64 = data.WaterConnection) === null || _data$WaterConnection64 === void 0 ? void 0 : (_data$WaterConnection65 = _data$WaterConnection64[0].applicationType) === null || _data$WaterConnection65 === void 0 ? void 0 : _data$WaterConnection65.includes("DISCONNECT")) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect59 = data.SewerageConnections) === null || _data$SewerageConnect59 === void 0 ? void 0 : (_data$SewerageConnect60 = _data$SewerageConnect59[0].applicationType) === null || _data$SewerageConnect60 === void 0 ? void 0 : _data$SewerageConnect60.includes("DISCONNECT"))) && /*#__PURE__*/React.createElement(Row, {
     label: t("WS_DISCONNECTION_REASON"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection63 = data.WaterConnection) === null || _data$WaterConnection63 === void 0 ? void 0 : (_data$WaterConnection64 = _data$WaterConnection63[0]) === null || _data$WaterConnection64 === void 0 ? void 0 : _data$WaterConnection64.disconnectionReason) != null ? data === null || data === void 0 ? void 0 : (_data$WaterConnection65 = data.WaterConnection) === null || _data$WaterConnection65 === void 0 ? void 0 : (_data$WaterConnection66 = _data$WaterConnection65[0]) === null || _data$WaterConnection66 === void 0 ? void 0 : _data$WaterConnection66.disconnectionReason : (data === null || data === void 0 ? void 0 : (_data$SewerageConnect58 = data.SewerageConnections) === null || _data$SewerageConnect58 === void 0 ? void 0 : (_data$SewerageConnect59 = _data$SewerageConnect58[0]) === null || _data$SewerageConnect59 === void 0 ? void 0 : _data$SewerageConnect59.disconnectionReason) != null ? data === null || data === void 0 ? void 0 : (_data$SewerageConnect60 = data.SewerageConnections) === null || _data$SewerageConnect60 === void 0 ? void 0 : (_data$SewerageConnect61 = _data$SewerageConnect60[0]) === null || _data$SewerageConnect61 === void 0 ? void 0 : _data$SewerageConnect61.disconnectionReason : t("NA"),
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection66 = data.WaterConnection) === null || _data$WaterConnection66 === void 0 ? void 0 : (_data$WaterConnection67 = _data$WaterConnection66[0]) === null || _data$WaterConnection67 === void 0 ? void 0 : _data$WaterConnection67.disconnectionReason) != null ? data === null || data === void 0 ? void 0 : (_data$WaterConnection68 = data.WaterConnection) === null || _data$WaterConnection68 === void 0 ? void 0 : (_data$WaterConnection69 = _data$WaterConnection68[0]) === null || _data$WaterConnection69 === void 0 ? void 0 : _data$WaterConnection69.disconnectionReason : (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$SewerageConnect62.disconnectionReason) != null ? data === null || data === void 0 ? void 0 : (_data$SewerageConnect63 = data.SewerageConnections) === null || _data$SewerageConnect63 === void 0 ? void 0 : (_data$SewerageConnect64 = _data$SewerageConnect63[0]) === null || _data$SewerageConnect64 === void 0 ? void 0 : _data$SewerageConnect64.disconnectionReason : t("NA"),
     textStyle: {
       wordBreak: "break-word"
     }
-  }))), (paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data = paymentDetails.data) === null || _paymentDetails$data === void 0 ? void 0 : (_paymentDetails$data$ = _paymentDetails$data.Bill) === null || _paymentDetails$data$ === void 0 ? void 0 : (_paymentDetails$data$2 = _paymentDetails$data$[0]) === null || _paymentDetails$data$2 === void 0 ? void 0 : (_paymentDetails$data$3 = _paymentDetails$data$2.billDetails) === null || _paymentDetails$data$3 === void 0 ? void 0 : (_paymentDetails$data$4 = _paymentDetails$data$3[0]) === null || _paymentDetails$data$4 === void 0 ? void 0 : _paymentDetails$data$4.billAccountDetails.length) > 0 && /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardHeader, {
+  })), (paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data = paymentDetails.data) === null || _paymentDetails$data === void 0 ? void 0 : (_paymentDetails$data$ = _paymentDetails$data.Bill) === null || _paymentDetails$data$ === void 0 ? void 0 : (_paymentDetails$data$2 = _paymentDetails$data$[0]) === null || _paymentDetails$data$2 === void 0 ? void 0 : (_paymentDetails$data$3 = _paymentDetails$data$2.billDetails) === null || _paymentDetails$data$3 === void 0 ? void 0 : (_paymentDetails$data$4 = _paymentDetails$data$3[0]) === null || _paymentDetails$data$4 === void 0 ? void 0 : _paymentDetails$data$4.billAccountDetails.length) > 0 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardHeader, {
     styles: {
       fontSize: "28px"
     }
   }, t("WS_FEE_DEATAILS_HEADER")), /*#__PURE__*/React.createElement(StatusTable, null, paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data2 = paymentDetails.data) === null || _paymentDetails$data2 === void 0 ? void 0 : (_paymentDetails$data3 = _paymentDetails$data2.Bill) === null || _paymentDetails$data3 === void 0 ? void 0 : (_paymentDetails$data4 = _paymentDetails$data3[0]) === null || _paymentDetails$data4 === void 0 ? void 0 : (_paymentDetails$data5 = _paymentDetails$data4.billDetails) === null || _paymentDetails$data5 === void 0 ? void 0 : (_paymentDetails$data6 = _paymentDetails$data5[0]) === null || _paymentDetails$data6 === void 0 ? void 0 : _paymentDetails$data6.billAccountDetails.map(bill => /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
     label: t(bill === null || bill === void 0 ? void 0 : bill.taxHeadCode),
-    text: "\u20B9" + Number(bill === null || bill === void 0 ? void 0 : bill.amount).toFixed(2),
-    textStyle: {
-      textAlign: "right"
-    }
+    text: "\u20B9" + Number(bill === null || bill === void 0 ? void 0 : bill.amount).toFixed(2)
   })), /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
     label: t("WS_TOTAL_AMOUNT_DUE"),
-    text: "\u20B9" + Number(isPaid ? 0 : paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data7 = paymentDetails.data) === null || _paymentDetails$data7 === void 0 ? void 0 : (_paymentDetails$data8 = _paymentDetails$data7.Bill) === null || _paymentDetails$data8 === void 0 ? void 0 : (_paymentDetails$data9 = _paymentDetails$data8[0]) === null || _paymentDetails$data9 === void 0 ? void 0 : (_paymentDetails$data0 = _paymentDetails$data9.billDetails) === null || _paymentDetails$data0 === void 0 ? void 0 : (_paymentDetails$data1 = _paymentDetails$data0[0]) === null || _paymentDetails$data1 === void 0 ? void 0 : _paymentDetails$data1.amount).toFixed(2),
-    textStyle: {
-      textAlign: "right",
-      fontSize: "18px",
-      fontWeight: "700"
-    }
+    text: "\u20B9" + Number(isPaid ? 0 : paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data7 = paymentDetails.data) === null || _paymentDetails$data7 === void 0 ? void 0 : (_paymentDetails$data8 = _paymentDetails$data7.Bill) === null || _paymentDetails$data8 === void 0 ? void 0 : (_paymentDetails$data9 = _paymentDetails$data8[0]) === null || _paymentDetails$data9 === void 0 ? void 0 : (_paymentDetails$data0 = _paymentDetails$data9.billDetails) === null || _paymentDetails$data0 === void 0 ? void 0 : (_paymentDetails$data1 = _paymentDetails$data0[0]) === null || _paymentDetails$data1 === void 0 ? void 0 : _paymentDetails$data1.amount).toFixed(2)
   }), /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
     label: t("WS_COMMON_TABLE_COL_APPLICATION_STATUS"),
     text: isPaid || Number(paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data10 = paymentDetails.data) === null || _paymentDetails$data10 === void 0 ? void 0 : (_paymentDetails$data11 = _paymentDetails$data10.Bill) === null || _paymentDetails$data11 === void 0 ? void 0 : (_paymentDetails$data12 = _paymentDetails$data11[0]) === null || _paymentDetails$data12 === void 0 ? void 0 : (_paymentDetails$data13 = _paymentDetails$data12.billDetails) === null || _paymentDetails$data13 === void 0 ? void 0 : (_paymentDetails$data14 = _paymentDetails$data13[0]) === null || _paymentDetails$data14 === void 0 ? void 0 : _paymentDetails$data14.amount).toFixed(2) == 0 ? t("WS_COMMON_PAID_LABEL") : t("WS_COMMON_NOT_PAID"),
     textStyle: isPaid || Number(paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data15 = paymentDetails.data) === null || _paymentDetails$data15 === void 0 ? void 0 : (_paymentDetails$data16 = _paymentDetails$data15.Bill) === null || _paymentDetails$data16 === void 0 ? void 0 : (_paymentDetails$data17 = _paymentDetails$data16[0]) === null || _paymentDetails$data17 === void 0 ? void 0 : (_paymentDetails$data18 = _paymentDetails$data17.billDetails) === null || _paymentDetails$data18 === void 0 ? void 0 : (_paymentDetails$data19 = _paymentDetails$data18[0]) === null || _paymentDetails$data19 === void 0 ? void 0 : _paymentDetails$data19.amount).toFixed(2) == 0 ? {
-      textAlign: "right",
       color: "darkgreen"
     } : {
-      textAlign: "right",
       color: "red"
     }
-  }))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardHeader, {
+  }))), /*#__PURE__*/React.createElement(CardHeader, {
     styles: {
       fontSize: "28px"
     }
@@ -28446,19 +28376,18 @@ const WSApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("WS_NATURE_OF_WORK"),
     text: "" + t(checkForNA$1(connectionDetails === null || connectionDetails === void 0 ? void 0 : connectionDetails.natureOfWork))
-  })))), (data === null || data === void 0 ? void 0 : (_data$WaterConnection67 = data.WaterConnection) === null || _data$WaterConnection67 === void 0 ? void 0 : (_data$WaterConnection68 = _data$WaterConnection67[0]) === null || _data$WaterConnection68 === void 0 ? void 0 : (_data$WaterConnection69 = _data$WaterConnection68.connectionHolders) === null || _data$WaterConnection69 === void 0 ? void 0 : _data$WaterConnection69.length) > 0 || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect62 = data.SewerageConnections) === null || _data$SewerageConnect62 === void 0 ? void 0 : (_data$SewerageConnect63 = _data$SewerageConnect62[0]) === null || _data$SewerageConnect63 === void 0 ? void 0 : (_data$SewerageConnect64 = _data$SewerageConnect63.connectionHolders) === null || _data$SewerageConnect64 === void 0 ? void 0 : _data$SewerageConnect64.length) > 0 ? /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardHeader, {
+  }))), (data === null || data === void 0 ? void 0 : (_data$WaterConnection70 = data.WaterConnection) === null || _data$WaterConnection70 === void 0 ? void 0 : (_data$WaterConnection71 = _data$WaterConnection70[0]) === null || _data$WaterConnection71 === void 0 ? void 0 : (_data$WaterConnection72 = _data$WaterConnection71.connectionHolders) === null || _data$WaterConnection72 === void 0 ? void 0 : _data$WaterConnection72.length) > 0 || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect65 = data.SewerageConnections) === null || _data$SewerageConnect65 === void 0 ? void 0 : (_data$SewerageConnect66 = _data$SewerageConnect65[0]) === null || _data$SewerageConnect66 === void 0 ? void 0 : (_data$SewerageConnect67 = _data$SewerageConnect66.connectionHolders) === null || _data$SewerageConnect67 === void 0 ? void 0 : _data$SewerageConnect67.length) > 0 ? /*#__PURE__*/React.createElement(React.Fragment, 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$WaterConnection70 = data.WaterConnection) === null || _data$WaterConnection70 === void 0 ? void 0 : (_data$WaterConnection71 = _data$WaterConnection70[0]) === null || _data$WaterConnection71 === void 0 ? void 0 : (_data$WaterConnection72 = _data$WaterConnection71.connectionHolders) === null || _data$WaterConnection72 === void 0 ? void 0 : (_data$WaterConnection73 = _data$WaterConnection72[0]) === null || _data$WaterConnection73 === void 0 ? void 0 : _data$WaterConnection73.mobileNumber) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect65 = data.SewerageConnections) === null || _data$SewerageConnect65 === void 0 ? void 0 : (_data$SewerageConnect66 = _data$SewerageConnect65[0]) === null || _data$SewerageConnect66 === void 0 ? void 0 : (_data$SewerageConnect67 = _data$SewerageConnect66.connectionHolders) === null || _data$SewerageConnect67 === void 0 ? void 0 : (_data$SewerageConnect68 = _data$SewerageConnect67[0]) === null || _data$SewerageConnect68 === void 0 ? void 0 : _data$SewerageConnect68.mobileNumber),
+    text: (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$WaterConnection75 = _data$WaterConnection74.connectionHolders) === null || _data$WaterConnection75 === void 0 ? void 0 : (_data$WaterConnection76 = _data$WaterConnection75[0]) === null || _data$WaterConnection76 === void 0 ? void 0 : _data$WaterConnection76.mobileNumber) || (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$SewerageConnect71 = _data$SewerageConnect70[0]) === null || _data$SewerageConnect71 === void 0 ? void 0 : _data$SewerageConnect71.mobileNumber),
     textStyle: {
       whiteSpace: "pre"
     },
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection74 = data.WaterConnection) === null || _data$WaterConnection74 === void 0 ? void 0 : (_data$WaterConnection75 = _data$WaterConnection74[0]) === null || _data$WaterConnection75 === void 0 ? void 0 : (_data$WaterConnection76 = _data$WaterConnection75.connectionHolders) === null || _data$WaterConnection76 === void 0 ? void 0 : (_data$WaterConnection77 = _data$WaterConnection76[0]) === null || _data$WaterConnection77 === void 0 ? void 0 : _data$WaterConnection77.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect69 = data.SewerageConnections) === null || _data$SewerageConnect69 === void 0 ? void 0 : (_data$SewerageConnect70 = _data$SewerageConnect69[0]) === null || _data$SewerageConnect70 === void 0 ? void 0 : (_data$SewerageConnect71 = _data$SewerageConnect70.connectionHolders) === null || _data$SewerageConnect71 === void 0 ? void 0 : (_data$SewerageConnect72 = _data$SewerageConnect71[0]) === null || _data$SewerageConnect72 === void 0 ? void 0 : _data$SewerageConnect72.uuid,
+      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? 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$WaterConnection80 = _data$WaterConnection79[0]) === null || _data$WaterConnection80 === void 0 ? void 0 : _data$WaterConnection80.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect72 = data.SewerageConnections) === null || _data$SewerageConnect72 === void 0 ? void 0 : (_data$SewerageConnect73 = _data$SewerageConnect72[0]) === null || _data$SewerageConnect73 === void 0 ? void 0 : (_data$SewerageConnect74 = _data$SewerageConnect73.connectionHolders) === null || _data$SewerageConnect74 === void 0 ? void 0 : (_data$SewerageConnect75 = _data$SewerageConnect74[0]) === null || _data$SewerageConnect75 === void 0 ? void 0 : _data$SewerageConnect75.uuid,
       fieldName: "connectionHoldersMobileNumber",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -28474,21 +28403,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$WaterConnection78 = data.WaterConnection) === null || _data$WaterConnection78 === void 0 ? void 0 : (_data$WaterConnection79 = _data$WaterConnection78[0]) === null || _data$WaterConnection79 === void 0 ? void 0 : (_data$WaterConnection80 = _data$WaterConnection79.connectionHolders) === null || _data$WaterConnection80 === void 0 ? void 0 : (_data$WaterConnection81 = _data$WaterConnection80[0]) === null || _data$WaterConnection81 === void 0 ? void 0 : _data$WaterConnection81.name) || (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.name),
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection81 = data.WaterConnection) === null || _data$WaterConnection81 === void 0 ? void 0 : (_data$WaterConnection82 = _data$WaterConnection81[0]) === null || _data$WaterConnection82 === void 0 ? void 0 : (_data$WaterConnection83 = _data$WaterConnection82.connectionHolders) === null || _data$WaterConnection83 === void 0 ? void 0 : (_data$WaterConnection84 = _data$WaterConnection83[0]) === null || _data$WaterConnection84 === void 0 ? void 0 : _data$WaterConnection84.name) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect76 = data.SewerageConnections) === null || _data$SewerageConnect76 === void 0 ? void 0 : (_data$SewerageConnect77 = _data$SewerageConnect76[0]) === null || _data$SewerageConnect77 === void 0 ? void 0 : (_data$SewerageConnect78 = _data$SewerageConnect77.connectionHolders) === null || _data$SewerageConnect78 === void 0 ? void 0 : (_data$SewerageConnect79 = _data$SewerageConnect78[0]) === null || _data$SewerageConnect79 === void 0 ? void 0 : _data$SewerageConnect79.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$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.gender) || (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.gender)),
+    text: t((data === null || data === void 0 ? void 0 : (_data$WaterConnection85 = data.WaterConnection) === null || _data$WaterConnection85 === void 0 ? void 0 : (_data$WaterConnection86 = _data$WaterConnection85[0]) === null || _data$WaterConnection86 === void 0 ? void 0 : (_data$WaterConnection87 = _data$WaterConnection86.connectionHolders) === null || _data$WaterConnection87 === void 0 ? void 0 : (_data$WaterConnection88 = _data$WaterConnection87[0]) === null || _data$WaterConnection88 === void 0 ? void 0 : _data$WaterConnection88.gender) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect80 = data.SewerageConnections) === null || _data$SewerageConnect80 === void 0 ? void 0 : (_data$SewerageConnect81 = _data$SewerageConnect80[0]) === null || _data$SewerageConnect81 === void 0 ? void 0 : (_data$SewerageConnect82 = _data$SewerageConnect81.connectionHolders) === null || _data$SewerageConnect82 === void 0 ? void 0 : (_data$SewerageConnect83 = _data$SewerageConnect82[0]) === null || _data$SewerageConnect83 === void 0 ? void 0 : _data$SewerageConnect83.gender)),
     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$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.uuid,
+      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection89 = data.WaterConnection) === null || _data$WaterConnection89 === void 0 ? void 0 : (_data$WaterConnection90 = _data$WaterConnection89[0]) === null || _data$WaterConnection90 === void 0 ? void 0 : (_data$WaterConnection91 = _data$WaterConnection90.connectionHolders) === null || _data$WaterConnection91 === void 0 ? void 0 : (_data$WaterConnection92 = _data$WaterConnection91[0]) === null || _data$WaterConnection92 === void 0 ? void 0 : _data$WaterConnection92.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect84 = data.SewerageConnections) === null || _data$SewerageConnect84 === void 0 ? void 0 : (_data$SewerageConnect85 = _data$SewerageConnect84[0]) === null || _data$SewerageConnect85 === void 0 ? void 0 : (_data$SewerageConnect86 = _data$SewerageConnect85.connectionHolders) === null || _data$SewerageConnect86 === void 0 ? void 0 : (_data$SewerageConnect87 = _data$SewerageConnect86[0]) === null || _data$SewerageConnect87 === void 0 ? void 0 : _data$SewerageConnect87.uuid,
       fieldName: "gender",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -28504,14 +28431,13 @@ 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$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.fatherOrHusbandName) || (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.fatherOrHusbandName) || t("CS_NA"),
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection93 = data.WaterConnection) === null || _data$WaterConnection93 === void 0 ? void 0 : (_data$WaterConnection94 = _data$WaterConnection93[0]) === null || _data$WaterConnection94 === void 0 ? void 0 : (_data$WaterConnection95 = _data$WaterConnection94.connectionHolders) === null || _data$WaterConnection95 === void 0 ? void 0 : (_data$WaterConnection96 = _data$WaterConnection95[0]) === null || _data$WaterConnection96 === void 0 ? void 0 : _data$WaterConnection96.fatherOrHusbandName) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect88 = data.SewerageConnections) === null || _data$SewerageConnect88 === void 0 ? void 0 : (_data$SewerageConnect89 = _data$SewerageConnect88[0]) === null || _data$SewerageConnect89 === void 0 ? void 0 : (_data$SewerageConnect90 = _data$SewerageConnect89.connectionHolders) === null || _data$SewerageConnect90 === void 0 ? void 0 : (_data$SewerageConnect91 = _data$SewerageConnect90[0]) === null || _data$SewerageConnect91 === void 0 ? void 0 : _data$SewerageConnect91.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$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.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$WaterConnection97 = data.WaterConnection) === null || _data$WaterConnection97 === void 0 ? void 0 : (_data$WaterConnection98 = _data$WaterConnection97[0]) === null || _data$WaterConnection98 === void 0 ? void 0 : (_data$WaterConnection99 = _data$WaterConnection98.connectionHolders) === null || _data$WaterConnection99 === void 0 ? void 0 : (_data$WaterConnection100 = _data$WaterConnection99[0]) === null || _data$WaterConnection100 === void 0 ? void 0 : _data$WaterConnection100.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect92 = data.SewerageConnections) === null || _data$SewerageConnect92 === void 0 ? void 0 : (_data$SewerageConnect93 = _data$SewerageConnect92[0]) === null || _data$SewerageConnect93 === void 0 ? void 0 : (_data$SewerageConnect94 = _data$SewerageConnect93.connectionHolders) === null || _data$SewerageConnect94 === void 0 ? void 0 : (_data$SewerageConnect95 = _data$SewerageConnect94[0]) === null || _data$SewerageConnect95 === void 0 ? void 0 : _data$SewerageConnect95.uuid,
       fieldName: "fatherOrHusbandName",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -28527,14 +28453,13 @@ 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$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.relationship) || (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.relationship) || t("CS_NA"),
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection101 = data.WaterConnection) === null || _data$WaterConnection101 === void 0 ? void 0 : (_data$WaterConnection102 = _data$WaterConnection101[0]) === null || _data$WaterConnection102 === void 0 ? void 0 : (_data$WaterConnection103 = _data$WaterConnection102.connectionHolders) === null || _data$WaterConnection103 === void 0 ? void 0 : (_data$WaterConnection104 = _data$WaterConnection103[0]) === null || _data$WaterConnection104 === void 0 ? void 0 : _data$WaterConnection104.relationship) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect96 = data.SewerageConnections) === null || _data$SewerageConnect96 === void 0 ? void 0 : (_data$SewerageConnect97 = _data$SewerageConnect96[0]) === null || _data$SewerageConnect97 === void 0 ? void 0 : (_data$SewerageConnect98 = _data$SewerageConnect97.connectionHolders) === null || _data$SewerageConnect98 === void 0 ? void 0 : (_data$SewerageConnect99 = _data$SewerageConnect98[0]) === null || _data$SewerageConnect99 === void 0 ? void 0 : _data$SewerageConnect99.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$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.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$WaterConnection105 = data.WaterConnection) === null || _data$WaterConnection105 === void 0 ? void 0 : (_data$WaterConnection106 = _data$WaterConnection105[0]) === null || _data$WaterConnection106 === void 0 ? void 0 : (_data$WaterConnection107 = _data$WaterConnection106.connectionHolders) === null || _data$WaterConnection107 === void 0 ? void 0 : (_data$WaterConnection108 = _data$WaterConnection107[0]) === null || _data$WaterConnection108 === void 0 ? void 0 : _data$WaterConnection108.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect100 = data.SewerageConnections) === null || _data$SewerageConnect100 === void 0 ? void 0 : (_data$SewerageConnect101 = _data$SewerageConnect100[0]) === null || _data$SewerageConnect101 === void 0 ? void 0 : (_data$SewerageConnect102 = _data$SewerageConnect101.connectionHolders) === null || _data$SewerageConnect102 === void 0 ? void 0 : (_data$SewerageConnect103 = _data$SewerageConnect102[0]) === null || _data$SewerageConnect103 === void 0 ? void 0 : _data$SewerageConnect103.uuid,
       fieldName: "relationship",
       model: "WnSConnection",
       showValue: false,
@@ -28550,11 +28475,10 @@ const WSApplicationDetails = () => {
       }
     }
   }), /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
     label: t("WS_OWN_DETAIL_CROSADD"),
-    text: (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.correspondenceAddress) || (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.correspondenceAddress) || t("CS_NA"),
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection109 = data.WaterConnection) === null || _data$WaterConnection109 === void 0 ? void 0 : (_data$WaterConnection110 = _data$WaterConnection109[0]) === null || _data$WaterConnection110 === void 0 ? void 0 : (_data$WaterConnection111 = _data$WaterConnection110.connectionHolders) === null || _data$WaterConnection111 === void 0 ? void 0 : (_data$WaterConnection112 = _data$WaterConnection111[0]) === null || _data$WaterConnection112 === void 0 ? void 0 : _data$WaterConnection112.correspondenceAddress) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect104 = data.SewerageConnections) === null || _data$SewerageConnect104 === void 0 ? void 0 : (_data$SewerageConnect105 = _data$SewerageConnect104[0]) === null || _data$SewerageConnect105 === void 0 ? void 0 : (_data$SewerageConnect106 = _data$SewerageConnect105.connectionHolders) === null || _data$SewerageConnect106 === void 0 ? void 0 : (_data$SewerageConnect107 = _data$SewerageConnect106[0]) === null || _data$SewerageConnect107 === void 0 ? void 0 : _data$SewerageConnect107.correspondenceAddress) || t("CS_NA"),
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? 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.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$WaterConnection113 = data.WaterConnection) === null || _data$WaterConnection113 === void 0 ? void 0 : (_data$WaterConnection114 = _data$WaterConnection113[0]) === null || _data$WaterConnection114 === void 0 ? void 0 : (_data$WaterConnection115 = _data$WaterConnection114.connectionHolders) === null || _data$WaterConnection115 === void 0 ? void 0 : (_data$WaterConnection116 = _data$WaterConnection115[0]) === null || _data$WaterConnection116 === void 0 ? void 0 : _data$WaterConnection116.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect108 = data.SewerageConnections) === null || _data$SewerageConnect108 === void 0 ? void 0 : (_data$SewerageConnect109 = _data$SewerageConnect108[0]) === null || _data$SewerageConnect109 === void 0 ? void 0 : (_data$SewerageConnect110 = _data$SewerageConnect109.connectionHolders) === null || _data$SewerageConnect110 === void 0 ? void 0 : (_data$SewerageConnect111 = _data$SewerageConnect110[0]) === null || _data$SewerageConnect111 === void 0 ? void 0 : _data$SewerageConnect111.uuid,
       fieldName: "correspondenceAddress",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -28570,42 +28494,13 @@ 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$WaterConnection114 = data.WaterConnection) !== null && _data$WaterConnection114 !== void 0 && (_data$WaterConnection115 = _data$WaterConnection114[0]) !== null && _data$WaterConnection115 !== void 0 && (_data$WaterConnection116 = _data$WaterConnection115.connectionHolders) !== null && _data$WaterConnection116 !== void 0 && (_data$WaterConnection117 = _data$WaterConnection116[0]) !== null && _data$WaterConnection117 !== void 0 && (_data$WaterConnection118 = _data$WaterConnection117.ownerType) !== null && _data$WaterConnection118 !== void 0 && _data$WaterConnection118.includes("*")) : !(data !== null && data !== void 0 && (_data$SewerageConnect109 = data.SewerageConnections) !== null && _data$SewerageConnect109 !== void 0 && (_data$SewerageConnect110 = _data$SewerageConnect109[0]) !== null && _data$SewerageConnect110 !== void 0 && (_data$SewerageConnect111 = _data$SewerageConnect110.connectionHolders) !== null && _data$SewerageConnect111 !== void 0 && (_data$SewerageConnect112 = _data$SewerageConnect111[0]) !== null && _data$SewerageConnect112 !== void 0 && (_data$SewerageConnect113 = _data$SewerageConnect112.ownerType) !== null && _data$SewerageConnect113 !== void 0 && _data$SewerageConnect113.includes("*"))) ? t("COMMON_MASTERS_OWNERTYPE_" + (applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection119 = data.WaterConnection) === null || _data$WaterConnection119 === void 0 ? void 0 : (_data$WaterConnection120 = _data$WaterConnection119[0]) === null || _data$WaterConnection120 === void 0 ? void 0 : (_data$WaterConnection121 = _data$WaterConnection120.connectionHolders) === null || _data$WaterConnection121 === void 0 ? void 0 : (_data$WaterConnection122 = _data$WaterConnection121[0]) === null || _data$WaterConnection122 === void 0 ? void 0 : _data$WaterConnection122.ownerType : data === null || data === void 0 ? void 0 : (_data$SewerageConnect114 = data.SewerageConnections) === null || _data$SewerageConnect114 === void 0 ? void 0 : (_data$SewerageConnect115 = _data$SewerageConnect114[0]) === null || _data$SewerageConnect115 === void 0 ? void 0 : (_data$SewerageConnect116 = _data$SewerageConnect115.connectionHolders) === null || _data$SewerageConnect116 === void 0 ? void 0 : (_data$SewerageConnect117 = _data$SewerageConnect116[0]) === null || _data$SewerageConnect117 === void 0 ? void 0 : _data$SewerageConnect117.ownerType)) : applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection123 = data.WaterConnection) === null || _data$WaterConnection123 === void 0 ? void 0 : (_data$WaterConnection124 = _data$WaterConnection123[0]) === null || _data$WaterConnection124 === void 0 ? void 0 : (_data$WaterConnection125 = _data$WaterConnection124.connectionHolders) === null || _data$WaterConnection125 === void 0 ? void 0 : (_data$WaterConnection126 = _data$WaterConnection125[0]) === null || _data$WaterConnection126 === void 0 ? void 0 : _data$WaterConnection126.ownerType : data === null || data === void 0 ? void 0 : (_data$SewerageConnect118 = data.SewerageConnections) === null || _data$SewerageConnect118 === void 0 ? void 0 : (_data$SewerageConnect119 = _data$SewerageConnect118[0]) === null || _data$SewerageConnect119 === void 0 ? void 0 : (_data$SewerageConnect120 = _data$SewerageConnect119.connectionHolders) === null || _data$SewerageConnect120 === void 0 ? void 0 : (_data$SewerageConnect121 = _data$SewerageConnect120[0]) === null || _data$SewerageConnect121 === void 0 ? void 0 : _data$SewerageConnect121.ownerType,
-    textStyle: {
-      whiteSpace: "pre"
-    },
-    privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection127 = data.WaterConnection) === null || _data$WaterConnection127 === void 0 ? void 0 : (_data$WaterConnection128 = _data$WaterConnection127[0]) === null || _data$WaterConnection128 === void 0 ? void 0 : (_data$WaterConnection129 = _data$WaterConnection128.connectionHolders) === null || _data$WaterConnection129 === void 0 ? void 0 : (_data$WaterConnection130 = _data$WaterConnection129[0]) === null || _data$WaterConnection130 === void 0 ? void 0 : _data$WaterConnection130.uuid : 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.uuid,
-      fieldName: "ownerType",
-      model: "WnSConnection",
-      showValue: false,
-      loadData: {
-        serviceName: serviceType === "WATER" ? "/ws-services/wc/_search" : "/sw-services/swc/_search",
-        requestBody: {},
-        requestParam: {
-          tenantId,
-          applicationNumber: applicationNobyData
-        },
-        jsonPath: serviceType === "WATER" ? "WaterConnection[0].connectionHolders[0].ownerType" : "SewerageConnections[0].connectionHolders[0].ownerType",
-        isArray: false,
-        d: res => {
-          var _res$WaterConnection, _res$WaterConnection2, _res$WaterConnection3, _res$WaterConnection4, _res$WaterConnection5, _res$WaterConnection6, _res$SewerageConnecti, _res$SewerageConnecti2, _res$SewerageConnecti3, _res$SewerageConnecti4, _res$SewerageConnecti5;
-          let resultString = res !== null && res !== void 0 && (_res$WaterConnection = res.WaterConnection) !== null && _res$WaterConnection !== void 0 && _res$WaterConnection[0] ? t("PROPERTYTAX_OWNERTYPE_" + (res === null || res === void 0 ? void 0 : (_res$WaterConnection2 = res.WaterConnection) === null || _res$WaterConnection2 === void 0 ? void 0 : (_res$WaterConnection3 = _res$WaterConnection2[0]) === null || _res$WaterConnection3 === void 0 ? void 0 : (_res$WaterConnection4 = _res$WaterConnection3.connectionHolders) === null || _res$WaterConnection4 === void 0 ? void 0 : (_res$WaterConnection5 = _res$WaterConnection4[0]) === null || _res$WaterConnection5 === void 0 ? void 0 : (_res$WaterConnection6 = _res$WaterConnection5.ownerType) === null || _res$WaterConnection6 === void 0 ? void 0 : _res$WaterConnection6.toUpperCase())) : t("PROPERTYTAX_OWNERTYPE_" + (res === null || res === void 0 ? void 0 : (_res$SewerageConnecti = res.SewerageConnections) === null || _res$SewerageConnecti === void 0 ? void 0 : (_res$SewerageConnecti2 = _res$SewerageConnecti[0]) === null || _res$SewerageConnecti2 === void 0 ? void 0 : (_res$SewerageConnecti3 = _res$SewerageConnecti2.connectionHolders) === null || _res$SewerageConnecti3 === void 0 ? void 0 : (_res$SewerageConnecti4 = _res$SewerageConnecti3[0]) === null || _res$SewerageConnecti4 === void 0 ? void 0 : (_res$SewerageConnecti5 = _res$SewerageConnecti4.ownerType) === null || _res$SewerageConnecti5 === void 0 ? void 0 : _res$SewerageConnecti5.toUpperCase()));
-          return resultString;
-        }
-      }
-    }
-  }), /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
     label: t("WS_OWN_DETAIL_EMAIL_ID_LABEL"),
-    text: (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.emailId) || (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.emailId) || "NA",
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection117 = data.WaterConnection) === null || _data$WaterConnection117 === void 0 ? void 0 : (_data$WaterConnection118 = _data$WaterConnection117[0]) === null || _data$WaterConnection118 === void 0 ? void 0 : (_data$WaterConnection119 = _data$WaterConnection118.connectionHolders) === null || _data$WaterConnection119 === void 0 ? void 0 : (_data$WaterConnection120 = _data$WaterConnection119[0]) === null || _data$WaterConnection120 === void 0 ? void 0 : _data$WaterConnection120.emailId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect112 = data.SewerageConnections) === null || _data$SewerageConnect112 === void 0 ? void 0 : (_data$SewerageConnect113 = _data$SewerageConnect112[0]) === null || _data$SewerageConnect113 === void 0 ? void 0 : (_data$SewerageConnect114 = _data$SewerageConnect113.connectionHolders) === null || _data$SewerageConnect114 === void 0 ? void 0 : (_data$SewerageConnect115 = _data$SewerageConnect114[0]) === null || _data$SewerageConnect115 === void 0 ? void 0 : _data$SewerageConnect115.emailId) || "NA",
     textStyle: {
       whiteSpace: "pre"
     },
     privacy: {
-      uuid: 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.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$WaterConnection121 = data.WaterConnection) === null || _data$WaterConnection121 === void 0 ? void 0 : (_data$WaterConnection122 = _data$WaterConnection121[0]) === null || _data$WaterConnection122 === void 0 ? void 0 : (_data$WaterConnection123 = _data$WaterConnection122.connectionHolders) === null || _data$WaterConnection123 === void 0 ? void 0 : (_data$WaterConnection124 = _data$WaterConnection123[0]) === null || _data$WaterConnection124 === void 0 ? void 0 : _data$WaterConnection124.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect116 = data.SewerageConnections) === null || _data$SewerageConnect116 === void 0 ? void 0 : (_data$SewerageConnect117 = _data$SewerageConnect116[0]) === null || _data$SewerageConnect117 === void 0 ? void 0 : (_data$SewerageConnect118 = _data$SewerageConnect117.connectionHolders) === null || _data$SewerageConnect118 === void 0 ? void 0 : (_data$SewerageConnect119 = _data$SewerageConnect118[0]) === null || _data$SewerageConnect119 === void 0 ? void 0 : _data$SewerageConnect119.uuid,
       fieldName: "connectionHoldersEmailId",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -28620,19 +28515,17 @@ const WSApplicationDetails = () => {
         isArray: false
       }
     }
-  }))) : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, null, t("WS_COMMON_CONNECTION_HOLDER_DETAILS_HEADER")), /*#__PURE__*/React.createElement(CardText, null, t("WS_SAME_AS_PROPERTY_OWNERS")))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardHeader, {
+  }))) : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardSubHeader, null, t("WS_COMMON_CONNECTION_HOLDER_DETAILS_HEADER")), /*#__PURE__*/React.createElement(CardText, null, t("WS_SAME_AS_PROPERTY_OWNERS"))), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardHeader, {
     styles: {
       fontSize: "28px"
     }
   }, t("WS_COMMON_PROPERTY_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
     label: t("WS_PROPERTY_ID_LABEL"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection139 = data.WaterConnection) === null || _data$WaterConnection139 === void 0 ? void 0 : (_data$WaterConnection140 = _data$WaterConnection139[0]) === null || _data$WaterConnection140 === void 0 ? void 0 : _data$WaterConnection140.propertyId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect134 = data.SewerageConnections) === null || _data$SewerageConnect134 === void 0 ? void 0 : (_data$SewerageConnect135 = _data$SewerageConnect134[0]) === null || _data$SewerageConnect135 === void 0 ? void 0 : _data$SewerageConnect135.propertyId),
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection125 = data.WaterConnection) === null || _data$WaterConnection125 === void 0 ? void 0 : (_data$WaterConnection126 = _data$WaterConnection125[0]) === null || _data$WaterConnection126 === void 0 ? void 0 : _data$WaterConnection126.propertyId) || (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$SewerageConnect121.propertyId),
     textStyle: {
       wordBreak: "break-word"
     }
   }), /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
     label: t("WS_OWN_DETAIL_OWN_NAME_LABEL"),
     text: PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties4 = PTData.Properties) === null || _PTData$Properties4 === void 0 ? void 0 : (_PTData$Properties4$ = _PTData$Properties4[0]) === null || _PTData$Properties4$ === void 0 ? void 0 : (_PTData$Properties4$$ = _PTData$Properties4$.owners.sort((a, b) => {
       var _a$additionalDetails, _b$additionalDetails;
@@ -28642,7 +28535,6 @@ const WSApplicationDetails = () => {
       whiteSpace: "pre"
     }
   }), /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
     label: t("WS_PROPERTY_ADDRESS"),
     text: getAddress(PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties5 = PTData.Properties) === null || _PTData$Properties5 === void 0 ? void 0 : (_PTData$Properties5$ = _PTData$Properties5[0]) === null || _PTData$Properties5$ === void 0 ? void 0 : _PTData$Properties5$.address, t) || t("CS_NA"),
     textStyle: {
@@ -28670,13 +28562,13 @@ const WSApplicationDetails = () => {
       }
     }
   }), /*#__PURE__*/React.createElement(Link, {
-    to: "/digit-ui/citizen/commonpt/view-property?propertyId=" + ((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$WaterConnection142.propertyId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect136 = data.SewerageConnections) === null || _data$SewerageConnect136 === void 0 ? void 0 : (_data$SewerageConnect137 = _data$SewerageConnect136[0]) === null || _data$SewerageConnect137 === void 0 ? void 0 : _data$SewerageConnect137.propertyId)) + "&tenantId=" + ((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$WaterConnection144.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect138 = data.SewerageConnections) === null || _data$SewerageConnect138 === void 0 ? void 0 : (_data$SewerageConnect139 = _data$SewerageConnect138[0]) === null || _data$SewerageConnect139 === void 0 ? void 0 : _data$SewerageConnect139.tenantId))
+    to: "/digit-ui/citizen/commonpt/view-property?propertyId=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection127 = data.WaterConnection) === null || _data$WaterConnection127 === void 0 ? void 0 : (_data$WaterConnection128 = _data$WaterConnection127[0]) === null || _data$WaterConnection128 === void 0 ? void 0 : _data$WaterConnection128.propertyId) || (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$SewerageConnect123.propertyId)) + "&tenantId=" + ((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$WaterConnection130.tenantId) || (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$SewerageConnect125.tenantId))
   }, /*#__PURE__*/React.createElement(LinkButton, {
     style: {
       textAlign: "left"
     },
     label: t("WS_VIEW_PROPERTY")
-  })))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardHeader, {
+  })))), /*#__PURE__*/React.createElement(CardHeader, {
     styles: {
       fontSize: "28px"
     }
@@ -28742,7 +28634,7 @@ const WSApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("LANDMARK"),
     text: "" + t(checkForNA$1(propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.landmark))
-  }))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardHeader, {
+  })), /*#__PURE__*/React.createElement(CardHeader, {
     styles: {
       fontSize: "28px"
     }
@@ -28778,7 +28670,7 @@ const WSApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("WS_NUMBER_OF_DWELLING_UNITS"),
     text: "" + t(checkForNA$1((useDetails === null || useDetails === void 0 ? void 0 : useDetails.NumberofDwellingUnits) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.noOfDwellingUnits)))
-  }))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardHeader, {
+  })), /*#__PURE__*/React.createElement(CardHeader, {
     styles: {
       fontSize: "28px"
     }
@@ -28799,7 +28691,7 @@ const WSApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("WS_EMPLOYEE_DESIGNATION"),
     text: "" + t(checkForNA$1(djbEmployee === null || djbEmployee === void 0 ? void 0 : djbEmployee.designation))
-  })))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardHeader, {
+  }))), /*#__PURE__*/React.createElement(CardHeader, {
     styles: {
       fontSize: "28px"
     }
@@ -28820,19 +28712,19 @@ const WSApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("WS_BANK_ACCOUNT_NO"),
     text: "" + t(checkForNA$1((bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.bankAccountNumber) || (bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.accountNumber)))
-  }))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardHeader, {
+  })), /*#__PURE__*/React.createElement(CardHeader, {
     styles: {
       fontSize: "28px"
     }
-  }, t("WS_COMMON_DOCUMENT_DETAILS")), (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$WaterConnection146.documents) && (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$WaterConnection148.documents.map((doc, index) => {
-    var _doc$documentType, _data$WaterConnection149, _data$WaterConnection150, _data$WaterConnection151, _data$WaterConnection152;
+  }, t("WS_COMMON_DOCUMENT_DETAILS")), (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$WaterConnection132.documents) && (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$WaterConnection134.documents.map((doc, index) => {
+    var _doc$documentType, _data$WaterConnection135, _data$WaterConnection136, _data$WaterConnection137, _data$WaterConnection138;
     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$WaterConnection149 = data.WaterConnection) === null || _data$WaterConnection149 === void 0 ? void 0 : (_data$WaterConnection150 = _data$WaterConnection149[0]) === null || _data$WaterConnection150 === void 0 ? void 0 : _data$WaterConnection150.documents,
+      value: data === null || data === void 0 ? void 0 : (_data$WaterConnection135 = data.WaterConnection) === null || _data$WaterConnection135 === void 0 ? void 0 : (_data$WaterConnection136 = _data$WaterConnection135[0]) === null || _data$WaterConnection136 === void 0 ? void 0 : _data$WaterConnection136.documents,
       Code: doc === null || doc === void 0 ? void 0 : doc.documentType,
       index: index
-    }), (data === null || data === void 0 ? void 0 : (_data$WaterConnection151 = data.WaterConnection) === null || _data$WaterConnection151 === void 0 ? void 0 : (_data$WaterConnection152 = _data$WaterConnection151[0]) === null || _data$WaterConnection152 === void 0 ? void 0 : _data$WaterConnection152.documents.length) != index + 1 ? /*#__PURE__*/React.createElement("hr", {
+    }), (data === null || data === void 0 ? void 0 : (_data$WaterConnection137 = data.WaterConnection) === null || _data$WaterConnection137 === void 0 ? void 0 : (_data$WaterConnection138 = _data$WaterConnection137[0]) === null || _data$WaterConnection138 === void 0 ? void 0 : _data$WaterConnection138.documents.length) != index + 1 ? /*#__PURE__*/React.createElement("hr", {
       style: {
         color: "#cccccc",
         backgroundColor: "#cccccc",
@@ -28841,15 +28733,15 @@ const WSApplicationDetails = () => {
         marginBottom: "20px"
       }
     }) : null)));
-  })), (data === null || data === void 0 ? void 0 : (_data$SewerageConnect140 = data.SewerageConnections) === null || _data$SewerageConnect140 === void 0 ? void 0 : (_data$SewerageConnect141 = _data$SewerageConnect140[0]) === null || _data$SewerageConnect141 === void 0 ? void 0 : _data$SewerageConnect141.documents) && (data === null || data === void 0 ? void 0 : (_data$SewerageConnect142 = data.SewerageConnections) === null || _data$SewerageConnect142 === void 0 ? void 0 : (_data$SewerageConnect143 = _data$SewerageConnect142[0]) === null || _data$SewerageConnect143 === void 0 ? void 0 : _data$SewerageConnect143.documents.map((doc, index) => {
-    var _doc$documentType2, _data$SewerageConnect144, _data$SewerageConnect145, _data$SewerageConnect146, _data$SewerageConnect147;
+  })), (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$SewerageConnect127.documents) && (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$SewerageConnect129.documents.map((doc, index) => {
+    var _doc$documentType2, _data$SewerageConnect130, _data$SewerageConnect131, _data$SewerageConnect132, _data$SewerageConnect133;
     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$SewerageConnect144 = data.SewerageConnections) === null || _data$SewerageConnect144 === void 0 ? void 0 : (_data$SewerageConnect145 = _data$SewerageConnect144[0]) === null || _data$SewerageConnect145 === void 0 ? void 0 : _data$SewerageConnect145.documents,
+      value: data === null || data === void 0 ? void 0 : (_data$SewerageConnect130 = data.SewerageConnections) === null || _data$SewerageConnect130 === void 0 ? void 0 : (_data$SewerageConnect131 = _data$SewerageConnect130[0]) === null || _data$SewerageConnect131 === void 0 ? void 0 : _data$SewerageConnect131.documents,
       Code: doc === null || doc === void 0 ? void 0 : doc.documentType,
       index: index
-    }), (data === null || data === void 0 ? void 0 : (_data$SewerageConnect146 = data.SewerageConnections) === null || _data$SewerageConnect146 === void 0 ? void 0 : (_data$SewerageConnect147 = _data$SewerageConnect146[0]) === null || _data$SewerageConnect147 === void 0 ? void 0 : _data$SewerageConnect147.documents.length) != index + 1 ? /*#__PURE__*/React.createElement("hr", {
+    }), (data === null || data === void 0 ? void 0 : (_data$SewerageConnect132 = data.SewerageConnections) === null || _data$SewerageConnect132 === void 0 ? void 0 : (_data$SewerageConnect133 = _data$SewerageConnect132[0]) === null || _data$SewerageConnect133 === void 0 ? void 0 : _data$SewerageConnect133.documents.length) != index + 1 ? /*#__PURE__*/React.createElement("hr", {
       style: {
         color: "white",
         backgroundColor: "white",
@@ -28858,42 +28750,36 @@ const WSApplicationDetails = () => {
         marginBottom: "20px"
       }
     }) : null)));
-  }))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement("div", {
-    id: "timeline"
-  }, /*#__PURE__*/React.createElement(WSWFApplicationTimeline, {
-    application: (data === null || data === void 0 ? void 0 : (_data$WaterConnection153 = data.WaterConnection) === null || _data$WaterConnection153 === void 0 ? void 0 : _data$WaterConnection153[0]) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect148 = data.SewerageConnections) === null || _data$SewerageConnect148 === void 0 ? void 0 : _data$SewerageConnect148[0]),
-    id: (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) || (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.applicationNo),
-    paymentbuttonenabled: false
-  })), (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.applicationStatus) === "PENDING_FOR_PAYMENT" || (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.applicationStatus) === "PENDING_FOR_PAYMENT" ? /*#__PURE__*/React.createElement(Link, {
+  })), (data === null || data === void 0 ? void 0 : (_data$WaterConnection139 = data.WaterConnection) === null || _data$WaterConnection139 === void 0 ? void 0 : (_data$WaterConnection140 = _data$WaterConnection139[0]) === null || _data$WaterConnection140 === void 0 ? void 0 : _data$WaterConnection140.applicationStatus) === "PENDING_FOR_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect134 = data.SewerageConnections) === null || _data$SewerageConnect134 === void 0 ? void 0 : (_data$SewerageConnect135 = _data$SewerageConnect134[0]) === null || _data$SewerageConnect135 === void 0 ? void 0 : _data$SewerageConnect135.applicationStatus) === "PENDING_FOR_PAYMENT" ? /*#__PURE__*/React.createElement(Link, {
     to: {
-      pathname: "/digit-ui/citizen/payment/my-bills/" + (paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data20 = paymentDetails.data) === null || _paymentDetails$data20 === void 0 ? void 0 : (_paymentDetails$data21 = _paymentDetails$data20.Bill) === null || _paymentDetails$data21 === void 0 ? void 0 : (_paymentDetails$data22 = _paymentDetails$data21[0]) === null || _paymentDetails$data22 === void 0 ? void 0 : _paymentDetails$data22.businessService) + "/" + (applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? stringReplaceAll(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.connectionNo, "/", "+") || stringReplaceAll(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.connectionNo, "/", "+") : stringReplaceAll(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.applicationNo, "/", "+") || stringReplaceAll(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.applicationNo, "/", "+")) + "?workflow=WNS&tenantId=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection162 = data.WaterConnection) === null || _data$WaterConnection162 === void 0 ? void 0 : (_data$WaterConnection163 = _data$WaterConnection162[0]) === null || _data$WaterConnection163 === void 0 ? void 0 : _data$WaterConnection163.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect157 = data.SewerageConnections) === null || _data$SewerageConnect157 === void 0 ? void 0 : (_data$SewerageConnect158 = _data$SewerageConnect157[0]) === null || _data$SewerageConnect158 === void 0 ? void 0 : _data$SewerageConnect158.tenantId)) + "&ConsumerName=" + ((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$WaterConnection166 = _data$WaterConnection165.connectionHolders) === null || _data$WaterConnection166 === void 0 ? void 0 : _data$WaterConnection166.map(owner => owner.name).join(",")) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect159 = data.SewerageConnections) === null || _data$SewerageConnect159 === void 0 ? void 0 : (_data$SewerageConnect160 = _data$SewerageConnect159[0]) === null || _data$SewerageConnect160 === void 0 ? void 0 : (_data$SewerageConnect161 = _data$SewerageConnect160.connectionHolders) === null || _data$SewerageConnect161 === void 0 ? void 0 : _data$SewerageConnect161.map(owner => owner.name).join(",")) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties8 = PTData.Properties) === null || _PTData$Properties8 === void 0 ? void 0 : (_PTData$Properties8$ = _PTData$Properties8[0]) === null || _PTData$Properties8$ === void 0 ? void 0 : (_PTData$Properties8$$ = _PTData$Properties8$.owners) === null || _PTData$Properties8$$ === void 0 ? void 0 : _PTData$Properties8$$.map(owner => owner.name).join(","))) + "&isDisoconnectFlow=" + (applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? true : false),
+      pathname: "/digit-ui/citizen/payment/my-bills/" + (paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data20 = paymentDetails.data) === null || _paymentDetails$data20 === void 0 ? void 0 : (_paymentDetails$data21 = _paymentDetails$data20.Bill) === null || _paymentDetails$data21 === void 0 ? void 0 : (_paymentDetails$data22 = _paymentDetails$data21[0]) === null || _paymentDetails$data22 === void 0 ? void 0 : _paymentDetails$data22.businessService) + "/" + (applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? stringReplaceAll(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$WaterConnection142.connectionNo, "/", "+") || stringReplaceAll(data === null || data === void 0 ? void 0 : (_data$SewerageConnect136 = data.SewerageConnections) === null || _data$SewerageConnect136 === void 0 ? void 0 : (_data$SewerageConnect137 = _data$SewerageConnect136[0]) === null || _data$SewerageConnect137 === void 0 ? void 0 : _data$SewerageConnect137.connectionNo, "/", "+") : stringReplaceAll(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$WaterConnection144.applicationNo, "/", "+") || stringReplaceAll(data === null || data === void 0 ? void 0 : (_data$SewerageConnect138 = data.SewerageConnections) === null || _data$SewerageConnect138 === void 0 ? void 0 : (_data$SewerageConnect139 = _data$SewerageConnect138[0]) === null || _data$SewerageConnect139 === void 0 ? void 0 : _data$SewerageConnect139.applicationNo, "/", "+")) + "?workflow=WNS&tenantId=" + ((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$WaterConnection146.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect140 = data.SewerageConnections) === null || _data$SewerageConnect140 === void 0 ? void 0 : (_data$SewerageConnect141 = _data$SewerageConnect140[0]) === null || _data$SewerageConnect141 === void 0 ? void 0 : _data$SewerageConnect141.tenantId)) + "&ConsumerName=" + ((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$WaterConnection149.map(owner => owner.name).join(",")) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect142 = data.SewerageConnections) === null || _data$SewerageConnect142 === void 0 ? void 0 : (_data$SewerageConnect143 = _data$SewerageConnect142[0]) === null || _data$SewerageConnect143 === void 0 ? void 0 : (_data$SewerageConnect144 = _data$SewerageConnect143.connectionHolders) === null || _data$SewerageConnect144 === void 0 ? void 0 : _data$SewerageConnect144.map(owner => owner.name).join(",")) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties8 = PTData.Properties) === null || _PTData$Properties8 === void 0 ? void 0 : (_PTData$Properties8$ = _PTData$Properties8[0]) === null || _PTData$Properties8$ === void 0 ? void 0 : (_PTData$Properties8$$ = _PTData$Properties8$.owners) === null || _PTData$Properties8$$ === void 0 ? void 0 : _PTData$Properties8$$.map(owner => owner.name).join(","))) + "&isDisoconnectFlow=" + (applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? true : false),
       state: {}
     }
   }, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("MAKE_PAYMENT")
-  })) : null, !(data !== null && data !== void 0 && (_data$WaterConnection167 = data.WaterConnection) !== null && _data$WaterConnection167 !== void 0 && (_data$WaterConnection168 = _data$WaterConnection167[0]) !== null && _data$WaterConnection168 !== void 0 && _data$WaterConnection168.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$WaterConnection169 = data.WaterConnection) !== null && _data$WaterConnection169 !== void 0 && (_data$WaterConnection170 = _data$WaterConnection169[0]) !== null && _data$WaterConnection170 !== void 0 && _data$WaterConnection170.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || !(data !== null && data !== void 0 && (_data$SewerageConnect162 = data.SewerageConnections) !== null && _data$SewerageConnect162 !== void 0 && (_data$SewerageConnect163 = _data$SewerageConnect162[0]) !== null && _data$SewerageConnect163 !== void 0 && _data$SewerageConnect163.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$SewerageConnect164 = data.SewerageConnections) !== null && _data$SewerageConnect164 !== void 0 && (_data$SewerageConnect165 = _data$SewerageConnect164[0]) !== null && _data$SewerageConnect165 !== void 0 && _data$SewerageConnect165.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React.createElement(Link, {
+  })) : null, !(data !== null && data !== void 0 && (_data$WaterConnection150 = data.WaterConnection) !== null && _data$WaterConnection150 !== void 0 && (_data$WaterConnection151 = _data$WaterConnection150[0]) !== null && _data$WaterConnection151 !== void 0 && _data$WaterConnection151.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$WaterConnection152 = data.WaterConnection) !== null && _data$WaterConnection152 !== void 0 && (_data$WaterConnection153 = _data$WaterConnection152[0]) !== null && _data$WaterConnection153 !== void 0 && _data$WaterConnection153.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || !(data !== null && data !== void 0 && (_data$SewerageConnect145 = data.SewerageConnections) !== null && _data$SewerageConnect145 !== void 0 && (_data$SewerageConnect146 = _data$SewerageConnect145[0]) !== null && _data$SewerageConnect146 !== void 0 && _data$SewerageConnect146.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$SewerageConnect147 = data.SewerageConnections) !== null && _data$SewerageConnect147 !== void 0 && (_data$SewerageConnect148 = _data$SewerageConnect147[0]) !== null && _data$SewerageConnect148 !== void 0 && _data$SewerageConnect148.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$WaterConnection171 = data.WaterConnection) === null || _data$WaterConnection171 === void 0 ? void 0 : (_data$WaterConnection172 = _data$WaterConnection171[0]) === null || _data$WaterConnection172 === void 0 ? void 0 : _data$WaterConnection172.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)),
+      pathname: "/digit-ui/citizen/ws/edit-application/" + ((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.tenantId) || (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.tenantId)),
       state: {
-        id: "" + ((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) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect168 = data.SewerageConnections) === null || _data$SewerageConnect168 === void 0 ? void 0 : (_data$SewerageConnect169 = _data$SewerageConnect168[0]) === null || _data$SewerageConnect169 === void 0 ? void 0 : _data$SewerageConnect169.applicationNo))
+        id: "" + ((data === null || data === void 0 ? void 0 : (_data$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) || (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.applicationNo))
       }
     }
   }, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("COMMON_EDIT")
-  })) : null, data !== null && data !== void 0 && (_data$WaterConnection175 = data.WaterConnection) !== null && _data$WaterConnection175 !== void 0 && (_data$WaterConnection176 = _data$WaterConnection175[0]) !== null && _data$WaterConnection176 !== void 0 && _data$WaterConnection176.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$WaterConnection177 = data.WaterConnection) !== null && _data$WaterConnection177 !== void 0 && (_data$WaterConnection178 = _data$WaterConnection177[0]) !== null && _data$WaterConnection178 !== void 0 && _data$WaterConnection178.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || data !== null && data !== void 0 && (_data$SewerageConnect170 = data.SewerageConnections) !== null && _data$SewerageConnect170 !== void 0 && (_data$SewerageConnect171 = _data$SewerageConnect170[0]) !== null && _data$SewerageConnect171 !== void 0 && _data$SewerageConnect171.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$SewerageConnect172 = data.SewerageConnections) !== null && _data$SewerageConnect172 !== void 0 && (_data$SewerageConnect173 = _data$SewerageConnect172[0]) !== null && _data$SewerageConnect173 !== void 0 && _data$SewerageConnect173.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React.createElement(Link, {
+  })) : null, data !== null && data !== void 0 && (_data$WaterConnection158 = data.WaterConnection) !== null && _data$WaterConnection158 !== void 0 && (_data$WaterConnection159 = _data$WaterConnection158[0]) !== null && _data$WaterConnection159 !== void 0 && _data$WaterConnection159.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$WaterConnection160 = data.WaterConnection) !== null && _data$WaterConnection160 !== void 0 && (_data$WaterConnection161 = _data$WaterConnection160[0]) !== null && _data$WaterConnection161 !== void 0 && _data$WaterConnection161.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || data !== null && data !== void 0 && (_data$SewerageConnect153 = data.SewerageConnections) !== null && _data$SewerageConnect153 !== void 0 && (_data$SewerageConnect154 = _data$SewerageConnect153[0]) !== null && _data$SewerageConnect154 !== void 0 && _data$SewerageConnect154.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$SewerageConnect155 = data.SewerageConnections) !== null && _data$SewerageConnect155 !== void 0 && (_data$SewerageConnect156 = _data$SewerageConnect155[0]) !== null && _data$SewerageConnect156 !== void 0 && _data$SewerageConnect156.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$WaterConnection179 = data.WaterConnection) === null || _data$WaterConnection179 === void 0 ? void 0 : (_data$WaterConnection180 = _data$WaterConnection179[0]) === null || _data$WaterConnection180 === void 0 ? void 0 : _data$WaterConnection180.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect174 = data.SewerageConnections) === null || _data$SewerageConnect174 === void 0 ? void 0 : (_data$SewerageConnect175 = _data$SewerageConnect174[0]) === null || _data$SewerageConnect175 === void 0 ? void 0 : _data$SewerageConnect175.applicationNo))
+        id: "" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection162 = data.WaterConnection) === null || _data$WaterConnection162 === void 0 ? void 0 : (_data$WaterConnection163 = _data$WaterConnection162[0]) === null || _data$WaterConnection163 === void 0 ? void 0 : _data$WaterConnection163.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect157 = data.SewerageConnections) === null || _data$SewerageConnect157 === void 0 ? void 0 : (_data$SewerageConnect158 = _data$SewerageConnect157[0]) === null || _data$SewerageConnect158 === void 0 ? void 0 : _data$SewerageConnect158.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$SewerageConnect176 = data.SewerageConnections) === null || _data$SewerageConnect176 === void 0 ? void 0 : _data$SewerageConnect176[0],
+      applicationData: data === null || data === void 0 ? void 0 : (_data$SewerageConnect159 = data.SewerageConnections) === null || _data$SewerageConnect159 === void 0 ? void 0 : _data$SewerageConnect159[0],
       serviceType: "SEWERAGE",
       WSDisconnectionForm: {
-        type: 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.isDisconnectionTemporary ? {
+        type: data !== null && data !== void 0 && (_data$SewerageConnect160 = data.SewerageConnections) !== null && _data$SewerageConnect160 !== void 0 && (_data$SewerageConnect161 = _data$SewerageConnect160[0]) !== null && _data$SewerageConnect161 !== void 0 && _data$SewerageConnect161.isDisconnectionTemporary ? {
           code: "type",
           value: {
             name: "Temporary",
@@ -28910,18 +28796,18 @@ const WSApplicationDetails = () => {
             code: "Permanent"
           }
         },
-        date: convertEpochToDateDMY(data === null || data === void 0 ? void 0 : (_data$SewerageConnect179 = data.SewerageConnections) === null || _data$SewerageConnect179 === void 0 ? void 0 : (_data$SewerageConnect180 = _data$SewerageConnect179[0]) === null || _data$SewerageConnect180 === void 0 ? void 0 : _data$SewerageConnect180.dateEffectiveFrom, true),
+        date: convertEpochToDateDMY(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.dateEffectiveFrom, true),
         reason: {
           code: "reason",
-          value: 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.disconnectionReason
+          value: 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.disconnectionReason
         },
-        documents: 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.documents
+        documents: 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.documents
       }
     } : {
-      applicationData: data === null || data === void 0 ? void 0 : (_data$WaterConnection181 = data.WaterConnection) === null || _data$WaterConnection181 === void 0 ? void 0 : _data$WaterConnection181[0],
+      applicationData: data === null || data === void 0 ? void 0 : (_data$WaterConnection164 = data.WaterConnection) === null || _data$WaterConnection164 === void 0 ? void 0 : _data$WaterConnection164[0],
       serviceType: "WATER",
       WSDisconnectionForm: {
-        type: 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.isDisconnectionTemporary ? {
+        type: data !== null && data !== void 0 && (_data$WaterConnection165 = data.WaterConnection) !== null && _data$WaterConnection165 !== void 0 && (_data$WaterConnection166 = _data$WaterConnection165[0]) !== null && _data$WaterConnection166 !== void 0 && _data$WaterConnection166.isDisconnectionTemporary ? {
           code: "type",
           value: {
             name: "Temporary",
@@ -28938,15 +28824,15 @@ const WSApplicationDetails = () => {
             code: "Permanent"
           }
         },
-        date: convertEpochToDateDMY(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.dateEffectiveFrom, true),
+        date: convertEpochToDateDMY(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.dateEffectiveFrom, true),
         reason: {
           code: "reason",
-          value: 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.disconnectionReason
+          value: 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.disconnectionReason
         },
-        documents: data === null || data === void 0 ? void 0 : (_data$WaterConnection188 = data.WaterConnection) === null || _data$WaterConnection188 === void 0 ? void 0 : (_data$WaterConnection189 = _data$WaterConnection188[0]) === null || _data$WaterConnection189 === void 0 ? void 0 : _data$WaterConnection189.documents
+        documents: 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.documents
       }
     })
-  })) : null)));
+  })) : null)))));
 };
 
 const WSAdditionalDetails = () => {
@@ -31145,7 +31031,7 @@ const WSConnection = _ref => {
 };
 
 const MyConnections = _ref => {
-  var _user$info, _user$info$userName, _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;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const user = Digit.UserService.getUser();
@@ -31176,7 +31062,7 @@ const MyConnections = _ref => {
     }),
     isSWLoading = _Digit$Hooks$ws$useMy2.isLoading,
     SWdata = _Digit$Hooks$ws$useMy2.data;
-  let connectionList = data === null || data === void 0 ? void 0 : data.WaterConnection.concat(SWdata === null || SWdata === void 0 ? void 0 : SWdata.SewerageConnections);
+  let connectionList = ((data === null || data === void 0 ? void 0 : data.WaterConnection) || []).concat((SWdata === null || SWdata === void 0 ? void 0 : SWdata.SewerageConnections) || []);
   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 === null || ob === void 0 ? void 0 : ob.propertyId).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 === null || ob === void 0 ? void 0 : ob.propertyId).join(",")) || "";
   let applicationNos = applicationNoWS.concat(applicaionNoSW);
@@ -31199,16 +31085,114 @@ const MyConnections = _ref => {
       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 _useState = useState(0),
+    pageOffset = _useState[0],
+    setPageOffset = _useState[1];
+  const _useState2 = useState(10),
+    pageSize = _useState2[0],
+    setPageSize = _useState2[1];
+  const isMobile = window.Digit.Utils.browser.isMobile();
+  const GetCell = value => /*#__PURE__*/React.createElement("span", {
+    className: "cell-text"
+  }, value);
+  const columns = useMemo(() => {
+    return [{
+      Header: t("WS_MYCONNECTIONS_CONSUMER_NO"),
+      disableSortBy: true,
+      Cell: _ref2 => {
+        var _row$original, _row$original2;
+        let row = _ref2.row;
+        return /*#__PURE__*/React.createElement("span", {
+          className: "link"
+        }, /*#__PURE__*/React.createElement(Link, {
+          to: {
+            pathname: "/digit-ui/citizen/ws/connection/details/" + encodeURI((_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.applicationNo),
+            state: _extends({}, row.original)
+          }
+        }, ((_row$original2 = row.original) === null || _row$original2 === void 0 ? void 0 : _row$original2.connectionNo) || "NA"));
+      }
+    }, {
+      Header: t("WS_MYCONNECTIONS_APPLICATION_NO"),
+      disableSortBy: true,
+      Cell: _ref3 => {
+        var _row$original3;
+        let row = _ref3.row;
+        return /*#__PURE__*/React.createElement("span", null, ((_row$original3 = row.original) === null || _row$original3 === void 0 ? void 0 : _row$original3.applicationNo) || "NA");
+      }
+    }, {
+      Header: t("WS_SERVICE_NAME_LABEL"),
+      disableSortBy: true,
+      Cell: _ref4 => {
+        var _row$original4;
+        let row = _ref4.row;
+        return GetCell(t("WS_APPLICATION_TYPE_" + ((_row$original4 = row.original) === null || _row$original4 === void 0 ? void 0 : _row$original4.applicationType)));
+      }
+    }, {
+      Header: t("WS_CONSUMER_NAME"),
+      disableSortBy: true,
+      Cell: _ref5 => {
+        var _row$original5, _row$original5$connec, _row$original6, _row$original6$proper, _row$original6$proper2, _row$original6$proper3;
+        let row = _ref5.row;
+        const names = ((_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : (_row$original5$connec = _row$original5.connectionHolders) === null || _row$original5$connec === void 0 ? void 0 : _row$original5$connec.map(owner => owner.name).join(",")) || ((_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : (_row$original6$proper = _row$original6.property) === null || _row$original6$proper === void 0 ? void 0 : (_row$original6$proper2 = _row$original6$proper.owners) === null || _row$original6$proper2 === void 0 ? void 0 : (_row$original6$proper3 = _row$original6$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);
+        })) === null || _row$original6$proper3 === void 0 ? void 0 : _row$original6$proper3.map(owner => owner.name).join(",")) || t("CS_NA");
+        return GetCell(names);
+      }
+    }, {
+      Header: t("WS_MYCONNECTIONS_STATUS"),
+      disableSortBy: true,
+      Cell: _ref6 => {
+        var _row$original7;
+        let row = _ref6.row;
+        return GetCell(t((_row$original7 = row.original) === null || _row$original7 === void 0 ? void 0 : _row$original7.status) || t("CS_NA"));
+      }
+    }, {
+      Header: t("WS_VIEW_DETAILS"),
+      disableSortBy: true,
+      Cell: _ref7 => {
+        let row = _ref7.row;
+        const application = row.original;
+        return /*#__PURE__*/React.createElement("span", {
+          className: "link"
+        }, /*#__PURE__*/React.createElement(Link, {
+          to: {
+            pathname: "/digit-ui/citizen/ws/connection/details/" + encodeURI(application === null || application === void 0 ? void 0 : application.applicationNo),
+            state: _extends({}, application)
+          }
+        }, t("WS_VIEW_DETAILS_LABEL")));
+      }
+    }];
+  }, [t]);
   if (isLoading || PTisLoading || isSWLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Header, null, t("WS_MYCONNECTIONS_HEADER") + " " + (connectionList ? "(" + connectionList.length + ")" : "")), /*#__PURE__*/React.createElement(WSInfoLabel, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(WSInfoLabel, {
     t: t
-  }), /*#__PURE__*/React.createElement("div", null, ((_connectionList = connectionList) === null || _connectionList === void 0 ? void 0 : _connectionList.length) > 0 && connectionList.map((application, index) => /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement("div", null, ((_connectionList = connectionList) === null || _connectionList === void 0 ? void 0 : _connectionList.length) > 0 ? isMobile ? connectionList.map((application, index) => /*#__PURE__*/React.createElement("div", {
     key: index
   }, /*#__PURE__*/React.createElement(WSConnection, {
     application: application
-  }))), !((_connectionList2 = connectionList) !== null && _connectionList2 !== void 0 && _connectionList2.length) > 0 && /*#__PURE__*/React.createElement("p", {
+  }))) : /*#__PURE__*/React.createElement(Table, {
+    t: t,
+    data: connectionList.slice(pageOffset, pageOffset + pageSize),
+    totalRecords: connectionList.length,
+    columns: columns,
+    getCellProps: cellInfo => {
+      return {
+        style: {
+          padding: "20px 18px",
+          fontSize: "16px"
+        }
+      };
+    },
+    onPageSizeChange: e => setPageSize(Number(e.target.value)),
+    currentPage: Math.floor(pageOffset / pageSize),
+    onNextPage: () => setPageOffset(pageOffset + pageSize),
+    onPrevPage: () => setPageOffset(pageOffset - pageSize),
+    pageSizeLimit: pageSize,
+    disableSort: true
+  }) : /*#__PURE__*/React.createElement("p", {
     style: {
       marginLeft: "16px",
       marginTop: "16px"
@@ -32454,176 +32438,6 @@ const WSInfoPage = () => {
   })));
 };
 
-const _excluded$3 = ["address", "actionCancelOnSubmit", "isEdit", "onSelect", "config", "hideZRO", "formData"];
-const PropertyLocationDetails = _ref => {
-  var _formDataProp$cpt2;
-  let address = _ref.address,
-    isEdit = _ref.isEdit,
-    onSelect = _ref.onSelect,
-    config = _ref.config,
-    hideZRO = _ref.hideZRO,
-    formDataProp = _ref.formData,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded$3);
-  const _useTranslation = useTranslation(),
-    t = _useTranslation.t;
-  const _useState = useState(null),
-    showToast = _useState[0],
-    setShowToast = _useState[1];
-  const _useState2 = useState({
-      addressType: (address === null || address === void 0 ? void 0 : address.addressType) || "",
-      pincode: (address === null || address === void 0 ? void 0 : address.pinCode) || "",
-      city: (address === null || address === void 0 ? void 0 : address.city) || "",
-      locality: (address === null || address === void 0 ? void 0 : address.locality) || "",
-      streetName: (address === null || address === void 0 ? void 0 : address.streetName) || "",
-      houseNo: (address === null || address === void 0 ? void 0 : address.houseNumber) || "",
-      houseName: (address === null || address === void 0 ? void 0 : address.houseName) || "",
-      landmark: (address === null || address === void 0 ? void 0 : address.landmark) || "",
-      addressLine1: (address === null || address === void 0 ? void 0 : address.address) || "",
-      addressLine2: (address === null || address === void 0 ? void 0 : address.address2) || "",
-      latitude: (address === null || address === void 0 ? void 0 : address.latitude) || "",
-      longitude: (address === null || address === void 0 ? void 0 : address.longitude) || "",
-      assembly: (address === null || address === void 0 ? void 0 : address.assembly) || "",
-      block: (address === null || address === void 0 ? void 0 : address.block) || "",
-      zone: (address === null || address === void 0 ? void 0 : address.zone) || "",
-      zroLocation: (address === null || address === void 0 ? void 0 : address.zroLocation) || "",
-      subLocality: (address === null || address === void 0 ? void 0 : address.subLocality) || "",
-      actualAssembly: (address === null || address === void 0 ? void 0 : address.actualAssembly) || "",
-      actualWard: (address === null || address === void 0 ? void 0 : address.actualWard) || "",
-      actualZone: (address === null || address === void 0 ? void 0 : address.actualZone) || ""
-    }),
-    formData = _useState2[0],
-    setFormData = _useState2[1];
-  const isPropertyFound = window.location.href.includes("ws/old-application");
-  useEffect(() => {
-    if (props.register) {
-      props.register({
-        name: "cpt"
-      });
-      props.register({
-        name: "cptId"
-      });
-    }
-  }, [props.register]);
-  useEffect(() => {
-    var _formDataProp$cpt;
-    if (formDataProp !== null && formDataProp !== void 0 && (_formDataProp$cpt = formDataProp.cpt) !== null && _formDataProp$cpt !== void 0 && _formDataProp$cpt.details) {
-      var _addressData$locality, _addressData$geoLocat, _addressData$geoLocat2, _addressData$locality2, _addressData$geoLocat3, _addressData$geoLocat4, _addressData$locality3, _addressData$addition, _addressData$addition2, _addressData$addition3, _addressData$addition4, _addressData$addition5, _addressData$addition6, _addressData$addition7, _addressData$addition8, _addressData$addition9, _addressData$addition0, _addressData$addition1, _addressData$addition10, _addressData$addition11;
-      const details = formDataProp.cpt.details;
-      const addressData = details.address || {};
-      const additionalDetails = details.additionalDetails || {};
-      const localityCode = ((_addressData$locality = addressData.locality) === null || _addressData$locality === void 0 ? void 0 : _addressData$locality.code) || addressData.locality || "";
-      const lat = (_addressData$geoLocat = addressData.geoLocation) !== null && _addressData$geoLocat !== void 0 && _addressData$geoLocat.latitude && ((_addressData$geoLocat2 = addressData.geoLocation) === null || _addressData$geoLocat2 === void 0 ? void 0 : _addressData$geoLocat2.latitude) !== 0 ? addressData.geoLocation.latitude : ((_addressData$locality2 = addressData.locality) === null || _addressData$locality2 === void 0 ? void 0 : _addressData$locality2.latitude) || addressData.latitude || "";
-      const lng = (_addressData$geoLocat3 = addressData.geoLocation) !== null && _addressData$geoLocat3 !== void 0 && _addressData$geoLocat3.longitude && ((_addressData$geoLocat4 = addressData.geoLocation) === null || _addressData$geoLocat4 === void 0 ? void 0 : _addressData$geoLocat4.longitude) !== 0 ? addressData.geoLocation.longitude : ((_addressData$locality3 = addressData.locality) === null || _addressData$locality3 === void 0 ? void 0 : _addressData$locality3.longitude) || addressData.longitude || "";
-      const zroCode = addressData.zroLocation || additionalDetails.zroLocation || ((_addressData$addition = addressData.additionalDetails) === null || _addressData$addition === void 0 ? void 0 : _addressData$addition.zroLocation) || "";
-      const zroValue = zroCode ? {
-        code: zroCode,
-        name: zroCode,
-        i18nKey: zroCode
-      } : "";
-      setFormData({
-        pincode: addressData.pincode || "",
-        city: addressData.city || "",
-        locality: localityCode,
-        streetName: addressData.street || "",
-        houseNo: addressData.houseNo || "",
-        landmark: addressData.landmark || "",
-        latitude: lat,
-        longitude: lng,
-        assembly: additionalDetails.assembly || ((_addressData$addition2 = addressData.additionalDetails) === null || _addressData$addition2 === void 0 ? void 0 : _addressData$addition2.assembly) || "",
-        block: additionalDetails.block || ((_addressData$addition3 = addressData.additionalDetails) === null || _addressData$addition3 === void 0 ? void 0 : _addressData$addition3.block) || "",
-        zone: additionalDetails.zone || ((_addressData$addition4 = addressData.additionalDetails) === null || _addressData$addition4 === void 0 ? void 0 : _addressData$addition4.zone) || "",
-        zroLocation: zroCode,
-        zro: zroValue,
-        subLocality: addressData.subLocality || "",
-        actualAssembly: addressData.actualAssembly || additionalDetails.actualAssembly || ((_addressData$addition5 = addressData.additionalDetails) === null || _addressData$addition5 === void 0 ? void 0 : _addressData$addition5.actualAssembly) || "",
-        actualWard: addressData.actualWard || additionalDetails.actualWard || ((_addressData$addition6 = addressData.additionalDetails) === null || _addressData$addition6 === void 0 ? void 0 : _addressData$addition6.actualWard) || "",
-        actualZone: addressData.actualZone || additionalDetails.actualZone || ((_addressData$addition7 = addressData.additionalDetails) === null || _addressData$addition7 === void 0 ? void 0 : _addressData$addition7.actualZone) || "",
-        address: _extends({}, addressData, {
-          city: addressData.city || "",
-          pincode: addressData.pincode || "",
-          locality: localityCode,
-          streetName: addressData.street || "",
-          houseNo: addressData.houseNo || "",
-          addressLine1: addressData.street || "",
-          latitude: lat,
-          longitude: lng,
-          zroLocation: zroCode,
-          zro: zroValue,
-          assembly: additionalDetails.assembly || ((_addressData$addition8 = addressData.additionalDetails) === null || _addressData$addition8 === void 0 ? void 0 : _addressData$addition8.assembly) || "",
-          block: additionalDetails.block || ((_addressData$addition9 = addressData.additionalDetails) === null || _addressData$addition9 === void 0 ? void 0 : _addressData$addition9.block) || "",
-          zone: additionalDetails.zone || ((_addressData$addition0 = addressData.additionalDetails) === null || _addressData$addition0 === void 0 ? void 0 : _addressData$addition0.zone) || "",
-          subLocality: addressData.subLocality || "",
-          actualWard: addressData.actualWard || additionalDetails.actualWard || ((_addressData$addition1 = addressData.additionalDetails) === null || _addressData$addition1 === void 0 ? void 0 : _addressData$addition1.actualWard) || "",
-          actualZone: addressData.actualZone || additionalDetails.actualZone || ((_addressData$addition10 = addressData.additionalDetails) === null || _addressData$addition10 === void 0 ? void 0 : _addressData$addition10.actualZone) || "",
-          actualAssembly: addressData.actualAssembly || additionalDetails.actualAssembly || ((_addressData$addition11 = addressData.additionalDetails) === null || _addressData$addition11 === void 0 ? void 0 : _addressData$addition11.actualAssembly) || ""
-        })
-      });
-    } else if ((formDataProp === null || formDataProp === void 0 ? void 0 : formDataProp.cpt) === null) {
-      const clearedData = {
-        addressType: "",
-        pincode: "",
-        city: "",
-        locality: "",
-        streetName: "",
-        houseNo: "",
-        houseName: "",
-        landmark: "",
-        addressLine1: "",
-        addressLine2: "",
-        latitude: "",
-        longitude: "",
-        assembly: "",
-        block: "",
-        zone: "",
-        zroLocation: "",
-        subLocality: "",
-        actualWard: "",
-        actualZone: "",
-        actualAssembly: "",
-        zro: "",
-        address: {}
-      };
-      setFormData(clearedData);
-      onSelect((config === null || config === void 0 ? void 0 : config.key) || "address", clearedData);
-    }
-  }, [formDataProp === null || formDataProp === void 0 ? void 0 : (_formDataProp$cpt2 = formDataProp.cpt) === null || _formDataProp$cpt2 === void 0 ? void 0 : _formDataProp$cpt2.details, formDataProp === null || formDataProp === void 0 ? void 0 : formDataProp.cpt]);
-  useEffect(() => {
-    if (showToast) {
-      const timer = setTimeout(() => {
-        setShowToast(null);
-      }, 1000);
-      return () => clearTimeout(timer);
-    }
-  }, [showToast]);
-  return /*#__PURE__*/React.createElement(CollapsibleCardPage, {
-    title: t("PT_LOCATION_DETAILS") + (config !== null && config !== void 0 && config.isAutomaticFill ? " (Automatic Fill by Property )" : ""),
-    defaultOpen: config !== null && config !== void 0 && config.isAutomaticFill ? false : true
-  }, /*#__PURE__*/React.createElement("div", {
-    style: _extends({
-      boxShadow: "none"
-    }, props.style)
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      marginTop: "20px"
-    }
-  }, /*#__PURE__*/React.createElement(AddressDetails, {
-    t: t,
-    formData: formData,
-    onSelect: (key, data) => {
-      setFormData(prev => _extends({}, prev, data));
-      onSelect(key, data);
-    },
-    config: _extends({
-      isCollapsible: false
-    }, config),
-    isEdit: isEdit,
-    showZRO: hideZRO ? false : true,
-    showMapActualLocation: true,
-    disable: isPropertyFound,
-    hideNextButton: true
-  }))));
-};
-
 const WSPropertyLocationDetails = props => {
   const t = props.t,
     config = props.config,
@@ -32636,6 +32450,7 @@ const WSPropertyLocationDetails = props => {
     onSelect(config.key, data);
   };
   const onSkip = () => onSelect();
+  const PropertyLocationDetails = Digit.ComponentRegistryService.setComponent("PropertyLocationDetails");
   if (userType === "citizen") {
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Timeline, {
       currentStep: 2
@@ -32659,7 +32474,7 @@ const WSPropertyLocationDetails = props => {
   return /*#__PURE__*/React.createElement(PropertyLocationDetails, props);
 };
 
-const _excluded$4 = ["errors"],
+const _excluded$3 = ["errors"],
   _excluded2$2 = ["register", "control", "watch", "setValue", "unregister", "handleSubmit", "formState", "getValues", "reset"];
 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;
@@ -32716,7 +32531,7 @@ const ApplicationBillAmendment = () => {
     handleSubmit = _useForm.handleSubmit,
     _useForm$formState = _useForm.formState,
     errors = _useForm$formState.errors,
-    rest = _objectWithoutPropertiesLoose(_useForm$formState, _excluded$4),
+    rest = _objectWithoutPropertiesLoose(_useForm$formState, _excluded$3),
     getValues = _useForm.getValues,
     methods = _objectWithoutPropertiesLoose(_useForm, _excluded2$2);
   const _Digit$Hooks$ws$useAp = Digit.Hooks.ws.useApplicationActionsBillAmendUpdate(),
@@ -36710,31 +36525,6 @@ const WorkflowTimeline = _ref => {
   })));
 };
 
-const _iteratorSymbol$1 = /*#__PURE__*/typeof Symbol !== "undefined" ? Symbol.iterator || (Symbol.iterator = Symbol("Symbol.iterator")) : "@@iterator";
-const _asyncIteratorSymbol$1 = /*#__PURE__*/typeof Symbol !== "undefined" ? Symbol.asyncIterator || (Symbol.asyncIterator = Symbol("Symbol.asyncIterator")) : "@@asyncIterator";
-function _catch$1(body, recover) {
-  try {
-    var result = body();
-  } catch (e) {
-    return recover(e);
-  }
-  if (result && result.then) {
-    return result.then(void 0, recover);
-  }
-  return result;
-}
-function _finallyRethrows$1(body, finalizer) {
-  try {
-    var result = body();
-  } catch (e) {
-    return finalizer(true, e);
-  }
-  if (result && result.then) {
-    return result.then(finalizer.bind(null, false), finalizer.bind(null, true));
-  }
-  return finalizer(false, result);
-}
-
 const configPTApproverApplication = _ref => {
   var _action$assigneeRoles;
   let t = _ref.t,
@@ -37483,7 +37273,7 @@ const ActionModal = _ref => {
               if (file.size >= 5242880) {
                 setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
               } else {
-                const _temp = _catch$1(function () {
+                const _temp = _catch(function () {
                   return Promise.resolve(Digit.UploadServices.Filestorage("PT", file, Digit.ULBService.getStateId())).then(function (response) {
                     var _response$data, _response$data$files;
                     if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -37710,7 +37500,7 @@ const ActionModal$1 = _ref => {
               if (file.size >= 5242880) {
                 setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
               } else {
-                const _temp = _catch$1(function () {
+                const _temp = _catch(function () {
                   return Promise.resolve(Digit.UploadServices.Filestorage("PT", file, Digit.ULBService.getStateId())).then(function (response) {
                     var _response$data, _response$data$files;
                     if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -37880,7 +37670,7 @@ const ActionModal$2 = _ref => {
                   if (file !== null && file !== void 0 && file.type && !allowedFileTypesRegex.test(file === null || file === void 0 ? void 0 : file.type)) {
                     setError(t("NOT_SUPPORTED_FILE_TYPE"));
                   } else {
-                    const _temp = _catch$1(function () {
+                    const _temp = _catch(function () {
                       return Promise.resolve(Digit.UploadServices.Filestorage("OBPS", file, Digit.ULBService.getStateId() || (tenantId === null || tenantId === void 0 ? void 0 : tenantId.split(".")[0]))).then(function (response) {
                         var _response$data, _response$data$files;
                         if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -38163,7 +37953,7 @@ const ActionModal$3 = _ref => {
                   if (file !== null && file !== void 0 && file.type && !allowedFileTypesRegex.test(file === null || file === void 0 ? void 0 : file.type)) {
                     setError(t("NOT_SUPPORTED_FILE_TYPE"));
                   } else {
-                    const _temp = _catch$1(function () {
+                    const _temp = _catch(function () {
                       return Promise.resolve(Digit.UploadServices.Filestorage("OBPS", file, Digit.ULBService.getStateId() || (tenantId === null || tenantId === void 0 ? void 0 : tenantId.split(".")[0]))).then(function (response) {
                         var _response$data, _response$data$files;
                         if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -38421,7 +38211,7 @@ const ActionModal$4 = _ref => {
                   if (file !== null && file !== void 0 && file.type && !allowedFileTypesRegex.test(file === null || file === void 0 ? void 0 : file.type)) {
                     setError(t("NOT_SUPPORTED_FILE_TYPE"));
                   } else {
-                    const _temp = _catch$1(function () {
+                    const _temp = _catch(function () {
                       return Promise.resolve(Digit.UploadServices.Filestorage("NOC", file, Digit.ULBService.getStateId() || (tenantId === null || tenantId === void 0 ? void 0 : tenantId.split(".")[0]))).then(function (response) {
                         var _response$data, _response$data$files;
                         if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -38648,7 +38438,7 @@ const ActionModal$5 = _ref => {
                   if (file !== null && file !== void 0 && file.type && !allowedFileTypesRegex.test(file === null || file === void 0 ? void 0 : file.type)) {
                     setError(t("NOT_SUPPORTED_FILE_TYPE"));
                   } else {
-                    const _temp = _catch$1(function () {
+                    const _temp = _catch(function () {
                       return Promise.resolve(Digit.UploadServices.Filestorage("WS", file, Digit.ULBService.getCurrentTenantId())).then(function (response) {
                         var _response$data, _response$data$files;
                         if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -38958,7 +38748,7 @@ const ActionModal$6 = _ref => {
               if (file.size >= 5242880) {
                 setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
               } else {
-                const _temp = _catch$1(function () {
+                const _temp = _catch(function () {
                   return Promise.resolve(Digit.UploadServices.Filestorage("PTR", file, Digit.ULBService.getStateId())).then(function (response) {
                     var _response$data, _response$data$files;
                     if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -39248,7 +39038,7 @@ const ActionModal$8 = _ref => {
               if (file.size >= 5242880) {
                 setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
               } else {
-                const _temp = _catch$1(function () {
+                const _temp = _catch(function () {
                   return Promise.resolve(Digit.UploadServices.Filestorage("CHB", file, tenantId)).then(function (response) {
                     var _response$data, _response$data$files;
                     if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -39414,7 +39204,7 @@ const ActionModal$9 = _ref => {
               if (file.size >= 5242880) {
                 setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
               } else {
-                const _temp = _catch$1(function () {
+                const _temp = _catch(function () {
                   return Promise.resolve(Digit.UploadServices.Filestorage("PTR", file, Digit.ULBService.getStateId())).then(function (response) {
                     var _response$data, _response$data$files;
                     if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -39586,8 +39376,8 @@ const ActionModal$a = _ref => {
               if (file.size >= 5242880) {
                 setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
               } else {
-                const _temp = _finallyRethrows$1(function () {
-                  return _catch$1(function () {
+                const _temp = _finallyRethrows(function () {
+                  return _catch(function () {
                     return Promise.resolve(Digit.UploadServices.Filestorage("StreetVending", file, tenantId)).then(function (response) {
                       var _response$data, _response$data$files;
                       if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -39873,7 +39663,7 @@ const ActionModal$b = _ref => {
               if (file.size >= 5242880) {
                 setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
               } else {
-                const _temp = _catch$1(function () {
+                const _temp = _catch(function () {
                   return Promise.resolve(Digit.UploadServices.Filestorage("WT", file, tenantId)).then(function (response) {
                     var _response$data, _response$data$files;
                     if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -40561,7 +40351,7 @@ function SelectDocument$4(_ref) {
                   if (file !== null && file !== void 0 && file.type && !allowedFileTypesRegex.test(file === null || file === void 0 ? void 0 : file.type)) {
                     setError(t("NOT_SUPPORTED_FILE_TYPE"));
                   } else {
-                    const _temp = _catch$1(function () {
+                    const _temp = _catch(function () {
                       setUploadedFile(null);
                       return Promise.resolve(Digit.UploadServices.Filestorage("PT", file, Digit.ULBService.getStateId())).then(function (response) {
                         var _response$data, _response$data$files;
@@ -40951,7 +40741,7 @@ function PropertyDocuments(_ref) {
   };
   const forceDownload = function (url, fileName) {
     try {
-      return Promise.resolve(_catch$1(function () {
+      return Promise.resolve(_catch(function () {
         return Promise.resolve(fetch(url)).then(function (response) {
           if (!response.ok) {
             throw new Error("HTTP error! status: " + response.status);
@@ -41181,7 +40971,7 @@ function PropertyDocuments(_ref) {
           y1: "15",
           x2: "12",
           y2: "3"
-        }))), /*#__PURE__*/React.createElement("label", {
+        }))), applicationStatus !== "PENDING_FOR_PAYMENT" && applicationStatus !== "WF_PENDING_FOR_PAYMENT" && /*#__PURE__*/React.createElement("label", {
           style: {
             display: "flex",
             alignItems: "center",
@@ -41214,7 +41004,7 @@ function PropertyDocuments(_ref) {
               }));
             }
           }
-        }), "Check Verified"));
+        }), t("Check Verified")));
       })())
     })));
   };
@@ -44161,7 +43951,7 @@ const ApplicationDetails = props => {
               const nocPrmomises = (_nocData = nocData) === null || _nocData === void 0 ? void 0 : _nocData.map(noc => {
                 return nocMutation === null || nocMutation === void 0 ? void 0 : nocMutation.mutateAsync(noc);
               });
-              const _temp = _catch$1(function () {
+              const _temp = _catch(function () {
                 setIsEnableLoader(true);
                 return Promise.resolve(Promise.all(nocPrmomises)).then(function (values) {
                   values && values.map(ob => {
@@ -44251,7 +44041,7 @@ const ApplicationDetails = props => {
 };
 
 const ApplicationDetails$1 = () => {
-  var _mdmsCommonmastersDat, _commonPayInfo, _applicationDetails$p4, _applicationDetails$p5, _applicationDetails$p6, _applicationDetails$p7, _applicationDetails$a3, _applicationDetails$a4, _applicationDetails$a5, _newValueFilter$, _applicationDetails$a6, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _workflowDetails$data15, _workflowDetails$data16, _workflowDetails$data17, _workflowDetails$data18, _workflowDetails$data21, _workflowDetails$data22, _workflowDetails$data23, _workflowDetails$data24, _workflowDetails$data25, _workflowDetails$data26, _workflowDetails$data27, _workflowDetails$data28, _workflowDetails$data29, _workflowDetails$data30, _workflowDetails$data37, _workflowDetails$data38, _workflowDetails$data39, _oldData$WaterConnect, _oldData$WaterConnect2, _oldData$SewerageConn, _oldData$SewerageConn2, _applicationDetails$a15, _applicationDetails$a16, _reciept_data2, _reciept_data2$Paymen, _applicationDetails$p11, _applicationDetails$p12, _applicationDetails$p13, _applicationDetails$p14, _applicationDetails$p15, _applicationDetails$p16;
+  var _mdmsCommonmastersDat, _commonPayInfo, _applicationDetails$p4, _applicationDetails$p5, _applicationDetails$p6, _applicationDetails$p7, _applicationDetails$a3, _applicationDetails$a4, _applicationDetails$a5, _newValueFilter$, _applicationDetails$a6, _applicationDetails$a7, _applicationDetails$a8, _applicationDetails$a9, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _workflowDetails$data15, _workflowDetails$data16, _workflowDetails$data17, _workflowDetails$data18, _workflowDetails$data21, _workflowDetails$data22, _workflowDetails$data23, _workflowDetails$data24, _workflowDetails$data25, _workflowDetails$data26, _workflowDetails$data27, _workflowDetails$data28, _workflowDetails$data29, _workflowDetails$data30, _workflowDetails$data37, _workflowDetails$data38, _workflowDetails$data39, _oldData$WaterConnect, _oldData$WaterConnect2, _oldData$SewerageConn, _oldData$SewerageConn2, _applicationDetails$a18, _applicationDetails$a19, _reciept_data$Payment2, _applicationDetails$p11, _applicationDetails$p12, _applicationDetails$p13, _applicationDetails$p14, _applicationDetails$p15, _applicationDetails$p16;
   const getRecieptSearch = function (tenantId, payments, consumerCodes, receiptKey) {
     try {
       let response = null;
@@ -44387,6 +44177,15 @@ const ApplicationDetails$1 = () => {
   });
   const _Digit$Hooks$ws$useWS2 = Digit.Hooks.ws.useWSApplicationActions(serviceType),
     mutate = _Digit$Hooks$ws$useWS2.mutate;
+  const _Digit$Hooks$useRecie = Digit.Hooks.useRecieptSearch({
+      tenantId: tenantId,
+      businessService: serviceType == "WATER" ? "WS.ONE_TIME_FEE" : "SW.ONE_TIME_FEE",
+      consumerCodes: applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a6 = applicationDetails.applicationData) === null || _applicationDetails$a6 === void 0 ? void 0 : _applicationDetails$a6.applicationNo
+    }, {
+      enabled: applicationDetails !== null && applicationDetails !== void 0 && (_applicationDetails$a7 = applicationDetails.applicationData) !== null && _applicationDetails$a7 !== void 0 && (_applicationDetails$a8 = _applicationDetails$a7.applicationType) !== null && _applicationDetails$a8 !== void 0 && _applicationDetails$a8.includes("NEW_") ? true : false,
+      privacy: Digit.Utils.getPrivacyObject()
+    }),
+    reciept_data = _Digit$Hooks$useRecie.data;
   const clearDataDetails = () => {
     clearSessionFormData();
     setSessionFormData({});
@@ -44400,7 +44199,7 @@ const ApplicationDetails$1 = () => {
     return true;
   };
   let dowloadOptions = [],
-    appStatus = (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a6 = applicationDetails.applicationData) === null || _applicationDetails$a6 === void 0 ? void 0 : _applicationDetails$a6.applicationStatus) || "";
+    appStatus = (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a9 = applicationDetails.applicationData) === null || _applicationDetails$a9 === void 0 ? void 0 : _applicationDetails$a9.applicationStatus) || "";
   workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : (_workflowDetails$data2 = _workflowDetails$data.actionState) === null || _workflowDetails$data2 === void 0 ? void 0 : (_workflowDetails$data3 = _workflowDetails$data2.nextActions) === null || _workflowDetails$data3 === void 0 ? void 0 : _workflowDetails$data3.forEach(action => {
     if ((action === null || action === void 0 ? void 0 : action.action) === "ACTIVATE_CONNECTION") {
       action.redirectionUrll = {
@@ -44531,10 +44330,10 @@ const ApplicationDetails$1 = () => {
   const oldApplication = serviceType === "WATER" ? oldData === null || oldData === void 0 ? void 0 : (_oldData$WaterConnect = oldData.WaterConnection) === null || _oldData$WaterConnect === void 0 ? void 0 : _oldData$WaterConnect[(oldData === null || oldData === void 0 ? void 0 : (_oldData$WaterConnect2 = oldData.WaterConnection) === null || _oldData$WaterConnect2 === void 0 ? void 0 : _oldData$WaterConnect2.length) - 1] : oldData === null || oldData === void 0 ? void 0 : (_oldData$SewerageConn = oldData.SewerageConnections) === null || _oldData$SewerageConn === void 0 ? void 0 : _oldData$SewerageConn[(oldData === null || oldData === void 0 ? void 0 : (_oldData$SewerageConn2 = oldData.SewerageConnections) === null || _oldData$SewerageConn2 === void 0 ? void 0 : _oldData$SewerageConn2.length) - 1];
   const handleDownloadPdf = function () {
     try {
-      var _applicationDetails$a7, _applicationDetails$a8, _applicationDetails$a9;
-      const tenantInfo = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a7 = applicationDetails.applicationData) === null || _applicationDetails$a7 === void 0 ? void 0 : _applicationDetails$a7.tenantId;
+      var _applicationDetails$a0, _applicationDetails$a1, _applicationDetails$a10;
+      const tenantInfo = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a0 = applicationDetails.applicationData) === null || _applicationDetails$a0 === void 0 ? void 0 : _applicationDetails$a0.tenantId;
       let result = applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData;
-      if (applicationDetails !== null && applicationDetails !== void 0 && (_applicationDetails$a8 = applicationDetails.applicationData) !== null && _applicationDetails$a8 !== void 0 && (_applicationDetails$a9 = _applicationDetails$a8.applicationType) !== null && _applicationDetails$a9 !== void 0 && _applicationDetails$a9.includes("MODIFY_")) {
+      if (applicationDetails !== null && applicationDetails !== void 0 && (_applicationDetails$a1 = applicationDetails.applicationData) !== null && _applicationDetails$a1 !== void 0 && (_applicationDetails$a10 = _applicationDetails$a1.applicationType) !== null && _applicationDetails$a10 !== void 0 && _applicationDetails$a10.includes("MODIFY_")) {
         const PDFdata = getWSAcknowledgementData$1(_extends({}, result), _extends({}, applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.propertyDetails), tenantInfo, t, oldApplication);
         PDFdata.then(ress => Digit.Utils.pdf.generateModifyPdf(ress));
         return Promise.resolve();
@@ -44548,10 +44347,10 @@ const ApplicationDetails$1 = () => {
   };
   const handleEstimateDownload = function () {
     try {
-      const _temp2 = function (_applicationDetails$a0, _applicationDetails$a1) {
-        if (applicationDetails !== null && applicationDetails !== void 0 && (_applicationDetails$a0 = applicationDetails.applicationData) !== null && _applicationDetails$a0 !== void 0 && (_applicationDetails$a1 = _applicationDetails$a0.additionalDetails) !== null && _applicationDetails$a1 !== void 0 && _applicationDetails$a1.estimationFileStoreId) {
-          var _applicationDetails$a10, _applicationDetails$a11;
-          getFiles([applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a10 = applicationDetails.applicationData) === null || _applicationDetails$a10 === void 0 ? void 0 : (_applicationDetails$a11 = _applicationDetails$a10.additionalDetails) === null || _applicationDetails$a11 === void 0 ? void 0 : _applicationDetails$a11.estimationFileStoreId], applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId);
+      const _temp2 = function (_applicationDetails$a11, _applicationDetails$a12) {
+        if (applicationDetails !== null && applicationDetails !== void 0 && (_applicationDetails$a11 = applicationDetails.applicationData) !== null && _applicationDetails$a11 !== void 0 && (_applicationDetails$a12 = _applicationDetails$a11.additionalDetails) !== null && _applicationDetails$a12 !== void 0 && _applicationDetails$a12.estimationFileStoreId) {
+          var _applicationDetails$a13, _applicationDetails$a14;
+          getFiles([applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a13 = applicationDetails.applicationData) === null || _applicationDetails$a13 === void 0 ? void 0 : (_applicationDetails$a14 = _applicationDetails$a13.additionalDetails) === null || _applicationDetails$a14 === void 0 ? void 0 : _applicationDetails$a14.estimationFileStoreId], applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId);
         } else {
           const warningCount = sessionStorage.getItem("WARINIG_COUNT") || "0";
           const warningCountDetails = JSON.parse(warningCount);
@@ -44609,8 +44408,8 @@ const ApplicationDetails$1 = () => {
     order: 2,
     label: t("WS_SANCTION_LETTER"),
     onClick: () => {
-      var _applicationDetails$a12, _applicationDetails$a13;
-      return getFiles([applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a12 = applicationDetails.applicationData) === null || _applicationDetails$a12 === void 0 ? void 0 : (_applicationDetails$a13 = _applicationDetails$a12.additionalDetails) === null || _applicationDetails$a13 === void 0 ? void 0 : _applicationDetails$a13.sanctionFileStoreId], applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId);
+      var _applicationDetails$a15, _applicationDetails$a16;
+      return getFiles([applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a15 = applicationDetails.applicationData) === null || _applicationDetails$a15 === void 0 ? void 0 : (_applicationDetails$a16 = _applicationDetails$a15.additionalDetails) === null || _applicationDetails$a16 === void 0 ? void 0 : _applicationDetails$a16.sanctionFileStoreId], applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId);
     }
   };
   const applicationDownloadObject = {
@@ -44622,8 +44421,8 @@ const ApplicationDetails$1 = () => {
     order: 4,
     label: t("DOWNLOAD_RECEIPT_HEADER"),
     onClick: () => {
-      var _reciept_data, _reciept_data$Payment, _applicationDetails$a14;
-      return getRecieptSearch(Digit.ULBService.getStateId(), (_reciept_data = reciept_data) === null || _reciept_data === void 0 ? void 0 : (_reciept_data$Payment = _reciept_data.Payments) === null || _reciept_data$Payment === void 0 ? void 0 : _reciept_data$Payment[0], applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a14 = applicationDetails.applicationData) === null || _applicationDetails$a14 === void 0 ? void 0 : _applicationDetails$a14.applicationNo, receiptKey);
+      var _reciept_data$Payment, _applicationDetails$a17;
+      return getRecieptSearch(Digit.ULBService.getStateId(), reciept_data === null || reciept_data === void 0 ? void 0 : (_reciept_data$Payment = reciept_data.Payments) === null || _reciept_data$Payment === void 0 ? void 0 : _reciept_data$Payment[0], applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a17 = applicationDetails.applicationData) === null || _applicationDetails$a17 === void 0 ? void 0 : _applicationDetails$a17.applicationNo, receiptKey);
     }
   };
   switch (appStatus) {
@@ -44638,7 +44437,7 @@ const ApplicationDetails$1 = () => {
       break;
     case "PENDING_FOR_CONNECTION_ACTIVATION":
     case "CONNECTION_ACTIVATED":
-      if (applicationDetails !== null && applicationDetails !== void 0 && (_applicationDetails$a15 = applicationDetails.applicationData) !== null && _applicationDetails$a15 !== void 0 && (_applicationDetails$a16 = _applicationDetails$a15.applicationType) !== null && _applicationDetails$a16 !== void 0 && _applicationDetails$a16.includes("NEW_") && ((_reciept_data2 = reciept_data) === null || _reciept_data2 === void 0 ? void 0 : (_reciept_data2$Paymen = _reciept_data2.Payments) === null || _reciept_data2$Paymen === void 0 ? void 0 : _reciept_data2$Paymen.length) > 0) dowloadOptions = [sanctionDownloadObject, wsEstimateDownloadObject, applicationDownloadObject, appFeeDownloadReceipt];else dowloadOptions = [sanctionDownloadObject, wsEstimateDownloadObject, applicationDownloadObject];
+      if (applicationDetails !== null && applicationDetails !== void 0 && (_applicationDetails$a18 = applicationDetails.applicationData) !== null && _applicationDetails$a18 !== void 0 && (_applicationDetails$a19 = _applicationDetails$a18.applicationType) !== null && _applicationDetails$a19 !== void 0 && _applicationDetails$a19.includes("NEW_") && (reciept_data === null || reciept_data === void 0 ? void 0 : (_reciept_data$Payment2 = reciept_data.Payments) === null || _reciept_data$Payment2 === void 0 ? void 0 : _reciept_data$Payment2.length) > 0) dowloadOptions = [sanctionDownloadObject, wsEstimateDownloadObject, applicationDownloadObject, appFeeDownloadReceipt];else dowloadOptions = [sanctionDownloadObject, wsEstimateDownloadObject, applicationDownloadObject];
       break;
     case "REJECTED":
       dowloadOptions = [applicationDownloadObject];
@@ -49029,31 +48828,21 @@ const CheckPage$4 = _ref2 => {
 const OLDApplication = () => {
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  const location = useLocation();
   const history = useHistory();
-  let filters = getQueryStringParams(location.search);
   const _useState = useState(false),
-    setSubmitValve = _useState[1];
-  const _useState2 = useState(false),
-    isEnableLoader = _useState2[0],
-    setIsEnableLoader = _useState2[1];
-  const _useState3 = useState(null),
-    showToast = _useState3[0],
-    setShowToast = _useState3[1];
-  const _useState4 = useState({}),
-    setAppDetails = _useState4[1];
-  const _useState5 = useState(null),
-    setWaterAndSewerageBoth = _useState5[1];
-  const _useState6 = useState({
+    isEnableLoader = _useState[0],
+    setIsEnableLoader = _useState[1];
+  const _useState2 = useState(null),
+    showToast = _useState2[0],
+    setShowToast = _useState2[1];
+  const _useState3 = useState({
       body: []
     }),
-    config = _useState6[0],
-    setConfig = _useState6[1];
-  const _useState7 = useState(1),
-    currentStep = _useState7[0];
-  const _useState8 = useState(false),
-    showCheckPage = _useState8[0],
-    setShowCheckPage = _useState8[1];
+    config = _useState3[0],
+    setConfig = _useState3[1];
+  const _useState4 = useState(false),
+    showCheckPage = _useState4[0],
+    setShowCheckPage = _useState4[1];
   const timelineConfig = [{
     label: "WS_COMMON_PROPERTY_DETAILS"
   }, {
@@ -49088,9 +48877,9 @@ const OLDApplication = () => {
   let _Digit$Hooks$ws$useWS = Digit.Hooks.ws.useWSConfigMDMS.WSCreateConfig(stateId, {}),
     newConfig = _Digit$Hooks$ws$useWS.data,
     isLoading = _Digit$Hooks$ws$useWS.isLoading;
-  const _useState9 = useState(new URLSearchParams(useLocation().search).get("propertyId")),
-    propertyId = _useState9[0],
-    setPropertyId = _useState9[1];
+  const _useState5 = useState(new URLSearchParams(useLocation().search).get("propertyId")),
+    propertyId = _useState5[0],
+    setPropertyId = _useState5[1];
   const _Digit$Hooks$useSessi = Digit.Hooks.useSessionStorage("PT_CREATE_EMP_WS_NEW_FORM", {}),
     sessionFormData = _Digit$Hooks$useSessi[0],
     setSessionFormData = _Digit$Hooks$useSessi[1],
@@ -49105,7 +48894,7 @@ const OLDApplication = () => {
         propertyIds: propertyId
       },
       tenantId: tenantId,
-      enabled: propertyId && propertyId != "" ? true : false
+      enabled: propertyId && propertyId !== "" ? true : false
     }),
     propertyDetails = _Digit$Hooks$pt$usePr.data;
   useEffect(() => {
@@ -49117,7 +48906,7 @@ const OLDApplication = () => {
       if (config) {
         var _config$body;
         const allCreateSections = (config === null || config === void 0 ? void 0 : (_config$body = config.body) === null || _config$body === void 0 ? void 0 : _config$body.filter(section => section === null || section === void 0 ? void 0 : section.isCreateConnection)) || [];
-        const desiredComponentOrder = ["CPTPropertySearchNSummary", "WSConnectionDetails", "WSConnectionHolderDetails", "CPTPropertyLocationDetails", "PropertyWaterConnection", "WSDjbEmployee", "WSActivationPlumberDetails", "WSRoadCuttingDetails", "WSBankDetails", "WSDocumentsEmployee", "WSDeclaration"];
+        const desiredComponentOrder = ["CPTPropertySearchNSummary", "WSConnectionDetails", "WSConnectionHolderDetails", "WSPropertyLocationDetails", "PropertyWaterConnection", "WSDjbEmployee", "WSActivationPlumberDetails", "WSRoadCuttingDetails", "WSBankDetails", "WSDocumentsEmployee", "WSDeclaration"];
         const reorderedBody = [];
         desiredComponentOrder.forEach(compName => {
           const section = allCreateSections.find(s => {
@@ -49127,13 +48916,13 @@ const OLDApplication = () => {
           });
           if (section) {
             reorderedBody.push(section);
-          } else if (compName === "CPTPropertyLocationDetails") {
+          } else if (compName === "WSPropertyLocationDetails") {
             reorderedBody.push({
               isCreateConnection: true,
               body: [{
                 type: "component",
                 key: "propertyAddress",
-                component: "CPTPropertyLocationDetails",
+                component: "WSPropertyLocationDetails",
                 withoutLabel: true,
                 isAutomaticFill: true
               }]
@@ -49213,23 +49002,18 @@ const OLDApplication = () => {
     updatingSewerageApplicationLoading = _Digit$Hooks$ws$useWS3.isLoading,
     sewerageUpdateMutation = _Digit$Hooks$ws$useWS3.mutate;
   const onFormValueChange = (setValue, formData, formState) => {
-    var _formState$errors, _formState$errors$Con, _Object$keys, _formState$errors2, _formState$errors2$Co;
     const updatedFormData = _extends({}, sessionFormData, formData);
     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 => {
-      var _ob$ref;
-      return ob.type === "required" && (ob === null || ob === void 0 ? void 0 : (_ob$ref = ob.ref) === null || _ob$ref === void 0 ? void 0 : _ob$ref.value) !== "";
-    }).length > 0) setSubmitValve(true);else setSubmitValve(!Object.keys(formState.errors).length);
   };
   const closeToastOfError = () => {
     setShowToast(null);
   };
   const onFormSubmit = data => {
-    var _data$cpt, _propertyDetails$Prop, _formStateErros$Conne, _Object$keys2, _formStateErros$Conne2;
+    var _data$cpt, _propertyDetails$Prop, _formStateErros$Conne, _Object$keys, _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) {
@@ -49246,9 +49030,9 @@ const OLDApplication = () => {
     }
     const errors = sessionStorage.getItem("FORMSTATE_ERRORS");
     const formStateErros = typeof errors === "string" && errors !== "null" ? JSON.parse(errors) : {};
-    if (Object.keys(formStateErros).length > 0 && !(Object.keys(formStateErros).length == 1 && formStateErros !== null && formStateErros !== void 0 && (_formStateErros$Conne = formStateErros["ConnectionHolderDetails"]) !== null && _formStateErros$Conne !== void 0 && _formStateErros$Conne.type && ((_Object$keys2 = Object.keys(formStateErros === null || formStateErros === void 0 ? void 0 : (_formStateErros$Conne2 = formStateErros["ConnectionHolderDetails"]) === null || _formStateErros$Conne2 === void 0 ? void 0 : _formStateErros$Conne2.type)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length) == 1 && formStateErros["ConnectionHolderDetails"] && Object.values(formStateErros["ConnectionHolderDetails"].type).filter(ob => {
-      var _ob$ref2;
-      return ob.type === "required" && (ob === null || ob === void 0 ? void 0 : (_ob$ref2 = ob.ref) === null || _ob$ref2 === void 0 ? void 0 : _ob$ref2.value) !== "";
+    if (Object.keys(formStateErros).length > 0 && !(Object.keys(formStateErros).length === 1 && formStateErros !== null && formStateErros !== void 0 && (_formStateErros$Conne = formStateErros["ConnectionHolderDetails"]) !== null && _formStateErros$Conne !== void 0 && _formStateErros$Conne.type && ((_Object$keys = Object.keys(formStateErros === null || formStateErros === void 0 ? void 0 : (_formStateErros$Conne2 = formStateErros["ConnectionHolderDetails"]) === null || _formStateErros$Conne2 === void 0 ? void 0 : _formStateErros$Conne2.type)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) === 1 && formStateErros["ConnectionHolderDetails"] && Object.values(formStateErros["ConnectionHolderDetails"].type).filter(ob => {
+      var _ob$ref;
+      return ob.type === "required" && (ob === null || ob === void 0 ? void 0 : (_ob$ref = ob.ref) === null || _ob$ref === void 0 ? void 0 : _ob$ref.value) !== "";
     }).length > 0)) {
       console.warn("[WS] onSubmit EXIT: formState errors blocking submit", formStateErros);
       setShowToast({
@@ -49373,7 +49157,6 @@ const OLDApplication = () => {
         waterDemandType: connDetail === null || connDetail === void 0 ? void 0 : connDetail.waterDemandType,
         ownerContactNumber: (data === null || data === void 0 ? void 0 : (_data$ConnectionHolde6 = data.ConnectionHolderDetails) === null || _data$ConnectionHolde6 === void 0 ? void 0 : (_data$ConnectionHolde7 = _data$ConnectionHolde6[0]) === null || _data$ConnectionHolde7 === void 0 ? void 0 : _data$ConnectionHolde7.mobileNumber) || (data === null || data === void 0 ? void 0 : (_data$cpt4 = data.cpt) === null || _data$cpt4 === void 0 ? void 0 : (_data$cpt4$details = _data$cpt4.details) === null || _data$cpt4$details === void 0 ? void 0 : (_data$cpt4$details$ow = _data$cpt4$details.owners) === null || _data$cpt4$details$ow === void 0 ? void 0 : (_data$cpt4$details$ow2 = _data$cpt4$details$ow[0]) === null || _data$cpt4$details$ow2 === void 0 ? void 0 : _data$cpt4$details$ow2.mobileNumber)
       };
-      const allDetails = cloneDeep_1(data);
       return Promise.resolve(createPayloadOfWS(data)).then(function (payload) {
         if (!(payload !== null && payload !== void 0 && payload.water) && !(payload !== null && payload !== void 0 && payload.sewerage)) {
           console.error("[WS] onSubmit EXIT: payload has neither water nor sewerage", payload);
@@ -49383,12 +49166,8 @@ const OLDApplication = () => {
           });
           return;
         }
-        let waterAndSewerageLoader = false,
-          waterLoader = false,
-          sewerageLoader = false;
+        let waterAndSewerageLoader = false;
         if (payload !== null && payload !== void 0 && payload.water && payload !== null && payload !== void 0 && payload.sewerage) waterAndSewerageLoader = true;
-        if (payload !== null && payload !== void 0 && payload.water && !(payload !== null && payload !== void 0 && payload.sewerage)) waterLoader = true;
-        if (!(payload !== null && payload !== void 0 && payload.water) && payload !== null && payload !== void 0 && payload.sewerage) sewerageLoader = true;
         let waterConnection = {
           WaterConnection: payload,
           disconnectRequest: false,
@@ -49400,7 +49179,6 @@ const OLDApplication = () => {
           reconnectRequest: false
         };
         if (waterAndSewerageLoader) {
-          setWaterAndSewerageBoth(true);
           sessionStorage.setItem("setWaterAndSewerageBoth", JSON.stringify(true));
         } else {
           sessionStorage.setItem("setWaterAndSewerageBoth", JSON.stringify(false));
@@ -49441,12 +49219,6 @@ const OLDApplication = () => {
                           },
                           onSuccess: function (waterUpdateData) {
                             try {
-                              setAppDetails(prev => {
-                                var _waterUpdateData$Wate;
-                                return _extends({}, prev, {
-                                  waterConnection: waterUpdateData === null || waterUpdateData === void 0 ? void 0 : (_waterUpdateData$Wate = waterUpdateData.WaterConnection) === null || _waterUpdateData$Wate === void 0 ? void 0 : _waterUpdateData$Wate[0]
-                                });
-                              });
                               return Promise.resolve(sewerageMutation(sewerageConnection, {
                                 onError: error => {
                                   var _error$response3, _error$response3$data, _error$response3$data2, _error$response3$data3;
@@ -49478,15 +49250,9 @@ const OLDApplication = () => {
                                         },
                                         onSuccess: function (sewerageUpdateData) {
                                           try {
-                                            var _waterUpdateData$Wate2, _waterUpdateData$Wate3, _sewerageUpdateData$S2, _sewerageUpdateData$S3;
-                                            setAppDetails(prev => {
-                                              var _sewerageUpdateData$S;
-                                              return _extends({}, prev, {
-                                                sewerageConnection: sewerageUpdateData === null || sewerageUpdateData === void 0 ? void 0 : (_sewerageUpdateData$S = sewerageUpdateData.SewerageConnections) === null || _sewerageUpdateData$S === void 0 ? void 0 : _sewerageUpdateData$S[0]
-                                              });
-                                            });
+                                            var _waterUpdateData$Wate, _waterUpdateData$Wate2, _sewerageUpdateData$S, _sewerageUpdateData$S2;
                                             clearSessionFormData();
-                                            history.push(basePath + "/ws-response?applicationNumber=" + (waterUpdateData === null || waterUpdateData === void 0 ? void 0 : (_waterUpdateData$Wate2 = waterUpdateData.WaterConnection) === null || _waterUpdateData$Wate2 === void 0 ? void 0 : (_waterUpdateData$Wate3 = _waterUpdateData$Wate2[0]) === null || _waterUpdateData$Wate3 === void 0 ? void 0 : _waterUpdateData$Wate3.applicationNo) + "&applicationNumber1=" + (sewerageUpdateData === null || sewerageUpdateData === void 0 ? void 0 : (_sewerageUpdateData$S2 = sewerageUpdateData.SewerageConnections) === null || _sewerageUpdateData$S2 === void 0 ? void 0 : (_sewerageUpdateData$S3 = _sewerageUpdateData$S2[0]) === null || _sewerageUpdateData$S3 === void 0 ? void 0 : _sewerageUpdateData$S3.applicationNo));
+                                            history.push(basePath + "/ws-response?applicationNumber=" + (waterUpdateData === null || waterUpdateData === void 0 ? void 0 : (_waterUpdateData$Wate = waterUpdateData.WaterConnection) === null || _waterUpdateData$Wate === void 0 ? void 0 : (_waterUpdateData$Wate2 = _waterUpdateData$Wate[0]) === null || _waterUpdateData$Wate2 === void 0 ? void 0 : _waterUpdateData$Wate2.applicationNo) + "&applicationNumber1=" + (sewerageUpdateData === null || sewerageUpdateData === void 0 ? void 0 : (_sewerageUpdateData$S = sewerageUpdateData.SewerageConnections) === null || _sewerageUpdateData$S === void 0 ? void 0 : (_sewerageUpdateData$S2 = _sewerageUpdateData$S[0]) === null || _sewerageUpdateData$S2 === void 0 ? void 0 : _sewerageUpdateData$S2.applicationNo));
                                             return Promise.resolve();
                                           } catch (e) {
                                             return Promise.reject(e);
@@ -49549,15 +49315,9 @@ const OLDApplication = () => {
                                 setTimeout(closeToastOfError, 5000);
                               },
                               onSuccess: data => {
-                                var _data$WaterConnection3, _data$WaterConnection4;
-                                setAppDetails(prev => {
-                                  var _data$WaterConnection2;
-                                  return _extends({}, prev, {
-                                    waterConnection: data === null || data === void 0 ? void 0 : (_data$WaterConnection2 = data.WaterConnection) === null || _data$WaterConnection2 === void 0 ? void 0 : _data$WaterConnection2[0]
-                                  });
-                                });
+                                var _data$WaterConnection2, _data$WaterConnection3;
                                 clearSessionFormData();
-                                history.push(basePath + "/ws-response?applicationNumber=" + (data === null || data === void 0 ? void 0 : (_data$WaterConnection3 = data.WaterConnection) === null || _data$WaterConnection3 === void 0 ? void 0 : (_data$WaterConnection4 = _data$WaterConnection3[0]) === null || _data$WaterConnection4 === void 0 ? void 0 : _data$WaterConnection4.applicationNo));
+                                history.push(basePath + "/ws-response?applicationNumber=" + (data === null || data === void 0 ? void 0 : (_data$WaterConnection2 = data.WaterConnection) === null || _data$WaterConnection2 === void 0 ? void 0 : (_data$WaterConnection3 = _data$WaterConnection2[0]) === null || _data$WaterConnection3 === void 0 ? void 0 : _data$WaterConnection3.applicationNo));
                               }
                             });
                           });
@@ -49605,15 +49365,9 @@ const OLDApplication = () => {
                                     setTimeout(closeToastOfError, 5000);
                                   },
                                   onSuccess: data => {
-                                    var _data$SewerageConnect3, _data$SewerageConnect4;
-                                    setAppDetails(prev => {
-                                      var _data$SewerageConnect2;
-                                      return _extends({}, prev, {
-                                        sewerageConnection: data === null || data === void 0 ? void 0 : (_data$SewerageConnect2 = data.SewerageConnections) === null || _data$SewerageConnect2 === void 0 ? void 0 : _data$SewerageConnect2[0]
-                                      });
-                                    });
+                                    var _data$SewerageConnect2, _data$SewerageConnect3;
                                     clearSessionFormData();
-                                    history.push(basePath + "/ws-response?applicationNumber1=" + (data === null || data === void 0 ? void 0 : (_data$SewerageConnect3 = data.SewerageConnections) === null || _data$SewerageConnect3 === void 0 ? void 0 : (_data$SewerageConnect4 = _data$SewerageConnect3[0]) === null || _data$SewerageConnect4 === void 0 ? void 0 : _data$SewerageConnect4.applicationNo));
+                                    history.push(basePath + "/ws-response?applicationNumber1=" + (data === null || data === void 0 ? void 0 : (_data$SewerageConnect2 = data.SewerageConnections) === null || _data$SewerageConnect2 === void 0 ? void 0 : (_data$SewerageConnect3 = _data$SewerageConnect2[0]) === null || _data$SewerageConnect3 === void 0 ? void 0 : _data$SewerageConnect3.applicationNo));
                                   }
                                 })).then(function () {});
                               });
@@ -49662,7 +49416,7 @@ const OLDApplication = () => {
     className: "employee-form-section-wrapper"
   }, /*#__PURE__*/React.createElement(VerticalTimeline, {
     config: timelineConfig,
-    currentActiveIndex: currentStep - 1,
+    currentActiveIndex: 0,
     showFinalStep: false
   }), /*#__PURE__*/React.createElement(FormComposer, {
     config: config.body,
@@ -49747,8 +49501,7 @@ const componentsToRegister = {
   WSLinks,
   WSServiceName: WSConnectionDetails,
   WSWaterConnectionDetails,
-  CPTPropertyLocationDetails: WSPropertyLocationDetails,
-  PTPropertyLocationDetails: WSPropertyLocationDetails,
+  WSPropertyLocationDetails,
   WSPropertyWaterConnection,
   WSDocsRequired,
   WSDocumentDetails: WSDocumentsEmployee,