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

package/dist/index.js

@@ -9,36 +9,29 @@ var reactHookForm = require('react-hook-form');
 var XLSX = require('xlsx');
 var reactQuery = require('react-query');
 
-// A type of promise-like that resolves synchronously and supports only one observer
-
-const _iteratorSymbol = /*#__PURE__*/ typeof Symbol !== "undefined" ? (Symbol.iterator || (Symbol.iterator = Symbol("Symbol.iterator"))) : "@@iterator";
-
-const _asyncIteratorSymbol = /*#__PURE__*/ typeof Symbol !== "undefined" ? (Symbol.asyncIterator || (Symbol.asyncIterator = Symbol("Symbol.asyncIterator"))) : "@@asyncIterator";
-
-// Asynchronously call a function and send errors to recovery continuation
+const _iteratorSymbol = /*#__PURE__*/typeof Symbol !== "undefined" ? Symbol.iterator || (Symbol.iterator = Symbol("Symbol.iterator")) : "@@iterator";
+const _asyncIteratorSymbol = /*#__PURE__*/typeof Symbol !== "undefined" ? Symbol.asyncIterator || (Symbol.asyncIterator = Symbol("Symbol.asyncIterator")) : "@@asyncIterator";
 function _catch(body, recover) {
-	try {
-		var result = body();
-	} catch(e) {
-		return recover(e);
-	}
-	if (result && result.then) {
-		return result.then(void 0, recover);
-	}
-	return result;
+  try {
+    var result = body();
+  } catch (e) {
+    return recover(e);
+  }
+  if (result && result.then) {
+    return result.then(void 0, recover);
+  }
+  return result;
 }
-
-// Asynchronously await a promise and pass the result to a finally continuation
 function _finallyRethrows(body, finalizer) {
-	try {
-		var result = body();
-	} catch (e) {
-		return finalizer(true, e);
-	}
-	if (result && result.then) {
-		return result.then(finalizer.bind(null, false), finalizer.bind(null, true));
-	}
-	return finalizer(false, result);
+  try {
+    var result = body();
+  } catch (e) {
+    return finalizer(true, e);
+  }
+  if (result && result.then) {
+    return result.then(finalizer.bind(null, false), finalizer.bind(null, true));
+  }
+  return finalizer(false, result);
 }
 
 const TestAcknowledgment = () => {
@@ -557,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,
@@ -729,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 => {
@@ -7879,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;
@@ -7977,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 => {
@@ -8282,8 +8299,8 @@ const WSMyApplications = () => {
     };
   });
   const sortedApplications = ((_applicationsList = applicationsList) === null || _applicationsList === void 0 ? void 0 : _applicationsList.length) > 0 ? applicationsList.sort((a, b) => {
-    var _b$auditDetails, _a$auditDetails;
-    return ((_b$auditDetails = b.auditDetails) === null || _b$auditDetails === void 0 ? void 0 : _b$auditDetails.lastModifiedTime) - ((_a$auditDetails = a.auditDetails) === null || _a$auditDetails === void 0 ? void 0 : _a$auditDetails.lastModifiedTime);
+    var _b$auditDetails, _b$auditDetails2, _a$auditDetails, _a$auditDetails2;
+    return (((_b$auditDetails = b.auditDetails) === null || _b$auditDetails === void 0 ? void 0 : _b$auditDetails.createdTime) || ((_b$auditDetails2 = b.auditDetails) === null || _b$auditDetails2 === void 0 ? void 0 : _b$auditDetails2.lastModifiedTime) || 0) - (((_a$auditDetails = a.auditDetails) === null || _a$auditDetails === void 0 ? void 0 : _a$auditDetails.createdTime) || ((_a$auditDetails2 = a.auditDetails) === null || _a$auditDetails2 === void 0 ? void 0 : _a$auditDetails2.lastModifiedTime) || 0);
   }) : [];
   let filteredApplications = sortedApplications;
   if (searchParams) {
@@ -8885,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();
@@ -9058,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",
@@ -9444,6 +9497,7 @@ const Response = () => {
   const {
     state
   } = reactRouterDom.useLocation();
+  const history = reactRouterDom.useHistory();
   const {
     t
   } = reactI18next.useTranslation();
@@ -9513,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 = () => {
@@ -9528,6 +9581,7 @@ const ResponseBillAmend = () => {
   const {
     state
   } = reactRouterDom.useLocation();
+  const history = reactRouterDom.useHistory();
   const {
     t
   } = reactI18next.useTranslation();
@@ -9542,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 => {
@@ -10799,6 +10852,390 @@ const WSCalculation = _ref => {
   })));
 };
 
+const WSZROVerification = () => {
+  const {
+    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,
+    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",
+    Cell: _ref => {
+      var _row$original, _row$original2;
+      let {
+        row
+      } = _ref;
+      return /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
+        to: {
+          pathname: `/digit-ui/employee/ws/zro-verification-details`,
+          search: `?connectionNumber=${(_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.connectionNo}&tenantId=${tenantId}`,
+          state: {
+            caseData: row.original
+          }
+        },
+        style: {
+          color: "#f47738",
+          textDecoration: "none"
+        }
+      }, ((_row$original2 = row.original) === null || _row$original2 === void 0 ? void 0 : _row$original2.connectionNo) || "NA");
+    }
+  }, {
+    Header: t("WS_BILLING_PERIOD_LABEL"),
+    Cell: _ref2 => {
+      var _row$original3, _row$original4;
+      let {
+        row
+      } = _ref2;
+      const from = (_row$original3 = row.original) !== null && _row$original3 !== void 0 && _row$original3.billingPeriodFrom ? Digit.DateUtils.ConvertTimestampToDate(row.original.billingPeriodFrom) : "NA";
+      const to = (_row$original4 = row.original) !== null && _row$original4 !== void 0 && _row$original4.billingPeriodTo ? Digit.DateUtils.ConvertTimestampToDate(row.original.billingPeriodTo) : "NA";
+      return /*#__PURE__*/React__default.createElement("span", null, `${from} - ${to}`);
+    }
+  }, {
+    Header: t("WS_PREVIOUS_READING_LABEL"),
+    accessor: "previousReading",
+    Cell: _ref3 => {
+      var _row$original5;
+      let {
+        row
+      } = _ref3;
+      return ((_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : _row$original5.previousReading) ?? "NA";
+    }
+  }, {
+    Header: t("WS_CURRENT_READING_LABEL"),
+    accessor: "currentReading",
+    Cell: _ref4 => {
+      var _row$original6;
+      let {
+        row
+      } = _ref4;
+      return ((_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : _row$original6.currentReading) ?? "NA";
+    }
+  }, {
+    Header: t("WS_CONSUMPTION_LABEL"),
+    accessor: "actualConsumption",
+    Cell: _ref5 => {
+      var _row$original7;
+      let {
+        row
+      } = _ref5;
+      return ((_row$original7 = row.original) === null || _row$original7 === void 0 ? void 0 : _row$original7.actualConsumption) ?? "NA";
+    }
+  }, {
+    Header: t("WS_COMMON_TABLE_COL_APP_STATUS_LABEL"),
+    accessor: "verification.status",
+    Cell: _ref6 => {
+      var _row$original8, _row$original8$verifi;
+      let {
+        row
+      } = _ref6;
+      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]);
+  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,
+    isLoading: isLoading,
+    isPaginationRequired: true,
+    csvExportData: data,
+    columns: columns
+  }));
+};
+
+const Heading = props => {
+  return /*#__PURE__*/React__default.createElement("h1", {
+    className: "heading-m"
+  }, props.label);
+};
+const Close = () => /*#__PURE__*/React__default.createElement("svg", {
+  xmlns: "http://www.w3.org/2000/svg",
+  viewBox: "0 0 24 24",
+  fill: "#FFFFFF"
+}, /*#__PURE__*/React__default.createElement("path", {
+  d: "M0 0h24v24H0V0z",
+  fill: "none"
+}), /*#__PURE__*/React__default.createElement("path", {
+  d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
+}));
+const CloseBtn = props => {
+  return /*#__PURE__*/React__default.createElement("div", {
+    className: "icon-bg-secondary",
+    onClick: props.onClick
+  }, /*#__PURE__*/React__default.createElement(Close, null));
+};
+const WSZROVerificationDetails = () => {
+  var _location$state;
+  const {
+    t
+  } = reactI18next.useTranslation();
+  const location = reactRouterDom.useLocation();
+  const history = reactRouterDom.useHistory();
+  const [displayMenu, setDisplayMenu] = React.useState(false);
+  const [showModal, setShowModal] = React.useState(false);
+  const [selectedAction, setSelectedAction] = React.useState(null);
+  const [comments, setComments] = React.useState("");
+  const [toast, setToast] = React.useState(null);
+  const [isSuccess, setIsSuccess] = React.useState(false);
+  const [apiResponse, setApiResponse] = React.useState(null);
+  React.useEffect(() => {
+    let timer;
+    if (isSuccess) {
+      timer = setTimeout(() => {
+        history.push("/digit-ui/employee/ws/zro-application");
+      }, 10000);
+    }
+    return () => {
+      if (timer) clearTimeout(timer);
+    };
+  }, [isSuccess, history]);
+  const caseDataFromState = (_location$state = location.state) === null || _location$state === void 0 ? void 0 : _location$state.caseData;
+  const searchParams = new URLSearchParams(location.search);
+  const connectionNumber = searchParams.get("connectionNumber");
+  const tenantId = searchParams.get("tenantId") || Digit.ULBService.getCurrentTenantId();
+  const {
+    isLoading,
+    data
+  } = Digit.Hooks.ws.useWSZROVerification({
+    tenantId,
+    filters: {
+      connectionNo: connectionNumber,
+      status: "PENDING",
+      offset: 0,
+      limit: 20
+    },
+    config: {
+      enabled: !caseDataFromState && !!connectionNumber,
+      select: res => {
+        var _res$cases;
+        return res === null || res === void 0 ? void 0 : (_res$cases = res.cases) === null || _res$cases === void 0 ? void 0 : _res$cases[0];
+      }
+    }
+  });
+  const caseDetails = caseDataFromState || data;
+  if (isLoading) {
+    return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
+  }
+  if (!caseDetails) {
+    return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, null, /*#__PURE__*/React__default.createElement("div", {
+      style: {
+        textAlign: "center"
+      }
+    }, t("CS_COMMON_NO_DATA")));
+  }
+  const {
+    verification,
+    ...billingData
+  } = caseDetails;
+  const formatDate = timestamp => {
+    if (!timestamp) return "NA";
+    return Digit.DateUtils.ConvertTimestampToDate(timestamp);
+  };
+  const onActionSelect = action => {
+    setSelectedAction(action);
+    setDisplayMenu(false);
+    setShowModal(true);
+  };
+  const closeModal = () => {
+    setShowModal(false);
+    setComments("");
+    setSelectedAction(null);
+  };
+  const submitAction = function () {
+    try {
+      const _temp = _catch(function () {
+        const payload = {
+          billingCycleId: billingData === null || billingData === void 0 ? void 0 : billingData.billingCycleId,
+          action: selectedAction === "VERIFY" ? "APPROVE" : "REJECT",
+          remarks: comments
+        };
+        return Promise.resolve(Digit.WSService.updateZROVerification(payload, tenantId)).then(function (res) {
+          setApiResponse(res);
+          setToast({
+            key: "success",
+            error: false,
+            message: t("WF_ZRO_ACTION_SUCCESS")
+          });
+          setShowModal(false);
+          setIsSuccess(true);
+        });
+      }, function (err) {
+        var _err$response, _err$response$data, _err$response$data$Er, _err$response$data$Er2;
+        console.error(err);
+        setToast({
+          key: "error",
+          error: true,
+          message: (err === null || err === void 0 ? void 0 : (_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : (_err$response$data$Er = _err$response$data.Errors) === null || _err$response$data$Er === void 0 ? void 0 : (_err$response$data$Er2 = _err$response$data$Er[0]) === null || _err$response$data$Er2 === void 0 ? void 0 : _err$response$data$Er2.message) || t("CS_ACTION_ERROR")
+        });
+        closeModal();
+      });
+      return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+  if (isSuccess) {
+    return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Banner, {
+      message: t(selectedAction === "VERIFY" ? "WF_ZRO_VERIFY_SUCCESS" : "WF_ZRO_REJECT_SUCCESS"),
+      applicationNumber: apiResponse !== null && apiResponse !== void 0 && apiResponse.connectionno ? apiResponse.connectionno : connectionNumber,
+      info: apiResponse !== null && apiResponse !== void 0 && apiResponse.connectionno ? t("WS_CONNECTION_NO_LABEL") : t("WS_CONNECTION_NO_LABEL"),
+      successful: selectedAction === "VERIFY"
+    }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardText, null, apiResponse !== null && apiResponse !== void 0 && apiResponse.message ? apiResponse.message : t("WF_ZRO_SUCCESS_MESSAGE_MAIN")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.ActionBar, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
+      label: t("CORE_COMMON_GO_TO_HOME"),
+      onSubmit: () => history.push("/digit-ui/employee/ws/zro-application")
+    })));
+  }
+  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, null, t("WS_VERIFICATION_DETAILS")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_CONNECTION_NO_LABEL"),
+    text: (verification === null || verification === void 0 ? void 0 : verification.connectionno) || "NA"
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_VERIFICATION_STATUS"),
+    text: (verification === null || verification === void 0 ? void 0 : verification.status) || "NA"
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_CONSUMPTION_LABEL"),
+    text: (verification === null || verification === void 0 ? void 0 : verification.consumption) ?? "NA"
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_PREVIOUS_CONSUMPTION"),
+    text: (verification === null || verification === void 0 ? void 0 : verification.previousconsumption) ?? "NA"
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_DEVIATION_FACTOR"),
+    text: verification !== null && verification !== void 0 && verification.deviationfactor ? Number(verification.deviationfactor).toFixed(2) : "NA"
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_REMARKS"),
+    text: (verification === null || verification === void 0 ? void 0 : verification.remarks) || "NA"
+  })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, {
+    style: {
+      marginTop: "32px"
+    }
+  }, t("WS_BILLING_AND_CONSUMPTION_DETAILS")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_BILLING_CYCLE_ID"),
+    text: billingData.billingCycleId || "NA"
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_BILLING_PERIOD"),
+    text: `${formatDate(billingData.billingPeriodFrom)} - ${formatDate(billingData.billingPeriodTo)}`
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_BILLING_DAYS"),
+    text: billingData.billingDays ?? "NA"
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_PREVIOUS_READING_LABEL"),
+    text: billingData.previousReading ?? "NA"
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_PREVIOUS_OK_READING_DATE"),
+    text: formatDate(billingData.previousOkReadingDate)
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_CURRENT_READING_LABEL"),
+    text: billingData.currentReading ?? "NA"
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_READING_QUALITY_CODE"),
+    text: billingData.readingQualityCode || "NA"
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_BILLING_BASIS"),
+    text: billingData.billingBasis || "NA"
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_ACTUAL_CONSUMPTION"),
+    text: billingData.actualConsumption ?? "NA"
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_MONTHLY_CONSUMPTION"),
+    text: billingData.monthlyConsumption ? Number(billingData.monthlyConsumption).toFixed(2) : "NA"
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_THRESHOLD_CONSUMPTION"),
+    text: billingData.thresholdConsumption ? Number(billingData.thresholdConsumption).toFixed(2) : "NA"
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_1_5X_FLAG"),
+    text: billingData.onePointFiveXFlag ? t("CORE_COMMON_YES") : t("CORE_COMMON_NO")
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_BILLING_CYCLE_STATUS"),
+    text: billingData.billingCycleStatus || "NA"
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_CORRECTION_STATUS"),
+    text: billingData.correctionStatus || "NA"
+  }))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.ActionBar, null, displayMenu ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Menu, {
+    localeKeyPrefix: "WF_ZRO",
+    options: ["VERIFY", "REJECT"],
+    t: t,
+    onSelect: onActionSelect
+  }) : null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
+    label: t("WF_TAKE_ACTION"),
+    onSubmit: () => setDisplayMenu(!displayMenu)
+  })), showModal && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
+    headerBarMain: /*#__PURE__*/React__default.createElement(Heading, {
+      label: selectedAction === "VERIFY" ? t("WF_ZRO_VERIFY") : t("WF_ZRO_REJECT")
+    }),
+    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn, {
+      onClick: closeModal
+    }),
+    actionCancelLabel: t("CS_COMMON_CANCEL"),
+    actionCancelOnSubmit: closeModal,
+    actionSaveLabel: selectedAction === "VERIFY" ? t("WF_ZRO_VERIFY") : t("WF_ZRO_REJECT"),
+    actionSaveOnSubmit: submitAction
+  }, /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      marginBottom: "16px"
+    }
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, t("WF_COMMON_COMMENTS")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextArea, {
+    name: "comments",
+    value: comments,
+    onChange: e => setComments(e.target.value)
+  }))), toast && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Toast, {
+    error: toast.error,
+    label: toast.message,
+    onClose: () => setToast(null)
+  }));
+};
+
 const BILLSBreadCrumbs = _ref => {
   var _applicationDetails$a, _applicationDetails$a9, _applicationDetails$a0, _applicationDetails$a1, _applicationDetails$a13, _applicationDetails$a14, _reciept_data$Payment2;
   const getRecieptSearch = function (tenantId, payments, consumerCodes, receiptKey) {
@@ -11248,6 +11685,15 @@ const BILLSBreadCrumbs = _ref => {
     path: "/digit-ui/employee/ws/water/calculation",
     label: t("WS_CALCULATION"),
     show: location.pathname.includes("/ws/water/calculation") ? true : false
+  }, {
+    path: "/digit-ui/employee/ws/zro-application",
+    label: t("WS_ZRO_VERIFICATION"),
+    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] = {
@@ -11587,6 +12033,12 @@ const App$1 = _ref2 => {
     component: props => /*#__PURE__*/React__default.createElement(WSCalculation, _extends({}, props, {
       parentRoute: path
     }))
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.PrivateRoute, {
+    path: `${path}/zro-application`,
+    component: () => /*#__PURE__*/React__default.createElement(WSZROVerification, null)
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.PrivateRoute, {
+    path: `${path}/zro-verification-details`,
+    component: () => /*#__PURE__*/React__default.createElement(WSZROVerificationDetails, null)
   }))))));
 };
 
@@ -16759,31 +17211,6 @@ const WSActivationSupportingDocuments = _ref => {
   }))));
 };
 
-const _iteratorSymbol$1 = /*#__PURE__*/typeof Symbol !== "undefined" ? Symbol.iterator || (Symbol.iterator = Symbol("Symbol.iterator")) : "@@iterator";
-const _asyncIteratorSymbol$1 = /*#__PURE__*/typeof Symbol !== "undefined" ? Symbol.asyncIterator || (Symbol.asyncIterator = Symbol("Symbol.asyncIterator")) : "@@asyncIterator";
-function _catch$1(body, recover) {
-  try {
-    var result = body();
-  } catch (e) {
-    return recover(e);
-  }
-  if (result && result.then) {
-    return result.then(void 0, recover);
-  }
-  return result;
-}
-function _finallyRethrows$1(body, finalizer) {
-  try {
-    var result = body();
-  } catch (e) {
-    return finalizer(true, e);
-  }
-  if (result && result.then) {
-    return result.then(finalizer.bind(null, false), finalizer.bind(null, true));
-  }
-  return finalizer(false, result);
-}
-
 var b = "function" === typeof Symbol && Symbol.for,
   c = b ? Symbol.for("react.element") : 60103,
   d = b ? Symbol.for("react.portal") : 60106,
@@ -17704,7 +18131,7 @@ ButtonSelector.defaultProps = {
   onSubmit: undefined
 };
 
-const Close = _ref23 => {
+const Close$1 = _ref23 => {
   let {
     className,
     style
@@ -17740,7 +18167,7 @@ const RemoveableTag = _ref => {
     style: extraStyles ? extraStyles === null || extraStyles === void 0 ? void 0 : extraStyles.textStyles : {}
   }, text), /*#__PURE__*/React__default.createElement("span", {
     onClick: disabled ? null : onClick
-  }, /*#__PURE__*/React__default.createElement(Close, {
+  }, /*#__PURE__*/React__default.createElement(Close$1, {
     className: "close",
     style: extraStyles ? extraStyles === null || extraStyles === void 0 ? void 0 : extraStyles.closeIconStyles : {}
   })));
@@ -17936,7 +18363,7 @@ const UploadFileDigiLocker = props => {
     try {
       let _exit = false;
       e.preventDefault();
-      return Promise.resolve(_catch$1(function () {
+      return Promise.resolve(_catch(function () {
         function _temp13(_result) {
           if (_exit) return _result;
           let TokenReq = {
@@ -18147,7 +18574,7 @@ const UploadFileDigiLocker = props => {
             function _temp2() {
               _exit = true;
             }
-            const _temp = _catch$1(function () {
+            const _temp = _catch(function () {
               const tenantId = Digit.ULBService.getCurrentTenantId() || "dl.djb";
               return Promise.resolve(Digit.DigiLockerService.authorization({
                 module: "WS",
@@ -27522,7 +27949,11 @@ const WSCard = () => {
       label: t("WS_APPLY_MUTATION"),
       link: `/digit-ui/employee/ws/mutation-application`,
       roles: ["WS_CEMP", "WS_APPROVER", "WS_FIELD_INSPECTOR", "WS_DOC_VERIFIER", "WS_CLERK", "SW_CEMP", "SW_APPROVER", "SW_FIELD_INSPECTOR", "SW_DOC_VERIFIER", "SW_CLERK"]
-    }]
+    }, {
+      label: t("WS_ZRO_VERIFICATION"),
+      link: `/digit-ui/employee/ws/zro-application`,
+      roles: ["WS_CEMP", "WS_APPROVER", "WS_FIELD_INSPECTOR", "WS_DOC_VERIFIER", "WS_CLERK", "SW_CEMP", "SW_APPROVER", "SW_FIELD_INSPECTOR", "SW_DOC_VERIFIER", "SW_CLERK"]
+    }].filter(link => link.roles ? checkForEmployee(link.roles) : true)
   };
   return /*#__PURE__*/React__default.createElement(digitUiReactComponents.EmployeeModuleCard, propsForModuleCard);
 };
@@ -28407,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"
     }
@@ -29392,1101 +29810,6 @@ const config = [{
   }]
 }];
 
-/** @license React v16.13.1
- * react-is.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-var b$1="function"===typeof Symbol&&Symbol.for,c$1=b$1?Symbol.for("react.element"):60103,d$1=b$1?Symbol.for("react.portal"):60106,e$1=b$1?Symbol.for("react.fragment"):60107,f$1=b$1?Symbol.for("react.strict_mode"):60108,g$1=b$1?Symbol.for("react.profiler"):60114,h$1=b$1?Symbol.for("react.provider"):60109,k$1=b$1?Symbol.for("react.context"):60110,l$1=b$1?Symbol.for("react.async_mode"):60111,m$1=b$1?Symbol.for("react.concurrent_mode"):60111,n$1=b$1?Symbol.for("react.forward_ref"):60112,p$1=b$1?Symbol.for("react.suspense"):60113,q$1=b$1?
-Symbol.for("react.suspense_list"):60120,r$1=b$1?Symbol.for("react.memo"):60115,t$1=b$1?Symbol.for("react.lazy"):60116,v$1=b$1?Symbol.for("react.block"):60121,w$1=b$1?Symbol.for("react.fundamental"):60117,x$1=b$1?Symbol.for("react.responder"):60118,y$1=b$1?Symbol.for("react.scope"):60119;
-function z$1(a){if("object"===typeof a&&null!==a){var u=a.$$typeof;switch(u){case c$1:switch(a=a.type,a){case l$1:case m$1:case e$1:case g$1:case f$1:case p$1:return a;default:switch(a=a&&a.$$typeof,a){case k$1:case n$1:case t$1:case r$1:case h$1:return a;default:return u}}case d$1:return u}}}function A$1(a){return z$1(a)===m$1}var AsyncMode$1=l$1;var ConcurrentMode$1=m$1;var ContextConsumer$1=k$1;var ContextProvider$1=h$1;var Element$1=c$1;var ForwardRef$1=n$1;var Fragment$1=e$1;var Lazy$1=t$1;var Memo$1=r$1;var Portal$1=d$1;
-var Profiler$1=g$1;var StrictMode$1=f$1;var Suspense$1=p$1;var isAsyncMode$1=function(a){return A$1(a)||z$1(a)===l$1};var isConcurrentMode$1=A$1;var isContextConsumer$1=function(a){return z$1(a)===k$1};var isContextProvider$1=function(a){return z$1(a)===h$1};var isElement$1=function(a){return "object"===typeof a&&null!==a&&a.$$typeof===c$1};var isForwardRef$1=function(a){return z$1(a)===n$1};var isFragment$1=function(a){return z$1(a)===e$1};var isLazy$1=function(a){return z$1(a)===t$1};
-var isMemo$1=function(a){return z$1(a)===r$1};var isPortal$1=function(a){return z$1(a)===d$1};var isProfiler$1=function(a){return z$1(a)===g$1};var isStrictMode$1=function(a){return z$1(a)===f$1};var isSuspense$1=function(a){return z$1(a)===p$1};
-var isValidElementType$1=function(a){return "string"===typeof a||"function"===typeof a||a===e$1||a===m$1||a===g$1||a===f$1||a===p$1||a===q$1||"object"===typeof a&&null!==a&&(a.$$typeof===t$1||a.$$typeof===r$1||a.$$typeof===h$1||a.$$typeof===k$1||a.$$typeof===n$1||a.$$typeof===w$1||a.$$typeof===x$1||a.$$typeof===y$1||a.$$typeof===v$1)};var typeOf$1=z$1;
-
-var reactIs_production_min$1 = {
-	AsyncMode: AsyncMode$1,
-	ConcurrentMode: ConcurrentMode$1,
-	ContextConsumer: ContextConsumer$1,
-	ContextProvider: ContextProvider$1,
-	Element: Element$1,
-	ForwardRef: ForwardRef$1,
-	Fragment: Fragment$1,
-	Lazy: Lazy$1,
-	Memo: Memo$1,
-	Portal: Portal$1,
-	Profiler: Profiler$1,
-	StrictMode: StrictMode$1,
-	Suspense: Suspense$1,
-	isAsyncMode: isAsyncMode$1,
-	isConcurrentMode: isConcurrentMode$1,
-	isContextConsumer: isContextConsumer$1,
-	isContextProvider: isContextProvider$1,
-	isElement: isElement$1,
-	isForwardRef: isForwardRef$1,
-	isFragment: isFragment$1,
-	isLazy: isLazy$1,
-	isMemo: isMemo$1,
-	isPortal: isPortal$1,
-	isProfiler: isProfiler$1,
-	isStrictMode: isStrictMode$1,
-	isSuspense: isSuspense$1,
-	isValidElementType: isValidElementType$1,
-	typeOf: typeOf$1
-};
-
-var reactIs_development$1 = createCommonjsModule(function (module, exports) {
-
-
-
-if (process.env.NODE_ENV !== "production") {
-  (function() {
-
-// The Symbol used to tag the ReactElement-like types. If there is no native Symbol
-// nor polyfill, then a plain number is used for performance.
-var hasSymbol = typeof Symbol === 'function' && Symbol.for;
-var REACT_ELEMENT_TYPE = hasSymbol ? Symbol.for('react.element') : 0xeac7;
-var REACT_PORTAL_TYPE = hasSymbol ? Symbol.for('react.portal') : 0xeaca;
-var REACT_FRAGMENT_TYPE = hasSymbol ? Symbol.for('react.fragment') : 0xeacb;
-var REACT_STRICT_MODE_TYPE = hasSymbol ? Symbol.for('react.strict_mode') : 0xeacc;
-var REACT_PROFILER_TYPE = hasSymbol ? Symbol.for('react.profiler') : 0xead2;
-var REACT_PROVIDER_TYPE = hasSymbol ? Symbol.for('react.provider') : 0xeacd;
-var REACT_CONTEXT_TYPE = hasSymbol ? Symbol.for('react.context') : 0xeace; // TODO: We don't use AsyncMode or ConcurrentMode anymore. They were temporary
-// (unstable) APIs that have been removed. Can we remove the symbols?
-
-var REACT_ASYNC_MODE_TYPE = hasSymbol ? Symbol.for('react.async_mode') : 0xeacf;
-var REACT_CONCURRENT_MODE_TYPE = hasSymbol ? Symbol.for('react.concurrent_mode') : 0xeacf;
-var REACT_FORWARD_REF_TYPE = hasSymbol ? Symbol.for('react.forward_ref') : 0xead0;
-var REACT_SUSPENSE_TYPE = hasSymbol ? Symbol.for('react.suspense') : 0xead1;
-var REACT_SUSPENSE_LIST_TYPE = hasSymbol ? Symbol.for('react.suspense_list') : 0xead8;
-var REACT_MEMO_TYPE = hasSymbol ? Symbol.for('react.memo') : 0xead3;
-var REACT_LAZY_TYPE = hasSymbol ? Symbol.for('react.lazy') : 0xead4;
-var REACT_BLOCK_TYPE = hasSymbol ? Symbol.for('react.block') : 0xead9;
-var REACT_FUNDAMENTAL_TYPE = hasSymbol ? Symbol.for('react.fundamental') : 0xead5;
-var REACT_RESPONDER_TYPE = hasSymbol ? Symbol.for('react.responder') : 0xead6;
-var REACT_SCOPE_TYPE = hasSymbol ? Symbol.for('react.scope') : 0xead7;
-
-function isValidElementType(type) {
-  return typeof type === 'string' || typeof type === 'function' || // Note: its typeof might be other than 'symbol' or 'number' if it's a polyfill.
-  type === REACT_FRAGMENT_TYPE || type === REACT_CONCURRENT_MODE_TYPE || type === REACT_PROFILER_TYPE || type === REACT_STRICT_MODE_TYPE || type === REACT_SUSPENSE_TYPE || type === REACT_SUSPENSE_LIST_TYPE || typeof type === 'object' && type !== null && (type.$$typeof === REACT_LAZY_TYPE || type.$$typeof === REACT_MEMO_TYPE || type.$$typeof === REACT_PROVIDER_TYPE || type.$$typeof === REACT_CONTEXT_TYPE || type.$$typeof === REACT_FORWARD_REF_TYPE || type.$$typeof === REACT_FUNDAMENTAL_TYPE || type.$$typeof === REACT_RESPONDER_TYPE || type.$$typeof === REACT_SCOPE_TYPE || type.$$typeof === REACT_BLOCK_TYPE);
-}
-
-function typeOf(object) {
-  if (typeof object === 'object' && object !== null) {
-    var $$typeof = object.$$typeof;
-
-    switch ($$typeof) {
-      case REACT_ELEMENT_TYPE:
-        var type = object.type;
-
-        switch (type) {
-          case REACT_ASYNC_MODE_TYPE:
-          case REACT_CONCURRENT_MODE_TYPE:
-          case REACT_FRAGMENT_TYPE:
-          case REACT_PROFILER_TYPE:
-          case REACT_STRICT_MODE_TYPE:
-          case REACT_SUSPENSE_TYPE:
-            return type;
-
-          default:
-            var $$typeofType = type && type.$$typeof;
-
-            switch ($$typeofType) {
-              case REACT_CONTEXT_TYPE:
-              case REACT_FORWARD_REF_TYPE:
-              case REACT_LAZY_TYPE:
-              case REACT_MEMO_TYPE:
-              case REACT_PROVIDER_TYPE:
-                return $$typeofType;
-
-              default:
-                return $$typeof;
-            }
-
-        }
-
-      case REACT_PORTAL_TYPE:
-        return $$typeof;
-    }
-  }
-
-  return undefined;
-} // AsyncMode is deprecated along with isAsyncMode
-
-var AsyncMode = REACT_ASYNC_MODE_TYPE;
-var ConcurrentMode = REACT_CONCURRENT_MODE_TYPE;
-var ContextConsumer = REACT_CONTEXT_TYPE;
-var ContextProvider = REACT_PROVIDER_TYPE;
-var Element = REACT_ELEMENT_TYPE;
-var ForwardRef = REACT_FORWARD_REF_TYPE;
-var Fragment = REACT_FRAGMENT_TYPE;
-var Lazy = REACT_LAZY_TYPE;
-var Memo = REACT_MEMO_TYPE;
-var Portal = REACT_PORTAL_TYPE;
-var Profiler = REACT_PROFILER_TYPE;
-var StrictMode = REACT_STRICT_MODE_TYPE;
-var Suspense = REACT_SUSPENSE_TYPE;
-var hasWarnedAboutDeprecatedIsAsyncMode = false; // AsyncMode should be deprecated
-
-function isAsyncMode(object) {
-  {
-    if (!hasWarnedAboutDeprecatedIsAsyncMode) {
-      hasWarnedAboutDeprecatedIsAsyncMode = true; // Using console['warn'] to evade Babel and ESLint
-
-      console['warn']('The ReactIs.isAsyncMode() alias has been deprecated, ' + 'and will be removed in React 17+. Update your code to use ' + 'ReactIs.isConcurrentMode() instead. It has the exact same API.');
-    }
-  }
-
-  return isConcurrentMode(object) || typeOf(object) === REACT_ASYNC_MODE_TYPE;
-}
-function isConcurrentMode(object) {
-  return typeOf(object) === REACT_CONCURRENT_MODE_TYPE;
-}
-function isContextConsumer(object) {
-  return typeOf(object) === REACT_CONTEXT_TYPE;
-}
-function isContextProvider(object) {
-  return typeOf(object) === REACT_PROVIDER_TYPE;
-}
-function isElement(object) {
-  return typeof object === 'object' && object !== null && object.$$typeof === REACT_ELEMENT_TYPE;
-}
-function isForwardRef(object) {
-  return typeOf(object) === REACT_FORWARD_REF_TYPE;
-}
-function isFragment(object) {
-  return typeOf(object) === REACT_FRAGMENT_TYPE;
-}
-function isLazy(object) {
-  return typeOf(object) === REACT_LAZY_TYPE;
-}
-function isMemo(object) {
-  return typeOf(object) === REACT_MEMO_TYPE;
-}
-function isPortal(object) {
-  return typeOf(object) === REACT_PORTAL_TYPE;
-}
-function isProfiler(object) {
-  return typeOf(object) === REACT_PROFILER_TYPE;
-}
-function isStrictMode(object) {
-  return typeOf(object) === REACT_STRICT_MODE_TYPE;
-}
-function isSuspense(object) {
-  return typeOf(object) === REACT_SUSPENSE_TYPE;
-}
-
-exports.AsyncMode = AsyncMode;
-exports.ConcurrentMode = ConcurrentMode;
-exports.ContextConsumer = ContextConsumer;
-exports.ContextProvider = ContextProvider;
-exports.Element = Element;
-exports.ForwardRef = ForwardRef;
-exports.Fragment = Fragment;
-exports.Lazy = Lazy;
-exports.Memo = Memo;
-exports.Portal = Portal;
-exports.Profiler = Profiler;
-exports.StrictMode = StrictMode;
-exports.Suspense = Suspense;
-exports.isAsyncMode = isAsyncMode;
-exports.isConcurrentMode = isConcurrentMode;
-exports.isContextConsumer = isContextConsumer;
-exports.isContextProvider = isContextProvider;
-exports.isElement = isElement;
-exports.isForwardRef = isForwardRef;
-exports.isFragment = isFragment;
-exports.isLazy = isLazy;
-exports.isMemo = isMemo;
-exports.isPortal = isPortal;
-exports.isProfiler = isProfiler;
-exports.isStrictMode = isStrictMode;
-exports.isSuspense = isSuspense;
-exports.isValidElementType = isValidElementType;
-exports.typeOf = typeOf;
-  })();
-}
-});
-
-var reactIs$1 = createCommonjsModule(function (module) {
-
-if (process.env.NODE_ENV === 'production') {
-  module.exports = reactIs_production_min$1;
-} else {
-  module.exports = reactIs_development$1;
-}
-});
-
-/*
-object-assign
-(c) Sindre Sorhus
-@license MIT
-*/
-/* eslint-disable no-unused-vars */
-var getOwnPropertySymbols$1 = Object.getOwnPropertySymbols;
-var hasOwnProperty$b = Object.prototype.hasOwnProperty;
-var propIsEnumerable$1 = Object.prototype.propertyIsEnumerable;
-
-function toObject$1(val) {
-	if (val === null || val === undefined) {
-		throw new TypeError('Object.assign cannot be called with null or undefined');
-	}
-
-	return Object(val);
-}
-
-function shouldUseNative$1() {
-	try {
-		if (!Object.assign) {
-			return false;
-		}
-
-		// Detect buggy property enumeration order in older V8 versions.
-
-		// https://bugs.chromium.org/p/v8/issues/detail?id=4118
-		var test1 = new String('abc');  // eslint-disable-line no-new-wrappers
-		test1[5] = 'de';
-		if (Object.getOwnPropertyNames(test1)[0] === '5') {
-			return false;
-		}
-
-		// https://bugs.chromium.org/p/v8/issues/detail?id=3056
-		var test2 = {};
-		for (var i = 0; i < 10; i++) {
-			test2['_' + String.fromCharCode(i)] = i;
-		}
-		var order2 = Object.getOwnPropertyNames(test2).map(function (n) {
-			return test2[n];
-		});
-		if (order2.join('') !== '0123456789') {
-			return false;
-		}
-
-		// https://bugs.chromium.org/p/v8/issues/detail?id=3056
-		var test3 = {};
-		'abcdefghijklmnopqrst'.split('').forEach(function (letter) {
-			test3[letter] = letter;
-		});
-		if (Object.keys(Object.assign({}, test3)).join('') !==
-				'abcdefghijklmnopqrst') {
-			return false;
-		}
-
-		return true;
-	} catch (err) {
-		// We don't expect any of the above to throw, but better to be safe.
-		return false;
-	}
-}
-
-var objectAssign$1 = shouldUseNative$1() ? Object.assign : function (target, source) {
-	var from;
-	var to = toObject$1(target);
-	var symbols;
-
-	for (var s = 1; s < arguments.length; s++) {
-		from = Object(arguments[s]);
-
-		for (var key in from) {
-			if (hasOwnProperty$b.call(from, key)) {
-				to[key] = from[key];
-			}
-		}
-
-		if (getOwnPropertySymbols$1) {
-			symbols = getOwnPropertySymbols$1(from);
-			for (var i = 0; i < symbols.length; i++) {
-				if (propIsEnumerable$1.call(from, symbols[i])) {
-					to[symbols[i]] = from[symbols[i]];
-				}
-			}
-		}
-	}
-
-	return to;
-};
-
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-var ReactPropTypesSecret$2 = 'SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED';
-
-var ReactPropTypesSecret_1$1 = ReactPropTypesSecret$2;
-
-var has$2 = Function.call.bind(Object.prototype.hasOwnProperty);
-
-var printWarning$2 = function() {};
-
-if (process.env.NODE_ENV !== 'production') {
-  var ReactPropTypesSecret$3 = ReactPropTypesSecret_1$1;
-  var loggedTypeFailures$1 = {};
-  var has$3 = has$2;
-
-  printWarning$2 = function(text) {
-    var message = 'Warning: ' + text;
-    if (typeof console !== 'undefined') {
-      console.error(message);
-    }
-    try {
-      // --- Welcome to debugging React ---
-      // This error was thrown as a convenience so that you can use this stack
-      // to find the callsite that caused this warning to fire.
-      throw new Error(message);
-    } catch (x) { /**/ }
-  };
-}
-
-/**
- * Assert that the values match with the type specs.
- * Error messages are memorized and will only be shown once.
- *
- * @param {object} typeSpecs Map of name to a ReactPropType
- * @param {object} values Runtime values that need to be type-checked
- * @param {string} location e.g. "prop", "context", "child context"
- * @param {string} componentName Name of the component for error messages.
- * @param {?Function} getStack Returns the component stack.
- * @private
- */
-function checkPropTypes$1(typeSpecs, values, location, componentName, getStack) {
-  if (process.env.NODE_ENV !== 'production') {
-    for (var typeSpecName in typeSpecs) {
-      if (has$3(typeSpecs, typeSpecName)) {
-        var error;
-        // Prop type validation may throw. In case they do, we don't want to
-        // fail the render phase where it didn't fail before. So we log it.
-        // After these have been cleaned up, we'll let them throw.
-        try {
-          // This is intentionally an invariant that gets caught. It's the same
-          // behavior as without this statement except with a better message.
-          if (typeof typeSpecs[typeSpecName] !== 'function') {
-            var err = Error(
-              (componentName || 'React class') + ': ' + location + ' type `' + typeSpecName + '` is invalid; ' +
-              'it must be a function, usually from the `prop-types` package, but received `' + typeof typeSpecs[typeSpecName] + '`.' +
-              'This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`.'
-            );
-            err.name = 'Invariant Violation';
-            throw err;
-          }
-          error = typeSpecs[typeSpecName](values, typeSpecName, componentName, location, null, ReactPropTypesSecret$3);
-        } catch (ex) {
-          error = ex;
-        }
-        if (error && !(error instanceof Error)) {
-          printWarning$2(
-            (componentName || 'React class') + ': type specification of ' +
-            location + ' `' + typeSpecName + '` is invalid; the type checker ' +
-            'function must return `null` or an `Error` but returned a ' + typeof error + '. ' +
-            'You may have forgotten to pass an argument to the type checker ' +
-            'creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and ' +
-            'shape all require an argument).'
-          );
-        }
-        if (error instanceof Error && !(error.message in loggedTypeFailures$1)) {
-          // Only monitor this failure once because there tends to be a lot of the
-          // same error.
-          loggedTypeFailures$1[error.message] = true;
-
-          var stack = getStack ? getStack() : '';
-
-          printWarning$2(
-            'Failed ' + location + ' type: ' + error.message + (stack != null ? stack : '')
-          );
-        }
-      }
-    }
-  }
-}
-
-/**
- * Resets warning cache when testing.
- *
- * @private
- */
-checkPropTypes$1.resetWarningCache = function() {
-  if (process.env.NODE_ENV !== 'production') {
-    loggedTypeFailures$1 = {};
-  }
-};
-
-var checkPropTypes_1$1 = checkPropTypes$1;
-
-var printWarning$3 = function() {};
-
-if (process.env.NODE_ENV !== 'production') {
-  printWarning$3 = function(text) {
-    var message = 'Warning: ' + text;
-    if (typeof console !== 'undefined') {
-      console.error(message);
-    }
-    try {
-      // --- Welcome to debugging React ---
-      // This error was thrown as a convenience so that you can use this stack
-      // to find the callsite that caused this warning to fire.
-      throw new Error(message);
-    } catch (x) {}
-  };
-}
-
-function emptyFunctionThatReturnsNull$1() {
-  return null;
-}
-
-var factoryWithTypeCheckers$1 = function(isValidElement, throwOnDirectAccess) {
-  /* global Symbol */
-  var ITERATOR_SYMBOL = typeof Symbol === 'function' && Symbol.iterator;
-  var FAUX_ITERATOR_SYMBOL = '@@iterator'; // Before Symbol spec.
-
-  /**
-   * Returns the iterator method function contained on the iterable object.
-   *
-   * Be sure to invoke the function with the iterable as context:
-   *
-   *     var iteratorFn = getIteratorFn(myIterable);
-   *     if (iteratorFn) {
-   *       var iterator = iteratorFn.call(myIterable);
-   *       ...
-   *     }
-   *
-   * @param {?object} maybeIterable
-   * @return {?function}
-   */
-  function getIteratorFn(maybeIterable) {
-    var iteratorFn = maybeIterable && (ITERATOR_SYMBOL && maybeIterable[ITERATOR_SYMBOL] || maybeIterable[FAUX_ITERATOR_SYMBOL]);
-    if (typeof iteratorFn === 'function') {
-      return iteratorFn;
-    }
-  }
-
-  /**
-   * Collection of methods that allow declaration and validation of props that are
-   * supplied to React components. Example usage:
-   *
-   *   var Props = require('ReactPropTypes');
-   *   var MyArticle = React.createClass({
-   *     propTypes: {
-   *       // An optional string prop named "description".
-   *       description: Props.string,
-   *
-   *       // A required enum prop named "category".
-   *       category: Props.oneOf(['News','Photos']).isRequired,
-   *
-   *       // A prop named "dialog" that requires an instance of Dialog.
-   *       dialog: Props.instanceOf(Dialog).isRequired
-   *     },
-   *     render: function() { ... }
-   *   });
-   *
-   * A more formal specification of how these methods are used:
-   *
-   *   type := array|bool|func|object|number|string|oneOf([...])|instanceOf(...)
-   *   decl := ReactPropTypes.{type}(.isRequired)?
-   *
-   * Each and every declaration produces a function with the same signature. This
-   * allows the creation of custom validation functions. For example:
-   *
-   *  var MyLink = React.createClass({
-   *    propTypes: {
-   *      // An optional string or URI prop named "href".
-   *      href: function(props, propName, componentName) {
-   *        var propValue = props[propName];
-   *        if (propValue != null && typeof propValue !== 'string' &&
-   *            !(propValue instanceof URI)) {
-   *          return new Error(
-   *            'Expected a string or an URI for ' + propName + ' in ' +
-   *            componentName
-   *          );
-   *        }
-   *      }
-   *    },
-   *    render: function() {...}
-   *  });
-   *
-   * @internal
-   */
-
-  var ANONYMOUS = '<<anonymous>>';
-
-  // Important!
-  // Keep this list in sync with production version in `./factoryWithThrowingShims.js`.
-  var ReactPropTypes = {
-    array: createPrimitiveTypeChecker('array'),
-    bigint: createPrimitiveTypeChecker('bigint'),
-    bool: createPrimitiveTypeChecker('boolean'),
-    func: createPrimitiveTypeChecker('function'),
-    number: createPrimitiveTypeChecker('number'),
-    object: createPrimitiveTypeChecker('object'),
-    string: createPrimitiveTypeChecker('string'),
-    symbol: createPrimitiveTypeChecker('symbol'),
-
-    any: createAnyTypeChecker(),
-    arrayOf: createArrayOfTypeChecker,
-    element: createElementTypeChecker(),
-    elementType: createElementTypeTypeChecker(),
-    instanceOf: createInstanceTypeChecker,
-    node: createNodeChecker(),
-    objectOf: createObjectOfTypeChecker,
-    oneOf: createEnumTypeChecker,
-    oneOfType: createUnionTypeChecker,
-    shape: createShapeTypeChecker,
-    exact: createStrictShapeTypeChecker,
-  };
-
-  /**
-   * inlined Object.is polyfill to avoid requiring consumers ship their own
-   * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
-   */
-  /*eslint-disable no-self-compare*/
-  function is(x, y) {
-    // SameValue algorithm
-    if (x === y) {
-      // Steps 1-5, 7-10
-      // Steps 6.b-6.e: +0 != -0
-      return x !== 0 || 1 / x === 1 / y;
-    } else {
-      // Step 6.a: NaN == NaN
-      return x !== x && y !== y;
-    }
-  }
-  /*eslint-enable no-self-compare*/
-
-  /**
-   * We use an Error-like object for backward compatibility as people may call
-   * PropTypes directly and inspect their output. However, we don't use real
-   * Errors anymore. We don't inspect their stack anyway, and creating them
-   * is prohibitively expensive if they are created too often, such as what
-   * happens in oneOfType() for any type before the one that matched.
-   */
-  function PropTypeError(message, data) {
-    this.message = message;
-    this.data = data && typeof data === 'object' ? data: {};
-    this.stack = '';
-  }
-  // Make `instanceof Error` still work for returned errors.
-  PropTypeError.prototype = Error.prototype;
-
-  function createChainableTypeChecker(validate) {
-    if (process.env.NODE_ENV !== 'production') {
-      var manualPropTypeCallCache = {};
-      var manualPropTypeWarningCount = 0;
-    }
-    function checkType(isRequired, props, propName, componentName, location, propFullName, secret) {
-      componentName = componentName || ANONYMOUS;
-      propFullName = propFullName || propName;
-
-      if (secret !== ReactPropTypesSecret_1$1) {
-        if (throwOnDirectAccess) {
-          // New behavior only for users of `prop-types` package
-          var err = new Error(
-            'Calling PropTypes validators directly is not supported by the `prop-types` package. ' +
-            'Use `PropTypes.checkPropTypes()` to call them. ' +
-            'Read more at http://fb.me/use-check-prop-types'
-          );
-          err.name = 'Invariant Violation';
-          throw err;
-        } else if (process.env.NODE_ENV !== 'production' && typeof console !== 'undefined') {
-          // Old behavior for people using React.PropTypes
-          var cacheKey = componentName + ':' + propName;
-          if (
-            !manualPropTypeCallCache[cacheKey] &&
-            // Avoid spamming the console because they are often not actionable except for lib authors
-            manualPropTypeWarningCount < 3
-          ) {
-            printWarning$3(
-              'You are manually calling a React.PropTypes validation ' +
-              'function for the `' + propFullName + '` prop on `' + componentName + '`. This is deprecated ' +
-              'and will throw in the standalone `prop-types` package. ' +
-              'You may be seeing this warning due to a third-party PropTypes ' +
-              'library. See https://fb.me/react-warning-dont-call-proptypes ' + 'for details.'
-            );
-            manualPropTypeCallCache[cacheKey] = true;
-            manualPropTypeWarningCount++;
-          }
-        }
-      }
-      if (props[propName] == null) {
-        if (isRequired) {
-          if (props[propName] === null) {
-            return new PropTypeError('The ' + location + ' `' + propFullName + '` is marked as required ' + ('in `' + componentName + '`, but its value is `null`.'));
-          }
-          return new PropTypeError('The ' + location + ' `' + propFullName + '` is marked as required in ' + ('`' + componentName + '`, but its value is `undefined`.'));
-        }
-        return null;
-      } else {
-        return validate(props, propName, componentName, location, propFullName);
-      }
-    }
-
-    var chainedCheckType = checkType.bind(null, false);
-    chainedCheckType.isRequired = checkType.bind(null, true);
-
-    return chainedCheckType;
-  }
-
-  function createPrimitiveTypeChecker(expectedType) {
-    function validate(props, propName, componentName, location, propFullName, secret) {
-      var propValue = props[propName];
-      var propType = getPropType(propValue);
-      if (propType !== expectedType) {
-        // `propValue` being instance of, say, date/regexp, pass the 'object'
-        // check, but we can offer a more precise error message here rather than
-        // 'of type `object`'.
-        var preciseType = getPreciseType(propValue);
-
-        return new PropTypeError(
-          'Invalid ' + location + ' `' + propFullName + '` of type ' + ('`' + preciseType + '` supplied to `' + componentName + '`, expected ') + ('`' + expectedType + '`.'),
-          {expectedType: expectedType}
-        );
-      }
-      return null;
-    }
-    return createChainableTypeChecker(validate);
-  }
-
-  function createAnyTypeChecker() {
-    return createChainableTypeChecker(emptyFunctionThatReturnsNull$1);
-  }
-
-  function createArrayOfTypeChecker(typeChecker) {
-    function validate(props, propName, componentName, location, propFullName) {
-      if (typeof typeChecker !== 'function') {
-        return new PropTypeError('Property `' + propFullName + '` of component `' + componentName + '` has invalid PropType notation inside arrayOf.');
-      }
-      var propValue = props[propName];
-      if (!Array.isArray(propValue)) {
-        var propType = getPropType(propValue);
-        return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` of type ' + ('`' + propType + '` supplied to `' + componentName + '`, expected an array.'));
-      }
-      for (var i = 0; i < propValue.length; i++) {
-        var error = typeChecker(propValue, i, componentName, location, propFullName + '[' + i + ']', ReactPropTypesSecret_1$1);
-        if (error instanceof Error) {
-          return error;
-        }
-      }
-      return null;
-    }
-    return createChainableTypeChecker(validate);
-  }
-
-  function createElementTypeChecker() {
-    function validate(props, propName, componentName, location, propFullName) {
-      var propValue = props[propName];
-      if (!isValidElement(propValue)) {
-        var propType = getPropType(propValue);
-        return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` of type ' + ('`' + propType + '` supplied to `' + componentName + '`, expected a single ReactElement.'));
-      }
-      return null;
-    }
-    return createChainableTypeChecker(validate);
-  }
-
-  function createElementTypeTypeChecker() {
-    function validate(props, propName, componentName, location, propFullName) {
-      var propValue = props[propName];
-      if (!reactIs$1.isValidElementType(propValue)) {
-        var propType = getPropType(propValue);
-        return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` of type ' + ('`' + propType + '` supplied to `' + componentName + '`, expected a single ReactElement type.'));
-      }
-      return null;
-    }
-    return createChainableTypeChecker(validate);
-  }
-
-  function createInstanceTypeChecker(expectedClass) {
-    function validate(props, propName, componentName, location, propFullName) {
-      if (!(props[propName] instanceof expectedClass)) {
-        var expectedClassName = expectedClass.name || ANONYMOUS;
-        var actualClassName = getClassName(props[propName]);
-        return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` of type ' + ('`' + actualClassName + '` supplied to `' + componentName + '`, expected ') + ('instance of `' + expectedClassName + '`.'));
-      }
-      return null;
-    }
-    return createChainableTypeChecker(validate);
-  }
-
-  function createEnumTypeChecker(expectedValues) {
-    if (!Array.isArray(expectedValues)) {
-      if (process.env.NODE_ENV !== 'production') {
-        if (arguments.length > 1) {
-          printWarning$3(
-            'Invalid arguments supplied to oneOf, expected an array, got ' + arguments.length + ' arguments. ' +
-            'A common mistake is to write oneOf(x, y, z) instead of oneOf([x, y, z]).'
-          );
-        } else {
-          printWarning$3('Invalid argument supplied to oneOf, expected an array.');
-        }
-      }
-      return emptyFunctionThatReturnsNull$1;
-    }
-
-    function validate(props, propName, componentName, location, propFullName) {
-      var propValue = props[propName];
-      for (var i = 0; i < expectedValues.length; i++) {
-        if (is(propValue, expectedValues[i])) {
-          return null;
-        }
-      }
-
-      var valuesString = JSON.stringify(expectedValues, function replacer(key, value) {
-        var type = getPreciseType(value);
-        if (type === 'symbol') {
-          return String(value);
-        }
-        return value;
-      });
-      return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` of value `' + String(propValue) + '` ' + ('supplied to `' + componentName + '`, expected one of ' + valuesString + '.'));
-    }
-    return createChainableTypeChecker(validate);
-  }
-
-  function createObjectOfTypeChecker(typeChecker) {
-    function validate(props, propName, componentName, location, propFullName) {
-      if (typeof typeChecker !== 'function') {
-        return new PropTypeError('Property `' + propFullName + '` of component `' + componentName + '` has invalid PropType notation inside objectOf.');
-      }
-      var propValue = props[propName];
-      var propType = getPropType(propValue);
-      if (propType !== 'object') {
-        return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` of type ' + ('`' + propType + '` supplied to `' + componentName + '`, expected an object.'));
-      }
-      for (var key in propValue) {
-        if (has$2(propValue, key)) {
-          var error = typeChecker(propValue, key, componentName, location, propFullName + '.' + key, ReactPropTypesSecret_1$1);
-          if (error instanceof Error) {
-            return error;
-          }
-        }
-      }
-      return null;
-    }
-    return createChainableTypeChecker(validate);
-  }
-
-  function createUnionTypeChecker(arrayOfTypeCheckers) {
-    if (!Array.isArray(arrayOfTypeCheckers)) {
-      process.env.NODE_ENV !== 'production' ? printWarning$3('Invalid argument supplied to oneOfType, expected an instance of array.') : void 0;
-      return emptyFunctionThatReturnsNull$1;
-    }
-
-    for (var i = 0; i < arrayOfTypeCheckers.length; i++) {
-      var checker = arrayOfTypeCheckers[i];
-      if (typeof checker !== 'function') {
-        printWarning$3(
-          'Invalid argument supplied to oneOfType. Expected an array of check functions, but ' +
-          'received ' + getPostfixForTypeWarning(checker) + ' at index ' + i + '.'
-        );
-        return emptyFunctionThatReturnsNull$1;
-      }
-    }
-
-    function validate(props, propName, componentName, location, propFullName) {
-      var expectedTypes = [];
-      for (var i = 0; i < arrayOfTypeCheckers.length; i++) {
-        var checker = arrayOfTypeCheckers[i];
-        var checkerResult = checker(props, propName, componentName, location, propFullName, ReactPropTypesSecret_1$1);
-        if (checkerResult == null) {
-          return null;
-        }
-        if (checkerResult.data && has$2(checkerResult.data, 'expectedType')) {
-          expectedTypes.push(checkerResult.data.expectedType);
-        }
-      }
-      var expectedTypesMessage = (expectedTypes.length > 0) ? ', expected one of type [' + expectedTypes.join(', ') + ']': '';
-      return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` supplied to ' + ('`' + componentName + '`' + expectedTypesMessage + '.'));
-    }
-    return createChainableTypeChecker(validate);
-  }
-
-  function createNodeChecker() {
-    function validate(props, propName, componentName, location, propFullName) {
-      if (!isNode(props[propName])) {
-        return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` supplied to ' + ('`' + componentName + '`, expected a ReactNode.'));
-      }
-      return null;
-    }
-    return createChainableTypeChecker(validate);
-  }
-
-  function invalidValidatorError(componentName, location, propFullName, key, type) {
-    return new PropTypeError(
-      (componentName || 'React class') + ': ' + location + ' type `' + propFullName + '.' + key + '` is invalid; ' +
-      'it must be a function, usually from the `prop-types` package, but received `' + type + '`.'
-    );
-  }
-
-  function createShapeTypeChecker(shapeTypes) {
-    function validate(props, propName, componentName, location, propFullName) {
-      var propValue = props[propName];
-      var propType = getPropType(propValue);
-      if (propType !== 'object') {
-        return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` of type `' + propType + '` ' + ('supplied to `' + componentName + '`, expected `object`.'));
-      }
-      for (var key in shapeTypes) {
-        var checker = shapeTypes[key];
-        if (typeof checker !== 'function') {
-          return invalidValidatorError(componentName, location, propFullName, key, getPreciseType(checker));
-        }
-        var error = checker(propValue, key, componentName, location, propFullName + '.' + key, ReactPropTypesSecret_1$1);
-        if (error) {
-          return error;
-        }
-      }
-      return null;
-    }
-    return createChainableTypeChecker(validate);
-  }
-
-  function createStrictShapeTypeChecker(shapeTypes) {
-    function validate(props, propName, componentName, location, propFullName) {
-      var propValue = props[propName];
-      var propType = getPropType(propValue);
-      if (propType !== 'object') {
-        return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` of type `' + propType + '` ' + ('supplied to `' + componentName + '`, expected `object`.'));
-      }
-      // We need to check all keys in case some are required but missing from props.
-      var allKeys = objectAssign$1({}, props[propName], shapeTypes);
-      for (var key in allKeys) {
-        var checker = shapeTypes[key];
-        if (has$2(shapeTypes, key) && typeof checker !== 'function') {
-          return invalidValidatorError(componentName, location, propFullName, key, getPreciseType(checker));
-        }
-        if (!checker) {
-          return new PropTypeError(
-            'Invalid ' + location + ' `' + propFullName + '` key `' + key + '` supplied to `' + componentName + '`.' +
-            '\nBad object: ' + JSON.stringify(props[propName], null, '  ') +
-            '\nValid keys: ' + JSON.stringify(Object.keys(shapeTypes), null, '  ')
-          );
-        }
-        var error = checker(propValue, key, componentName, location, propFullName + '.' + key, ReactPropTypesSecret_1$1);
-        if (error) {
-          return error;
-        }
-      }
-      return null;
-    }
-
-    return createChainableTypeChecker(validate);
-  }
-
-  function isNode(propValue) {
-    switch (typeof propValue) {
-      case 'number':
-      case 'string':
-      case 'undefined':
-        return true;
-      case 'boolean':
-        return !propValue;
-      case 'object':
-        if (Array.isArray(propValue)) {
-          return propValue.every(isNode);
-        }
-        if (propValue === null || isValidElement(propValue)) {
-          return true;
-        }
-
-        var iteratorFn = getIteratorFn(propValue);
-        if (iteratorFn) {
-          var iterator = iteratorFn.call(propValue);
-          var step;
-          if (iteratorFn !== propValue.entries) {
-            while (!(step = iterator.next()).done) {
-              if (!isNode(step.value)) {
-                return false;
-              }
-            }
-          } else {
-            // Iterator will provide entry [k,v] tuples rather than values.
-            while (!(step = iterator.next()).done) {
-              var entry = step.value;
-              if (entry) {
-                if (!isNode(entry[1])) {
-                  return false;
-                }
-              }
-            }
-          }
-        } else {
-          return false;
-        }
-
-        return true;
-      default:
-        return false;
-    }
-  }
-
-  function isSymbol(propType, propValue) {
-    // Native Symbol.
-    if (propType === 'symbol') {
-      return true;
-    }
-
-    // falsy value can't be a Symbol
-    if (!propValue) {
-      return false;
-    }
-
-    // 19.4.3.5 Symbol.prototype[@@toStringTag] === 'Symbol'
-    if (propValue['@@toStringTag'] === 'Symbol') {
-      return true;
-    }
-
-    // Fallback for non-spec compliant Symbols which are polyfilled.
-    if (typeof Symbol === 'function' && propValue instanceof Symbol) {
-      return true;
-    }
-
-    return false;
-  }
-
-  // Equivalent of `typeof` but with special handling for array and regexp.
-  function getPropType(propValue) {
-    var propType = typeof propValue;
-    if (Array.isArray(propValue)) {
-      return 'array';
-    }
-    if (propValue instanceof RegExp) {
-      // Old webkits (at least until Android 4.0) return 'function' rather than
-      // 'object' for typeof a RegExp. We'll normalize this here so that /bla/
-      // passes PropTypes.object.
-      return 'object';
-    }
-    if (isSymbol(propType, propValue)) {
-      return 'symbol';
-    }
-    return propType;
-  }
-
-  // This handles more types than `getPropType`. Only used for error messages.
-  // See `createPrimitiveTypeChecker`.
-  function getPreciseType(propValue) {
-    if (typeof propValue === 'undefined' || propValue === null) {
-      return '' + propValue;
-    }
-    var propType = getPropType(propValue);
-    if (propType === 'object') {
-      if (propValue instanceof Date) {
-        return 'date';
-      } else if (propValue instanceof RegExp) {
-        return 'regexp';
-      }
-    }
-    return propType;
-  }
-
-  // Returns a string that is postfixed to a warning about an invalid type.
-  // For example, "undefined" or "of type array"
-  function getPostfixForTypeWarning(value) {
-    var type = getPreciseType(value);
-    switch (type) {
-      case 'array':
-      case 'object':
-        return 'an ' + type;
-      case 'boolean':
-      case 'date':
-      case 'regexp':
-        return 'a ' + type;
-      default:
-        return type;
-    }
-  }
-
-  // Returns class name of the object, if any.
-  function getClassName(propValue) {
-    if (!propValue.constructor || !propValue.constructor.name) {
-      return ANONYMOUS;
-    }
-    return propValue.constructor.name;
-  }
-
-  ReactPropTypes.checkPropTypes = checkPropTypes_1$1;
-  ReactPropTypes.resetWarningCache = checkPropTypes_1$1.resetWarningCache;
-  ReactPropTypes.PropTypes = ReactPropTypes;
-
-  return ReactPropTypes;
-};
-
-function emptyFunction$1() {}
-function emptyFunctionWithReset$1() {}
-emptyFunctionWithReset$1.resetWarningCache = emptyFunction$1;
-
-var factoryWithThrowingShims$1 = function() {
-  function shim(props, propName, componentName, location, propFullName, secret) {
-    if (secret === ReactPropTypesSecret_1$1) {
-      // It is still safe when called from React.
-      return;
-    }
-    var err = new Error(
-      'Calling PropTypes validators directly is not supported by the `prop-types` package. ' +
-      'Use PropTypes.checkPropTypes() to call them. ' +
-      'Read more at http://fb.me/use-check-prop-types'
-    );
-    err.name = 'Invariant Violation';
-    throw err;
-  }  shim.isRequired = shim;
-  function getShim() {
-    return shim;
-  }  // Important!
-  // Keep this list in sync with production version in `./factoryWithTypeCheckers.js`.
-  var ReactPropTypes = {
-    array: shim,
-    bigint: shim,
-    bool: shim,
-    func: shim,
-    number: shim,
-    object: shim,
-    string: shim,
-    symbol: shim,
-
-    any: shim,
-    arrayOf: getShim,
-    element: shim,
-    elementType: shim,
-    instanceOf: getShim,
-    node: shim,
-    objectOf: getShim,
-    oneOf: getShim,
-    oneOfType: getShim,
-    shape: getShim,
-    exact: getShim,
-
-    checkPropTypes: emptyFunctionWithReset$1,
-    resetWarningCache: emptyFunction$1
-  };
-
-  ReactPropTypes.PropTypes = ReactPropTypes;
-
-  return ReactPropTypes;
-};
-
-var propTypes$1 = createCommonjsModule(function (module) {
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-if (process.env.NODE_ENV !== 'production') {
-  var ReactIs = reactIs$1;
-
-  // By explicitly using `prop-types` you are opting into new development behavior.
-  // http://fb.me/prop-types-in-prod
-  var throwOnDirectAccess = true;
-  module.exports = factoryWithTypeCheckers$1(ReactIs.isElement, throwOnDirectAccess);
-} else {
-  // By explicitly using `prop-types` you are opting into new production behavior.
-  // http://fb.me/prop-types-in-prod
-  module.exports = factoryWithThrowingShims$1();
-}
-});
-
 const SearchConnection = _ref => {
   var _Digit$Hooks$ws$usews;
   let {
@@ -30888,7 +30211,7 @@ const SearchConnection = _ref => {
   }));
 };
 SearchConnection.propTypes = {
-  loginParams: propTypes$1.any
+  loginParams: propTypes.any
 };
 SearchConnection.defaultProps = {
   loginParams: null
@@ -31864,9 +31187,9 @@ const ChallanSearchResults = _ref => {
   }, t("WS_CLICK_HERE_TO_APPLY"))))));
 };
 ChallanSearchResults.propTypes = {
-  template: propTypes$1.any,
-  header: propTypes$1.string,
-  actionButtonLabel: propTypes$1.string
+  template: propTypes.any,
+  header: propTypes.string,
+  actionButtonLabel: propTypes.string
 };
 ChallanSearchResults.defaultProps = {
   template: [],
@@ -33524,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;
@@ -33642,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: {
@@ -34272,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"
@@ -34345,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)}`,
@@ -34794,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();
@@ -35457,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",
@@ -35498,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",
@@ -35508,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",
@@ -35531,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 ? {
@@ -36971,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 = () => {};
@@ -37286,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"
@@ -38805,9 +38067,9 @@ const WNSMyBills = _ref => {
   }, t("CS_BILLS_TEXT_NO_BILLS_FOUND")));
 };
 WNSMyBills.propTypes = {
-  template: propTypes$1.any,
-  header: propTypes$1.string,
-  actionButtonLabel: propTypes$1.string
+  template: propTypes.any,
+  header: propTypes.string,
+  actionButtonLabel: propTypes.string
 };
 WNSMyBills.defaultProps = {
   template: [],
@@ -38869,6 +38131,15 @@ const WSInfoPage = () => {
   const [isOtpSending, setIsOtpSending] = React.useState(false);
   const [isOtpVerifying, setIsOtpVerifying] = React.useState(false);
   const [showToast, setShowToast] = React.useState(null);
+  const [isMobileVerified, setIsMobileVerified] = React.useState(false);
+  const [timeLeft, setTimeLeft] = React.useState(0);
+  React.useEffect(() => {
+    let timer;
+    if (timeLeft > 0) {
+      timer = setTimeout(() => setTimeLeft(timeLeft - 1), 1000);
+    }
+    return () => clearTimeout(timer);
+  }, [timeLeft]);
   React.useEffect(() => {
     sessionStorage.removeItem("WS_OTP_VERIFIED_PROPERTY_ID");
   }, []);
@@ -38887,7 +38158,7 @@ const WSInfoPage = () => {
       mobileNumber: mobileNumberToSearch
     },
     tenantId: tenantId,
-    enabled: (hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && (mobileNumberToSearch === null || mobileNumberToSearch === void 0 ? void 0 : mobileNumberToSearch.length) === 10 ? true : false
+    enabled: (hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && (mobileNumberToSearch === null || mobileNumberToSearch === void 0 ? void 0 : mobileNumberToSearch.length) === 10 && isMobileVerified ? true : false
   });
   const radioOptions = [{
     code: "YES",
@@ -38897,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) {
@@ -38938,7 +38210,7 @@ const WSInfoPage = () => {
             setIsOtpSending(false);
             setShowToast({
               key: "error",
-              message: (errObj === null || errObj === void 0 ? void 0 : (_errObj$fields = errObj.fields) === null || _errObj$fields === void 0 ? void 0 : (_errObj$fields$ = _errObj$fields[0]) === null || _errObj$fields$ === void 0 ? void 0 : _errObj$fields$.message) || (errObj === null || errObj === void 0 ? void 0 : errObj.message) || "Failed to send OTP"
+              message: (errObj === null || errObj === void 0 ? void 0 : (_errObj$fields = errObj.fields) === null || _errObj$fields === void 0 ? void 0 : (_errObj$fields$ = _errObj$fields[0]) === null || _errObj$fields$ === void 0 ? void 0 : _errObj$fields$.message) || (errObj === null || errObj === void 0 ? void 0 : errObj.message) || t("WS_FAILED_TO_SEND_OTP") || "Failed to send OTP"
             });
             return;
           }
@@ -38948,21 +38220,22 @@ const WSInfoPage = () => {
             setIsOtpSending(false);
             setShowToast({
               key: "error",
-              message: (errObj === null || errObj === void 0 ? void 0 : (_errObj$ = errObj[0]) === null || _errObj$ === void 0 ? void 0 : _errObj$.message) || "Failed to send OTP"
+              message: (errObj === null || errObj === void 0 ? void 0 : (_errObj$ = errObj[0]) === null || _errObj$ === void 0 ? void 0 : _errObj$.message) || t("WS_FAILED_TO_SEND_OTP") || "Failed to send OTP"
             });
             return;
           }
           setIsOtpSending(false);
           setShowOtpVerification(true);
+          setTimeLeft(30);
           setShowToast({
             key: "success",
-            message: "OTP sent successfully!"
+            message: t("PT_SEC_OTP_SENT_SUCEESS") || "OTP sent successfully!"
           });
         });
       }, function (err) {
         var _err$response, _err$response$data, _err$response2, _err$response2$data;
         setIsOtpSending(false);
-        let errMsg = "Failed to send OTP";
+        let errMsg = t("WS_FAILED_TO_SEND_OTP") || "Failed to send OTP";
         if (err !== null && err !== void 0 && (_err$response = err.response) !== null && _err$response !== void 0 && (_err$response$data = _err$response.data) !== null && _err$response$data !== void 0 && _err$response$data.error) {
           var _err$response$data$er, _err$response$data$er2, _err$response$data$er3, _err$response$data$er4;
           errMsg = ((_err$response$data$er = err.response.data.error) === null || _err$response$data$er === void 0 ? void 0 : (_err$response$data$er2 = _err$response$data$er.fields) === null || _err$response$data$er2 === void 0 ? void 0 : (_err$response$data$er3 = _err$response$data$er2[0]) === null || _err$response$data$er3 === void 0 ? void 0 : _err$response$data$er3.message) || ((_err$response$data$er4 = err.response.data.error) === null || _err$response$data$er4 === void 0 ? void 0 : _err$response$data$er4.message) || errMsg;
@@ -38990,7 +38263,7 @@ const WSInfoPage = () => {
       if (!otp || otp.length < 6) {
         setShowToast({
           key: "warning",
-          message: "Please enter a valid 6-digit OTP"
+          message: t("WS_PLEASE_ENTER_VALID_OTP") || "Please enter a valid 6-digit OTP"
         });
         return Promise.resolve();
       }
@@ -39021,14 +38294,15 @@ const WSInfoPage = () => {
           setIsOtpVerifying(false);
           setShowToast({
             key: "success",
-            message: "OTP verified successfully!"
+            message: t("WS_OTP_VERIFIED_SUCCESSFULLY") || "OTP verified successfully!"
           });
-          proceedToNext();
+          setShowOtpVerification(false);
+          setIsMobileVerified(true);
         });
       }, function (err) {
         var _err$response3, _err$response3$data, _err$response4, _err$response4$data;
         setIsOtpVerifying(false);
-        let errMsg = err.message || "Failed to verify OTP";
+        let errMsg = err.message || t("WS_FAILED_TO_VERIFY_OTP") || "Failed to verify OTP";
         if (err !== null && err !== void 0 && (_err$response3 = err.response) !== null && _err$response3 !== void 0 && (_err$response3$data = _err$response3.data) !== null && _err$response3$data !== void 0 && _err$response3$data.error) {
           var _err$response$data$er5, _err$response$data$er6, _err$response$data$er7, _err$response$data$er8;
           errMsg = ((_err$response$data$er5 = err.response.data.error) === null || _err$response$data$er5 === void 0 ? void 0 : (_err$response$data$er6 = _err$response$data$er5.fields) === null || _err$response$data$er6 === void 0 ? void 0 : (_err$response$data$er7 = _err$response$data$er6[0]) === null || _err$response$data$er7 === void 0 ? void 0 : _err$response$data$er7.message) || ((_err$response$data$er8 = err.response.data.error) === null || _err$response$data$er8 === void 0 ? void 0 : _err$response$data$er8.message) || errMsg;
@@ -39053,7 +38327,14 @@ const WSInfoPage = () => {
       if (e.stopPropagation) e.stopPropagation();
     }
     if ((hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && selectedProperty) {
-      handleSendOtp(e);
+      if (!isMobileVerified) {
+        setShowToast({
+          key: "warning",
+          message: t("WS_PLEASE_VERIFY_MOBILE_NUMBER") || "Please verify mobile number first"
+        });
+        return;
+      }
+      proceedToNext();
     } else if ((hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && !selectedProperty) {
       return;
     } else {
@@ -39068,72 +38349,6 @@ const WSInfoPage = () => {
     ...prop,
     displayName: `${prop.propertyId} - ${getAddress$1(prop.address, t)}`
   }))) || [];
-  if (showOtpVerification) {
-    return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, null, /*#__PURE__*/React__default.createElement("form", {
-      onSubmit: handleVerifyOtp
-    }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardHeader, null, t("WS_VERIFY_OTP_HEADER") || "Verify OTP"), /*#__PURE__*/React__default.createElement("div", {
-      style: {
-        marginBottom: "24px"
-      }
-    }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Label, null, t("WS_ENTER_OTP_SENT_TO") || "Enter OTP sent to", " +91 ", getMaskedPhone(mobileNumberToSearch), " *"), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
-      t: t,
-      type: "text",
-      inputMode: "numeric",
-      pattern: "[0-9]*",
-      isMandatory: false,
-      value: otp,
-      maxLength: 6,
-      onChange: e => setOtp(e.target.value.replace(/\D/g, "").slice(0, 6)),
-      onKeyDown: e => {
-        if (["-", "+", "e", "E", "."].includes(e.key)) e.preventDefault();
-      },
-      placeholder: t("WS_ENTER_6_DIGIT_OTP") || "Enter 6-digit OTP",
-      style: {
-        width: "100%",
-        maxWidth: "300px"
-      }
-    })), /*#__PURE__*/React__default.createElement("div", {
-      style: {
-        display: "flex",
-        gap: "16px",
-        marginBottom: "24px"
-      }
-    }, /*#__PURE__*/React__default.createElement("button", {
-      type: "button",
-      onClick: handleSendOtp,
-      disabled: isOtpSending,
-      style: {
-        color: "#f47738",
-        background: "none",
-        border: "none",
-        cursor: "pointer",
-        fontWeight: "bold",
-        textDecoration: "underline"
-      }
-    }, isOtpSending ? t("WS_SENDING_OTP") || "Sending..." : t("WS_RESEND_OTP") || "Resend OTP"), /*#__PURE__*/React__default.createElement("button", {
-      type: "button",
-      onClick: () => setShowOtpVerification(false),
-      style: {
-        color: "#f47738",
-        background: "none",
-        border: "none",
-        cursor: "pointer",
-        fontWeight: "bold",
-        textDecoration: "underline"
-      }
-    }, t("CS_COMMON_CANCEL") || "Cancel")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
-      label: t("WS_VERIFY_OTP_AND_PROCEED") || "Verify & Proceed",
-      onSubmit: handleVerifyOtp,
-      disabled: otp.length < 6 || isOtpVerifying,
-      submit: true
-    }))), showToast && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Toast, {
-      error: showToast.key === "error",
-      warning: showToast.key === "warning",
-      label: t(showToast.message),
-      onClose: () => setShowToast(null),
-      isDleteBtn: true
-    }));
-  }
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardHeader, null, t("WS_COMMON_APPL_NEW_CONNECTION")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CitizenInfoLabel, {
     style: {
       margin: "0px",
@@ -39165,30 +38380,7 @@ const WSInfoPage = () => {
       display: "flex",
       gap: "24px"
     }
-  })), (hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && /*#__PURE__*/React__default.createElement("div", {
-    style: {
-      marginBottom: "24px"
-    }
-  }, !isEmployee && /*#__PURE__*/React__default.createElement("div", {
-    style: {
-      marginBottom: "16px"
-    }
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Label, null, t("CORE_COMMON_MOBILE_NUMBER")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
-    t: t,
-    type: "number",
-    isMandatory: false,
-    name: "mobileNumber",
-    value: searchMobileNumber,
-    onChange: e => {
-      const val = e.target.value.replace(/\D/g, "").slice(0, 10);
-      setSearchMobileNumber(val);
-      setSelectedProperty(null);
-      setShowOtpVerification(false);
-      setOtp("");
-    },
-    placeholder: t("Enter mobile number"),
-    maxLength: 10
-  })), isEmployee && /*#__PURE__*/React__default.createElement("div", {
+  })), (hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("div", {
     style: {
       display: "flex",
       flexDirection: "column",
@@ -39197,39 +38389,59 @@ const WSInfoPage = () => {
     }
   }, /*#__PURE__*/React__default.createElement("div", {
     style: {
-      display: "flex",
+      display: "grid",
+      gridTemplateColumns: "1fr 1fr",
       gap: "24px",
-      alignItems: "flex-end"
+      alignItems: "start"
+    }
+  }, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Label, null, t("CORE_COMMON_MOBILE_NUMBER")), /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      display: "flex",
+      gap: "16px",
+      alignItems: "center"
     }
   }, /*#__PURE__*/React__default.createElement("div", {
     style: {
       flex: 1
     }
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Label, null, t("CORE_COMMON_MOBILE_NUMBER")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
     t: t,
     type: "number",
     isMandatory: false,
     name: "mobileNumber",
     value: searchMobileNumber,
     onChange: e => {
-      const val = e.target.value;
-      if (val.length <= 10) {
-        setSearchMobileNumber(val);
-        setSelectedProperty(null);
-        setShowOtpVerification(false);
-        setOtp("");
-      }
+      const val = e.target.value.replace(/\D/g, "").slice(0, 10);
+      setSearchMobileNumber(val);
+      setSelectedProperty(null);
+      setShowOtpVerification(false);
+      setOtp("");
+      setIsMobileVerified(false);
     },
-    placeholder: t("Enter mobile number"),
-    maxLength: 10
-  })), /*#__PURE__*/React__default.createElement("div", {
+    placeholder: t("WS_ENTER_MOBILE_NUMBER") || "Enter mobile number",
+    maxLength: 10,
+    disabled: isMobileVerified
+  })), (searchMobileNumber === null || searchMobileNumber === void 0 ? void 0 : searchMobileNumber.length) === 10 && !isMobileVerified && !showOtpVerification && /*#__PURE__*/React__default.createElement("button", {
+    type: "button",
+    onClick: handleSendOtp,
+    disabled: isOtpSending,
     style: {
-      flex: 1
+      padding: "8px 16px",
+      border: "1px solid #1a67a3",
+      background: "white",
+      color: "#1a67a3",
+      borderRadius: "4px",
+      cursor: "pointer",
+      fontWeight: "bold",
+      whiteSpace: "nowrap"
+    }
+  }, isOtpSending ? t("WS_SENDING_OTP") || "Sending..." : t("PTUPNO_SENDOTP") || "Send OTP"))), /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Label, null, t("WS_SELECT_EXISTING_PROPERTY")), isLoading ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null) : /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      display: "flex",
+      flexDirection: "column",
+      gap: "8px"
     }
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Label, null, t("WS_SELECT_EXISTING_PROPERTY")), /*#__PURE__*/React__default.createElement("div", {
-    className: "field"
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
-    className: "form-field",
     option: propertyOptions,
     optionKey: "displayName",
     id: "propertyId",
@@ -39241,51 +38453,125 @@ const WSInfoPage = () => {
     },
     t: t,
     placeholder: t("PT_SELECT_PROPERTY"),
-    disable: isLoading || propertyOptions.length === 0
-  })))), (searchMobileNumber === null || searchMobileNumber === void 0 ? void 0 : searchMobileNumber.length) === 10 && !isLoading && propertyOptions.length === 0 && /*#__PURE__*/React__default.createElement("div", {
+    disable: !isMobileVerified || propertyOptions.length === 0
+  }), propertyOptions.length > 0 && /*#__PURE__*/React__default.createElement("span", {
+    style: {
+      fontSize: "14px",
+      color: "#505A5F"
+    }
+  }, t("WS_PROPERTY_AUTOFILL_MSG"))))), showOtpVerification && !isMobileVerified && /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      border: "1px solid #d6d5d4",
+      borderRadius: "4px",
+      background: "#f8f9fa",
+      padding: "12px"
+    }
+  }, /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      fontWeight: "bold",
+      fontSize: "18px",
+      marginBottom: "8px"
+    }
+  }, t("WS_VERIFY_OTP_HEADER") || "OTP Verification"), /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      color: "#505A5F",
+      marginBottom: "16px"
+    }
+  }, t("WS_ENTER_OTP_SENT_TO") || "Enter the 6-digit OTP sent to", " ", getMaskedPhone(searchMobileNumber)), /*#__PURE__*/React__default.createElement("div", {
     style: {
       display: "flex",
-      flexDirection: "column",
-      gap: "16px"
+      flexWrap: "wrap",
+      gap: "15px",
+      alignItems: "center"
     }
-  }, /*#__PURE__*/React__default.createElement("span", {
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.OTPInput, {
     style: {
-      color: "#d63031",
+      marginBottom: "0px"
+    },
+    length: 6,
+    onChange: setOtp,
+    value: otp
+  }), /*#__PURE__*/React__default.createElement("button", {
+    type: "button",
+    onClick: handleVerifyOtp,
+    disabled: otp.length < 6 || isOtpVerifying,
+    style: {
+      padding: "6px 20px",
+      background: otp.length < 6 || isOtpVerifying ? "#ccc" : "#1a67a3",
+      color: "white",
+      border: "none",
+      borderRadius: "4px",
+      cursor: otp.length < 6 || isOtpVerifying ? "not-allowed" : "pointer",
       fontWeight: "bold"
     }
-  }, t("WS_NO_PROPERTY_FOUND_ON_THIS_NUMBER") || "No property found on this number, please create the property first."), /*#__PURE__*/React__default.createElement("span", {
-    onClick: handleCreateProperty
-  }, /*#__PURE__*/React__default.createElement("button", {
-    className: "submit-bar",
+  }, isOtpVerifying ? t("WS_VERIFYING_OTP") || "Verifying..." : t("WS_VERIFY_OTP_AND_PROCEED") || "Verify OTP"), /*#__PURE__*/React__default.createElement("button", {
     type: "button",
+    onClick: handleSendOtp,
+    disabled: timeLeft > 0 || isOtpSending,
     style: {
-      color: "white",
-      margin: 0
+      padding: "6px 20px",
+      background: "white",
+      color: timeLeft > 0 || isOtpSending ? "#ccc" : "#1a67a3",
+      border: `1px solid ${timeLeft > 0 || isOtpSending ? "#ccc" : "#1a67a3"}`,
+      borderRadius: "4px",
+      cursor: timeLeft > 0 || isOtpSending ? "not-allowed" : "pointer",
+      fontWeight: "bold"
+    }
+  }, timeLeft > 0 ? `${t("WS_RESEND_OTP") || "Resend OTP"} (00:${timeLeft < 10 ? `0${timeLeft}` : timeLeft})` : t("WS_RESEND_OTP") || "Resend OTP")), timeLeft > 0 && /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      marginTop: "12px",
+      color: "#505A5F",
+      fontSize: "14px"
     }
-  }, t("CPT_CREATE_PROPERTY"))))), !isEmployee && (isLoading || propertyOptions.length > 0) && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Label, null, t("WS_SELECT_EXISTING_PROPERTY")), isLoading && !isEmployee ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null) : !isEmployee ? propertyOptions.length > 0 ? /*#__PURE__*/React__default.createElement("div", {
+  }, t("WS_DIDNT_RECEIVE_OTP_RESEND") || "Didn't receive OTP? You can resend after", " ", timeLeft, " ", t("WS_SECONDS") || "seconds", ".")), isMobileVerified && /*#__PURE__*/React__default.createElement("div", {
     style: {
       display: "flex",
-      flexDirection: "column",
+      justifyContent: "space-between",
+      alignItems: "center",
+      background: "#d4edda",
+      border: "1px solid #c3e6cb",
+      color: "#155724",
+      padding: "12px 16px",
+      borderRadius: "4px"
+    }
+  }, /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      display: "flex",
+      alignItems: "center",
       gap: "8px"
     }
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
-    option: propertyOptions,
-    optionKey: "displayName",
-    id: "propertyId",
-    selected: selectedProperty,
-    select: val => {
-      setSelectedProperty(val);
-      setShowOtpVerification(false);
+  }, /*#__PURE__*/React__default.createElement("span", {
+    style: {
+      background: "#28a745",
+      color: "white",
+      borderRadius: "50%",
+      width: "24px",
+      height: "24px",
+      display: "inline-flex",
+      justifyContent: "center",
+      alignItems: "center",
+      fontWeight: "bold"
+    }
+  }, "\u2713"), /*#__PURE__*/React__default.createElement("span", {
+    style: {
+      fontWeight: "bold"
+    }
+  }, t("WS_MOBILE_VERIFIED_SUCCESSFULLY") || "Mobile number verified successfully!")), /*#__PURE__*/React__default.createElement("button", {
+    type: "button",
+    onClick: () => {
+      setIsMobileVerified(false);
       setOtp("");
+      setShowOtpVerification(false);
     },
-    t: t,
-    placeholder: t("PT_SELECT_PROPERTY")
-  }), /*#__PURE__*/React__default.createElement("span", {
     style: {
-      fontSize: "14px",
-      color: "#505A5F"
+      color: "#1a67a3",
+      background: "none",
+      border: "none",
+      cursor: "pointer",
+      fontWeight: "bold",
+      textDecoration: "underline"
     }
-  }, t("WS_PROPERTY_AUTOFILL_MSG"))) : /*#__PURE__*/React__default.createElement("div", {
+  }, t("WS_CHANGE_NUMBER") || "Change Number")), (searchMobileNumber === null || searchMobileNumber === void 0 ? void 0 : searchMobileNumber.length) === 10 && isMobileVerified && !isLoading && propertyOptions.length === 0 && /*#__PURE__*/React__default.createElement("div", {
     style: {
       display: "flex",
       flexDirection: "column",
@@ -39306,7 +38592,7 @@ const WSInfoPage = () => {
       color: "white",
       margin: 0
     }
-  }, t("CPT_CREATE_PROPERTY")))) : null), (hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "NO" && /*#__PURE__*/React__default.createElement("div", {
+  }, t("CPT_CREATE_PROPERTY")))))), (hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "NO" && /*#__PURE__*/React__default.createElement("div", {
     style: {
       marginBottom: "24px",
       display: "flex",
@@ -39322,7 +38608,7 @@ const WSInfoPage = () => {
       color: "white",
       margin: 0
     }
-  }, t("CPT_CREATE_PROPERTY")))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, {
+  }, t("CPT_CREATE_PROPERTY")))), /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, {
     style: {
       marginTop: "0",
       marginBottom: "0"
@@ -39382,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",
@@ -39414,7 +38688,7 @@ const WSInfoPage = () => {
       marginBottom: "24px",
       lineHeight: "2"
     }
-  }, /*#__PURE__*/React__default.createElement("li", null, t("WS_DOC_IDENTITY_PROOF")), /*#__PURE__*/React__default.createElement("li", null, t("WS_DOC_ADDRESS_PROOF")), /*#__PURE__*/React__default.createElement("li", null, t("WS_DOC_ELECTRICITY_BILL")), /*#__PURE__*/React__default.createElement("li", null, t("WS_DOC_PLUMBER_REPORT")), /*#__PURE__*/React__default.createElement("li", null, t("WS_DOC_BUILDING_PLAN")), /*#__PURE__*/React__default.createElement("li", null, t("WS_DOC_PROPERTY_TAX_RECEIPT")), /*#__PURE__*/React__default.createElement("li", null, t("WS_DOC_APPLICANT_PHOTOGRAPH"))), !hasProperty || (hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && !selectedProperty ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
+  }, /*#__PURE__*/React__default.createElement("li", null, t("WS_DOC_IDENTITY_PROOF")), /*#__PURE__*/React__default.createElement("li", null, t("WS_DOC_ADDRESS_PROOF")), /*#__PURE__*/React__default.createElement("li", null, t("WS_DOC_ELECTRICITY_BILL")), /*#__PURE__*/React__default.createElement("li", null, t("WS_DOC_PLUMBER_REPORT")), /*#__PURE__*/React__default.createElement("li", null, t("WS_DOC_BUILDING_PLAN")), /*#__PURE__*/React__default.createElement("li", null, t("WS_DOC_PROPERTY_TAX_RECEIPT")), /*#__PURE__*/React__default.createElement("li", null, t("WS_DOC_APPLICANT_PHOTOGRAPH")))), !hasProperty || (hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && !selectedProperty ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
     label: t("CS_COMMON_NEXT"),
     onSubmit: () => {},
     disabled: true
@@ -40448,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,
@@ -41130,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();
@@ -41346,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",
@@ -42949,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,
@@ -43525,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,
@@ -44465,12 +43656,12 @@ const configSVApproverApplication = _ref => {
   };
 };
 
-const Heading = props => {
+const Heading$1 = props => {
   return /*#__PURE__*/React__default.createElement("h1", {
     className: "heading-m"
   }, props.label);
 };
-const Close$1 = () => /*#__PURE__*/React__default.createElement("svg", {
+const Close$2 = () => /*#__PURE__*/React__default.createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg",
   viewBox: "0 0 24 24",
   fill: "#FFFFFF"
@@ -44480,11 +43671,11 @@ const Close$1 = () => /*#__PURE__*/React__default.createElement("svg", {
 }), /*#__PURE__*/React__default.createElement("path", {
   d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
 }));
-const CloseBtn = props => {
+const CloseBtn$1 = props => {
   return /*#__PURE__*/React__default.createElement("div", {
     className: "icon-bg-secondary",
     onClick: props.onClick
-  }, /*#__PURE__*/React__default.createElement(Close$1, null));
+  }, /*#__PURE__*/React__default.createElement(Close$2, null));
 };
 const ActionModal = _ref => {
   var _action$assigneeRoles, _action$assigneeRoles2;
@@ -44566,7 +43757,7 @@ const ActionModal = _ref => {
               if (file.size >= 5242880) {
                 setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
               } else {
-                const _temp = _catch$1(function () {
+                const _temp = _catch(function () {
                   return Promise.resolve(Digit.UploadServices.Filestorage("PT", file, Digit.ULBService.getStateId())).then(function (response) {
                     var _response$data, _response$data$files;
                     if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -44666,10 +43857,10 @@ const ActionModal = _ref => {
     }
   }, [action, approvers, financialYears, selectedFinancialYear, uploadedFile]);
   return action && config.form ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
-    headerBarMain: /*#__PURE__*/React__default.createElement(Heading, {
+    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$1, {
       label: t(config.label.heading)
     }),
-    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn, {
+    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$1, {
       onClick: closeModal
     }),
     actionCancelLabel: t(config.label.cancel),
@@ -44689,12 +43880,12 @@ const ActionModal = _ref => {
   })) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
 };
 
-const Heading$1 = props => {
+const Heading$2 = props => {
   return /*#__PURE__*/React__default.createElement("h1", {
     className: "heading-m"
   }, props.label);
 };
-const Close$2 = () => /*#__PURE__*/React__default.createElement("svg", {
+const Close$3 = () => /*#__PURE__*/React__default.createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg",
   viewBox: "0 0 24 24",
   fill: "#FFFFFF"
@@ -44704,11 +43895,11 @@ const Close$2 = () => /*#__PURE__*/React__default.createElement("svg", {
 }), /*#__PURE__*/React__default.createElement("path", {
   d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
 }));
-const CloseBtn$1 = props => {
+const CloseBtn$2 = props => {
   return /*#__PURE__*/React__default.createElement("div", {
     className: "icon-bg-secondary",
     onClick: props.onClick
-  }, /*#__PURE__*/React__default.createElement(Close$2, null));
+  }, /*#__PURE__*/React__default.createElement(Close$3, null));
 };
 const ActionModal$1 = _ref => {
   var _action$assigneeRoles, _action$assigneeRoles2;
@@ -44789,7 +43980,7 @@ const ActionModal$1 = _ref => {
               if (file.size >= 5242880) {
                 setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
               } else {
-                const _temp = _catch$1(function () {
+                const _temp = _catch(function () {
                   return Promise.resolve(Digit.UploadServices.Filestorage("PT", file, Digit.ULBService.getStateId())).then(function (response) {
                     var _response$data, _response$data$files;
                     if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -44846,10 +44037,10 @@ const ActionModal$1 = _ref => {
     }
   }, [action, approvers, financialYears, selectedFinancialYear, uploadedFile]);
   return action && config.form ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
-    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$1, {
+    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$2, {
       label: t(config.label.heading)
     }),
-    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$1, {
+    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$2, {
       onClick: closeModal
     }),
     actionCancelLabel: t(config.label.cancel),
@@ -44868,7 +44059,7 @@ const ActionModal$1 = _ref => {
   })) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
 };
 
-const Heading$2 = props => {
+const Heading$3 = props => {
   return /*#__PURE__*/React__default.createElement("h1", {
     style: {
       marginLeft: "22px"
@@ -44876,7 +44067,7 @@ const Heading$2 = props => {
     className: "heading-m BPAheading-m"
   }, props.label);
 };
-const Close$3 = () => /*#__PURE__*/React__default.createElement("svg", {
+const Close$4 = () => /*#__PURE__*/React__default.createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg",
   viewBox: "0 0 24 24",
   fill: "#FFFFFF"
@@ -44886,11 +44077,11 @@ const Close$3 = () => /*#__PURE__*/React__default.createElement("svg", {
 }), /*#__PURE__*/React__default.createElement("path", {
   d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
 }));
-const CloseBtn$2 = props => {
+const CloseBtn$3 = props => {
   return /*#__PURE__*/React__default.createElement("div", {
     className: "icon-bg-secondary",
     onClick: props.onClick
-  }, /*#__PURE__*/React__default.createElement(Close$3, null));
+  }, /*#__PURE__*/React__default.createElement(Close$4, null));
 };
 const ActionModal$2 = _ref => {
   var _action$assigneeRoles, _action$assigneeRoles2;
@@ -44954,7 +44145,7 @@ const ActionModal$2 = _ref => {
                   if (file !== null && file !== void 0 && file.type && !allowedFileTypesRegex.test(file === null || file === void 0 ? void 0 : file.type)) {
                     setError(t(`NOT_SUPPORTED_FILE_TYPE`));
                   } else {
-                    const _temp = _catch$1(function () {
+                    const _temp = _catch(function () {
                       return Promise.resolve(Digit.UploadServices.Filestorage("OBPS", file, Digit.ULBService.getStateId() || (tenantId === null || tenantId === void 0 ? void 0 : tenantId.split(".")[0]))).then(function (response) {
                         var _response$data, _response$data$files;
                         if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -45018,10 +44209,10 @@ const ActionModal$2 = _ref => {
     }
   }, [action, approvers, uploadedFile, error]);
   return action && config.form ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
-    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$2, {
+    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$3, {
       label: t(config.label.heading)
     }),
-    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$2, {
+    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$3, {
       onClick: closeModal
     }),
     actionCancelLabel: t(config.label.cancel),
@@ -45062,7 +44253,7 @@ const ActionModal$2 = _ref => {
   })) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
 };
 
-const Heading$3 = props => {
+const Heading$4 = props => {
   return /*#__PURE__*/React__default.createElement("h1", {
     style: {
       marginLeft: "22px"
@@ -45070,7 +44261,7 @@ const Heading$3 = props => {
     className: "heading-m BPAheading-m"
   }, props.label);
 };
-const Close$4 = () => /*#__PURE__*/React__default.createElement("svg", {
+const Close$5 = () => /*#__PURE__*/React__default.createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg",
   viewBox: "0 0 24 24",
   fill: "#FFFFFF"
@@ -45080,11 +44271,11 @@ const Close$4 = () => /*#__PURE__*/React__default.createElement("svg", {
 }), /*#__PURE__*/React__default.createElement("path", {
   d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
 }));
-const CloseBtn$3 = props => {
+const CloseBtn$4 = props => {
   return /*#__PURE__*/React__default.createElement("div", {
     className: "icon-bg-secondary",
     onClick: props.onClick
-  }, /*#__PURE__*/React__default.createElement(Close$4, null));
+  }, /*#__PURE__*/React__default.createElement(Close$5, null));
 };
 const ActionModal$3 = _ref => {
   var _applicationData, _applicationData$land, _applicationData$land2, _applicationData2, _applicationData2$lan, _applicationData2$lan2, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6;
@@ -45233,7 +44424,7 @@ const ActionModal$3 = _ref => {
                   if (file !== null && file !== void 0 && file.type && !allowedFileTypesRegex.test(file === null || file === void 0 ? void 0 : file.type)) {
                     setError(t(`NOT_SUPPORTED_FILE_TYPE`));
                   } else {
-                    const _temp = _catch$1(function () {
+                    const _temp = _catch(function () {
                       return Promise.resolve(Digit.UploadServices.Filestorage("OBPS", file, Digit.ULBService.getStateId() || (tenantId === null || tenantId === void 0 ? void 0 : tenantId.split(".")[0]))).then(function (response) {
                         var _response$data, _response$data$files;
                         if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -45351,10 +44542,10 @@ const ActionModal$3 = _ref => {
     }
   }, [action, approvers, selectedFinancialYear, uploadedFile, error]);
   return action && config.form ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
-    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$3, {
+    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$4, {
       label: t(config.label.heading)
     }),
-    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$3, {
+    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$4, {
       onClick: closeModal
     }),
     actionCancelLabel: t(config.label.cancel),
@@ -45397,7 +44588,7 @@ const ActionModal$3 = _ref => {
   })) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
 };
 
-const Heading$4 = props => {
+const Heading$5 = props => {
   return /*#__PURE__*/React__default.createElement("h1", {
     style: {
       marginLeft: "22px"
@@ -45405,7 +44596,7 @@ const Heading$4 = props => {
     className: "heading-m BPAheading-m"
   }, props.label);
 };
-const Close$5 = () => /*#__PURE__*/React__default.createElement("svg", {
+const Close$6 = () => /*#__PURE__*/React__default.createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg",
   viewBox: "0 0 24 24",
   fill: "#FFFFFF"
@@ -45415,11 +44606,11 @@ const Close$5 = () => /*#__PURE__*/React__default.createElement("svg", {
 }), /*#__PURE__*/React__default.createElement("path", {
   d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
 }));
-const CloseBtn$4 = props => {
+const CloseBtn$5 = props => {
   return /*#__PURE__*/React__default.createElement("div", {
     className: "icon-bg-secondary",
     onClick: props.onClick
-  }, /*#__PURE__*/React__default.createElement(Close$5, null));
+  }, /*#__PURE__*/React__default.createElement(Close$6, null));
 };
 const ActionModal$4 = _ref => {
   var _action$assigneeRoles, _action$assigneeRoles2;
@@ -45485,7 +44676,7 @@ const ActionModal$4 = _ref => {
                   if (file !== null && file !== void 0 && file.type && !allowedFileTypesRegex.test(file === null || file === void 0 ? void 0 : file.type)) {
                     setError(t(`NOT_SUPPORTED_FILE_TYPE`));
                   } else {
-                    const _temp = _catch$1(function () {
+                    const _temp = _catch(function () {
                       return Promise.resolve(Digit.UploadServices.Filestorage("NOC", file, Digit.ULBService.getStateId() || (tenantId === null || tenantId === void 0 ? void 0 : tenantId.split(".")[0]))).then(function (response) {
                         var _response$data, _response$data$files;
                         if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -45558,10 +44749,10 @@ const ActionModal$4 = _ref => {
     }
   }, [action, approvers, uploadedFile, error]);
   return action && config.form ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
-    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$4, {
+    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$5, {
       label: t(config.label.heading)
     }),
-    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$4, {
+    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$5, {
       onClick: closeModal
     }),
     actionCancelLabel: t(config.label.cancel),
@@ -45602,12 +44793,12 @@ const ActionModal$4 = _ref => {
   })) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
 };
 
-const Heading$5 = props => {
+const Heading$6 = props => {
   return /*#__PURE__*/React__default.createElement("h1", {
     className: "heading-m"
   }, props.label);
 };
-const Close$6 = () => /*#__PURE__*/React__default.createElement("svg", {
+const Close$7 = () => /*#__PURE__*/React__default.createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg",
   viewBox: "0 0 24 24",
   fill: "#FFFFFF"
@@ -45617,11 +44808,11 @@ const Close$6 = () => /*#__PURE__*/React__default.createElement("svg", {
 }), /*#__PURE__*/React__default.createElement("path", {
   d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
 }));
-const CloseBtn$5 = props => {
+const CloseBtn$6 = props => {
   return /*#__PURE__*/React__default.createElement("div", {
     className: "icon-bg-secondary",
     onClick: props.onClick
-  }, /*#__PURE__*/React__default.createElement(Close$6, null));
+  }, /*#__PURE__*/React__default.createElement(Close$7, null));
 };
 const convertDateToEpochNew$1 = function (dateString, dayStartOrEnd) {
   if (dayStartOrEnd === void 0) {
@@ -45713,7 +44904,7 @@ const ActionModal$5 = _ref => {
                   if (file !== null && file !== void 0 && file.type && !allowedFileTypesRegex.test(file === null || file === void 0 ? void 0 : file.type)) {
                     setError(t(`NOT_SUPPORTED_FILE_TYPE`));
                   } else {
-                    const _temp = _catch$1(function () {
+                    const _temp = _catch(function () {
                       return Promise.resolve(Digit.UploadServices.Filestorage("WS", file, Digit.ULBService.getCurrentTenantId())).then(function (response) {
                         var _response$data, _response$data$files;
                         if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -45934,10 +45125,10 @@ const ActionModal$5 = _ref => {
     }
   }, [action, approvers, uploadedFile, error, isReasonRequiredAction, selectedReason, otherReasonText, showApprovalChecklist, approvalChecklist, applicationData]);
   return action && config.form ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
-    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$5, {
+    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$6, {
       label: t(config.label.heading)
     }),
-    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$5, {
+    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$6, {
       onClick: closeModal
     }),
     actionCancelLabel: t(config.label.cancel),
@@ -45970,12 +45161,12 @@ const ActionModal$5 = _ref => {
   }))) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
 };
 
-const Heading$6 = props => {
+const Heading$7 = props => {
   return /*#__PURE__*/React__default.createElement("h1", {
     className: "heading-m"
   }, props.label);
 };
-const Close$7 = () => /*#__PURE__*/React__default.createElement("svg", {
+const Close$8 = () => /*#__PURE__*/React__default.createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg",
   viewBox: "0 0 24 24",
   fill: "#FFFFFF"
@@ -45985,11 +45176,11 @@ const Close$7 = () => /*#__PURE__*/React__default.createElement("svg", {
 }), /*#__PURE__*/React__default.createElement("path", {
   d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
 }));
-const CloseBtn$6 = props => {
+const CloseBtn$7 = props => {
   return /*#__PURE__*/React__default.createElement("div", {
     className: "icon-bg-secondary",
     onClick: props.onClick
-  }, /*#__PURE__*/React__default.createElement(Close$7, null));
+  }, /*#__PURE__*/React__default.createElement(Close$8, null));
 };
 const ActionModal$6 = _ref => {
   var _action$assigneeRoles, _action$assigneeRoles2;
@@ -46049,7 +45240,7 @@ const ActionModal$6 = _ref => {
               if (file.size >= 5242880) {
                 setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
               } else {
-                const _temp = _catch$1(function () {
+                const _temp = _catch(function () {
                   return Promise.resolve(Digit.UploadServices.Filestorage("PTR", file, Digit.ULBService.getStateId())).then(function (response) {
                     var _response$data, _response$data$files;
                     if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -46109,10 +45300,10 @@ const ActionModal$6 = _ref => {
     }
   }, [action, approvers, uploadedFile]);
   return action && config.form ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
-    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$6, {
+    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$7, {
       label: t(config.label.heading)
     }),
-    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$6, {
+    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$7, {
       onClick: closeModal
     }),
     actionCancelLabel: t(config.label.cancel),
@@ -46131,12 +45322,12 @@ const ActionModal$6 = _ref => {
   })) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
 };
 
-const Heading$7 = props => {
+const Heading$8 = props => {
   return /*#__PURE__*/React__default.createElement("h1", {
     className: "heading-m"
   }, props.label);
 };
-const Close$8 = () => /*#__PURE__*/React__default.createElement("svg", {
+const Close$9 = () => /*#__PURE__*/React__default.createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg",
   viewBox: "0 0 24 24",
   fill: "#FFFFFF"
@@ -46146,11 +45337,11 @@ const Close$8 = () => /*#__PURE__*/React__default.createElement("svg", {
 }), /*#__PURE__*/React__default.createElement("path", {
   d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
 }));
-const CloseBtn$7 = props => {
+const CloseBtn$8 = props => {
   return /*#__PURE__*/React__default.createElement("div", {
     className: "icon-bg-secondary",
     onClick: props.onClick
-  }, /*#__PURE__*/React__default.createElement(Close$8, null));
+  }, /*#__PURE__*/React__default.createElement(Close$9, null));
 };
 const ActionModal$7 = _ref => {
   var _action$roles, _action$roles$, _action$roles$$map;
@@ -46230,10 +45421,10 @@ const ActionModal$7 = _ref => {
     }
   }, [action, approvers, uploadedFile]);
   return action && config.form ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
-    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$7, {
+    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$8, {
       label: t(config.label.heading)
     }),
-    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$7, {
+    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$8, {
       onClick: closeModal
     }),
     actionCancelLabel: t(config.label.cancel),
@@ -46256,12 +45447,12 @@ const ActionModal$7 = _ref => {
   })) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
 };
 
-const Heading$8 = props => {
+const Heading$9 = props => {
   return /*#__PURE__*/React__default.createElement("h1", {
     className: "heading-m"
   }, props.label);
 };
-const Close$9 = () => /*#__PURE__*/React__default.createElement("svg", {
+const Close$a = () => /*#__PURE__*/React__default.createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg",
   viewBox: "0 0 24 24",
   fill: "#FFFFFF"
@@ -46271,11 +45462,11 @@ const Close$9 = () => /*#__PURE__*/React__default.createElement("svg", {
 }), /*#__PURE__*/React__default.createElement("path", {
   d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
 }));
-const CloseBtn$8 = props => {
+const CloseBtn$9 = props => {
   return /*#__PURE__*/React__default.createElement("div", {
     className: "icon-bg-secondary",
     onClick: props.onClick
-  }, /*#__PURE__*/React__default.createElement(Close$9, null));
+  }, /*#__PURE__*/React__default.createElement(Close$a, null));
 };
 const ActionModal$8 = _ref => {
   var _action$assigneeRoles, _action$assigneeRoles2;
@@ -46334,7 +45525,7 @@ const ActionModal$8 = _ref => {
               if (file.size >= 5242880) {
                 setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
               } else {
-                const _temp = _catch$1(function () {
+                const _temp = _catch(function () {
                   return Promise.resolve(Digit.UploadServices.Filestorage("CHB", file, tenantId)).then(function (response) {
                     var _response$data, _response$data$files;
                     if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -46393,173 +45584,6 @@ const ActionModal$8 = _ref => {
       }));
     }
   }, [action, approvers, uploadedFile]);
-  return action && config.form ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
-    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$8, {
-      label: t(config.label.heading)
-    }),
-    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$8, {
-      onClick: closeModal
-    }),
-    actionCancelLabel: t(config.label.cancel),
-    actionCancelOnSubmit: closeModal,
-    actionSaveLabel: t(config.label.submit),
-    actionSaveOnSubmit: () => {},
-    formId: "modal-action"
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.FormComposer, {
-    config: config.form,
-    noBoxShadow: true,
-    inline: true,
-    childrenAtTheBottom: true,
-    onSubmit: submit,
-    defaultValues: defaultValues,
-    formId: "modal-action"
-  })) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
-};
-
-const Heading$9 = props => {
-  return /*#__PURE__*/React__default.createElement("h1", {
-    className: "heading-m"
-  }, props.label);
-};
-const Close$a = () => /*#__PURE__*/React__default.createElement("svg", {
-  xmlns: "http://www.w3.org/2000/svg",
-  viewBox: "0 0 24 24",
-  fill: "#FFFFFF"
-}, /*#__PURE__*/React__default.createElement("path", {
-  d: "M0 0h24v24H0V0z",
-  fill: "none"
-}), /*#__PURE__*/React__default.createElement("path", {
-  d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
-}));
-const CloseBtn$9 = props => {
-  return /*#__PURE__*/React__default.createElement("div", {
-    className: "icon-bg-secondary",
-    onClick: props.onClick
-  }, /*#__PURE__*/React__default.createElement(Close$a, null));
-};
-const ActionModal$9 = _ref => {
-  var _action$assigneeRoles, _action$assigneeRoles2;
-  let {
-    t,
-    action,
-    tenantId,
-    state,
-    id,
-    closeModal,
-    submitAction,
-    actionData,
-    applicationData,
-    businessService,
-    moduleCode
-  } = _ref;
-  console.log("snjdskbjdfbjskfjkbs", action);
-  const {
-    data: approverData,
-    isLoading: PTALoading
-  } = Digit.Hooks.useEmployeeSearch(tenantId, {
-    roles: action === null || action === void 0 ? void 0 : (_action$assigneeRoles = action.assigneeRoles) === null || _action$assigneeRoles === void 0 ? void 0 : (_action$assigneeRoles2 = _action$assigneeRoles.map) === null || _action$assigneeRoles2 === void 0 ? void 0 : _action$assigneeRoles2.call(_action$assigneeRoles, e => ({
-      code: e
-    })),
-    isActive: true
-  }, {
-    enabled: !(action !== null && action !== void 0 && action.isTerminateState)
-  });
-  const [config, setConfig] = React.useState({});
-  const [defaultValues, setDefaultValues] = React.useState({});
-  const [approvers, setApprovers] = React.useState([]);
-  const [selectedApprover, setSelectedApprover] = React.useState(null);
-  const [pickUpDate, setpickUpDate] = React.useState(null);
-  const [file, setFile] = React.useState(null);
-  const [uploadedFile, setUploadedFile] = React.useState(null);
-  const [error, setError] = React.useState(null);
-  const [disableActionSubmit, setDisableActionSubmit] = React.useState(false);
-  React.useEffect(() => {
-    var _approverData$Employe;
-    setApprovers(approverData === null || approverData === void 0 ? void 0 : (_approverData$Employe = approverData.Employees) === null || _approverData$Employe === void 0 ? void 0 : _approverData$Employe.map(employee => {
-      var _employee$user;
-      return {
-        uuid: employee === null || employee === void 0 ? void 0 : employee.uuid,
-        name: employee === null || employee === void 0 ? void 0 : (_employee$user = employee.user) === null || _employee$user === void 0 ? void 0 : _employee$user.name
-      };
-    }));
-  }, [approverData]);
-  function selectFile(e) {
-    setFile(e.target.files[0]);
-  }
-  React.useEffect(() => {
-    (function () {
-      try {
-        setError(null);
-        const _temp3 = function () {
-          if (file) {
-            const _temp2 = function () {
-              if (file.size >= 5242880) {
-                setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
-              } else {
-                const _temp = _catch$1(function () {
-                  return Promise.resolve(Digit.UploadServices.Filestorage("PTR", file, Digit.ULBService.getStateId())).then(function (response) {
-                    var _response$data, _response$data$files;
-                    if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
-                      var _response$data2, _response$data2$files;
-                      setUploadedFile(response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$files = _response$data2.files[0]) === null || _response$data2$files === void 0 ? void 0 : _response$data2$files.fileStoreId);
-                    } else {
-                      setError(t("CS_FILE_UPLOAD_ERROR"));
-                    }
-                  });
-                }, function () {
-                  setError(t("CS_FILE_UPLOAD_ERROR"));
-                });
-                if (_temp && _temp.then) return _temp.then(function () {});
-              }
-            }();
-            if (_temp2 && _temp2.then) return _temp2.then(function () {});
-          }
-        }();
-        return _temp3 && _temp3.then ? _temp3.then(function () {}) : void 0;
-      } catch (e) {
-        Promise.reject(e);
-      }
-    })();
-  }, [file]);
-  function submit(data) {
-    let workflow = {
-      action: action === null || action === void 0 ? void 0 : action.action,
-      comments: data === null || data === void 0 ? void 0 : data.comments,
-      businessService,
-      moduleName: moduleCode
-    };
-    console.log("applicationData", data);
-    if (uploadedFile) workflow["documents"] = [{
-      documentType: (action === null || action === void 0 ? void 0 : action.action) + " DOC",
-      fileName: file === null || file === void 0 ? void 0 : file.name,
-      filestoreId: uploadedFile
-    }, {}];
-    applicationData.pickUpDate = data === null || data === void 0 ? void 0 : data.date;
-    applicationData.transactionId = data === null || data === void 0 ? void 0 : data.transactionId;
-    applicationData.finalAmount = data === null || data === void 0 ? void 0 : data.finalAmount;
-    submitAction({
-      EwasteApplication: [{
-        ...applicationData,
-        workflow
-      }]
-    });
-  }
-  React.useEffect(() => {
-    if (action) {
-      setConfig(configEWApproverApplication({
-        t,
-        action,
-        approvers,
-        selectedApprover,
-        setSelectedApprover,
-        selectFile,
-        uploadedFile,
-        setUploadedFile,
-        businessService
-      }));
-    }
-  }, [action, approvers, uploadedFile]);
-  console.log("conggg", config);
   return action && config.form ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
     headerBarMain: /*#__PURE__*/React__default.createElement(Heading$9, {
       label: t(config.label.heading)
@@ -46604,6 +45628,173 @@ const CloseBtn$a = props => {
     onClick: props.onClick
   }, /*#__PURE__*/React__default.createElement(Close$b, null));
 };
+const ActionModal$9 = _ref => {
+  var _action$assigneeRoles, _action$assigneeRoles2;
+  let {
+    t,
+    action,
+    tenantId,
+    state,
+    id,
+    closeModal,
+    submitAction,
+    actionData,
+    applicationData,
+    businessService,
+    moduleCode
+  } = _ref;
+  console.log("snjdskbjdfbjskfjkbs", action);
+  const {
+    data: approverData,
+    isLoading: PTALoading
+  } = Digit.Hooks.useEmployeeSearch(tenantId, {
+    roles: action === null || action === void 0 ? void 0 : (_action$assigneeRoles = action.assigneeRoles) === null || _action$assigneeRoles === void 0 ? void 0 : (_action$assigneeRoles2 = _action$assigneeRoles.map) === null || _action$assigneeRoles2 === void 0 ? void 0 : _action$assigneeRoles2.call(_action$assigneeRoles, e => ({
+      code: e
+    })),
+    isActive: true
+  }, {
+    enabled: !(action !== null && action !== void 0 && action.isTerminateState)
+  });
+  const [config, setConfig] = React.useState({});
+  const [defaultValues, setDefaultValues] = React.useState({});
+  const [approvers, setApprovers] = React.useState([]);
+  const [selectedApprover, setSelectedApprover] = React.useState(null);
+  const [pickUpDate, setpickUpDate] = React.useState(null);
+  const [file, setFile] = React.useState(null);
+  const [uploadedFile, setUploadedFile] = React.useState(null);
+  const [error, setError] = React.useState(null);
+  const [disableActionSubmit, setDisableActionSubmit] = React.useState(false);
+  React.useEffect(() => {
+    var _approverData$Employe;
+    setApprovers(approverData === null || approverData === void 0 ? void 0 : (_approverData$Employe = approverData.Employees) === null || _approverData$Employe === void 0 ? void 0 : _approverData$Employe.map(employee => {
+      var _employee$user;
+      return {
+        uuid: employee === null || employee === void 0 ? void 0 : employee.uuid,
+        name: employee === null || employee === void 0 ? void 0 : (_employee$user = employee.user) === null || _employee$user === void 0 ? void 0 : _employee$user.name
+      };
+    }));
+  }, [approverData]);
+  function selectFile(e) {
+    setFile(e.target.files[0]);
+  }
+  React.useEffect(() => {
+    (function () {
+      try {
+        setError(null);
+        const _temp3 = function () {
+          if (file) {
+            const _temp2 = function () {
+              if (file.size >= 5242880) {
+                setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
+              } else {
+                const _temp = _catch(function () {
+                  return Promise.resolve(Digit.UploadServices.Filestorage("PTR", file, Digit.ULBService.getStateId())).then(function (response) {
+                    var _response$data, _response$data$files;
+                    if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
+                      var _response$data2, _response$data2$files;
+                      setUploadedFile(response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$files = _response$data2.files[0]) === null || _response$data2$files === void 0 ? void 0 : _response$data2$files.fileStoreId);
+                    } else {
+                      setError(t("CS_FILE_UPLOAD_ERROR"));
+                    }
+                  });
+                }, function () {
+                  setError(t("CS_FILE_UPLOAD_ERROR"));
+                });
+                if (_temp && _temp.then) return _temp.then(function () {});
+              }
+            }();
+            if (_temp2 && _temp2.then) return _temp2.then(function () {});
+          }
+        }();
+        return _temp3 && _temp3.then ? _temp3.then(function () {}) : void 0;
+      } catch (e) {
+        Promise.reject(e);
+      }
+    })();
+  }, [file]);
+  function submit(data) {
+    let workflow = {
+      action: action === null || action === void 0 ? void 0 : action.action,
+      comments: data === null || data === void 0 ? void 0 : data.comments,
+      businessService,
+      moduleName: moduleCode
+    };
+    console.log("applicationData", data);
+    if (uploadedFile) workflow["documents"] = [{
+      documentType: (action === null || action === void 0 ? void 0 : action.action) + " DOC",
+      fileName: file === null || file === void 0 ? void 0 : file.name,
+      filestoreId: uploadedFile
+    }, {}];
+    applicationData.pickUpDate = data === null || data === void 0 ? void 0 : data.date;
+    applicationData.transactionId = data === null || data === void 0 ? void 0 : data.transactionId;
+    applicationData.finalAmount = data === null || data === void 0 ? void 0 : data.finalAmount;
+    submitAction({
+      EwasteApplication: [{
+        ...applicationData,
+        workflow
+      }]
+    });
+  }
+  React.useEffect(() => {
+    if (action) {
+      setConfig(configEWApproverApplication({
+        t,
+        action,
+        approvers,
+        selectedApprover,
+        setSelectedApprover,
+        selectFile,
+        uploadedFile,
+        setUploadedFile,
+        businessService
+      }));
+    }
+  }, [action, approvers, uploadedFile]);
+  console.log("conggg", config);
+  return action && config.form ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
+    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$a, {
+      label: t(config.label.heading)
+    }),
+    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$a, {
+      onClick: closeModal
+    }),
+    actionCancelLabel: t(config.label.cancel),
+    actionCancelOnSubmit: closeModal,
+    actionSaveLabel: t(config.label.submit),
+    actionSaveOnSubmit: () => {},
+    formId: "modal-action"
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.FormComposer, {
+    config: config.form,
+    noBoxShadow: true,
+    inline: true,
+    childrenAtTheBottom: true,
+    onSubmit: submit,
+    defaultValues: defaultValues,
+    formId: "modal-action"
+  })) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
+};
+
+const Heading$b = props => {
+  return /*#__PURE__*/React__default.createElement("h1", {
+    className: "heading-m"
+  }, props.label);
+};
+const Close$c = () => /*#__PURE__*/React__default.createElement("svg", {
+  xmlns: "http://www.w3.org/2000/svg",
+  viewBox: "0 0 24 24",
+  fill: "#FFFFFF"
+}, /*#__PURE__*/React__default.createElement("path", {
+  d: "M0 0h24v24H0V0z",
+  fill: "none"
+}), /*#__PURE__*/React__default.createElement("path", {
+  d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
+}));
+const CloseBtn$b = props => {
+  return /*#__PURE__*/React__default.createElement("div", {
+    className: "icon-bg-secondary",
+    onClick: props.onClick
+  }, /*#__PURE__*/React__default.createElement(Close$c, null));
+};
 const ActionModal$a = _ref => {
   var _action$assigneeRoles, _action$assigneeRoles2;
   let {
@@ -46662,8 +45853,8 @@ const ActionModal$a = _ref => {
               if (file.size >= 5242880) {
                 setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
               } else {
-                const _temp = _finallyRethrows$1(function () {
-                  return _catch$1(function () {
+                const _temp = _finallyRethrows(function () {
+                  return _catch(function () {
                     return Promise.resolve(Digit.UploadServices.Filestorage("StreetVending", file, tenantId)).then(function (response) {
                       var _response$data, _response$data$files;
                       if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -46730,10 +45921,10 @@ const ActionModal$a = _ref => {
     }));
   }, [action, approvers, uploadedFile]);
   return action && config.form ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
-    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$a, {
+    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$b, {
       label: t(config.label.heading)
     }),
-    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$a, {
+    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$b, {
       onClick: closeModal
     }),
     actionCancelLabel: t(config.label.cancel),
@@ -46817,12 +46008,12 @@ const configWTApproverApplication = _ref => {
   };
 };
 
-const Heading$b = props => {
+const Heading$c = props => {
   return /*#__PURE__*/React__default.createElement("h1", {
     className: "heading-m"
   }, props.label);
 };
-const Close$c = () => /*#__PURE__*/React__default.createElement("svg", {
+const Close$d = () => /*#__PURE__*/React__default.createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg",
   viewBox: "0 0 24 24",
   fill: "#FFFFFF"
@@ -46832,11 +46023,11 @@ const Close$c = () => /*#__PURE__*/React__default.createElement("svg", {
 }), /*#__PURE__*/React__default.createElement("path", {
   d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
 }));
-const CloseBtn$b = props => {
+const CloseBtn$c = props => {
   return /*#__PURE__*/React__default.createElement("div", {
     className: "icon-bg-secondary",
     onClick: props.onClick
-  }, /*#__PURE__*/React__default.createElement(Close$c, null));
+  }, /*#__PURE__*/React__default.createElement(Close$d, null));
 };
 const ActionModal$b = _ref => {
   var _action$assigneeRoles, _action$assigneeRoles2, _dsoData$vendor, _vehicleData$vehicle, _vehicleData$vehicle$;
@@ -46952,7 +46143,7 @@ const ActionModal$b = _ref => {
               if (file.size >= 5242880) {
                 setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
               } else {
-                const _temp = _catch$1(function () {
+                const _temp = _catch(function () {
                   return Promise.resolve(Digit.UploadServices.Filestorage("WT", file, tenantId)).then(function (response) {
                     var _response$data, _response$data$files;
                     if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
@@ -47034,10 +46225,10 @@ const ActionModal$b = _ref => {
     }
   }, [action, approvers, uploadedFile, dsoData, selectVehicle, vehicleData]);
   return action && config.form ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
-    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$b, {
+    headerBarMain: /*#__PURE__*/React__default.createElement(Heading$c, {
       label: t(config.label.heading)
     }),
-    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$b, {
+    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$c, {
       onClick: closeModal
     }),
     actionCancelLabel: t(config.label.cancel),
@@ -47636,7 +46827,7 @@ function SelectDocument$4(_ref) {
                   if (file !== null && file !== void 0 && file.type && !allowedFileTypesRegex.test(file === null || file === void 0 ? void 0 : file.type)) {
                     setError(t(`NOT_SUPPORTED_FILE_TYPE`));
                   } else {
-                    const _temp = _catch$1(function () {
+                    const _temp = _catch(function () {
                       setUploadedFile(null);
                       return Promise.resolve(Digit.UploadServices.Filestorage("PT", file, Digit.ULBService.getStateId())).then(function (response) {
                         var _response$data, _response$data$files;
@@ -48017,7 +47208,7 @@ function PropertyDocuments(_ref) {
   };
   const forceDownload = function (url, fileName) {
     try {
-      return Promise.resolve(_catch$1(function () {
+      return Promise.resolve(_catch(function () {
         return Promise.resolve(fetch(url)).then(function (response) {
           if (!response.ok) {
             throw new Error(`HTTP error! status: ${response.status}`);
@@ -49328,7 +48519,7 @@ const ArrearSummary = _ref => {
   }, t("CS_HIDE_CARD"))));
 };
 
-const Close$d = () => /*#__PURE__*/React__default.createElement("svg", {
+const Close$e = () => /*#__PURE__*/React__default.createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg",
   viewBox: "0 0 24 24",
   fill: "#FFFFFF"
@@ -49338,11 +48529,11 @@ const Close$d = () => /*#__PURE__*/React__default.createElement("svg", {
 }), /*#__PURE__*/React__default.createElement("path", {
   d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
 }));
-const CloseBtn$c = props => {
+const CloseBtn$d = props => {
   return /*#__PURE__*/React__default.createElement("div", {
     className: "icon-bg-secondary",
     onClick: props.onClick
-  }, /*#__PURE__*/React__default.createElement(Close$d, null));
+  }, /*#__PURE__*/React__default.createElement(Close$e, null));
 };
 const RenewPopup = _ref => {
   let {
@@ -49370,7 +48561,7 @@ const RenewPopup = _ref => {
     headerBarMain: /*#__PURE__*/React__default.createElement(Heading, {
       label: "SV_WANT_TO_EDIT"
     }),
-    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$c, {
+    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$d, {
       onClick: closeModal
     }),
     actionCancelLabel: t("CS_COMMON_BACK"),
@@ -49515,7 +48706,7 @@ const DueVerification = _ref => {
       try {
         return Promise.resolve(function () {
           if (isZROApproval && applicationData !== null && applicationData !== void 0 && applicationData.applicationNo) {
-            return _catch$1(function () {
+            return _catch(function () {
               return Promise.resolve(checkDueVerification({
                 DueVerification: {
                   applicationNo: applicationData.applicationNo
@@ -49559,7 +48750,7 @@ const DueVerification = _ref => {
             });
             return;
           }
-          return _catch$1(function () {
+          return _catch(function () {
             return Promise.resolve(checkDueVerification({
               DueVerification: {
                 kno: kno
@@ -50604,7 +49795,7 @@ function ApplicationDetailsActionBar(_ref) {
   }, t(`${forcedActionPrefix || `WF_EMPLOYEE_${businessService === null || businessService === void 0 ? void 0 : businessService.toUpperCase()}`}_${actions === null || actions === void 0 ? void 0 : (_actions$4 = actions[0]) === null || _actions$4 === void 0 ? void 0 : _actions$4.action}`))));
 }
 
-const Close$e = () => /*#__PURE__*/React__default.createElement("svg", {
+const Close$f = () => /*#__PURE__*/React__default.createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg",
   viewBox: "0 0 24 24",
   fill: "#FFFFFF"
@@ -50614,11 +49805,11 @@ const Close$e = () => /*#__PURE__*/React__default.createElement("svg", {
 }), /*#__PURE__*/React__default.createElement("path", {
   d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
 }));
-const CloseBtn$d = props => {
+const CloseBtn$e = props => {
   return /*#__PURE__*/React__default.createElement("div", {
     className: "icon-bg-secondary",
     onClick: props.onClick
-  }, /*#__PURE__*/React__default.createElement(Close$e, null));
+  }, /*#__PURE__*/React__default.createElement(Close$f, null));
 };
 function ApplicationDetailsWarningPopup(_ref) {
   let {
@@ -50636,7 +49827,7 @@ function ApplicationDetailsWarningPopup(_ref) {
     headerBarMain: /*#__PURE__*/React__default.createElement("h1", {
       className: "heading-m"
     }, t("PT_DUES_ARE_PENDING")),
-    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$d, {
+    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$e, {
       onClick: () => {
         closeWarningPopup();
       }
@@ -50921,7 +50112,7 @@ const ApplicationDetails = props => {
               const nocPrmomises = (_nocData = nocData) === null || _nocData === void 0 ? void 0 : _nocData.map(noc => {
                 return nocMutation === null || nocMutation === void 0 ? void 0 : nocMutation.mutateAsync(noc);
               });
-              const _temp = _catch$1(function () {
+              const _temp = _catch(function () {
                 setIsEnableLoader(true);
                 return Promise.resolve(Promise.all(nocPrmomises)).then(function (values) {
                   values && values.map(ob => {
@@ -54822,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"
@@ -54841,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",
@@ -55110,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);
         }
       },
@@ -55123,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,
@@ -55144,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: {
@@ -55249,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"
@@ -55450,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 = {};
@@ -55463,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;
@@ -55476,7 +54674,8 @@ const Step3_UploadDocuments = _ref => {
       identityProofType,
       documentNumber: documentNumber.trim(),
       identityProofDocumentId: identityProofFile,
-      saleDeedDocumentId: mutationDocFile
+      saleDeedDocumentId: mutationDocFile,
+      isDeclarationChecked
     });
   };
   const uploadBoxStyle = (hasError, hasFile) => ({
@@ -55567,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 => {
@@ -55599,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) {
@@ -55622,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"
       } : {}),
@@ -55632,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: {
@@ -55808,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",
@@ -55887,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);
@@ -56069,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"
@@ -57121,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, {
@@ -58998,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,
@@ -59073,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) || {};
@@ -59313,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",
@@ -59477,8 +58716,6 @@ const OLDApplication = () => {
     label: "WS_PROPERTY_AND_WATER_CONNECTION_USE_DETAILS"
   }, {
     label: "WS_DJB_EMPLOYEE"
-  }, {
-    label: "WS_BANK_DETAILS"
   }, {
     label: "WS_DOCUMENTS"
   }, {
@@ -59523,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(() => {
@@ -59535,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 => {
@@ -59571,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,