@djb25/digit-ui-module-ws 1.0.90 → 1.0.91

package/dist/index.js

@@ -550,6 +550,16 @@ const createPayloadOfWS = function (data) {
         status: "ACTIVE"
       });
     }
+    if (connectionDetail !== null && connectionDetail !== void 0 && connectionDetail.orgDeptDocument) {
+      var _connectionDetail$org;
+      let documentType = "OWNER.ORGANIZATION_DOCUMENT";
+      allDocuments.push({
+        documentType: documentType,
+        fileStoreId: (connectionDetail === null || connectionDetail === void 0 ? void 0 : (_connectionDetail$org = connectionDetail.orgDeptDocument) === null || _connectionDetail$org === void 0 ? void 0 : _connectionDetail$org.fileStoreId) || (connectionDetail === null || connectionDetail === void 0 ? void 0 : connectionDetail.orgDeptDocument),
+        documentUid: "",
+        status: "ACTIVE"
+      });
+    }
     let payload = {
       water: !!isWater,
       sewerage: !!isSewerage,
@@ -722,6 +732,18 @@ const getAllDocumentsForUpdate = data => {
       status: "ACTIVE"
     });
   }
+  const connectionDetailsArray = Array.isArray(data === null || data === void 0 ? void 0 : data.ConnectionDetails) ? data.ConnectionDetails : data !== null && data !== void 0 && data.ConnectionDetails ? Object.values(data.ConnectionDetails).filter(i => typeof i === "object") : [];
+  const connectionDetail = (connectionDetailsArray === null || connectionDetailsArray === void 0 ? void 0 : connectionDetailsArray[0]) || (data === null || data === void 0 ? void 0 : data.ConnectionDetails) || {};
+  if (connectionDetail !== null && connectionDetail !== void 0 && connectionDetail.orgDeptDocument) {
+    var _connectionDetail$org2;
+    let documentType = "OWNER.ORGANIZATION_DOCUMENT";
+    allDocuments.push({
+      documentType: documentType,
+      fileStoreId: (connectionDetail === null || connectionDetail === void 0 ? void 0 : (_connectionDetail$org2 = connectionDetail.orgDeptDocument) === null || _connectionDetail$org2 === void 0 ? void 0 : _connectionDetail$org2.fileStoreId) || (connectionDetail === null || connectionDetail === void 0 ? void 0 : connectionDetail.orgDeptDocument),
+      documentUid: "",
+      status: "ACTIVE"
+    });
+  }
   return allDocuments;
 };
 const convertToWSUpdate = data => {
@@ -7872,7 +7894,7 @@ var lodash = createCommonjsModule(function (module, exports) {
 });
 
 const WSApplication = _ref => {
-  var _user$info, _user$info$userName, _user$info2, _user$info3, _application$applicat, _application$applicat2, _application$applicat3, _application$applicat4, _application$applicat5, _application$applicat6, _application$connecti, _application$property, _application$property2, _application$property3, _application$property4, _application$property5, _application$property6, _application$applicat7, _application$connecti2, _application$connecti3, _PTData$Properties, _PTData$Properties$, _PTData$Properties$$o, _application$applicat8, _application$applicat9;
+  var _user$info, _user$info$userName, _user$info2, _user$info3, _application$applicat, _application$applicat2, _application$applicat3, _application$applicat4, _application$applicat5, _application$applicat6, _application$connecti, _application$property, _application$property2, _application$property3, _application$property4, _application$property5, _application$property6;
   let {
     application
   } = _ref;
@@ -7970,19 +7992,21 @@ const WSApplication = _ref => {
     to: `/digit-ui/citizen/ws/connection/application/${encodeApplicationNo}`
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
     label: t("WS_VIEW_DETAILS_LABEL")
-  })), (application === null || application === void 0 ? void 0 : application.applicationStatus) === "PENDING_FOR_PAYMENT" ? /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
-    to: {
-      pathname: `/digit-ui/citizen/payment/my-bills/${businessService}/${application !== null && application !== void 0 && (_application$applicat7 = application.applicationNo) !== null && _application$applicat7 !== void 0 && _application$applicat7.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, "/", "+")}`,
-      search: `?workflow=WNS&tenantId=${application === null || application === void 0 ? void 0 : application.tenantId}&ConsumerName=${(application === null || application === void 0 ? void 0 : (_application$connecti2 = application.connectionHolders) === null || _application$connecti2 === void 0 ? void 0 : _application$connecti2.map(owner => owner.name).join(",")) || (application === null || application === void 0 ? void 0 : (_application$connecti3 = application.connectionHolders) === null || _application$connecti3 === void 0 ? void 0 : _application$connecti3.map(owner => owner.name).join(",")) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties = PTData.Properties) === null || _PTData$Properties === void 0 ? void 0 : (_PTData$Properties$ = _PTData$Properties[0]) === null || _PTData$Properties$ === void 0 ? void 0 : (_PTData$Properties$$o = _PTData$Properties$.owners) === null || _PTData$Properties$$o === void 0 ? void 0 : _PTData$Properties$$o.map(owner => owner.name).join(","))}&isDisoconnectFlow=${application !== null && application !== void 0 && (_application$applicat8 = application.applicationNo) !== null && _application$applicat8 !== void 0 && _application$applicat8.includes("DC") ? true : false}&consumerCode=${application !== null && application !== void 0 && (_application$applicat9 = application.applicationNo) !== null && _application$applicat9 !== void 0 && _application$applicat9.includes("DC") ? application === null || application === void 0 ? void 0 : application.connectionNo : application === null || application === void 0 ? void 0 : application.applicationNo}`,
-      state: {}
-    }
-  }, /*#__PURE__*/React__default.createElement("div", {
+  })), (application === null || application === void 0 ? void 0 : application.applicationStatus) === "PENDING_FOR_PAYMENT" ? /*#__PURE__*/React__default.createElement("div", {
     style: {
       marginTop: "10px"
     }
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
-    label: t("MAKE_PAYMENT")
-  }))) : null);
+    label: t("MAKE_PAYMENT"),
+    onSubmit: () => {
+      var _application$applicat7, _application$connecti2, _application$connecti3, _PTData$Properties, _PTData$Properties$, _PTData$Properties$$o, _application$applicat8, _application$applicat9;
+      history.push({
+        pathname: `/digit-ui/citizen/payment/my-bills/${businessService}/${application !== null && application !== void 0 && (_application$applicat7 = application.applicationNo) !== null && _application$applicat7 !== void 0 && _application$applicat7.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, "/", "+")}`,
+        search: `?workflow=WNS&tenantId=${application === null || application === void 0 ? void 0 : application.tenantId}&ConsumerName=${(application === null || application === void 0 ? void 0 : (_application$connecti2 = application.connectionHolders) === null || _application$connecti2 === void 0 ? void 0 : _application$connecti2.map(owner => owner.name).join(",")) || (application === null || application === void 0 ? void 0 : (_application$connecti3 = application.connectionHolders) === null || _application$connecti3 === void 0 ? void 0 : _application$connecti3.map(owner => owner.name).join(",")) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties = PTData.Properties) === null || _PTData$Properties === void 0 ? void 0 : (_PTData$Properties$ = _PTData$Properties[0]) === null || _PTData$Properties$ === void 0 ? void 0 : (_PTData$Properties$$o = _PTData$Properties$.owners) === null || _PTData$Properties$$o === void 0 ? void 0 : _PTData$Properties$$o.map(owner => owner.name).join(","))}&isDisoconnectFlow=${application !== null && application !== void 0 && (_application$applicat8 = application.applicationNo) !== null && _application$applicat8 !== void 0 && _application$applicat8.includes("DC") ? true : false}&consumerCode=${application !== null && application !== void 0 && (_application$applicat9 = application.applicationNo) !== null && _application$applicat9 !== void 0 && _application$applicat9.includes("DC") ? application === null || application === void 0 ? void 0 : application.connectionNo : application === null || application === void 0 ? void 0 : application.applicationNo}`,
+        state: {}
+      });
+    }
+  })) : null);
 };
 
 const EyeSvgINdex = _ref => {
@@ -8878,7 +8902,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, _waterApplicationData8, _waterApplicationData9, _waterApplicationData0, _waterApplicationData1, _waterApplicationData10, _waterApplicationData11, _waterApplicationData12, _waterApplicationData13, _waterApplicationData14, _waterApplicationData15, _waterApplicationData16, _waterApplicationData17, _waterApplicationData18, _waterApplicationData19, _waterApplicationData20, _sewerageApplicationD8, _sewerageApplicationD9, _sewerageApplicationD0, _sewerageApplicationD1, _sewerageApplicationD10, _sewerageApplicationD11, _sewerageApplicationD12, _sewerageApplicationD13, _sewerageApplicationD14, _sewerageApplicationD15, _sewerageApplicationD16, _sewerageApplicationD17, _sewerageApplicationD18, _sewerageApplicationD19, _sewerageApplicationD20;
+  var _waterApplicationData, _waterApplicationData2, _waterApplicationData3, _sewerageApplicationD, _sewerageApplicationD2, _sewerageApplicationD3, _oldDataWater$WaterCo, _oldDataWater$WaterCo2, _oldDataSew$SewerageC, _oldDataSew$SewerageC2, _waterApplicationData8, _sewerageApplicationD8;
   const {
     t
   } = reactI18next.useTranslation();
@@ -9051,30 +9075,66 @@ 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("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/employee/payment/collect/${waterApplicationData !== null && waterApplicationData !== void 0 && (_waterApplicationData9 = waterApplicationData.applicationData) !== null && _waterApplicationData9 !== void 0 && (_waterApplicationData0 = _waterApplicationData9.applicationNo) !== null && _waterApplicationData0 !== void 0 && _waterApplicationData0.includes("DC") ? "WS" : "WS.ONE_TIME_FEE"}/${waterApplicationData !== null && waterApplicationData !== void 0 && (_waterApplicationData1 = waterApplicationData.applicationData) !== null && _waterApplicationData1 !== void 0 && (_waterApplicationData10 = _waterApplicationData1.applicationNo) !== null && _waterApplicationData10 !== void 0 && _waterApplicationData10.includes("DC") ? stringReplaceAll(waterApplicationData === null || waterApplicationData === void 0 ? void 0 : (_waterApplicationData11 = waterApplicationData.applicationData) === null || _waterApplicationData11 === void 0 ? void 0 : _waterApplicationData11.connectionNo, "/", "+") : stringReplaceAll(waterApplicationData === null || waterApplicationData === void 0 ? void 0 : (_waterApplicationData12 = waterApplicationData.applicationData) === null || _waterApplicationData12 === void 0 ? void 0 : _waterApplicationData12.applicationNo, "/", "+")}/${waterApplicationData === null || waterApplicationData === void 0 ? void 0 : (_waterApplicationData13 = waterApplicationData.applicationData) === null || _waterApplicationData13 === void 0 ? void 0 : _waterApplicationData13.tenantId}?workflow=WNS&tenantId=${waterApplicationData === null || waterApplicationData === void 0 ? void 0 : (_waterApplicationData14 = waterApplicationData.applicationData) === null || _waterApplicationData14 === void 0 ? void 0 : _waterApplicationData14.tenantId}&ConsumerName=${(waterApplicationData === null || waterApplicationData === void 0 ? void 0 : (_waterApplicationData15 = waterApplicationData.applicationData) === null || _waterApplicationData15 === void 0 ? void 0 : (_waterApplicationData16 = _waterApplicationData15.connectionHolders) === null || _waterApplicationData16 === void 0 ? void 0 : _waterApplicationData16.map(owner => owner.name).join(",")) || (waterApplicationData === null || waterApplicationData === void 0 ? void 0 : (_waterApplicationData17 = waterApplicationData.propertyDetails) === null || _waterApplicationData17 === void 0 ? void 0 : (_waterApplicationData18 = _waterApplicationData17.owners) === null || _waterApplicationData18 === void 0 ? void 0 : _waterApplicationData18.map(owner => owner.name).join(","))}&isDisconnectFlow=${waterApplicationData !== null && waterApplicationData !== void 0 && (_waterApplicationData19 = waterApplicationData.applicationData) !== null && _waterApplicationData19 !== void 0 && (_waterApplicationData20 = _waterApplicationData19.applicationNo) !== null && _waterApplicationData20 !== void 0 && _waterApplicationData20.includes("DC") ? true : false}`,
-      state: {}
-    }
-  }, /*#__PURE__*/React__default.createElement("div", {
+  })), 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("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/employee/payment/collect/${sewerageApplicationData !== null && sewerageApplicationData !== void 0 && (_sewerageApplicationD9 = sewerageApplicationData.applicationData) !== null && _sewerageApplicationD9 !== void 0 && (_sewerageApplicationD0 = _sewerageApplicationD9.applicationNo) !== null && _sewerageApplicationD0 !== void 0 && _sewerageApplicationD0.includes("DC") ? "SW" : "SW.ONE_TIME_FEE"}/${sewerageApplicationData !== null && sewerageApplicationData !== void 0 && (_sewerageApplicationD1 = sewerageApplicationData.applicationData) !== null && _sewerageApplicationD1 !== void 0 && (_sewerageApplicationD10 = _sewerageApplicationD1.applicationNo) !== null && _sewerageApplicationD10 !== void 0 && _sewerageApplicationD10.includes("DC") ? stringReplaceAll(sewerageApplicationData === null || sewerageApplicationData === void 0 ? void 0 : (_sewerageApplicationD11 = sewerageApplicationData.applicationData) === null || _sewerageApplicationD11 === void 0 ? void 0 : _sewerageApplicationD11.connectionNo, "/", "+") : stringReplaceAll(sewerageApplicationData === null || sewerageApplicationData === void 0 ? void 0 : (_sewerageApplicationD12 = sewerageApplicationData.applicationData) === null || _sewerageApplicationD12 === void 0 ? void 0 : _sewerageApplicationD12.applicationNo, "/", "+")}/${sewerageApplicationData === null || sewerageApplicationData === void 0 ? void 0 : (_sewerageApplicationD13 = sewerageApplicationData.applicationData) === null || _sewerageApplicationD13 === void 0 ? void 0 : _sewerageApplicationD13.tenantId}?workflow=WNS&tenantId=${sewerageApplicationData === null || sewerageApplicationData === void 0 ? void 0 : (_sewerageApplicationD14 = sewerageApplicationData.applicationData) === null || _sewerageApplicationD14 === void 0 ? void 0 : _sewerageApplicationD14.tenantId}&ConsumerName=${(sewerageApplicationData === null || sewerageApplicationData === void 0 ? void 0 : (_sewerageApplicationD15 = sewerageApplicationData.applicationData) === null || _sewerageApplicationD15 === void 0 ? void 0 : (_sewerageApplicationD16 = _sewerageApplicationD15.connectionHolders) === null || _sewerageApplicationD16 === void 0 ? void 0 : _sewerageApplicationD16.map(owner => owner.name).join(",")) || (sewerageApplicationData === null || sewerageApplicationData === void 0 ? void 0 : (_sewerageApplicationD17 = sewerageApplicationData.propertyDetails) === null || _sewerageApplicationD17 === void 0 ? void 0 : (_sewerageApplicationD18 = _sewerageApplicationD17.owners) === null || _sewerageApplicationD18 === void 0 ? void 0 : _sewerageApplicationD18.map(owner => owner.name).join(","))}&isDisconnectFlow=${sewerageApplicationData !== null && sewerageApplicationData !== void 0 && (_sewerageApplicationD19 = sewerageApplicationData.applicationData) !== null && _sewerageApplicationD19 !== void 0 && (_sewerageApplicationD20 = _sewerageApplicationD19.applicationNo) !== null && _sewerageApplicationD20 !== void 0 && _sewerageApplicationD20.includes("DC") ? true : false}`,
-      state: {}
+    label: t("MAKE_PAYMENT"),
+    onSubmit: () => {
+      var _waterApplicationData9, _waterApplicationData0, _waterApplicationData1, _waterApplicationData10, _waterApplicationData11, _waterApplicationData12, _waterApplicationData13, _waterApplicationData14, _waterApplicationData15, _waterApplicationData16, _waterApplicationData17, _waterApplicationData18, _waterApplicationData19;
+      let isEmployee = window.location.href.includes("/employee");
+      let businessService = waterApplicationData !== null && waterApplicationData !== void 0 && (_waterApplicationData9 = waterApplicationData.applicationData) !== null && _waterApplicationData9 !== void 0 && (_waterApplicationData0 = _waterApplicationData9.applicationNo) !== null && _waterApplicationData0 !== void 0 && _waterApplicationData0.includes("DC") ? "WS" : "WS.ONE_TIME_FEE";
+      let consumerCodeOriginal = waterApplicationData !== null && waterApplicationData !== void 0 && (_waterApplicationData1 = waterApplicationData.applicationData) !== null && _waterApplicationData1 !== void 0 && (_waterApplicationData10 = _waterApplicationData1.applicationNo) !== null && _waterApplicationData10 !== void 0 && _waterApplicationData10.includes("DC") ? waterApplicationData === null || waterApplicationData === void 0 ? void 0 : (_waterApplicationData11 = waterApplicationData.applicationData) === null || _waterApplicationData11 === void 0 ? void 0 : _waterApplicationData11.connectionNo : waterApplicationData === null || waterApplicationData === void 0 ? void 0 : (_waterApplicationData12 = waterApplicationData.applicationData) === null || _waterApplicationData12 === void 0 ? void 0 : _waterApplicationData12.applicationNo;
+      let consumerCode = stringReplaceAll(consumerCodeOriginal, "/", "+");
+      let tenantId = waterApplicationData === null || waterApplicationData === void 0 ? void 0 : (_waterApplicationData13 = waterApplicationData.applicationData) === null || _waterApplicationData13 === void 0 ? void 0 : _waterApplicationData13.tenantId;
+      let consumerName = (waterApplicationData === null || waterApplicationData === void 0 ? void 0 : (_waterApplicationData14 = waterApplicationData.applicationData) === null || _waterApplicationData14 === void 0 ? void 0 : (_waterApplicationData15 = _waterApplicationData14.connectionHolders) === null || _waterApplicationData15 === void 0 ? void 0 : _waterApplicationData15.map(owner => owner.name).join(",")) || (waterApplicationData === null || waterApplicationData === void 0 ? void 0 : (_waterApplicationData16 = waterApplicationData.propertyDetails) === null || _waterApplicationData16 === void 0 ? void 0 : (_waterApplicationData17 = _waterApplicationData16.owners) === null || _waterApplicationData17 === void 0 ? void 0 : _waterApplicationData17.map(owner => owner.name).join(","));
+      let isDisconnectFlow = waterApplicationData !== null && waterApplicationData !== void 0 && (_waterApplicationData18 = waterApplicationData.applicationData) !== null && _waterApplicationData18 !== void 0 && (_waterApplicationData19 = _waterApplicationData18.applicationNo) !== null && _waterApplicationData19 !== void 0 && _waterApplicationData19.includes("DC") ? true : false;
+      if (isEmployee) {
+        history.push({
+          pathname: `/digit-ui/employee/payment/collect/${businessService}/${encodeURIComponent(consumerCodeOriginal)}/${tenantId}`,
+          search: `?tenantId=${tenantId}&consumerCode=${consumerCodeOriginal}&ISWSAPP&applicationNumber=${consumerCodeOriginal}`,
+          state: {}
+        });
+      } else {
+        history.push({
+          pathname: `/digit-ui/citizen/payment/my-bills/${businessService}/${consumerCode}`,
+          search: `?workflow=WNS&tenantId=${tenantId}&ConsumerName=${consumerName}&isDisoconnectFlow=${isDisconnectFlow}&consumerCode=${consumerCodeOriginal}`,
+          state: {}
+        });
+      }
     }
-  }, /*#__PURE__*/React__default.createElement("div", {
+  })) : 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("div", {
     style: {
       marginTop: "10px",
       marginLeft: "10px"
     }
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
-    label: t("MAKE_PAYMENT")
-  }))) : null), /*#__PURE__*/React__default.createElement(digitUiReactComponents.ActionBar, {
+    label: t("MAKE_PAYMENT"),
+    onSubmit: () => {
+      var _sewerageApplicationD9, _sewerageApplicationD0, _sewerageApplicationD1, _sewerageApplicationD10, _sewerageApplicationD11, _sewerageApplicationD12, _sewerageApplicationD13, _sewerageApplicationD14, _sewerageApplicationD15, _sewerageApplicationD16, _sewerageApplicationD17, _sewerageApplicationD18, _sewerageApplicationD19;
+      let isEmployee = window.location.href.includes("/employee");
+      let businessService = sewerageApplicationData !== null && sewerageApplicationData !== void 0 && (_sewerageApplicationD9 = sewerageApplicationData.applicationData) !== null && _sewerageApplicationD9 !== void 0 && (_sewerageApplicationD0 = _sewerageApplicationD9.applicationNo) !== null && _sewerageApplicationD0 !== void 0 && _sewerageApplicationD0.includes("DC") ? "SW" : "SW.ONE_TIME_FEE";
+      let consumerCodeOriginal = sewerageApplicationData !== null && sewerageApplicationData !== void 0 && (_sewerageApplicationD1 = sewerageApplicationData.applicationData) !== null && _sewerageApplicationD1 !== void 0 && (_sewerageApplicationD10 = _sewerageApplicationD1.applicationNo) !== null && _sewerageApplicationD10 !== void 0 && _sewerageApplicationD10.includes("DC") ? sewerageApplicationData === null || sewerageApplicationData === void 0 ? void 0 : (_sewerageApplicationD11 = sewerageApplicationData.applicationData) === null || _sewerageApplicationD11 === void 0 ? void 0 : _sewerageApplicationD11.connectionNo : sewerageApplicationData === null || sewerageApplicationData === void 0 ? void 0 : (_sewerageApplicationD12 = sewerageApplicationData.applicationData) === null || _sewerageApplicationD12 === void 0 ? void 0 : _sewerageApplicationD12.applicationNo;
+      let consumerCode = stringReplaceAll(consumerCodeOriginal, "/", "+");
+      let tenantId = sewerageApplicationData === null || sewerageApplicationData === void 0 ? void 0 : (_sewerageApplicationD13 = sewerageApplicationData.applicationData) === null || _sewerageApplicationD13 === void 0 ? void 0 : _sewerageApplicationD13.tenantId;
+      let consumerName = (sewerageApplicationData === null || sewerageApplicationData === void 0 ? void 0 : (_sewerageApplicationD14 = sewerageApplicationData.applicationData) === null || _sewerageApplicationD14 === void 0 ? void 0 : (_sewerageApplicationD15 = _sewerageApplicationD14.connectionHolders) === null || _sewerageApplicationD15 === void 0 ? void 0 : _sewerageApplicationD15.map(owner => owner.name).join(",")) || (sewerageApplicationData === null || sewerageApplicationData === void 0 ? void 0 : (_sewerageApplicationD16 = sewerageApplicationData.propertyDetails) === null || _sewerageApplicationD16 === void 0 ? void 0 : (_sewerageApplicationD17 = _sewerageApplicationD16.owners) === null || _sewerageApplicationD17 === void 0 ? void 0 : _sewerageApplicationD17.map(owner => owner.name).join(","));
+      let isDisconnectFlow = sewerageApplicationData !== null && sewerageApplicationData !== void 0 && (_sewerageApplicationD18 = sewerageApplicationData.applicationData) !== null && _sewerageApplicationD18 !== void 0 && (_sewerageApplicationD19 = _sewerageApplicationD18.applicationNo) !== null && _sewerageApplicationD19 !== void 0 && _sewerageApplicationD19.includes("DC") ? true : false;
+      if (isEmployee) {
+        history.push({
+          pathname: `/digit-ui/employee/payment/collect/${businessService}/${encodeURIComponent(consumerCodeOriginal)}/${tenantId}`,
+          search: `?tenantId=${tenantId}&consumerCode=${consumerCodeOriginal}&ISWSAPP&applicationNumber=${consumerCodeOriginal}`,
+          state: {}
+        });
+      } else {
+        history.push({
+          pathname: `/digit-ui/citizen/payment/my-bills/${businessService}/${consumerCode}`,
+          search: `?workflow=WNS&tenantId=${tenantId}&ConsumerName=${consumerName}&isDisoconnectFlow=${isDisconnectFlow}&consumerCode=${consumerCodeOriginal}`,
+          state: {}
+        });
+      }
+    }
+  })) : null), /*#__PURE__*/React__default.createElement(digitUiReactComponents.ActionBar, {
     style: {
       display: "flex",
       justifyContent: "flex-end",
@@ -9437,6 +9497,7 @@ const Response = () => {
   const {
     state
   } = reactRouterDom.useLocation();
+  const history = reactRouterDom.useHistory();
   const {
     t
   } = reactI18next.useTranslation();
@@ -9506,14 +9567,13 @@ const Response = () => {
       justifyContent: "flex-end",
       alignItems: "baseline"
     }
-  }, /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
-    to: `/digit-ui/employee`,
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
+    label: t("CORE_COMMON_GO_TO_HOME"),
+    onSubmit: () => history.push(`/digit-ui/employee`),
     style: {
       marginRight: "1rem"
     }
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
-    label: t("CORE_COMMON_GO_TO_HOME")
-  })))));
+  }))));
 };
 
 const ResponseBillAmend = () => {
@@ -9521,6 +9581,7 @@ const ResponseBillAmend = () => {
   const {
     state
   } = reactRouterDom.useLocation();
+  const history = reactRouterDom.useHistory();
   const {
     t
   } = reactI18next.useTranslation();
@@ -9535,14 +9596,13 @@ const ResponseBillAmend = () => {
       justifyContent: "flex-end",
       alignItems: "baseline"
     }
-  }, /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
-    to: `/digit-ui/employee`,
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
+    label: t("CORE_COMMON_GO_TO_HOME"),
+    onSubmit: () => history.push(`/digit-ui/employee`),
     style: {
       marginRight: "1rem"
     }
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
-    label: t("CORE_COMMON_GO_TO_HOME")
-  })))));
+  }))));
 };
 
 const getPropertyAddress$2 = property => {
@@ -10797,20 +10857,42 @@ const WSZROVerification = () => {
     t
   } = reactI18next.useTranslation();
   const tenantId = Digit.ULBService.getCurrentTenantId();
+  const [connectionNo, setConnectionNo] = React.useState("");
+  const [filters, setFilters] = React.useState({
+    status: "PENDING",
+    offset: 0,
+    limit: 20
+  });
   const {
     isLoading,
     data
   } = Digit.Hooks.ws.useWSZROVerification({
     tenantId,
-    filters: {
-      status: "PENDING",
-      offset: 0,
-      limit: 20
-    },
+    filters,
     config: {
       select: res => (res === null || res === void 0 ? void 0 : res.cases) || []
     }
   });
+  const onSubmit = e => {
+    if (e) e.preventDefault();
+    const newFilters = {
+      status: "PENDING",
+      offset: 0,
+      limit: 20
+    };
+    if (connectionNo !== null && connectionNo !== void 0 && connectionNo.trim()) {
+      newFilters.connectionNo = connectionNo.trim();
+    }
+    setFilters(newFilters);
+  };
+  const clearSearch = () => {
+    setConnectionNo("");
+    setFilters({
+      status: "PENDING",
+      offset: 0,
+      limit: 20
+    });
+  };
   const columns = React__default.useMemo(() => [{
     Header: t("WS_CONNECTION_NO_LABEL"),
     accessor: "connectionNo",
@@ -10885,10 +10967,25 @@ const WSZROVerification = () => {
       return (_row$original8 = row.original) !== null && _row$original8 !== void 0 && (_row$original8$verifi = _row$original8.verification) !== null && _row$original8$verifi !== void 0 && _row$original8$verifi.status ? t(`WS_ZRO_STATUS_${row.original.verification.status}`) : "NA";
     }
   }], [t]);
-  if (isLoading) {
-    return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
-  }
-  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Table, {
+  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SearchForm, {
+    onSubmit: onSubmit,
+    handleSubmit: fn => fn,
+    className: "formcomposer-section-grid"
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SearchField, null, /*#__PURE__*/React__default.createElement("label", null, t("WS_CONNECTION_NO_LABEL")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
+    name: "connectionNo",
+    value: connectionNo,
+    onChange: e => setConnectionNo(e.target.value)
+  })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.SearchField, {
+    className: "ws-submit"
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
+    label: t("ES_COMMON_SEARCH"),
+    submit: true,
+    className: "submit-bar generic-button"
+  }), /*#__PURE__*/React__default.createElement("button", {
+    type: "button",
+    className: "clear-search generic-button",
+    onClick: clearSearch
+  }, t("ES_COMMON_CLEAR_SEARCH"))))), isLoading ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.Table, {
     t: t,
     data: data || [],
     totalRecords: (data === null || data === void 0 ? void 0 : data.length) || 0,
@@ -11591,7 +11688,12 @@ const BILLSBreadCrumbs = _ref => {
   }, {
     path: "/digit-ui/employee/ws/zro-application",
     label: t("WS_ZRO_VERIFICATION"),
-    show: location.pathname.includes("/ws/zro-application") ? true : false
+    show: location.pathname.includes("/ws/zro-application") || location.pathname.includes("/ws/zro-verification-details") ? true : false,
+    isclickable: location.pathname.includes("/ws/zro-verification-details") ? true : false
+  }, {
+    path: "/digit-ui/employee/ws/zro-verification-details",
+    label: t("WS_APPLICATION_DETAILS_HEADER"),
+    show: location.pathname.includes("/ws/zro-verification-details") ? true : false
   }];
   let lastCrumbIndex = findLastIndex(crumbs, "show", true);
   crumbs[lastCrumbIndex] = {
@@ -28736,24 +28838,11 @@ const newConfig = [{
     route: "property-water-details",
     component: "WSPropertyWaterConnection",
     key: "waterConnection",
-    nextStep: "bank-details",
-    WATER: "bank-details",
-    hideInEmployee: true,
-    texts: {
-      header: "WS_PROPERTY_ADDRESS_DETAILS",
-      cardText: "",
-      submitBarLabel: "CS_COMMON_NEXT"
-    }
-  }, {
-    route: "bank-details",
-    component: "WSBankDetails",
-    key: "bankDetails",
     nextStep: "disability-details",
     WATER: "disability-details",
     hideInEmployee: true,
     texts: {
-      headerCaption: "WS_COMMON_CONNECTION_DETAIL",
-      header: "WS_BANK_DETAILS",
+      header: "WS_PROPERTY_ADDRESS_DETAILS",
       cardText: "",
       submitBarLabel: "CS_COMMON_NEXT"
     }
@@ -32758,7 +32847,7 @@ const checkForNA$1 = value => {
   return value ? value : "CS_NA";
 };
 const WSApplicationDetails = () => {
-  var _user$info, _user$info$userName, _user$info2, _user$info3, _Digit$SessionStorage, _user$info4, _data$WaterConnection, _data$WaterConnection2, _data$SewerageConnect, _data$SewerageConnect2, _data$WaterConnection3, _data$WaterConnection4, _data$SewerageConnect3, _data$SewerageConnect4, _data$WaterConnection5, _data$WaterConnection6, _data$WaterConnection7, _data$SewerageConnect5, _data$SewerageConnect6, _data$SewerageConnect7, _data$WaterConnection8, _data$WaterConnection9, _data$SewerageConnect8, _data$SewerageConnect9, _data$WaterConnection0, _data$WaterConnection1, _data$SewerageConnect0, _data$SewerageConnect1, _data$WaterConnection10, _data$WaterConnection11, _data$SewerageConnect10, _data$SewerageConnect11, _data$WaterConnection12, _data$SewerageConnect12, _PTData$Properties, _PTData$Properties$, _PTData$Properties2, _PTData$Properties2$, _data$WaterConnection13, _data$WaterConnection14, _data$WaterConnection15, _data$WaterConnection16, _data$SewerageConnect13, _data$SewerageConnect14, _data$SewerageConnect15, _data$SewerageConnect16, _data$WaterConnection17, _data$WaterConnection18, _data$SewerageConnect17, _data$SewerageConnect18, _appDetailsData$appli, _data$WaterConnection37, _data$WaterConnection38, _data$SewerageConnect33, _data$SewerageConnect34, _data$WaterConnection39, _data$WaterConnection40, _data$SewerageConnect35, _data$SewerageConnect36, _data$WaterConnection41, _data$WaterConnection42, _data$SewerageConnect37, _data$SewerageConnect38, _data$WaterConnection43, _data$WaterConnection44, _data$SewerageConnect39, _data$SewerageConnect40, _data$WaterConnection45, _data$WaterConnection46, _data$SewerageConnect41, _data$WaterConnection47, _data$WaterConnection48, _data$SewerageConnect42, _data$SewerageConnect43, _data$WaterConnection49, _data$WaterConnection50, _data$SewerageConnect44, _data$SewerageConnect45, _data$WaterConnection51, _data$WaterConnection52, _data$SewerageConnect46, _data$SewerageConnect47, _data$WaterConnection53, _data$WaterConnection54, _data$SewerageConnect48, _data$SewerageConnect49, _data$WaterConnection55, _data$WaterConnection56, _data$SewerageConnect50, _data$SewerageConnect51, _data$WaterConnection57, _data$WaterConnection58, _data$SewerageConnect52, _data$SewerageConnect53, _data$WaterConnection59, _data$WaterConnection60, _data$SewerageConnect54, _data$SewerageConnect55, _data$WaterConnection61, _data$WaterConnection62, _data$SewerageConnect56, _data$SewerageConnect57, _data$WaterConnection63, _data$WaterConnection64, _data$SewerageConnect58, _data$SewerageConnect59, _data$WaterConnection65, _data$WaterConnection66, _data$SewerageConnect60, _data$SewerageConnect61, _data$WaterConnection67, _data$WaterConnection68, _data$WaterConnection69, _data$WaterConnection70, _data$SewerageConnect62, _data$SewerageConnect63, _data$SewerageConnect64, _data$SewerageConnect65, _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$WaterConnection71, _data$WaterConnection72, _data$WaterConnection73, _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$SewerageConnect109, _data$SewerageConnect110, _data$SewerageConnect111, _data$SewerageConnect112, _data$WaterConnection118, _data$WaterConnection119, _data$WaterConnection120, _data$WaterConnection121, _data$SewerageConnect113, _data$SewerageConnect114, _data$SewerageConnect115, _data$SewerageConnect116, _data$WaterConnection122, _data$WaterConnection123, _data$WaterConnection124, _data$WaterConnection125, _data$SewerageConnect117, _data$SewerageConnect118, _data$SewerageConnect119, _data$SewerageConnect120, _data$WaterConnection126, _data$WaterConnection127, _data$WaterConnection128, _data$WaterConnection129, _data$SewerageConnect121, _data$SewerageConnect122, _data$SewerageConnect123, _data$SewerageConnect124, _data$WaterConnection130, _data$WaterConnection131, _data$WaterConnection132, _data$WaterConnection133, _data$SewerageConnect125, _data$SewerageConnect126, _data$SewerageConnect127, _data$SewerageConnect128, _data$WaterConnection134, _data$WaterConnection135, _data$SewerageConnect129, _data$SewerageConnect130, _PTData$Properties5, _PTData$Properties5$, _PTData$Properties5$$, _PTData$Properties5$$2, _PTData$Properties6, _PTData$Properties6$, _PTData$Properties7, _PTData$Properties7$, _PTData$Properties7$$, _PTData$Properties7$$2, _PTData$Properties8, _PTData$Properties8$, _data$WaterConnection136, _data$WaterConnection137, _data$SewerageConnect131, _data$SewerageConnect132, _data$WaterConnection138, _data$WaterConnection139, _data$SewerageConnect133, _data$SewerageConnect134, _propertyAddress$city, _propertyAddress$city2, _propertyAddress$loca, _propertyAddress$loca2, _propertyAddress$subL, _propertyAddress$subL2, _propertyAddress$asse, _propertyAddress$asse2, _propertyAddress$bloc, _propertyAddress$bloc2, _propertyAddress$ward, _propertyAddress$ward2, _propertyAddress$zone, _propertyAddress$zone2, _propertyAddress$zone3, _propertyAddress$zone4, _useDetails$categoryT, _useDetails$categoryT2, _useDetails$propertyC, _useDetails$propertyC2, _propertyAdditionalDe, _propertyAdditionalDe2, _PTData$Properties9, _PTData$Properties9$, _useDetails$propertyT, _useDetails$propertyT2, _propertyAdditionalDe3, _propertyAdditionalDe4, _PTData$Properties0, _PTData$Properties0$, _useDetails$WaterConn, _useDetails$WaterConn2, _useDetails$waterConn, _useDetails$waterConn2, _propertyAdditionalDe5, _propertyAdditionalDe6, _useDetails$noOfFloor, _useDetails$noOfFloor2, _PTData$Properties1, _PTData$Properties1$, _useDetails$SelectYea, _useDetails$SelectYea2, _useDetails$SelectYea3, _useDetails$construct, _useDetails$construct2, _data$WaterConnection140, _data$WaterConnection141, _data$WaterConnection142, _data$WaterConnection143, _data$SewerageConnect135, _data$SewerageConnect136, _data$SewerageConnect137, _data$SewerageConnect138, _data$WaterConnection146, _data$WaterConnection147, _data$WaterConnection148, _data$WaterConnection149, _data$WaterConnection150, _data$WaterConnection151, _data$SewerageConnect141, _data$SewerageConnect142, _data$SewerageConnect143, _data$SewerageConnect144, _data$SewerageConnect145, _data$SewerageConnect146, _paymentDetails$data, _paymentDetails$data$, _paymentDetails$data$2, _paymentDetails$data2, _paymentDetails$data3, _paymentDetails$data4, _data$WaterConnection152, _data$WaterConnection153, _data$SewerageConnect147, _data$SewerageConnect148, _data$WaterConnection154, _data$WaterConnection155, _data$WaterConnection156, _data$SewerageConnect149, _data$SewerageConnect150, _data$SewerageConnect151, _PTData$Properties10, _PTData$Properties10$, _PTData$Properties10$2, _paymentDetails$data5, _paymentDetails$data6, _paymentDetails$data7, _data$WaterConnection157, _data$WaterConnection158, _data$WaterConnection159, _data$WaterConnection160, _data$SewerageConnect152, _data$SewerageConnect153, _data$SewerageConnect154, _data$SewerageConnect155, _data$WaterConnection161, _data$WaterConnection162, _data$SewerageConnect156, _data$SewerageConnect157, _data$WaterConnection163, _data$WaterConnection164, _data$SewerageConnect158, _data$SewerageConnect159, _data$WaterConnection165, _data$WaterConnection166, _data$SewerageConnect160, _data$SewerageConnect161, _data$WaterConnection167, _data$WaterConnection168, _data$WaterConnection169, _data$SewerageConnect162, _data$SewerageConnect163, _data$WaterConnection170, _data$WaterConnection171, _data$SewerageConnect164, _data$SewerageConnect165, _data$WaterConnection172, _data$WaterConnection173, _data$WaterConnection174, _data$WaterConnection175, _data$SewerageConnect166, _data$SewerageConnect167, _data$SewerageConnect168, _data$SewerageConnect169, _data$WaterConnection176, _data$WaterConnection177, _data$SewerageConnect170, _data$SewerageConnect171, _data$SewerageConnect172, _data$SewerageConnect173, _data$SewerageConnect174, _data$SewerageConnect175, _data$SewerageConnect176, _data$SewerageConnect177, _data$SewerageConnect178, _data$SewerageConnect179, _data$SewerageConnect180, _data$WaterConnection178, _data$WaterConnection179, _data$WaterConnection180, _data$WaterConnection181, _data$WaterConnection182, _data$WaterConnection183, _data$WaterConnection184, _data$WaterConnection185, _data$WaterConnection186;
+  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$WaterConnection7, _data$SewerageConnect5, _data$SewerageConnect6, _data$SewerageConnect7, _data$WaterConnection8, _data$WaterConnection9, _data$SewerageConnect8, _data$SewerageConnect9, _data$WaterConnection0, _data$WaterConnection1, _data$SewerageConnect0, _data$SewerageConnect1, _data$WaterConnection10, _data$WaterConnection11, _data$SewerageConnect10, _data$SewerageConnect11, _data$WaterConnection12, _data$SewerageConnect12, _PTData$Properties, _PTData$Properties$, _PTData$Properties2, _PTData$Properties2$, _data$WaterConnection13, _data$WaterConnection14, _data$WaterConnection15, _data$WaterConnection16, _data$SewerageConnect13, _data$SewerageConnect14, _data$SewerageConnect15, _data$SewerageConnect16, _data$WaterConnection17, _data$WaterConnection18, _data$SewerageConnect17, _data$SewerageConnect18, _appDetailsData$appli, _data$WaterConnection37, _data$WaterConnection38, _data$SewerageConnect33, _data$SewerageConnect34, _data$WaterConnection39, _data$WaterConnection40, _data$SewerageConnect35, _data$SewerageConnect36, _data$WaterConnection41, _data$WaterConnection42, _data$SewerageConnect37, _data$SewerageConnect38, _data$WaterConnection43, _data$WaterConnection44, _data$SewerageConnect39, _data$SewerageConnect40, _data$WaterConnection45, _data$WaterConnection46, _data$SewerageConnect41, _data$WaterConnection47, _data$WaterConnection48, _data$SewerageConnect42, _data$SewerageConnect43, _data$WaterConnection49, _data$WaterConnection50, _data$SewerageConnect44, _data$SewerageConnect45, _data$WaterConnection51, _data$WaterConnection52, _data$SewerageConnect46, _data$SewerageConnect47, _data$WaterConnection53, _data$WaterConnection54, _data$SewerageConnect48, _data$SewerageConnect49, _data$WaterConnection55, _data$WaterConnection56, _data$SewerageConnect50, _data$SewerageConnect51, _data$WaterConnection57, _data$WaterConnection58, _data$SewerageConnect52, _data$SewerageConnect53, _data$WaterConnection59, _data$WaterConnection60, _data$SewerageConnect54, _data$SewerageConnect55, _data$WaterConnection61, _data$WaterConnection62, _data$SewerageConnect56, _data$SewerageConnect57, _data$WaterConnection63, _data$WaterConnection64, _data$SewerageConnect58, _data$SewerageConnect59, _data$WaterConnection65, _data$WaterConnection66, _data$SewerageConnect60, _data$SewerageConnect61, _data$WaterConnection67, _data$WaterConnection68, _data$WaterConnection69, _data$WaterConnection70, _data$SewerageConnect62, _data$SewerageConnect63, _data$SewerageConnect64, _data$SewerageConnect65, _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$WaterConnection71, _data$WaterConnection72, _data$WaterConnection73, _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$SewerageConnect109, _data$SewerageConnect110, _data$SewerageConnect111, _data$SewerageConnect112, _data$WaterConnection118, _data$WaterConnection119, _data$WaterConnection120, _data$WaterConnection121, _data$SewerageConnect113, _data$SewerageConnect114, _data$SewerageConnect115, _data$SewerageConnect116, _data$WaterConnection122, _data$WaterConnection123, _data$WaterConnection124, _data$WaterConnection125, _data$SewerageConnect117, _data$SewerageConnect118, _data$SewerageConnect119, _data$SewerageConnect120, _data$WaterConnection126, _data$WaterConnection127, _data$WaterConnection128, _data$WaterConnection129, _data$SewerageConnect121, _data$SewerageConnect122, _data$SewerageConnect123, _data$SewerageConnect124, _data$WaterConnection130, _data$WaterConnection131, _data$WaterConnection132, _data$WaterConnection133, _data$SewerageConnect125, _data$SewerageConnect126, _data$SewerageConnect127, _data$SewerageConnect128, _data$WaterConnection134, _data$WaterConnection135, _data$SewerageConnect129, _data$SewerageConnect130, _PTData$Properties5, _PTData$Properties5$, _PTData$Properties5$$, _PTData$Properties5$$2, _PTData$Properties6, _PTData$Properties6$, _PTData$Properties7, _PTData$Properties7$, _PTData$Properties7$$, _PTData$Properties7$$2, _PTData$Properties8, _PTData$Properties8$, _data$WaterConnection136, _data$WaterConnection137, _data$SewerageConnect131, _data$SewerageConnect132, _data$WaterConnection138, _data$WaterConnection139, _data$SewerageConnect133, _data$SewerageConnect134, _propertyAddress$city, _propertyAddress$city2, _propertyAddress$loca, _propertyAddress$loca2, _propertyAddress$subL, _propertyAddress$subL2, _propertyAddress$asse, _propertyAddress$asse2, _propertyAddress$bloc, _propertyAddress$bloc2, _propertyAddress$ward, _propertyAddress$ward2, _propertyAddress$zone, _propertyAddress$zone2, _propertyAddress$zone3, _propertyAddress$zone4, _useDetails$categoryT, _useDetails$categoryT2, _useDetails$propertyC, _useDetails$propertyC2, _propertyAdditionalDe, _propertyAdditionalDe2, _PTData$Properties9, _PTData$Properties9$, _useDetails$propertyT, _useDetails$propertyT2, _propertyAdditionalDe3, _propertyAdditionalDe4, _PTData$Properties0, _PTData$Properties0$, _useDetails$WaterConn, _useDetails$WaterConn2, _useDetails$waterConn, _useDetails$waterConn2, _propertyAdditionalDe5, _propertyAdditionalDe6, _useDetails$noOfFloor, _useDetails$noOfFloor2, _PTData$Properties1, _PTData$Properties1$, _useDetails$SelectYea, _useDetails$SelectYea2, _useDetails$SelectYea3, _useDetails$construct, _useDetails$construct2, _data$WaterConnection140, _data$WaterConnection141, _data$WaterConnection142, _data$WaterConnection143, _data$SewerageConnect135, _data$SewerageConnect136, _data$SewerageConnect137, _data$SewerageConnect138, _data$WaterConnection146, _data$WaterConnection147, _data$WaterConnection148, _data$WaterConnection149, _data$WaterConnection150, _data$WaterConnection151, _data$SewerageConnect141, _data$SewerageConnect142, _data$SewerageConnect143, _data$SewerageConnect144, _data$SewerageConnect145, _data$SewerageConnect146, _data$WaterConnection157, _data$WaterConnection158, _data$WaterConnection159, _data$WaterConnection160, _data$SewerageConnect152, _data$SewerageConnect153, _data$SewerageConnect154, _data$SewerageConnect155, _data$WaterConnection161, _data$WaterConnection162, _data$SewerageConnect156, _data$SewerageConnect157, _data$WaterConnection163, _data$WaterConnection164, _data$SewerageConnect158, _data$SewerageConnect159, _data$WaterConnection165, _data$WaterConnection166, _data$SewerageConnect160, _data$SewerageConnect161, _data$WaterConnection167, _data$WaterConnection168, _data$WaterConnection169, _data$SewerageConnect162, _data$SewerageConnect163, _data$WaterConnection170, _data$WaterConnection171, _data$SewerageConnect164, _data$SewerageConnect165, _data$WaterConnection172, _data$WaterConnection173, _data$WaterConnection174, _data$WaterConnection175, _data$SewerageConnect166, _data$SewerageConnect167, _data$SewerageConnect168, _data$SewerageConnect169, _data$WaterConnection176, _data$WaterConnection177, _data$SewerageConnect170, _data$SewerageConnect171, _data$SewerageConnect172, _data$SewerageConnect173, _data$SewerageConnect174, _data$SewerageConnect175, _data$SewerageConnect176, _data$SewerageConnect177, _data$SewerageConnect178, _data$SewerageConnect179, _data$SewerageConnect180, _data$WaterConnection178, _data$WaterConnection179, _data$WaterConnection180, _data$WaterConnection181, _data$WaterConnection182, _data$WaterConnection183, _data$WaterConnection184, _data$WaterConnection185, _data$WaterConnection186;
   const getDisconnectionNoticeSearch = function () {
     try {
       var _data$WaterConnection188, _data$WaterConnection189, _data$SewerageConnect182, _data$SewerageConnect183;
@@ -32876,7 +32965,6 @@ const WSApplicationDetails = () => {
   const useDetails = additionalDetails;
   const propertyAdditionalDetails = (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties = PTData.Properties) === null || _PTData$Properties === void 0 ? void 0 : (_PTData$Properties$ = _PTData$Properties[0]) === null || _PTData$Properties$ === void 0 ? void 0 : _PTData$Properties$.additionalDetails) || {};
   const djbEmployee = additionalDetails;
-  const bankDetails = additionalDetails;
   const propertyAddress = (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties2 = PTData.Properties) === null || _PTData$Properties2 === void 0 ? void 0 : (_PTData$Properties2$ = _PTData$Properties2[0]) === null || _PTData$Properties2$ === void 0 ? void 0 : _PTData$Properties2$.address) || additionalDetails;
   const checkifPrivacyenabled = Digit.Hooks.ws.useToCheckPrivacyEnablement({
     privacy: {
@@ -33506,27 +33594,6 @@ const WSApplicationDetails = () => {
       },
       onClick: () => getFiles([djbEmployee === null || djbEmployee === void 0 ? void 0 : djbEmployee.document], tenantId)
     }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.GenericFileIcon, null), " ", t("CS_COMMON_VIEW"))
-  }))), !isMutation && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardHeader, {
-    styles: {
-      fontSize: "28px"
-    }
-  }, t("WS_BANK_DETAILS")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, {
-    style: {
-      marginTop: "10px",
-      marginBottom: "30px"
-    }
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
-    label: t("WS_NAME_OF_BANK"),
-    text: `${t(checkForNA$1(bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.bankName))}`
-  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
-    label: t("WS_NAME_OF_BRANCH"),
-    text: `${t(checkForNA$1((bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.bankBranchName) || (bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.branchName)))}`
-  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
-    label: t("WS_IFSC_CODE"),
-    text: `${t(checkForNA$1(bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.ifscCode))}`
-  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.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__default.createElement(digitUiReactComponents.CardHeader, {
     styles: {
       fontSize: "28px"
@@ -33579,16 +33646,22 @@ const WSApplicationDetails = () => {
         marginBottom: "20px"
       }
     }) : null)));
-  })), (data === null || data === void 0 ? void 0 : (_data$WaterConnection146 = data.WaterConnection) === null || _data$WaterConnection146 === void 0 ? void 0 : (_data$WaterConnection147 = _data$WaterConnection146[0]) === null || _data$WaterConnection147 === void 0 ? void 0 : _data$WaterConnection147.applicationStatus) === "PENDING_FOR_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$WaterConnection148 = data.WaterConnection) === null || _data$WaterConnection148 === void 0 ? void 0 : (_data$WaterConnection149 = _data$WaterConnection148[0]) === null || _data$WaterConnection149 === void 0 ? void 0 : _data$WaterConnection149.applicationStatus) === "PENDING_FOR_FINAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$WaterConnection150 = data.WaterConnection) === null || _data$WaterConnection150 === void 0 ? void 0 : (_data$WaterConnection151 = _data$WaterConnection150[0]) === null || _data$WaterConnection151 === void 0 ? void 0 : _data$WaterConnection151.applicationStatus) === "PENDING_FOR_ADDITIONAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect141 = data.SewerageConnections) === null || _data$SewerageConnect141 === void 0 ? void 0 : (_data$SewerageConnect142 = _data$SewerageConnect141[0]) === null || _data$SewerageConnect142 === void 0 ? void 0 : _data$SewerageConnect142.applicationStatus) === "PENDING_FOR_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect143 = data.SewerageConnections) === null || _data$SewerageConnect143 === void 0 ? void 0 : (_data$SewerageConnect144 = _data$SewerageConnect143[0]) === null || _data$SewerageConnect144 === void 0 ? void 0 : _data$SewerageConnect144.applicationStatus) === "PENDING_FOR_FINAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect145 = data.SewerageConnections) === null || _data$SewerageConnect145 === void 0 ? void 0 : (_data$SewerageConnect146 = _data$SewerageConnect145[0]) === null || _data$SewerageConnect146 === void 0 ? void 0 : _data$SewerageConnect146.applicationStatus) === "PENDING_FOR_ADDITIONAL_PAYMENT" ? /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
-    to: {
-      pathname: `/digit-ui/citizen/payment/my-bills/${paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data = paymentDetails.data) === null || _paymentDetails$data === void 0 ? void 0 : (_paymentDetails$data$ = _paymentDetails$data.Bill) === null || _paymentDetails$data$ === void 0 ? void 0 : (_paymentDetails$data$2 = _paymentDetails$data$[0]) === null || _paymentDetails$data$2 === void 0 ? void 0 : _paymentDetails$data$2.businessService}/${stringReplaceAll(paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data2 = paymentDetails.data) === null || _paymentDetails$data2 === void 0 ? void 0 : (_paymentDetails$data3 = _paymentDetails$data2.Bill) === null || _paymentDetails$data3 === void 0 ? void 0 : (_paymentDetails$data4 = _paymentDetails$data3[0]) === null || _paymentDetails$data4 === void 0 ? void 0 : _paymentDetails$data4.consumerCode, "/", "+")}`,
-      search: `?workflow=WNS&tenantId=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection152 = data.WaterConnection) === null || _data$WaterConnection152 === void 0 ? void 0 : (_data$WaterConnection153 = _data$WaterConnection152[0]) === null || _data$WaterConnection153 === void 0 ? void 0 : _data$WaterConnection153.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect147 = data.SewerageConnections) === null || _data$SewerageConnect147 === void 0 ? void 0 : (_data$SewerageConnect148 = _data$SewerageConnect147[0]) === null || _data$SewerageConnect148 === void 0 ? void 0 : _data$SewerageConnect148.tenantId)}&ConsumerName=${(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$WaterConnection156 = _data$WaterConnection155.connectionHolders) === null || _data$WaterConnection156 === void 0 ? void 0 : _data$WaterConnection156.map(owner => owner.name).join(",")) || (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$SewerageConnect151 = _data$SewerageConnect150.connectionHolders) === null || _data$SewerageConnect151 === void 0 ? void 0 : _data$SewerageConnect151.map(owner => owner.name).join(",")) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties10 = PTData.Properties) === null || _PTData$Properties10 === void 0 ? void 0 : (_PTData$Properties10$ = _PTData$Properties10[0]) === null || _PTData$Properties10$ === void 0 ? void 0 : (_PTData$Properties10$2 = _PTData$Properties10$.owners) === null || _PTData$Properties10$2 === void 0 ? void 0 : _PTData$Properties10$2.map(owner => owner.name).join(","))}&isDisoconnectFlow=${applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? true : false}&consumerCode=${paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data5 = paymentDetails.data) === null || _paymentDetails$data5 === void 0 ? void 0 : (_paymentDetails$data6 = _paymentDetails$data5.Bill) === null || _paymentDetails$data6 === void 0 ? void 0 : (_paymentDetails$data7 = _paymentDetails$data6[0]) === null || _paymentDetails$data7 === void 0 ? void 0 : _paymentDetails$data7.consumerCode}`,
-      state: {
-        fromApplicationDetails: true
-      }
+  })), (data === null || data === void 0 ? void 0 : (_data$WaterConnection146 = data.WaterConnection) === null || _data$WaterConnection146 === void 0 ? void 0 : (_data$WaterConnection147 = _data$WaterConnection146[0]) === null || _data$WaterConnection147 === void 0 ? void 0 : _data$WaterConnection147.applicationStatus) === "PENDING_FOR_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$WaterConnection148 = data.WaterConnection) === null || _data$WaterConnection148 === void 0 ? void 0 : (_data$WaterConnection149 = _data$WaterConnection148[0]) === null || _data$WaterConnection149 === void 0 ? void 0 : _data$WaterConnection149.applicationStatus) === "PENDING_FOR_FINAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$WaterConnection150 = data.WaterConnection) === null || _data$WaterConnection150 === void 0 ? void 0 : (_data$WaterConnection151 = _data$WaterConnection150[0]) === null || _data$WaterConnection151 === void 0 ? void 0 : _data$WaterConnection151.applicationStatus) === "PENDING_FOR_ADDITIONAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect141 = data.SewerageConnections) === null || _data$SewerageConnect141 === void 0 ? void 0 : (_data$SewerageConnect142 = _data$SewerageConnect141[0]) === null || _data$SewerageConnect142 === void 0 ? void 0 : _data$SewerageConnect142.applicationStatus) === "PENDING_FOR_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect143 = data.SewerageConnections) === null || _data$SewerageConnect143 === void 0 ? void 0 : (_data$SewerageConnect144 = _data$SewerageConnect143[0]) === null || _data$SewerageConnect144 === void 0 ? void 0 : _data$SewerageConnect144.applicationStatus) === "PENDING_FOR_FINAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect145 = data.SewerageConnections) === null || _data$SewerageConnect145 === void 0 ? void 0 : (_data$SewerageConnect146 = _data$SewerageConnect145[0]) === null || _data$SewerageConnect146 === void 0 ? void 0 : _data$SewerageConnect146.applicationStatus) === "PENDING_FOR_ADDITIONAL_PAYMENT" ? /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      marginTop: "10px"
     }
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
-    label: t("MAKE_PAYMENT")
+    label: t("MAKE_PAYMENT"),
+    onSubmit: () => {
+      var _paymentDetails$data, _paymentDetails$data$, _paymentDetails$data$2, _paymentDetails$data2, _paymentDetails$data3, _paymentDetails$data4, _data$WaterConnection152, _data$WaterConnection153, _data$SewerageConnect147, _data$SewerageConnect148, _data$WaterConnection154, _data$WaterConnection155, _data$WaterConnection156, _data$SewerageConnect149, _data$SewerageConnect150, _data$SewerageConnect151, _PTData$Properties10, _PTData$Properties10$, _PTData$Properties10$2, _paymentDetails$data5, _paymentDetails$data6, _paymentDetails$data7;
+      history.push({
+        pathname: `/digit-ui/citizen/payment/my-bills/${paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data = paymentDetails.data) === null || _paymentDetails$data === void 0 ? void 0 : (_paymentDetails$data$ = _paymentDetails$data.Bill) === null || _paymentDetails$data$ === void 0 ? void 0 : (_paymentDetails$data$2 = _paymentDetails$data$[0]) === null || _paymentDetails$data$2 === void 0 ? void 0 : _paymentDetails$data$2.businessService}/${stringReplaceAll(paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data2 = paymentDetails.data) === null || _paymentDetails$data2 === void 0 ? void 0 : (_paymentDetails$data3 = _paymentDetails$data2.Bill) === null || _paymentDetails$data3 === void 0 ? void 0 : (_paymentDetails$data4 = _paymentDetails$data3[0]) === null || _paymentDetails$data4 === void 0 ? void 0 : _paymentDetails$data4.consumerCode, "/", "+")}`,
+        search: `?workflow=WNS&tenantId=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection152 = data.WaterConnection) === null || _data$WaterConnection152 === void 0 ? void 0 : (_data$WaterConnection153 = _data$WaterConnection152[0]) === null || _data$WaterConnection153 === void 0 ? void 0 : _data$WaterConnection153.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect147 = data.SewerageConnections) === null || _data$SewerageConnect147 === void 0 ? void 0 : (_data$SewerageConnect148 = _data$SewerageConnect147[0]) === null || _data$SewerageConnect148 === void 0 ? void 0 : _data$SewerageConnect148.tenantId)}&ConsumerName=${(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$WaterConnection156 = _data$WaterConnection155.connectionHolders) === null || _data$WaterConnection156 === void 0 ? void 0 : _data$WaterConnection156.map(owner => owner.name).join(",")) || (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$SewerageConnect151 = _data$SewerageConnect150.connectionHolders) === null || _data$SewerageConnect151 === void 0 ? void 0 : _data$SewerageConnect151.map(owner => owner.name).join(",")) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties10 = PTData.Properties) === null || _PTData$Properties10 === void 0 ? void 0 : (_PTData$Properties10$ = _PTData$Properties10[0]) === null || _PTData$Properties10$ === void 0 ? void 0 : (_PTData$Properties10$2 = _PTData$Properties10$.owners) === null || _PTData$Properties10$2 === void 0 ? void 0 : _PTData$Properties10$2.map(owner => owner.name).join(","))}&isDisoconnectFlow=${applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? true : false}&consumerCode=${paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data5 = paymentDetails.data) === null || _paymentDetails$data5 === void 0 ? void 0 : (_paymentDetails$data6 = _paymentDetails$data5.Bill) === null || _paymentDetails$data6 === void 0 ? void 0 : (_paymentDetails$data7 = _paymentDetails$data6[0]) === null || _paymentDetails$data7 === void 0 ? void 0 : _paymentDetails$data7.consumerCode}`,
+        state: {
+          fromApplicationDetails: true
+        }
+      });
+    }
   })) : null, !(data !== null && data !== void 0 && (_data$WaterConnection157 = data.WaterConnection) !== null && _data$WaterConnection157 !== void 0 && (_data$WaterConnection158 = _data$WaterConnection157[0]) !== null && _data$WaterConnection158 !== void 0 && _data$WaterConnection158.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$WaterConnection159 = data.WaterConnection) !== null && _data$WaterConnection159 !== void 0 && (_data$WaterConnection160 = _data$WaterConnection159[0]) !== null && _data$WaterConnection160 !== void 0 && _data$WaterConnection160.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || !(data !== null && data !== void 0 && (_data$SewerageConnect152 = data.SewerageConnections) !== null && _data$SewerageConnect152 !== void 0 && (_data$SewerageConnect153 = _data$SewerageConnect152[0]) !== null && _data$SewerageConnect153 !== void 0 && _data$SewerageConnect153.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$SewerageConnect154 = data.SewerageConnections) !== null && _data$SewerageConnect154 !== void 0 && (_data$SewerageConnect155 = _data$SewerageConnect154[0]) !== null && _data$SewerageConnect155 !== void 0 && _data$SewerageConnect155.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
     to: {
       pathname: isMutation ? `/digit-ui/citizen/ws/mutation-application` : `/digit-ui/citizen/ws/edit-application/${(data === null || data === void 0 ? void 0 : (_data$WaterConnection161 = data.WaterConnection) === null || _data$WaterConnection161 === void 0 ? void 0 : (_data$WaterConnection162 = _data$WaterConnection161[0]) === null || _data$WaterConnection162 === void 0 ? void 0 : _data$WaterConnection162.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect156 = data.SewerageConnections) === null || _data$SewerageConnect156 === void 0 ? void 0 : (_data$SewerageConnect157 = _data$SewerageConnect156[0]) === null || _data$SewerageConnect157 === void 0 ? void 0 : _data$SewerageConnect157.tenantId)}`,
@@ -34028,7 +34101,7 @@ const getConnectionDetailsPDF = function (application, property, tenantInfo, t)
 };
 
 const ConnectionDetails$5 = () => {
-  var _Digit$SessionStorage, _user$info, _data$SewerageConnect, _data$SewerageConnect2, _data$WaterConnection, _data$WaterConnection2, _Object$keys, _connectionData$Water, _connectionData$Water2, _connectionData$Sewer, _connectionData$Sewer2, _data$WaterConnection3, _data$WaterConnection4, _data$WaterConnection5, _data$WaterConnection6, _data$WaterConnection7, _data$WaterConnection8, _data$WaterConnection9, _data$WaterConnection0, _data$SewerageConnect3, _data$SewerageConnect4, _data$SewerageConnect5, _data$SewerageConnect6, _state, _state$applicationNo, _state2, _state3, _state4, _state4$applicationTy, _state5, _state6, _state7, _state8, _state8$applicationTy, _state9, _state0, _state1, _state10, _state10$applicationT, _state11, _state12, _state13, _state14, _state15, _state15$applicationT, _state16, _state16$waterSource, _state16$waterSource$, _state17, _state18, _state18$waterSource, _state18$waterSource$, _state19, _state20, _state21, _state22, _state22$additionalDe, _state23, _state23$applicationT, _state24, _state24$additionalDe, _state24$additionalDe2, _state25, _state25$additionalDe, _state25$additionalDe2, _state26, _state26$additionalDe, _state27, _state27$additionalDe, _state28, _state28$additionalDe, _state28$additionalDe2, _state29, _state29$additionalDe, _state30, _state31, _state32, _state33, _state33$property, _state33$property$own, _PTData$Properties2, _PTData$Properties2$, _PTData$Properties3, _PTData$Properties3$, _PTData$Properties3$$, _PTData$Properties3$$2, _PTData$Properties4, _PTData$Properties4$, _user$info2, _user$info2$userName, _user$info3, _user$info4, _state34, _state34$additionalDe, _state34$additionalDe2, _state35, _state35$additionalDe, _state35$additionalDe2, _state36, _state36$additionalDe, _state37, _state37$additionalDe, _state38, _state38$additionalDe, _state39, _state39$additionalDe, _state40, _state40$additionalDe, _state41, _state42, _state43, _state44, _state44$connectionHo, _state44$connectionHo2, _data$WaterConnection16, _data$WaterConnection17, _data$WaterConnection18, _data$WaterConnection19, _data$SewerageConnect0, _data$SewerageConnect1, _data$SewerageConnect10, _data$SewerageConnect11, _data$WaterConnection20, _data$WaterConnection21, _data$WaterConnection22, _data$WaterConnection23, _data$SewerageConnect12, _data$SewerageConnect13, _data$SewerageConnect14, _data$SewerageConnect15, _data$WaterConnection24, _data$WaterConnection25, _data$WaterConnection26, _data$WaterConnection27, _data$SewerageConnect16, _data$SewerageConnect17, _data$SewerageConnect18, _data$SewerageConnect19, _data$WaterConnection28, _data$WaterConnection29, _data$WaterConnection30, _data$WaterConnection31, _data$SewerageConnect20, _data$SewerageConnect21, _data$SewerageConnect22, _data$SewerageConnect23, _data$WaterConnection32, _data$WaterConnection33, _data$WaterConnection34, _data$WaterConnection35, _data$SewerageConnect24, _data$SewerageConnect25, _data$SewerageConnect26, _data$SewerageConnect27, _data$WaterConnection36, _data$WaterConnection37, _data$WaterConnection38, _data$WaterConnection39, _data$SewerageConnect28, _data$SewerageConnect29, _data$SewerageConnect30, _data$SewerageConnect31, _data$WaterConnection40, _data$WaterConnection41, _data$WaterConnection42, _data$WaterConnection43, _data$SewerageConnect32, _data$SewerageConnect33, _data$SewerageConnect34, _data$SewerageConnect35, _data$WaterConnection44, _data$WaterConnection45, _data$WaterConnection46, _data$WaterConnection47, _data$SewerageConnect36, _data$SewerageConnect37, _data$SewerageConnect38, _data$SewerageConnect39, _data$WaterConnection48, _data$WaterConnection49, _data$WaterConnection50, _data$WaterConnection51, _data$SewerageConnect40, _data$SewerageConnect41, _data$SewerageConnect42, _data$SewerageConnect43, _data$WaterConnection52, _data$WaterConnection53, _data$WaterConnection54, _data$WaterConnection55, _data$SewerageConnect44, _data$SewerageConnect45, _data$SewerageConnect46, _data$SewerageConnect47, _state45, _state45$additionalDe, _state46, _state46$additionalDe, _state47, _state47$additionalDe, _state48, _state48$additionalDe, _state49, _state49$additionalDe, _state50, _state51, _state54, _state55, _state56, _state57, _state58, _state59, _paymentDetails$data17, _paymentDetails$data18;
+  var _Digit$SessionStorage, _user$info, _data$SewerageConnect, _data$SewerageConnect2, _data$WaterConnection, _data$WaterConnection2, _Object$keys, _connectionData$Water, _connectionData$Water2, _connectionData$Sewer, _connectionData$Sewer2, _data$WaterConnection3, _data$WaterConnection4, _data$WaterConnection5, _data$WaterConnection6, _data$WaterConnection7, _data$WaterConnection8, _data$WaterConnection9, _data$WaterConnection0, _data$SewerageConnect3, _data$SewerageConnect4, _data$SewerageConnect5, _data$SewerageConnect6, _state, _state$applicationNo, _state2, _state3, _state4, _state4$applicationTy, _state5, _state6, _state7, _state8, _state8$applicationTy, _state9, _state0, _state1, _state10, _state10$applicationT, _state11, _state12, _state13, _state14, _state15, _state15$applicationT, _state16, _state16$waterSource, _state16$waterSource$, _state17, _state18, _state18$waterSource, _state18$waterSource$, _state19, _state20, _state21, _state22, _state22$additionalDe, _state23, _state23$applicationT, _state24, _state24$additionalDe, _state24$additionalDe2, _state25, _state25$additionalDe, _state25$additionalDe2, _state26, _state26$additionalDe, _state27, _state27$additionalDe, _state28, _state28$additionalDe, _state28$additionalDe2, _state29, _state29$additionalDe, _state30, _state31, _state32, _state33, _state33$property, _state33$property$own, _PTData$Properties2, _PTData$Properties2$, _PTData$Properties3, _PTData$Properties3$, _PTData$Properties3$$, _PTData$Properties3$$2, _PTData$Properties4, _PTData$Properties4$, _user$info2, _user$info2$userName, _user$info3, _user$info4, _state34, _state34$additionalDe, _state34$additionalDe2, _state35, _state35$additionalDe, _state35$additionalDe2, _state36, _state36$additionalDe, _state37, _state37$additionalDe, _state38, _state38$additionalDe, _state39, _state39$additionalDe, _state40, _state40$additionalDe, _state41, _state42, _state43, _state44, _state44$connectionHo, _state44$connectionHo2, _data$WaterConnection16, _data$WaterConnection17, _data$WaterConnection18, _data$WaterConnection19, _data$SewerageConnect0, _data$SewerageConnect1, _data$SewerageConnect10, _data$SewerageConnect11, _data$WaterConnection20, _data$WaterConnection21, _data$WaterConnection22, _data$WaterConnection23, _data$SewerageConnect12, _data$SewerageConnect13, _data$SewerageConnect14, _data$SewerageConnect15, _data$WaterConnection24, _data$WaterConnection25, _data$WaterConnection26, _data$WaterConnection27, _data$SewerageConnect16, _data$SewerageConnect17, _data$SewerageConnect18, _data$SewerageConnect19, _data$WaterConnection28, _data$WaterConnection29, _data$WaterConnection30, _data$WaterConnection31, _data$SewerageConnect20, _data$SewerageConnect21, _data$SewerageConnect22, _data$SewerageConnect23, _data$WaterConnection32, _data$WaterConnection33, _data$WaterConnection34, _data$WaterConnection35, _data$SewerageConnect24, _data$SewerageConnect25, _data$SewerageConnect26, _data$SewerageConnect27, _data$WaterConnection36, _data$WaterConnection37, _data$WaterConnection38, _data$WaterConnection39, _data$SewerageConnect28, _data$SewerageConnect29, _data$SewerageConnect30, _data$SewerageConnect31, _data$WaterConnection40, _data$WaterConnection41, _data$WaterConnection42, _data$WaterConnection43, _data$SewerageConnect32, _data$SewerageConnect33, _data$SewerageConnect34, _data$SewerageConnect35, _data$WaterConnection44, _data$WaterConnection45, _data$WaterConnection46, _data$WaterConnection47, _data$SewerageConnect36, _data$SewerageConnect37, _data$SewerageConnect38, _data$SewerageConnect39, _data$WaterConnection48, _data$WaterConnection49, _data$WaterConnection50, _data$WaterConnection51, _data$SewerageConnect40, _data$SewerageConnect41, _data$SewerageConnect42, _data$SewerageConnect43, _data$WaterConnection52, _data$WaterConnection53, _data$WaterConnection54, _data$WaterConnection55, _data$SewerageConnect44, _data$SewerageConnect45, _data$SewerageConnect46, _data$SewerageConnect47, _state45, _state46, _state49, _state50, _state51, _state52, _state53, _state54, _paymentDetails$data17, _paymentDetails$data18;
   const {
     t
   } = reactI18next.useTranslation();
@@ -34691,39 +34764,15 @@ const ConnectionDetails$5 = () => {
         isArray: false
       }
     }
-  }))) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardText, null, t("WS_PROPERTY_OWNER_SAME_AS_CONN_HOLDERS")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardHeader, {
-    styles: {
-      fontSize: "28px"
-    }
-  }, t("WS_COMMON_BANK_DETAILS")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
-    className: "border-none",
-    label: t("WS_BANK_NAME"),
-    text: ((_state45 = state) === null || _state45 === void 0 ? void 0 : (_state45$additionalDe = _state45.additionalDetails) === null || _state45$additionalDe === void 0 ? void 0 : _state45$additionalDe.bankName) || "NA"
-  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
-    className: "border-none",
-    label: t("WS_BANK_BRANCH_NAME"),
-    text: ((_state46 = state) === null || _state46 === void 0 ? void 0 : (_state46$additionalDe = _state46.additionalDetails) === null || _state46$additionalDe === void 0 ? void 0 : _state46$additionalDe.bankBranchName) || "NA"
-  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
-    className: "border-none",
-    label: t("WS_BANK_ACCOUNT_NUMBER"),
-    text: ((_state47 = state) === null || _state47 === void 0 ? void 0 : (_state47$additionalDe = _state47.additionalDetails) === null || _state47$additionalDe === void 0 ? void 0 : _state47$additionalDe.accountNumber) || ((_state48 = state) === null || _state48 === void 0 ? void 0 : (_state48$additionalDe = _state48.additionalDetails) === null || _state48$additionalDe === void 0 ? void 0 : _state48$additionalDe.bankAccountNumber) || "NA"
-  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
-    className: "border-none",
-    label: t("WS_BANK_IFSC_CODE"),
-    text: ((_state49 = state) === null || _state49 === void 0 ? void 0 : (_state49$additionalDe = _state49.additionalDetails) === null || _state49$additionalDe === void 0 ? void 0 : _state49$additionalDe.ifscCode) || "NA"
-  })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardHeader, {
-    styles: {
-      fontSize: "28px"
-    }
-  }, t("WS_COMMON_BANK_DETAILS")), ((_state50 = state) === null || _state50 === void 0 ? void 0 : _state50.documents) && ((_state51 = state) === null || _state51 === void 0 ? void 0 : _state51.documents.map((doc, index) => {
-    var _doc$documentType, _state52, _state53;
+  }))) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardText, null, t("WS_PROPERTY_OWNER_SAME_AS_CONN_HOLDERS")), ((_state45 = state) === null || _state45 === void 0 ? void 0 : _state45.documents) && ((_state46 = state) === null || _state46 === void 0 ? void 0 : _state46.documents.map((doc, index) => {
+    var _doc$documentType, _state47, _state48;
     return /*#__PURE__*/React__default.createElement("div", {
       key: `doc-${index}`
     }, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSectionHeader, null, t(doc === null || doc === void 0 ? void 0 : (_doc$documentType = doc.documentType) === null || _doc$documentType === void 0 ? void 0 : _doc$documentType.split(".").slice(0, 2).join("_"))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, null, /*#__PURE__*/React__default.createElement(WSDocument, {
-      value: (_state52 = state) === null || _state52 === void 0 ? void 0 : _state52.documents,
+      value: (_state47 = state) === null || _state47 === void 0 ? void 0 : _state47.documents,
       Code: doc === null || doc === void 0 ? void 0 : doc.documentType,
       index: index
-    }), ((_state53 = state) === null || _state53 === void 0 ? void 0 : _state53.documents.length) != index + 1 ? /*#__PURE__*/React__default.createElement("hr", {
+    }), ((_state48 = state) === null || _state48 === void 0 ? void 0 : _state48.documents.length) != index + 1 ? /*#__PURE__*/React__default.createElement("hr", {
       style: {
         color: "#cccccc",
         backgroundColor: "#cccccc",
@@ -34732,7 +34781,7 @@ const ConnectionDetails$5 = () => {
         marginBottom: "20px"
       }
     }) : null)));
-  })), (((_state54 = state) === null || _state54 === void 0 ? void 0 : _state54.status) !== "inactive" || ((_state55 = state) === null || _state55 === void 0 ? void 0 : _state55.applicationStatus) !== "Inactive" || ((_state56 = state) === null || _state56 === void 0 ? void 0 : _state56.applicationStatus) !== "INACTIVE") && !isDisconnectionDone ? /*#__PURE__*/React__default.createElement("div", {
+  })), (((_state49 = state) === null || _state49 === void 0 ? void 0 : _state49.status) !== "inactive" || ((_state50 = state) === null || _state50 === void 0 ? void 0 : _state50.applicationStatus) !== "Inactive" || ((_state51 = state) === null || _state51 === void 0 ? void 0 : _state51.applicationStatus) !== "INACTIVE") && !isDisconnectionDone ? /*#__PURE__*/React__default.createElement("div", {
     style: {
       display: "flex",
       justifyContent: "flex-end",
@@ -34742,7 +34791,7 @@ const ConnectionDetails$5 = () => {
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
     label: t("WS_DISCONNECTION_BUTTON"),
     onSubmit: onActionSelect
-  })) : ((_state57 = state) === null || _state57 === void 0 ? void 0 : _state57.applicationStatus) == "DISCONNECTION_EXECUTED" && ((_state58 = state) === null || _state58 === void 0 ? void 0 : _state58.status) == "Inactive" && ((_state59 = state) === null || _state59 === void 0 ? void 0 : _state59.isDisconnectionTemporary) && /*#__PURE__*/React__default.createElement("div", {
+  })) : ((_state52 = state) === null || _state52 === void 0 ? void 0 : _state52.applicationStatus) == "DISCONNECTION_EXECUTED" && ((_state53 = state) === null || _state53 === void 0 ? void 0 : _state53.status) == "Inactive" && ((_state54 = state) === null || _state54 === void 0 ? void 0 : _state54.isDisconnectionTemporary) && /*#__PURE__*/React__default.createElement("div", {
     style: {
       display: "flex",
       justifyContent: "flex-end",
@@ -34765,8 +34814,8 @@ const ConnectionDetails$5 = () => {
     actionSingleLabel: t("COMMON_MAKE_PAYMENT"),
     hideSubmit: true,
     actionSingleSubmit: () => {
-      var _state60, _state61;
-      history.push(`/digit-ui/citizen/payment/collect/${isSW ? "SW" : "WS"}/${encodeURIComponent((_state60 = state) === null || _state60 === void 0 ? void 0 : _state60.connectionNo)}/${tenantId}?consumerCode=${(_state61 = state) === null || _state61 === void 0 ? void 0 : _state61.connectionNo}&&tenantId=${tenantId}&&workflow=WNS`);
+      var _state55, _state56;
+      history.push(`/digit-ui/citizen/payment/collect/${isSW ? "SW" : "WS"}/${encodeURIComponent((_state55 = state) === null || _state55 === void 0 ? void 0 : _state55.connectionNo)}/${tenantId}?consumerCode=${(_state56 = state) === null || _state56 === void 0 ? void 0 : _state56.connectionNo}&&tenantId=${tenantId}&&workflow=WNS`);
       setshowModal(false);
     },
     popupStyles: mobileView ? {
@@ -36205,7 +36254,6 @@ const CheckPage = _ref => {
   const useDetails = (value === null || value === void 0 ? void 0 : (_value$waterConnectio = value.waterConnection) === null || _value$waterConnectio === void 0 ? void 0 : _value$waterConnectio.useDetails) || {};
   const djbEmployee = (value === null || value === void 0 ? void 0 : value.djbEmployee) || {};
   const disability = (value === null || value === void 0 ? void 0 : value.disability) || (value === null || value === void 0 ? void 0 : value.additionalDetails) || {};
-  const bankDetails = (value === null || value === void 0 ? void 0 : value.bankDetails) || {};
   const additionalDetails = {};
   const checkForNA = val => val ? val : "CS_NA";
   const onEdit = () => {};
@@ -36520,26 +36568,6 @@ const CheckPage = _ref => {
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("WS_DIVYANGJAN"),
     text: `${disability !== null && disability !== void 0 && disability.isDivyangjan ? t("CORE_COMMON_YES") : t("CORE_COMMON_NO")}`
-  })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, null, t("WS_BANK_DETAILS")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, {
-    style: {
-      marginTop: "10px",
-      marginBottom: "30px"
-    }
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
-    label: t("WS_NAME_OF_BANK"),
-    text: `${t(checkForNA(bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.bankName))}`,
-    actionButton: /*#__PURE__*/React__default.createElement(ActionButton, {
-      onClick: onEdit
-    })
-  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
-    label: t("WS_NAME_OF_BRANCH"),
-    text: `${t(checkForNA((bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.bankBranchName) || (bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.branchName)))}`
-  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
-    label: t("WS_IFSC_CODE"),
-    text: `${t(checkForNA(bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.ifscCode))}`
-  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
-    label: t("WS_BANK_ACCOUNT_NO"),
-    text: `${t(checkForNA((bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.bankAccountNumber) || (bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.accountNumber)))}`
   })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
     style: {
       paddingRight: "16px"
@@ -38140,6 +38168,7 @@ const WSInfoPage = () => {
     i18nKey: "TL_COMMON_NO"
   }];
   const proceedToNext = () => {
+    sessionStorage.removeItem("Digit.PT_CREATE_EMP_WS_NEW_FORM");
     const isEmployee = window.location.href.includes("/employee");
     const baseUrl = isEmployee ? "/digit-ui/employee/ws" : "/digit-ui/citizen/ws";
     if ((hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && selectedProperty) {
@@ -38639,19 +38668,7 @@ const WSInfoPage = () => {
       marginBottom: "24px",
       lineHeight: "2"
     }
-  }, /*#__PURE__*/React__default.createElement("li", null, t("WS_EMPLOYEE_ID")), /*#__PURE__*/React__default.createElement("li", null, t("WS_DATE_OF_RETIREMENT")), /*#__PURE__*/React__default.createElement("li", null, t("WS_EMPLOYEE_DESIGNATION"))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, {
-    style: {
-      marginTop: "0",
-      marginBottom: "0"
-    }
-  }, t("WS_BANK_DETAILS")), /*#__PURE__*/React__default.createElement("ul", {
-    style: {
-      listStyleType: "disc",
-      marginLeft: "20px",
-      marginBottom: "24px",
-      lineHeight: "2"
-    }
-  }, /*#__PURE__*/React__default.createElement("li", null, t("WS_NAME_OF_BANK")), /*#__PURE__*/React__default.createElement("li", null, t("WS_NAME_OF_BRANCH")), /*#__PURE__*/React__default.createElement("li", null, t("WS_IFSC_CODE")), /*#__PURE__*/React__default.createElement("li", null, t("WS_BANK_ACCOUNT_NO"))), /*#__PURE__*/React__default.createElement("div", {
+  }, /*#__PURE__*/React__default.createElement("li", null, t("WS_EMPLOYEE_ID")), /*#__PURE__*/React__default.createElement("li", null, t("WS_DATE_OF_RETIREMENT")), /*#__PURE__*/React__default.createElement("li", null, t("WS_EMPLOYEE_DESIGNATION"))), /*#__PURE__*/React__default.createElement("div", {
     style: {
       display: "flex",
       justifyContent: "space-between",
@@ -39705,8 +39722,6 @@ const EMAIL_PATTERN = /^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}$/;
 const MOBILE_PATTERN = /^[6-9][0-9]{9}$/;
 const NUMBER_PATTERN$2 = /^\d+$/;
 const DECIMAL_PATTERN$2 = /^\d+(\.\d{1,2})?$/;
-const IFSC_PATTERN = /^[A-Z]{4}0[A-Z0-9]{6}$/;
-const ACCOUNT_PATTERN = /^[0-9]{9,18}$/;
 const COLLAPSIBLE_CONTENT_TAB = "__WS_SECTION_CONTENT__";
 const createOption = (code, name) => ({
   code,
@@ -40387,7 +40402,7 @@ const FileUploadField = _ref6 => {
   })))));
 };
 const NewApplication = () => {
-  var _Digit$SessionStorage, _getFieldError, _getFieldError2, _getFieldError3, _getFieldError4, _getFieldError5, _getFieldError6, _getFieldError7, _getFieldError8, _getFieldError9, _getFieldError0, _getFieldError1, _getFieldError10, _getFieldError11, _watch, _watch3, _watch5, _watch7, _watch9, _formValues$applicati, _formValues$applicati2, _formValues$applicati3, _formValues$applicati4, _formValues$applicati5, _formValues$applicati6, _formValues$applicati7, _formValues$applicati8, _formValues$applicati9, _formValues$applicati0, _formValues$applicati1, _formValues$applicati10, _formValues$applicati11, _formValues$applicati12, _formValues$applicati13, _formValues$applicati14, _formValues$applicati15, _formValues$applicati16, _formValues$applicati17, _formValues$applicati18, _formValues$applicati19, _formValues$applicati20, _formValues$applicati21, _formValues$applicati22, _formValues$applicati23, _formValues$applicant, _formValues$applicant2, _formValues$applicant3, _formValues$applicant4, _formValues$applicant5, _formValues$applicant6, _formValues$applicant7, _formValues$useDetail, _formValues$applicant8, _formValues$contact, _formValues$contact2, _formValues$contact3, _formValues$documents, _formValues$djbEmploy, _formValues$djbEmploy2, _formValues$djbEmploy3, _formValues$djbEmploy4, _formValues$djbEmploy5, _formValues$disabilit, _formValues$governmen, _formValues$governmen2, _formValues$governmen3, _formValues$governmen4, _formValues$propertyA, _formValues$propertyA2, _formValues$propertyA3, _formValues$propertyA4, _formValues$propertyA5, _formValues$propertyA6, _formValues$propertyA7, _formValues$propertyA8, _formValues$propertyA9, _formValues$propertyA0, _formValues$propertyA1, _formValues$useDetail2, _formValues$useDetail3, _formValues$useDetail4, _formValues$useDetail5, _formValues$useDetail6, _formValues$useDetail7, _formValues$useDetail8, _formValues$useDetail9, _formValues$useDetail0, _formValues$useDetail1, _formValues$useDetail10, _formValues$useDetail11, _formValues$bankDetai, _formValues$bankDetai2, _formValues$bankDetai3, _formValues$bankDetai4, _formValues$documents2, _formValues$documents3, _formValues$documents4, _formValues$documents5, _formValues$documents6, _formValues$documents7, _formValues$documents8, _formValues$documents9, _formValues$documents0, _formValues$documents1, _formValues$declarati, _formValues$declarati2, _formValues$declarati3, _formValues$declarati4, _formValues$declarati5;
+  var _Digit$SessionStorage, _getFieldError, _getFieldError2, _getFieldError3, _getFieldError4, _getFieldError5, _getFieldError6, _getFieldError7, _getFieldError8, _getFieldError9, _getFieldError0, _getFieldError1, _getFieldError10, _getFieldError11, _watch, _watch3, _watch5, _watch7, _watch9, _formValues$applicati, _formValues$applicati2, _formValues$applicati3, _formValues$applicati4, _formValues$applicati5, _formValues$applicati6, _formValues$applicati7, _formValues$applicati8, _formValues$applicati9, _formValues$applicati0, _formValues$applicati1, _formValues$applicati10, _formValues$applicati11, _formValues$applicati12, _formValues$applicati13, _formValues$applicati14, _formValues$applicati15, _formValues$applicati16, _formValues$applicati17, _formValues$applicati18, _formValues$applicati19, _formValues$applicati20, _formValues$applicati21, _formValues$applicati22, _formValues$applicati23, _formValues$applicant, _formValues$applicant2, _formValues$applicant3, _formValues$applicant4, _formValues$applicant5, _formValues$applicant6, _formValues$applicant7, _formValues$useDetail, _formValues$applicant8, _formValues$contact, _formValues$contact2, _formValues$contact3, _formValues$documents, _formValues$djbEmploy, _formValues$djbEmploy2, _formValues$djbEmploy3, _formValues$djbEmploy4, _formValues$djbEmploy5, _formValues$disabilit, _formValues$governmen, _formValues$governmen2, _formValues$governmen3, _formValues$governmen4, _formValues$propertyA, _formValues$propertyA2, _formValues$propertyA3, _formValues$propertyA4, _formValues$propertyA5, _formValues$propertyA6, _formValues$propertyA7, _formValues$propertyA8, _formValues$propertyA9, _formValues$propertyA0, _formValues$propertyA1, _formValues$useDetail2, _formValues$useDetail3, _formValues$useDetail4, _formValues$useDetail5, _formValues$useDetail6, _formValues$useDetail7, _formValues$useDetail8, _formValues$useDetail9, _formValues$useDetail0, _formValues$useDetail1, _formValues$useDetail10, _formValues$useDetail11, _formValues$documents2, _formValues$documents3, _formValues$documents4, _formValues$documents5, _formValues$documents6, _formValues$documents7, _formValues$documents8, _formValues$documents9, _formValues$documents0, _formValues$documents1, _formValues$declarati, _formValues$declarati2, _formValues$declarati3, _formValues$declarati4, _formValues$declarati5;
   const {
     t
   } = reactI18next.useTranslation();
@@ -40603,10 +40618,6 @@ const NewApplication = () => {
     sectionId: "useDetails",
     route: "use-details",
     actions: "Property & Connection Use Details"
-  }, {
-    sectionId: "bankDetails",
-    route: "bank-details",
-    actions: "Bank Details"
   }, {
     sectionId: "documents",
     route: "documents",
@@ -42206,64 +42217,6 @@ const NewApplication = () => {
     }),
     name: "useDetails.hospitalBeds"
   })) : null), /*#__PURE__*/React__default.createElement(SectionCard, {
-    description: "Refund or payment-linked bank account details.",
-    isOpen: collapsedSections.bank,
-    onToggle: toggleSection,
-    sectionKey: "bankDetails",
-    title: "Bank Details",
-    sectionRef: sectionRefs.bankDetails
-  }, /*#__PURE__*/React__default.createElement(FieldBlock, {
-    error: getFieldError("bankDetails.bankName"),
-    label: "Name of the Bank",
-    required: true
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
-    errorStyle: !!getFieldError("bankDetails.bankName"),
-    inputRef: register({
-      required: "Bank Name is required."
-    }),
-    name: "bankDetails.bankName"
-  })), /*#__PURE__*/React__default.createElement(FieldBlock, {
-    error: getFieldError("bankDetails.branchName"),
-    label: "Name of the Branch",
-    required: true
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
-    errorStyle: !!getFieldError("bankDetails.branchName"),
-    inputRef: register({
-      required: "Branch Name is required."
-    }),
-    name: "bankDetails.branchName"
-  })), /*#__PURE__*/React__default.createElement(FieldBlock, {
-    error: getFieldError("bankDetails.ifscCode"),
-    label: "IFSC Code",
-    required: true
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
-    errorStyle: !!getFieldError("bankDetails.ifscCode"),
-    inputRef: register({
-      pattern: {
-        value: IFSC_PATTERN,
-        message: "Enter a valid IFSC code."
-      },
-      required: "IFSC Code is required."
-    }),
-    name: "bankDetails.ifscCode",
-    onChange: event => {
-      event.target.value = event.target.value.toUpperCase();
-    }
-  })), /*#__PURE__*/React__default.createElement(FieldBlock, {
-    error: getFieldError("bankDetails.bankAccountNumber"),
-    label: "Bank Account No.",
-    required: true
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
-    errorStyle: !!getFieldError("bankDetails.bankAccountNumber"),
-    inputRef: register({
-      pattern: {
-        value: ACCOUNT_PATTERN,
-        message: "Enter a valid bank account number."
-      },
-      required: "Bank Account Number is required."
-    }),
-    name: "bankDetails.bankAccountNumber"
-  }))), /*#__PURE__*/React__default.createElement(SectionCard, {
     description: "Documents to be attached. Maximum allowed file size is 5 MB.",
     isOpen: collapsedSections.documents,
     onToggle: toggleSection,
@@ -42782,25 +42735,6 @@ const NewApplication = () => {
   }), /*#__PURE__*/React__default.createElement(PreviewItem, {
     label: "Water Connection Usage Type",
     value: formValues === null || formValues === void 0 ? void 0 : (_formValues$useDetail11 = formValues.useDetails) === null || _formValues$useDetail11 === void 0 ? void 0 : _formValues$useDetail11.WaterConnectionUsageType
-  })), /*#__PURE__*/React__default.createElement(SectionCard, {
-    description: "Banking information as entered in the form.",
-    isOpen: collapsedSections.bank,
-    onToggle: toggleSection,
-    sectionKey: "bank",
-    title: "Bank Details",
-    onEditClick: () => handleSectionEdit("bankDetails")
-  }, /*#__PURE__*/React__default.createElement(PreviewItem, {
-    label: "Name of the Bank",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$bankDetai = formValues.bankDetails) === null || _formValues$bankDetai === void 0 ? void 0 : _formValues$bankDetai.bankName
-  }), /*#__PURE__*/React__default.createElement(PreviewItem, {
-    label: "Name of the Branch",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$bankDetai2 = formValues.bankDetails) === null || _formValues$bankDetai2 === void 0 ? void 0 : _formValues$bankDetai2.branchName
-  }), /*#__PURE__*/React__default.createElement(PreviewItem, {
-    label: "IFSC Code",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$bankDetai3 = formValues.bankDetails) === null || _formValues$bankDetai3 === void 0 ? void 0 : _formValues$bankDetai3.ifscCode
-  }), /*#__PURE__*/React__default.createElement(PreviewItem, {
-    label: "Bank Account No.",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$bankDetai4 = formValues.bankDetails) === null || _formValues$bankDetai4 === void 0 ? void 0 : _formValues$bankDetai4.bankAccountNumber
   })), /*#__PURE__*/React__default.createElement(SectionCard, {
     description: "Uploaded supporting documents.",
     isOpen: collapsedSections.documents,
@@ -54079,7 +54013,9 @@ const Step2_NewConsumerDetails = _ref => {
     control,
     name: "reasonForNameChange"
   });
-  const isOtherReason = (selectedReason === null || selectedReason === void 0 ? void 0 : selectedReason.code) === "OTHER" || selectedReason === "OTHER";
+  const isDevolutionOrInheritance = (selectedReason === null || selectedReason === void 0 ? void 0 : selectedReason.code) === "DEVOLUTION_INHERITANCE" || selectedReason === "DEVOLUTION_INHERITANCE" || String((selectedReason === null || selectedReason === void 0 ? void 0 : selectedReason.code) || "").toUpperCase().includes("DEVOLUTION") || String(selectedReason || "").toUpperCase().includes("DEVOLUTION");
+  console.log("selectedReason in Step2:", selectedReason);
+  console.log("isDevolutionOrInheritance:", isDevolutionOrInheritance);
   const genderOptions = [{
     code: "MALE",
     i18nKey: "Male"
@@ -54098,7 +54034,7 @@ const Step2_NewConsumerDetails = _ref => {
     i18nKey: "Devolution/Inheritance"
   }, {
     code: "OTHER",
-    i18nKey: "Other Reason(Gift Deed, Lease Agreement, etc)"
+    i18nKey: "Other Reason(Registered Sale Deed/Convayed Deed/Transfer Deed, Registered GPA, Possession Letter/Allotment Letter)"
   }];
   const relationshipOptions = [{
     code: "BLOOD_RELATION",
@@ -54367,7 +54303,8 @@ const Step2_NewConsumerDetails = _ref => {
           ...p,
           reasonForNameChange: true
         }));
-        if ((val === null || val === void 0 ? void 0 : val.code) !== "OTHER" && val !== "OTHER") {
+        const isDev = (val === null || val === void 0 ? void 0 : val.code) === "DEVOLUTION_INHERITANCE" || val === "DEVOLUTION_INHERITANCE" || String((val === null || val === void 0 ? void 0 : val.code) || "").toUpperCase().includes("DEVOLUTION") || String(val || "").toUpperCase().includes("DEVOLUTION");
+        if (!isDev) {
           setValue("relationshipWithExistingConsumer", null);
         }
       },
@@ -54380,13 +54317,13 @@ const Step2_NewConsumerDetails = _ref => {
   }, errors === null || errors === void 0 ? void 0 : (_errors$reasonForName = errors.reasonForNameChange) === null || _errors$reasonForName === void 0 ? void 0 : _errors$reasonForName.message)), /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, {
     style: {
       fontWeight: "bold",
-      color: isOtherReason ? "inherit" : "#999"
+      color: isDevolutionOrInheritance ? "inherit" : "#999"
     }
-  }, "Relationship with Existing Consumer ", isOtherReason && mandatoryIndicator), /*#__PURE__*/React__default.createElement(reactHookForm.Controller, {
+  }, "Relationship with Existing Consumer ", isDevolutionOrInheritance && mandatoryIndicator), /*#__PURE__*/React__default.createElement(reactHookForm.Controller, {
     control: control,
     name: "relationshipWithExistingConsumer",
     rules: {
-      required: isOtherReason ? "Relationship is required when 'Other Reason' is selected" : false
+      required: isDevolutionOrInheritance ? "Relationship is required when 'Devolution/Inheritance' is selected" : false
     },
     render: props => /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
       selected: props.value,
@@ -54401,16 +54338,16 @@ const Step2_NewConsumerDetails = _ref => {
       optionKey: "i18nKey",
       t: t,
       placeholder: "Select relationship",
-      disable: !isOtherReason
+      disable: !isDevolutionOrInheritance
     })
-  }), !isOtherReason && /*#__PURE__*/React__default.createElement("span", {
+  }), !isDevolutionOrInheritance && /*#__PURE__*/React__default.createElement("span", {
     style: {
       fontSize: "11px",
       color: "#999",
       marginTop: "4px",
       display: "block"
     }
-  }, "Enabled only when \"Other Reason\" is selected above"), (errors === null || errors === void 0 ? void 0 : errors.relationshipWithExistingConsumer) && /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabelError, {
+  }, "Enabled only when \"Devolution/Inheritance\" is selected above"), (errors === null || errors === void 0 ? void 0 : errors.relationshipWithExistingConsumer) && /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabelError, {
     style: errorStyle
   }, errors === null || errors === void 0 ? void 0 : (_errors$relationshipW = errors.relationshipWithExistingConsumer) === null || _errors$relationshipW === void 0 ? void 0 : _errors$relationshipW.message))), /*#__PURE__*/React__default.createElement("div", {
     style: {
@@ -54506,6 +54443,8 @@ const Step3_UploadDocuments = _ref => {
   const [hasAttemptedSubmit, setHasAttemptedSubmit] = React.useState(false);
   const [digiLockerUpload, setDigilockerUpload] = React.useState(false);
   const [isDocumentUidLocked, setIsDocumentUidLocked] = React.useState(false);
+  const [showDocumentNumber, setShowDocumentNumber] = React.useState(false);
+  const [isDeclarationChecked, setIsDeclarationChecked] = React.useState((defaultValues === null || defaultValues === void 0 ? void 0 : defaultValues.isDeclarationChecked) || false);
   const identityOptions = [{
     code: "AADHAAR",
     i18nKey: "Aadhaar Card"
@@ -54707,11 +54646,12 @@ const Step3_UploadDocuments = _ref => {
       if (!identityProofType) newErrors.identityType = "Please select a document type";
       if (!identityProofFile) newErrors.identityFile = "Please upload your identity proof document";
       if (!mutationDocFile) newErrors.mutationFile = "Please upload the reason-based supporting document";
+      if (!isDeclarationChecked) newErrors.declaration = "You must accept the declaration before proceeding";
       const docError = validateDocumentNumber(documentNumber, identityProofType);
       if (docError) newErrors.documentNumber = docError;
       setFieldErrors(newErrors);
     }
-  }, [identityProofType, documentNumber, identityProofFile, mutationDocFile, hasAttemptedSubmit]);
+  }, [identityProofType, documentNumber, identityProofFile, mutationDocFile, isDeclarationChecked, hasAttemptedSubmit]);
   const onProceed = () => {
     setHasAttemptedSubmit(true);
     const newErrors = {};
@@ -54720,6 +54660,7 @@ const Step3_UploadDocuments = _ref => {
     if (docError) newErrors.documentNumber = docError;
     if (!identityProofFile) newErrors.identityFile = "Please upload your identity proof document";
     if (!mutationDocFile) newErrors.mutationFile = "Please upload the reason-based supporting document";
+    if (!isDeclarationChecked) newErrors.declaration = "You must accept the declaration before proceeding";
     setFieldErrors(newErrors);
     if (Object.keys(newErrors).length > 0) {
       const errorCount = Object.keys(newErrors).length;
@@ -54733,7 +54674,8 @@ const Step3_UploadDocuments = _ref => {
       identityProofType,
       documentNumber: documentNumber.trim(),
       identityProofDocumentId: identityProofFile,
-      saleDeedDocumentId: mutationDocFile
+      saleDeedDocumentId: mutationDocFile,
+      isDeclarationChecked
     });
   };
   const uploadBoxStyle = (hasError, hasFile) => ({
@@ -54824,7 +54766,7 @@ const Step3_UploadDocuments = _ref => {
     style: {
       fontWeight: "bold"
     }
-  }, "1. Address / Identity Proof ", mandatoryIndicator), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
+  }, "1. Identity Proof ", mandatoryIndicator), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
     selected: identityProofType,
     option: identityOptions,
     select: val => {
@@ -54856,7 +54798,19 @@ const Step3_UploadDocuments = _ref => {
       fontWeight: "bold",
       marginTop: "8px"
     }
-  }, "Document Number ", mandatoryIndicator), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
+  }, "Document Number ", mandatoryIndicator), /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      display: "flex",
+      alignItems: "flex-start",
+      gap: "8px",
+      marginBottom: "4px"
+    }
+  }, /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      flex: 1
+    }
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
+    type: showDocumentNumber ? "text" : "password",
     value: documentNumber,
     onChange: e => {
       if (!isDocumentUidLocked) {
@@ -54879,7 +54833,7 @@ const Step3_UploadDocuments = _ref => {
     placeholder: (identityProofType === null || identityProofType === void 0 ? void 0 : identityProofType.code) === "AADHAAR" ? "Enter 12-digit Aadhaar number" : (identityProofType === null || identityProofType === void 0 ? void 0 : identityProofType.code) === "PAN" ? "Enter PAN (e.g. ABCDE1234F)" : "Enter Document Number",
     disabled: isDocumentUidLocked,
     style: {
-      marginBottom: "4px",
+      marginBottom: "0",
       ...(fieldErrors.documentNumber ? {
         border: "1px solid #d32f2f"
       } : {}),
@@ -54889,7 +54843,23 @@ const Step3_UploadDocuments = _ref => {
         color: "#555"
       } : {})
     }
-  }), fieldErrors.documentNumber && /*#__PURE__*/React__default.createElement("div", {
+  })), /*#__PURE__*/React__default.createElement("button", {
+    type: "button",
+    onClick: () => setShowDocumentNumber(!showDocumentNumber),
+    style: {
+      padding: "8px 16px",
+      backgroundColor: "#f4f9fc",
+      border: "1px solid #ccc",
+      borderRadius: "4px",
+      cursor: "pointer",
+      fontWeight: "500",
+      fontSize: "14px",
+      height: "40px",
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "center"
+    }
+  }, showDocumentNumber ? "Hide" : "View")), fieldErrors.documentNumber && /*#__PURE__*/React__default.createElement("div", {
     style: errorTextStyle
   }, fieldErrors.documentNumber), (identityProofType === null || identityProofType === void 0 ? void 0 : identityProofType.code) === "AADHAAR" && !fieldErrors.documentNumber && /*#__PURE__*/React__default.createElement("span", {
     style: {
@@ -55065,6 +55035,37 @@ const Step3_UploadDocuments = _ref => {
       marginRight: "4px"
     }
   }), " View ", mutationFileName)))), /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      marginTop: "24px",
+      padding: "16px",
+      backgroundColor: fieldErrors.declaration ? "#fef2f2" : "#f8f9fa",
+      borderRadius: "8px",
+      border: fieldErrors.declaration ? "1px solid #d32f2f" : "1px solid #e9ecef"
+    }
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CheckBox, {
+    label: "I declare that the documents uploaded by me are genuine, valid, and accurate to the best of my knowledge.",
+    onChange: e => {
+      setIsDeclarationChecked(e.target.checked);
+      if (e.target.checked) {
+        setFieldErrors(prev => ({
+          ...prev,
+          declaration: null
+        }));
+      }
+    },
+    checked: isDeclarationChecked,
+    style: isMobileView ? {
+      fontSize: "12px",
+      alignItems: "flex-start"
+    } : {
+      alignItems: "center"
+    }
+  }), fieldErrors.declaration && /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      ...errorTextStyle,
+      marginLeft: "28px"
+    }
+  }, fieldErrors.declaration)), /*#__PURE__*/React__default.createElement("div", {
     style: {
       display: "flex",
       flexDirection: isMobileView ? "column" : "row",
@@ -55144,7 +55145,8 @@ const Step4_Preview = _ref => {
     resolvedServiceType,
     onBack,
     onSubmit,
-    isLoading
+    isLoading,
+    isEditFlow
   } = _ref;
   const [agreed, setAgreed] = React.useState(false);
   const [fee, setFee] = React.useState(0);
@@ -55326,7 +55328,7 @@ const Step4_Preview = _ref => {
       gridTemplateColumns: isMobileView ? "1fr 1fr" : "repeat(auto-fill, minmax(150px, 1fr))",
       gap: isMobileView ? "12px" : "16px"
     }
-  }, infoItem("Connection No", connectionNo), infoItem("Meter Number", meterId), infoItem("Property ID", propertyId))), /*#__PURE__*/React__default.createElement("div", {
+  }, infoItem("Connection No", connectionNo), infoItem("Meter Number", meterId), infoItem("Property ID", propertyId))), !isEditFlow && /*#__PURE__*/React__default.createElement("div", {
     style: {
       ...sectionStyle,
       borderLeft: "4px solid #f29c1f"
@@ -56378,7 +56380,8 @@ const MutationApplication = () => {
     resolvedServiceType: resolvedServiceType,
     onBack: () => history.push(`${path}/document`),
     onSubmit: submitApplication,
-    isLoading: isSubmitting
+    isLoading: isSubmitting,
+    isEditFlow: isEditFlow
   })), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
     path: `${path}/submission`
   }, /*#__PURE__*/React__default.createElement(Step5_Submission, {
@@ -58255,7 +58258,7 @@ const openFilePDF = fileId => {
   }).catch(error => console.error("Error fetching file:", error));
 };
 const CheckPage$4 = _ref2 => {
-  var _Digit$UserService$ge, _data$cpt, _data$ConnectionDetai, _data$connectionDetai, _data$ConnectionHolde, _data$connectionHolde, _data$useDetails, _data$bankDetails, _data$DocumentsRequir, _data$documents, _data$djbEmployee, _data$disability, _connectionDetails, _connectionDetails$se, _connectionDetails2, _connectionDetails2$s, _connectionDetails3, _connectionDetails4, _connectionDetails4$c, _connectionDetails5, _connectionDetails5$c, _connectionDetails6, _connectionDetails7, _connectionDetails7$w, _connectionDetails8, _connectionDetails8$w, _connectionDetails9, _connectionDetails0, _connectionDetails0$a, _connectionDetails1, _connectionDetails1$a, _connectionDetails10, _connectionDetails11, _connectionDetails11$, _connectionDetails12, _connectionDetails12$, _connectionDetails13, _connectionDetails14, _connectionDetails14$, _connectionDetails15, _connectionDetails15$, _connectionDetails16, _connectionDetails16$, _connectionDetails17, _connectionDetails18, _connectionDetails19, _connectionDetails20, _holderDetails, _holderDetails2, _holderDetails3, _holderDetails4, _holderDetails4$gende, _holderDetails5, _holderDetails5$gende, _holderDetails6, _holderDetails7, _holderDetails8, _holderDetails8$relat, _holderDetails9, _holderDetails9$relat, _holderDetails0, _holderDetails1, _holderDetails10, _holderDetails11, _propertyAddress, _propertyAddress$zro, _propertyAddress2, _propertyAddress3, _propertyAddress4, _propertyAddress4$add, _propertyAddress5, _propertyAddress5$add, _propertyAddress6, _propertyAddress6$add, _propertyAddress7, _propertyAddress8, _propertyAddress8$cit, _propertyAddress9, _propertyAddress9$cit, _propertyAddress0, _propertyAddress1, _propertyAddress10, _propertyAddress11, _propertyAddress11$lo, _propertyAddress12, _propertyAddress12$lo, _propertyAddress13, _propertyAddress14, _propertyAddress14$su, _propertyAddress15, _propertyAddress15$su, _propertyAddress16, _propertyAddress17, _propertyAddress18, _propertyAddress19, _propertyAddress20, _propertyAddress21, _propertyAddress22, _propertyAddress23, _propertyAddress24, _propertyAddress25, _propertyAddress26, _propertyAddress26$as, _propertyAddress27, _propertyAddress27$as, _propertyAddress28, _propertyAddress29, _propertyAddress29$bl, _propertyAddress30, _propertyAddress30$bl, _propertyAddress31, _propertyAddress32, _propertyAddress32$wa, _propertyAddress33, _propertyAddress33$wa, _propertyAddress34, _propertyAddress35, _propertyAddress35$zo, _propertyAddress36, _propertyAddress36$zo, _propertyAddress37, _propertyAddress38, _propertyAddress39, _propertyAddress40, _propertyAddress41, _useDetails$categoryT, _useDetails$categoryT2, _useDetails$propertyC, _useDetails$propertyC2, _useDetails$propertyT, _useDetails$propertyT2, _useDetails$WaterConn, _useDetails$WaterConn2, _useDetails$waterConn, _useDetails$waterConn2, _useDetails$noOfFloor, _useDetails$noOfFloor2, _useDetails$SelectYea, _useDetails$SelectYea2, _useDetails$SelectYea3, _useDetails$construct, _useDetails$construct2, _declaration$submitte, _declaration$submitte2, _declaration$signatur;
+  var _Digit$UserService$ge, _data$cpt, _data$ConnectionDetai, _data$connectionDetai, _data$ConnectionHolde, _data$connectionHolde, _data$useDetails, _data$DocumentsRequir, _data$documents, _data$djbEmployee, _data$disability, _connectionDetails, _connectionDetails$se, _connectionDetails2, _connectionDetails2$s, _connectionDetails3, _connectionDetails4, _connectionDetails4$c, _connectionDetails5, _connectionDetails5$c, _connectionDetails6, _connectionDetails7, _connectionDetails7$w, _connectionDetails8, _connectionDetails8$w, _connectionDetails9, _connectionDetails0, _connectionDetails0$a, _connectionDetails1, _connectionDetails1$a, _connectionDetails10, _connectionDetails11, _connectionDetails11$, _connectionDetails12, _connectionDetails12$, _connectionDetails13, _connectionDetails14, _connectionDetails14$, _connectionDetails15, _connectionDetails15$, _connectionDetails16, _connectionDetails16$, _connectionDetails17, _connectionDetails18, _connectionDetails19, _connectionDetails20, _holderDetails, _holderDetails2, _holderDetails3, _holderDetails4, _holderDetails4$gende, _holderDetails5, _holderDetails5$gende, _holderDetails6, _holderDetails7, _holderDetails8, _holderDetails8$relat, _holderDetails9, _holderDetails9$relat, _holderDetails0, _holderDetails1, _holderDetails10, _holderDetails11, _propertyAddress, _propertyAddress$zro, _propertyAddress2, _propertyAddress3, _propertyAddress4, _propertyAddress4$add, _propertyAddress5, _propertyAddress5$add, _propertyAddress6, _propertyAddress6$add, _propertyAddress7, _propertyAddress8, _propertyAddress8$cit, _propertyAddress9, _propertyAddress9$cit, _propertyAddress0, _propertyAddress1, _propertyAddress10, _propertyAddress11, _propertyAddress11$lo, _propertyAddress12, _propertyAddress12$lo, _propertyAddress13, _propertyAddress14, _propertyAddress14$su, _propertyAddress15, _propertyAddress15$su, _propertyAddress16, _propertyAddress17, _propertyAddress18, _propertyAddress19, _propertyAddress20, _propertyAddress21, _propertyAddress22, _propertyAddress23, _propertyAddress24, _propertyAddress25, _propertyAddress26, _propertyAddress26$as, _propertyAddress27, _propertyAddress27$as, _propertyAddress28, _propertyAddress29, _propertyAddress29$bl, _propertyAddress30, _propertyAddress30$bl, _propertyAddress31, _propertyAddress32, _propertyAddress32$wa, _propertyAddress33, _propertyAddress33$wa, _propertyAddress34, _propertyAddress35, _propertyAddress35$zo, _propertyAddress36, _propertyAddress36$zo, _propertyAddress37, _propertyAddress38, _propertyAddress39, _propertyAddress40, _propertyAddress41, _useDetails$categoryT, _useDetails$categoryT2, _useDetails$propertyC, _useDetails$propertyC2, _useDetails$propertyT, _useDetails$propertyT2, _useDetails$WaterConn, _useDetails$WaterConn2, _useDetails$waterConn, _useDetails$waterConn2, _useDetails$noOfFloor, _useDetails$noOfFloor2, _useDetails$SelectYea, _useDetails$SelectYea2, _useDetails$SelectYea3, _useDetails$construct, _useDetails$construct2, _declaration$submitte, _declaration$submitte2, _declaration$signatur;
   let {
     data,
     onSubmit,
@@ -58330,7 +58333,6 @@ const CheckPage$4 = _ref2 => {
     holderDetails = holderDetails[0] || {};
   }
   const useDetails = (data === null || data === void 0 ? void 0 : (_data$useDetails = data.useDetails) === null || _data$useDetails === void 0 ? void 0 : _data$useDetails.useDetails) || (data === null || data === void 0 ? void 0 : data.useDetails) || {};
-  const bankDetails = (data === null || data === void 0 ? void 0 : (_data$bankDetails = data.bankDetails) === null || _data$bankDetails === void 0 ? void 0 : _data$bankDetails.bankDetails) || (data === null || data === void 0 ? void 0 : data.bankDetails) || {};
   const documents = (data === null || data === void 0 ? void 0 : (_data$DocumentsRequir = data.DocumentsRequired) === null || _data$DocumentsRequir === void 0 ? void 0 : _data$DocumentsRequir.documents) || (data === null || data === void 0 ? void 0 : (_data$documents = data.documents) === null || _data$documents === void 0 ? void 0 : _data$documents.documents) || [];
   const declaration = (data === null || data === void 0 ? void 0 : data.declarationData) || (data === null || data === void 0 ? void 0 : data.declaration) || {};
   const djbEmployee = (data === null || data === void 0 ? void 0 : (_data$djbEmployee = data.djbEmployee) === null || _data$djbEmployee === void 0 ? void 0 : _data$djbEmployee.djbEmployee) || (data === null || data === void 0 ? void 0 : data.djbEmployee) || {};
@@ -58570,26 +58572,6 @@ const CheckPage$4 = _ref2 => {
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: "Divyangjan/Person with Disability?",
     text: disability !== null && disability !== void 0 && disability.isDivyangjan ? t("CORE_COMMON_YES") : t("CORE_COMMON_NO")
-  })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, null, t("WS_BANK_DETAILS")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, {
-    style: {
-      marginTop: "10px",
-      marginBottom: "30px"
-    }
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
-    label: t("WS_NAME_OF_BANK"),
-    text: `${t(checkForNA(bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.bankName))}`,
-    actionButton: /*#__PURE__*/React__default.createElement(ActionButton$1, {
-      onClick: onEdit
-    })
-  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
-    label: t("WS_NAME_OF_BRANCH"),
-    text: `${t(checkForNA((bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.bankBranchName) || (bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.branchName)))}`
-  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
-    label: t("WS_IFSC_CODE"),
-    text: `${t(checkForNA(bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.ifscCode))}`
-  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
-    label: t("WS_BANK_ACCOUNT_NO"),
-    text: `${t(checkForNA((bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.bankAccountNumber) || (bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.accountNumber)))}`
   })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, null, t("WS_DOCUMENTS")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, {
     style: {
       marginTop: "10px",
@@ -58734,8 +58716,6 @@ const OLDApplication = () => {
     label: "WS_PROPERTY_AND_WATER_CONNECTION_USE_DETAILS"
   }, {
     label: "WS_DJB_EMPLOYEE"
-  }, {
-    label: "WS_BANK_DETAILS"
   }, {
     label: "WS_DOCUMENTS"
   }, {
@@ -58780,7 +58760,7 @@ const OLDApplication = () => {
     if (requestedPropertyId !== initialPropertyId.current || requestedPropertyId && requestedPropertyId !== verifiedPropertyId.current) {
       clearSessionFormData();
       sessionStorage.removeItem("WS_OTP_VERIFIED_PROPERTY_ID");
-      history.replace("/digit-ui/employee/ws/info");
+      history.replace(window.location.href.includes("/employee") ? "/digit-ui/employee/ws/info" : "/digit-ui/citizen/ws/info");
     }
   }, [clearSessionFormData, history, requestedPropertyId]);
   React.useEffect(() => {
@@ -58792,7 +58772,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", "WSPropertyLocationDetails", "PropertyWaterConnection", ...(isCitizen ? [] : ["WSDjbEmployee"]), "WSDivyangjan", "WSActivationPlumberDetails", "WSRoadCuttingDetails", "WSBankDetails", "WSDocumentsEmployee", "WSDeclaration"];
+        const desiredComponentOrder = ["CPTPropertySearchNSummary", "WSConnectionDetails", "WSConnectionHolderDetails", "WSPropertyLocationDetails", "PropertyWaterConnection", ...(isCitizen ? [] : ["WSDjbEmployee"]), "WSDivyangjan", "WSActivationPlumberDetails", "WSRoadCuttingDetails", "WSDocumentsEmployee", "WSDeclaration"];
         const reorderedBody = [];
         desiredComponentOrder.forEach(compName => {
           const section = allCreateSections.find(s => {
@@ -58828,16 +58808,6 @@ const OLDApplication = () => {
                 isAutomaticFill: true
               }]
             });
-          } else if (compName === "WSBankDetails") {
-            reorderedBody.push({
-              isCreateConnection: true,
-              body: [{
-                type: "component",
-                key: "bankDetails",
-                component: "WSBankDetails",
-                withoutLabel: true
-              }]
-            });
           } else if (compName === "WSDeclaration") {
             reorderedBody.push({
               isCreateConnection: true,