@djb25/digit-ui-module-ws 1.0.42 → 1.0.44

package/dist/index.js

@@ -7839,7 +7839,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 = reactI18next.useTranslation(),
     t = _useTranslation.t;
   const user = Digit.UserService.getUser();
@@ -7895,15 +7895,114 @@ const WSMyApplications = () => {
     }),
     PTisLoading = _Digit$Hooks$pt$usePr.isLoading,
     PTdata = _Digit$Hooks$pt$usePr.data;
+  const _useState = React.useState(0),
+    pageOffset = _useState[0],
+    setPageOffset = _useState[1];
+  const _useState2 = React.useState(10),
+    pageSize = _useState2[0],
+    setPageSize = _useState2[1];
+  const isMobile = window.Digit.Utils.browser.isMobile();
+  const GetCell = value => /*#__PURE__*/React__default.createElement("span", {
+    className: "cell-text"
+  }, value);
+  const columns = React.useMemo(() => {
+    return [{
+      Header: t("WS_MYCONNECTIONS_APPLICATION_NO"),
+      disableSortBy: true,
+      Cell: _ref => {
+        var _row$original, _row$original2;
+        let row = _ref.row;
+        return /*#__PURE__*/React__default.createElement("span", {
+          className: "link"
+        }, /*#__PURE__*/React__default.createElement(reactRouterDom.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__default.createElement("span", {
+          className: "link"
+        }, /*#__PURE__*/React__default.createElement(reactRouterDom.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__default.createElement("span", {
+          className: "link"
+        }, /*#__PURE__*/React__default.createElement(reactRouterDom.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__default.createElement(digitUiReactComponents.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, {
@@ -7925,16 +8024,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__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(WSInfoLabel, {
-    t: t
-  }), /*#__PURE__*/React__default.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__default.createElement("div", {
+  }) : [];
+  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(WSInfoLabel, {
+    t: t
+  }), /*#__PURE__*/React__default.createElement("div", null, (sortedApplications === null || sortedApplications === void 0 ? void 0 : sortedApplications.length) > 0 ? isMobile ? sortedApplications.map((application, index) => /*#__PURE__*/React__default.createElement("div", {
     key: index
   }, /*#__PURE__*/React__default.createElement(WSApplication, {
     application: application
-  }))), !((_applicationsList2 = applicationsList) !== null && _applicationsList2 !== void 0 && _applicationsList2.length) > 0 && /*#__PURE__*/React__default.createElement("p", {
+  }))) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.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__default.createElement("p", {
     style: {
       marginLeft: "16px",
       marginTop: "16px"
@@ -8344,7 +8455,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 = reactI18next.useTranslation(),
     t = _useTranslation.t;
   const tenantId = Digit.ULBService.getCurrentTenantId();
@@ -8496,7 +8607,30 @@ const WSResponse = props => {
   }, /*#__PURE__*/React__default.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__default.createElement(digitUiReactComponents.ActionBar, {
+  })), t("WS_PRINT_SEWERAGE_APPLICATION_LABEL"))), /*#__PURE__*/React__default.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__default.createElement(reactRouterDom.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__default.createElement("div", {
+    style: {
+      marginTop: "10px"
+    }
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.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__default.createElement(reactRouterDom.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__default.createElement("div", {
+    style: {
+      marginTop: "10px",
+      marginLeft: "10px"
+    }
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
+    label: t("MAKE_PAYMENT")
+  }))) : null), /*#__PURE__*/React__default.createElement(digitUiReactComponents.ActionBar, {
     style: {
       display: "flex",
       justifyContent: "flex-end",
@@ -8577,7 +8711,7 @@ const App = _ref => {
     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",
@@ -8595,6 +8729,10 @@ const App = _ref => {
     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);
@@ -8620,7 +8758,7 @@ const App = _ref => {
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.ModuleHeader, {
     leftContent: /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.ArrowLeft, {
       className: "icon"
-    }), "Back"),
+    }), t("CS_COMMON_BACK")),
     onLeftClick: () => window.history.back(),
     breadcrumbs: getDynamicBreadcrumbs()
   }), /*#__PURE__*/React__default.createElement("div", {
@@ -10294,31 +10432,6 @@ const WSDocsRequired = _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 WSSewerageConnectionDetails = _ref => {
   var _formData$sewerageCon, _formData$sewerageCon2;
   let t = _ref.t,
@@ -10752,6 +10865,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,
@@ -20994,14 +21132,6 @@ const useInboxTableConfig = _ref => {
     }];
   });
   return {
-    getCellProps: cellInfo => {
-      return {
-        style: {
-          padding: "20px 18px",
-          fontSize: "16px"
-        }
-      };
-    },
     disableSort: false,
     autoSort: false,
     manualPagination: true,
@@ -21327,12 +21457,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__default.createElement(digitUiReactComponents.DropIcon, null),
     headerText: checkPathName ? "MODULE_WATER" : "MODULE_SW"
@@ -24247,7 +24371,7 @@ const newConfig = [{
     }
   }, {
     route: "property-location-details",
-    component: "CPTPropertyLocationDetails",
+    component: "WSPropertyLocationDetails",
     key: "propertyLocationDetails",
     nextStep: "property-water-details",
     hideInEmployee: true,
@@ -28210,26 +28334,16 @@ const WSApplicationDetails = () => {
     }
   }, t("WS_FEE_DEATAILS_HEADER")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.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__default.createElement(digitUiReactComponents.Row, {
     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__default.createElement(digitUiReactComponents.Row, {
     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__default.createElement(digitUiReactComponents.Row, {
     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__default.createElement(digitUiReactComponents.CardHeader, {
@@ -30920,7 +31034,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 = reactI18next.useTranslation(),
     t = _useTranslation.t;
   const user = Digit.UserService.getUser();
@@ -30951,7 +31065,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);
@@ -30974,16 +31088,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 = React.useState(0),
+    pageOffset = _useState[0],
+    setPageOffset = _useState[1];
+  const _useState2 = React.useState(10),
+    pageSize = _useState2[0],
+    setPageSize = _useState2[1];
+  const isMobile = window.Digit.Utils.browser.isMobile();
+  const GetCell = value => /*#__PURE__*/React__default.createElement("span", {
+    className: "cell-text"
+  }, value);
+  const columns = React.useMemo(() => {
+    return [{
+      Header: t("WS_MYCONNECTIONS_CONSUMER_NO"),
+      disableSortBy: true,
+      Cell: _ref2 => {
+        var _row$original, _row$original2;
+        let row = _ref2.row;
+        return /*#__PURE__*/React__default.createElement("span", {
+          className: "link"
+        }, /*#__PURE__*/React__default.createElement(reactRouterDom.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__default.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__default.createElement("span", {
+          className: "link"
+        }, /*#__PURE__*/React__default.createElement(reactRouterDom.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__default.createElement(digitUiReactComponents.Loader, null);
   }
-  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Header, null, t("WS_MYCONNECTIONS_HEADER") + " " + (connectionList ? "(" + connectionList.length + ")" : "")), /*#__PURE__*/React__default.createElement(WSInfoLabel, {
+  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(WSInfoLabel, {
     t: t
-  }), /*#__PURE__*/React__default.createElement("div", null, ((_connectionList = connectionList) === null || _connectionList === void 0 ? void 0 : _connectionList.length) > 0 && connectionList.map((application, index) => /*#__PURE__*/React__default.createElement("div", {
+  }), /*#__PURE__*/React__default.createElement("div", null, ((_connectionList = connectionList) === null || _connectionList === void 0 ? void 0 : _connectionList.length) > 0 ? isMobile ? connectionList.map((application, index) => /*#__PURE__*/React__default.createElement("div", {
     key: index
   }, /*#__PURE__*/React__default.createElement(WSConnection, {
     application: application
-  }))), !((_connectionList2 = connectionList) !== null && _connectionList2 !== void 0 && _connectionList2.length) > 0 && /*#__PURE__*/React__default.createElement("p", {
+  }))) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.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__default.createElement("p", {
     style: {
       marginLeft: "16px",
       marginTop: "16px"
@@ -32229,154 +32441,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 = reactI18next.useTranslation(),
-    t = _useTranslation.t;
-  const _useState = React.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 = _useState[0],
-    setFormData = _useState[1];
-  const isPropertyFound = window.location.href.includes("ws/old-application");
-  React.useEffect(() => {
-    if (props.register) {
-      props.register({
-        name: "cpt"
-      });
-      props.register({
-        name: "cptId"
-      });
-    }
-  }, [props.register]);
-  React.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]);
-  return /*#__PURE__*/React__default.createElement(digitUiReactComponents.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,
@@ -32389,6 +32453,7 @@ const WSPropertyLocationDetails = props => {
     onSelect(config.key, data);
   };
   const onSkip = () => onSelect();
+  const PropertyLocationDetails = Digit.ComponentRegistryService.getComponent("PropertyLocationDetails");
   if (userType === "citizen") {
     return /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(Timeline, {
       currentStep: 2
@@ -32412,7 +32477,7 @@ const WSPropertyLocationDetails = props => {
   return /*#__PURE__*/React__default.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;
@@ -32469,7 +32534,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(),
@@ -40909,7 +40974,7 @@ function PropertyDocuments(_ref) {
           y1: "15",
           x2: "12",
           y2: "3"
-        }))), /*#__PURE__*/React__default.createElement("label", {
+        }))), applicationStatus !== "PENDING_FOR_PAYMENT" && applicationStatus !== "WF_PENDING_FOR_PAYMENT" && /*#__PURE__*/React__default.createElement("label", {
           style: {
             display: "flex",
             alignItems: "center",
@@ -43979,7 +44044,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;
@@ -44115,6 +44180,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({});
@@ -44128,7 +44202,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 = {
@@ -44259,10 +44333,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();
@@ -44276,10 +44350,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);
@@ -44337,8 +44411,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 = {
@@ -44350,8 +44424,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) {
@@ -44366,7 +44440,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];
@@ -48757,31 +48831,21 @@ const CheckPage$4 = _ref2 => {
 const OLDApplication = () => {
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
-  const location = reactRouterDom.useLocation();
   const history = reactRouterDom.useHistory();
-  let filters = getQueryStringParams(location.search);
   const _useState = React.useState(false),
-    setSubmitValve = _useState[1];
-  const _useState2 = React.useState(false),
-    isEnableLoader = _useState2[0],
-    setIsEnableLoader = _useState2[1];
-  const _useState3 = React.useState(null),
-    showToast = _useState3[0],
-    setShowToast = _useState3[1];
-  const _useState4 = React.useState({}),
-    setAppDetails = _useState4[1];
-  const _useState5 = React.useState(null),
-    setWaterAndSewerageBoth = _useState5[1];
-  const _useState6 = React.useState({
+    isEnableLoader = _useState[0],
+    setIsEnableLoader = _useState[1];
+  const _useState2 = React.useState(null),
+    showToast = _useState2[0],
+    setShowToast = _useState2[1];
+  const _useState3 = React.useState({
       body: []
     }),
-    config = _useState6[0],
-    setConfig = _useState6[1];
-  const _useState7 = React.useState(1),
-    currentStep = _useState7[0];
-  const _useState8 = React.useState(false),
-    showCheckPage = _useState8[0],
-    setShowCheckPage = _useState8[1];
+    config = _useState3[0],
+    setConfig = _useState3[1];
+  const _useState4 = React.useState(false),
+    showCheckPage = _useState4[0],
+    setShowCheckPage = _useState4[1];
   const timelineConfig = [{
     label: "WS_COMMON_PROPERTY_DETAILS"
   }, {
@@ -48816,9 +48880,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 = React.useState(new URLSearchParams(reactRouterDom.useLocation().search).get("propertyId")),
-    propertyId = _useState9[0],
-    setPropertyId = _useState9[1];
+  const _useState5 = React.useState(new URLSearchParams(reactRouterDom.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],
@@ -48833,7 +48897,7 @@ const OLDApplication = () => {
         propertyIds: propertyId
       },
       tenantId: tenantId,
-      enabled: propertyId && propertyId != "" ? true : false
+      enabled: propertyId && propertyId !== "" ? true : false
     }),
     propertyDetails = _Digit$Hooks$pt$usePr.data;
   React.useEffect(() => {
@@ -48845,7 +48909,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 => {
@@ -48855,13 +48919,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
               }]
@@ -48941,23 +49005,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) {
@@ -48974,9 +49033,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({
@@ -49101,7 +49160,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);
@@ -49111,12 +49169,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,
@@ -49128,7 +49182,6 @@ const OLDApplication = () => {
           reconnectRequest: false
         };
         if (waterAndSewerageLoader) {
-          setWaterAndSewerageBoth(true);
           sessionStorage.setItem("setWaterAndSewerageBoth", JSON.stringify(true));
         } else {
           sessionStorage.setItem("setWaterAndSewerageBoth", JSON.stringify(false));
@@ -49169,12 +49222,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;
@@ -49206,15 +49253,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);
@@ -49277,15 +49318,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));
                               }
                             });
                           });
@@ -49333,15 +49368,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 () {});
                               });
@@ -49390,7 +49419,7 @@ const OLDApplication = () => {
     className: "employee-form-section-wrapper"
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.VerticalTimeline, {
     config: timelineConfig,
-    currentActiveIndex: currentStep - 1,
+    currentActiveIndex: 0,
     showFinalStep: false
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.FormComposer, {
     config: config.body,
@@ -49475,8 +49504,7 @@ const componentsToRegister = {
   WSLinks,
   WSServiceName: WSConnectionDetails,
   WSWaterConnectionDetails,
-  CPTPropertyLocationDetails: WSPropertyLocationDetails,
-  PTPropertyLocationDetails: WSPropertyLocationDetails,
+  WSPropertyLocationDetails,
   WSPropertyWaterConnection,
   WSDocsRequired,
   WSDocumentDetails: WSDocumentsEmployee,