@djb25/digit-ui-module-ws 1.0.74 → 1.0.76

package/dist/index.modern.js

@@ -8044,7 +8044,9 @@ const WSMyApplications = () => {
         }, /*#__PURE__*/React.createElement(Link, {
           to: {
             pathname: "/digit-ui/citizen/payment/my-bills/" + businessService + "/" + (application !== null && application !== void 0 && (_application$applicat4 = application.applicationNo) !== null && _application$applicat4 !== void 0 && _application$applicat4.includes("DC") ? stringReplaceAll(application === null || application === void 0 ? void 0 : application.connectionNo, "/", "+") || stringReplaceAll(application === null || application === void 0 ? void 0 : application.connectionNo, "/", "+") : stringReplaceAll(application === null || application === void 0 ? void 0 : application.applicationNo, "/", "+") || stringReplaceAll(application === null || application === void 0 ? void 0 : application.applicationNo, "/", "+")) + "?workflow=WNS&tenantId=" + (application === null || application === void 0 ? void 0 : application.tenantId) + "&ConsumerName=" + ((application === null || application === void 0 ? void 0 : (_application$connecti = application.connectionHolders) === null || _application$connecti === void 0 ? void 0 : _application$connecti.map(owner => owner.name).join(",")) || (application === null || application === void 0 ? void 0 : (_application$connecti2 = application.connectionHolders) === null || _application$connecti2 === void 0 ? void 0 : _application$connecti2.map(owner => owner.name).join(",")) || (application === null || application === void 0 ? void 0 : (_application$property = application.property) === null || _application$property === void 0 ? void 0 : (_application$property2 = _application$property.owners) === null || _application$property2 === void 0 ? void 0 : _application$property2.map(owner => owner.name).join(","))) + "&isDisoconnectFlow=" + (application !== null && application !== void 0 && (_application$applicat5 = application.applicationNo) !== null && _application$applicat5 !== void 0 && _application$applicat5.includes("DC") ? true : false),
-            state: {}
+            state: {
+              fromMyApplications: true
+            }
           }
         }, t("MAKE_PAYMENT"))) : null;
       }
@@ -8402,7 +8404,7 @@ const getDocumentDetails = (application, t) => {
 };
 const getWSAcknowledgementData = function (application, property, tenantInfo, t) {
   try {
-    var _application$tradeLic21, _application$tradeLic22;
+    var _application$tradeLic17, _application$tradeLic18;
     function _temp2() {
       return Promise.resolve(getHeaderDetails(application, t, tenantInfo)).then(function (header) {
         return {
@@ -8417,7 +8419,7 @@ const getWSAcknowledgementData = function (application, property, tenantInfo, t)
         };
       });
     }
-    const filesArray = application === null || application === void 0 ? void 0 : (_application$tradeLic21 = application.tradeLicenseDetail) === null || _application$tradeLic21 === void 0 ? void 0 : (_application$tradeLic22 = _application$tradeLic21.applicationDocuments) === null || _application$tradeLic22 === void 0 ? void 0 : _application$tradeLic22.map(value => value === null || value === void 0 ? void 0 : value.fileStoreId);
+    const filesArray = application === null || application === void 0 ? void 0 : (_application$tradeLic17 = application.tradeLicenseDetail) === null || _application$tradeLic17 === void 0 ? void 0 : (_application$tradeLic18 = _application$tradeLic17.applicationDocuments) === null || _application$tradeLic18 === void 0 ? void 0 : _application$tradeLic18.map(value => value === null || value === void 0 ? void 0 : value.fileStoreId);
     let res;
     const _temp = function () {
       if (filesArray) {
@@ -8963,14 +8965,18 @@ const App = _ref => {
     fetchToken();
   }, []);
   const crumbs = [{
-    path: "/digit-ui/employee",
+    path: "/digit-ui/citizen",
     show: true,
     style: isMobile ? {
       width: "20%"
     } : {},
     icon: HomeIcon
   }, {
-    path: "/digit-ui/citizen/ws/create-application",
+    path: "/digit-ui/citizen/ws-home",
+    label: t("ES_TITLE_WATER_AND_SEWERAGE"),
+    show: true
+  }, {
+    path: "/digit-ui/citizen/ws/info",
     label: t("WS_COMMON_APPL_NEW_CONNECTION"),
     show: location.pathname.includes("/create-application") || location.pathname.includes("/info")
   }, {
@@ -8980,11 +8986,11 @@ const App = _ref => {
   }, {
     path: "/digit-ui/citizen/ws/my-applications",
     label: t("CS_HOME_MY_APPLICATIONS") + " " + (totalAppsCount ? "(" + totalAppsCount + ")" : ""),
-    show: location.pathname.includes("/my-applications")
+    show: location.pathname.includes("/my-applications") || location.pathname.includes("/connection/application")
   }, {
     path: "/digit-ui/citizen/ws/my-connections",
     label: t("WS_MYCONNECTIONS_HEADER"),
-    show: location.pathname.includes("/my-connections")
+    show: location.pathname.includes("/my-connections") || location.pathname.includes("/connection/details")
   }, {
     path: "/digit-ui/citizen/ws/my-bills",
     label: t("CS_WS_MY_BILLS"),
@@ -9001,13 +9007,21 @@ const App = _ref => {
     path: location.pathname,
     label: t("WS_APPLICATION_DETAILS_HEADER"),
     show: location.pathname.includes("/connection/application")
+  }, {
+    path: location.pathname,
+    label: t("WS_COMMON_CONNECTION_DETAIL"),
+    show: location.pathname.includes("/connection/details")
   }, {
     path: location.pathname,
     label: t("WS_APPLICATION_DETAILS_HEADER"),
     show: location.pathname.includes("ws-response")
   }];
   const getDynamicBreadcrumbs = () => {
-    return crumbs.filter(crumb => crumb.show);
+    let activeCrumbs = crumbs.filter(crumb => crumb.show);
+    if (activeCrumbs.length > 0) {
+      activeCrumbs[activeCrumbs.length - 1].path = "";
+    }
+    return activeCrumbs;
   };
   const WSCreate = (_Digit3 = Digit) === null || _Digit3 === void 0 ? void 0 : (_Digit3$ComponentRegi = _Digit3.ComponentRegistryService) === null || _Digit3$ComponentRegi === void 0 ? void 0 : _Digit3$ComponentRegi.getComponent("WSCreate");
   const WSDisconnection = (_Digit4 = Digit) === null || _Digit4 === void 0 ? void 0 : (_Digit4$ComponentRegi = _Digit4.ComponentRegistryService) === null || _Digit4$ComponentRegi === void 0 ? void 0 : _Digit4$ComponentRegi.getComponent("WSDisconnection");
@@ -10740,13 +10754,13 @@ const BILLSBreadCrumbs = _ref => {
       width: "20%"
     } : {},
     icon: HomeIcon
-  }, {
-    path: "/digit-ui/employee/ws/wsinformation",
-    label: t("WS_COMMON_APPL_NEW_CONNECTION"),
-    show: location.pathname.includes("/create-application") || location.pathname.includes("/new-application") || location.pathname.includes("/old-application") || location.pathname.includes("/info")
   }, {
     path: "/digit-ui/employee/module/details",
     label: t("ES_TITLE_WATER_AND_SEWERAGE"),
+    show: true
+  }, {
+    path: "/digit-ui/employee/ws/info",
+    label: t("WS_COMMON_APPL_NEW_CONNECTION"),
     show: location.pathname.includes("/create-application") || location.pathname.includes("/new-application") || location.pathname.includes("/old-application") || location.pathname.includes("/info")
   }, {
     path: "/digit-ui/employee/ws/create-application",
@@ -10957,7 +10971,32 @@ const BILLSBreadCrumbs = _ref => {
     isclickable: false
   });
   const getDynamicBreadcrumbs = () => {
-    return crumbs.filter(crumb => crumb.show);
+    let activeCrumbs = crumbs.filter(crumb => crumb.show);
+    if (fromScreen && activeCrumbs.length > 0) {
+      const lastCrumbIndex = activeCrumbs.length - 1;
+      const lastCrumb = activeCrumbs[lastCrumbIndex];
+      if (lastCrumb.label && lastCrumb.label.includes(" / ")) {
+        const parts = lastCrumb.label.split(" / ");
+        const isSewerage = serviceType === "SEWERAGE" || (applicationNumber === null || applicationNumber === void 0 ? void 0 : applicationNumber.includes("SW_AP")) || (applicationNumbercheck === null || applicationNumbercheck === void 0 ? void 0 : applicationNumbercheck.includes("SW_AP"));
+        activeCrumbs.pop();
+        activeCrumbs.push({
+          label: parts[0],
+          show: true,
+          isBack: true,
+          onClick: () => window.history.back()
+        });
+        activeCrumbs.push({
+          path: "",
+          label: parts[1],
+          show: true,
+          isclickable: false,
+          rightContent: lastCrumb.rightContent
+        });
+      }
+    } else if (activeCrumbs.length > 0) {
+      activeCrumbs[activeCrumbs.length - 1].path = "";
+    }
+    return activeCrumbs;
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, showWaringToast && /*#__PURE__*/React.createElement(Toast, {
     style: {
@@ -19269,29 +19308,21 @@ const DisconnectTimeline = _ref => {
     currentStep = _ref$currentStep === void 0 ? 1 : _ref$currentStep,
     _ref$flow = _ref.flow,
     flow = _ref$flow === void 0 ? "" : _ref$flow;
-  const _useTranslation = useTranslation(),
-    t = _useTranslation.t;
+  const _useTranslation = useTranslation();
   const isMobile = window.Digit.Utils.browser.isMobile();
   getAction$1(flow);
-  return /*#__PURE__*/React.createElement("div", {
-    className: "timeline-container",
-    style: isMobile ? {} : {
-      maxWidth: "960px",
-      minWidth: "640px",
-      marginRight: "auto"
-    }
-  }, actions$1.map((action, index, arr) => /*#__PURE__*/React.createElement("div", {
-    className: "timeline-checkpoint",
-    key: index
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "timeline-content"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "circle " + (index <= currentStep - 1 && 'active')
-  }, index < currentStep - 1 ? /*#__PURE__*/React.createElement(TickMark, null) : index + 1), /*#__PURE__*/React.createElement("span", {
-    className: "secondary-color"
-  }, t(action))), index < arr.length - 1 && /*#__PURE__*/React.createElement("span", {
-    className: "line " + (index < currentStep - 1 && 'active')
-  }))));
+  const timelineConfig = actions$1.map((action, index) => ({
+    route: "step-" + (index + 1),
+    timeLine: [{
+      actions: action,
+      currentStep: index + 1
+    }]
+  }));
+  return /*#__PURE__*/React.createElement(VerticalTimeline, {
+    config: timelineConfig,
+    currentActiveIndex: currentStep - 1,
+    showFinalStep: false
+  });
 };
 
 function toInteger(dirtyNumber) {
@@ -21067,7 +21098,15 @@ const WSDisconnectionForm = _ref => {
   if (isMdmsLoading || wsDocsLoading || isEnableLoader || slaLoading) return /*#__PURE__*/React.createElement(Loader, null);
   if (userType === "citizen") {
     var _disconnectionData$ty, _disconnectionData$ty2, _disconnectionData$ty3, _disconnectionData$ty4, _disconnectionData$ty5, _disconnectionData$re2, _disconnectionData$re3, _disconnectionData$re4, _disconnectionData$re5;
-    return /*#__PURE__*/React.createElement("div", null, userType === "citizen" && /*#__PURE__*/React.createElement(DisconnectTimeline, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CitizenInfoLabel, {
+      textStyle: {
+        color: "#0B0C0C"
+      },
+      text: t("WS_DISONNECT_APPL_INFO"),
+      info: t("CS_COMMON_INFO")
+    }), /*#__PURE__*/React.createElement("div", {
+      className: "employee-form-section-wrapper"
+    }, userType === "citizen" && /*#__PURE__*/React.createElement(DisconnectTimeline, {
       currentStep: 1
     }), /*#__PURE__*/React.createElement(FormStep, {
       config: config,
@@ -21205,16 +21244,7 @@ const WSDisconnectionForm = _ref => {
       error: (error === null || error === void 0 ? void 0 : error.key) === "error" ? true : false,
       label: t(error === null || error === void 0 ? void 0 : error.message),
       onClose: () => setError(null)
-    }))), /*#__PURE__*/React.createElement(CitizenInfoLabel, {
-      style: {
-        margin: "0px"
-      },
-      textStyle: {
-        color: "#0B0C0C"
-      },
-      text: t("WS_DISONNECT_APPL_INFO"),
-      info: t("CS_COMMON_INFO")
-    }));
+    })))));
   }
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(FormStep, {
     config: config,
@@ -21753,8 +21783,21 @@ const WSRestorationForm = _ref => {
   if (isMdmsLoading || wsDocsLoading || isEnableLoader || slaLoading) return /*#__PURE__*/React.createElement(Loader, null);
   if (userType === 'citizen') {
     var _disconnectionData$re2, _disconnectionData$re3;
-    return /*#__PURE__*/React.createElement("div", null, userType === "citizen" && /*#__PURE__*/React.createElement(DisconnectTimeline, {
-      currentStep: 1
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CitizenInfoLabel, {
+      style: {
+        margin: "0px",
+        marginBottom: "1.5rem"
+      },
+      textStyle: {
+        color: "#0B0C0C"
+      },
+      text: t("WS_DISONNECT_APPL_INFO"),
+      info: t("CS_COMMON_INFO")
+    }), /*#__PURE__*/React.createElement("div", {
+      className: "employee-form-section-wrapper"
+    }, userType === "citizen" && /*#__PURE__*/React.createElement(DisconnectTimeline, {
+      currentStep: 1,
+      flow: "RESTORATION"
     }), /*#__PURE__*/React.createElement(FormStep, {
       config: config,
       onSelect: handleSubmit,
@@ -21810,16 +21853,7 @@ const WSRestorationForm = _ref => {
       error: (error === null || error === void 0 ? void 0 : error.key) === "error" ? true : false,
       label: t(error === null || error === void 0 ? void 0 : error.message),
       onClose: () => setError(null)
-    }))), /*#__PURE__*/React.createElement(CitizenInfoLabel, {
-      style: {
-        margin: "0px"
-      },
-      textStyle: {
-        color: "#0B0C0C"
-      },
-      text: t("WS_DISONNECT_APPL_INFO"),
-      info: t("CS_COMMON_INFO")
-    }));
+    })))));
   }
   console.log("applicationData", applicationData);
   return /*#__PURE__*/React.createElement("div", {
@@ -21961,6 +21995,7 @@ function WSDisconnectionDocumentsForm(_ref) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
   return /*#__PURE__*/React.createElement("div", {
+    className: "employee-form-section-wrapper",
     style: {
       marginTop: "19px"
     }
@@ -23877,7 +23912,7 @@ const useInboxTableConfig = _ref => {
           application = "modify";
         }
         return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Link, {
-          to: "/digit-ui/employee/ws/" + application + "-details?applicationNumber=" + row.original["applicationNo"] + "&tenantId=" + tenantId + "&service=" + service + "&from=WS_SEWERAGE_INBOX"
+          to: "/digit-ui/employee/ws/" + application + "-details?applicationNumber=" + row.original["applicationNo"] + "&tenantId=" + tenantId + "&service=" + service + "&from=" + (service === "WATER" ? "WS_WATER_INBOX" : "WS_SEWERAGE_INBOX")
         }, " ", /*#__PURE__*/React.createElement("span", {
           className: "link"
         }, row.original["applicationNo"])));
@@ -30365,7 +30400,7 @@ const ChallanSearchResults = _ref => {
       display: "block"
     }
   }, /*#__PURE__*/React.createElement(Link, {
-    to: "/digit-ui/citizen/ws/create-application/search-property"
+    to: "/digit-ui/citizen/ws/info"
   }, t("WS_CLICK_HERE_TO_APPLY"))))));
 };
 ChallanSearchResults.propTypes = {
@@ -31198,17 +31233,10 @@ const WSFeeEstimation = _ref => {
     if ((sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill = sessionFormData.billDetails) === null || _sessionFormData$bill === void 0 ? void 0 : _sessionFormData$bill.length) > 0) {
       var _sessionFormData$bill2, _sessionFormData$bill3, _sessionFormData$bill4, _sessionFormData$bill5, _sessionFormData$bill6, _sessionFormData$bill7, _sessionFormData$bill8, _sessionFormData$bill9, _sessionFormData$bill0, _sessionFormData$bill1, _sessionFormData$bill10;
       const billAccountDetails = (sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill2 = sessionFormData.billDetails) === null || _sessionFormData$bill2 === void 0 ? void 0 : (_sessionFormData$bill3 = _sessionFormData$bill2[0]) === null || _sessionFormData$bill3 === void 0 ? void 0 : _sessionFormData$bill3.billAccountDetails) || (sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill4 = sessionFormData.billDetails) === null || _sessionFormData$bill4 === void 0 ? void 0 : (_sessionFormData$bill5 = _sessionFormData$bill4[0]) === null || _sessionFormData$bill5 === void 0 ? void 0 : _sessionFormData$bill5.taxHeadEstimates) || [];
-      const values = billAccountDetails.length > 0 ? billAccountDetails.map(bill => {
-        var _bill$status;
-        return {
-          title: bill === null || bill === void 0 ? void 0 : bill.taxHeadCode,
-          value: /*#__PURE__*/React.createElement("span", null, "\u20B9", Number(bill === null || bill === void 0 ? void 0 : bill.amount).toFixed(2), bill !== null && bill !== void 0 && bill.status ? /*#__PURE__*/React.createElement("span", {
-            style: {
-              color: (bill === null || bill === void 0 ? void 0 : (_bill$status = bill.status) === null || _bill$status === void 0 ? void 0 : _bill$status.toUpperCase()) === "PAID" ? "green" : "red"
-            }
-          }, " (" + (bill === null || bill === void 0 ? void 0 : bill.status) + ")") : "")
-        };
-      }) : [{
+      const values = billAccountDetails.length > 0 ? billAccountDetails.map(bill => ({
+        title: bill === null || bill === void 0 ? void 0 : bill.taxHeadCode,
+        value: /*#__PURE__*/React.createElement("span", null, "\u20B9", Number(bill === null || bill === void 0 ? void 0 : bill.amount).toFixed(2))
+      })) : [{
         title: "WS_APPLICATION_FEE_HEADER",
         value: /*#__PURE__*/React.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill6 = sessionFormData.billDetails) === null || _sessionFormData$bill6 === void 0 ? void 0 : (_sessionFormData$bill7 = _sessionFormData$bill6[0]) === null || _sessionFormData$bill7 === void 0 ? void 0 : _sessionFormData$bill7.fee)
       }, {
@@ -31290,17 +31318,10 @@ const WSFeeEstimation = _ref => {
           }
           result.Calculation[0].billSlabData = _.groupBy(result === null || result === void 0 ? void 0 : (_result$Calculation3 = result.Calculation) === null || _result$Calculation3 === void 0 ? void 0 : (_result$Calculation3$ = _result$Calculation3[0]) === null || _result$Calculation3$ === void 0 ? void 0 : _result$Calculation3$.taxHeadEstimates, "category");
           const taxHeadEstimates = (result === null || result === void 0 ? void 0 : (_result$Calculation4 = result.Calculation) === null || _result$Calculation4 === void 0 ? void 0 : (_result$Calculation4$ = _result$Calculation4[0]) === null || _result$Calculation4$ === void 0 ? void 0 : _result$Calculation4$.taxHeadEstimates) || [];
-          const values = taxHeadEstimates.length > 0 ? taxHeadEstimates.map(data => {
-            var _data$status;
-            return {
-              title: data === null || data === void 0 ? void 0 : data.taxHeadCode,
-              value: /*#__PURE__*/React.createElement("span", null, "\u20B9", Number(data === null || data === void 0 ? void 0 : data.estimateAmount).toFixed(2), data !== null && data !== void 0 && data.status ? /*#__PURE__*/React.createElement("span", {
-                style: {
-                  color: (data === null || data === void 0 ? void 0 : (_data$status = data.status) === null || _data$status === void 0 ? void 0 : _data$status.toUpperCase()) === "PAID" ? "green" : "red"
-                }
-              }, " (" + (data === null || data === void 0 ? void 0 : data.status) + ")") : "")
-            };
-          }) : [{
+          const values = taxHeadEstimates.length > 0 ? taxHeadEstimates.map(data => ({
+            title: data === null || data === void 0 ? void 0 : data.taxHeadCode,
+            value: /*#__PURE__*/React.createElement("span", null, "\u20B9", Number(data === null || data === void 0 ? void 0 : data.estimateAmount).toFixed(2))
+          })) : [{
             title: "WS_APPLICATION_FEE_HEADER",
             value: (_result$Calculation5 = result.Calculation) === null || _result$Calculation5 === void 0 ? void 0 : (_result$Calculation5$ = _result$Calculation5[0]) === null || _result$Calculation5$ === void 0 ? void 0 : _result$Calculation5$.fee
           }, {
@@ -31625,17 +31646,10 @@ const ViewBreakup = _ref => {
       if (rows === void 0) {
         rows = [];
       }
-      return rows.map(row => {
-        var _row$status;
-        return {
-          title: t(row === null || row === void 0 ? void 0 : row.taxHeadCode),
-          value: /*#__PURE__*/React.createElement("span", null, "\u20B9" + formatNumber(row === null || row === void 0 ? void 0 : row.amount), row !== null && row !== void 0 && row.status ? /*#__PURE__*/React.createElement("span", {
-            style: {
-              color: (row === null || row === void 0 ? void 0 : (_row$status = row.status) === null || _row$status === void 0 ? void 0 : _row$status.toUpperCase()) === "PAID" ? "green" : "red"
-            }
-          }, " (" + (row === null || row === void 0 ? void 0 : row.status) + ")") : "")
-        };
-      });
+      return rows.map(row => ({
+        title: t(row === null || row === void 0 ? void 0 : row.taxHeadCode),
+        value: /*#__PURE__*/React.createElement("span", null, "\u20B9" + formatNumber(row === null || row === void 0 ? void 0 : row.amount))
+      }));
     };
     const connectionHolder = wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$2 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$2 === void 0 ? void 0 : (_wsAdditionalDetails$3 = _wsAdditionalDetails$2.appDetails) === null || _wsAdditionalDetails$3 === void 0 ? void 0 : (_wsAdditionalDetails$4 = _wsAdditionalDetails$3.connectionHolders) === null || _wsAdditionalDetails$4 === void 0 ? void 0 : _wsAdditionalDetails$4[0];
     const applicantName = [connectionHolder === null || connectionHolder === void 0 ? void 0 : connectionHolder.name, connectionHolder === null || connectionHolder === void 0 ? void 0 : connectionHolder.middleName, connectionHolder === null || connectionHolder === void 0 ? void 0 : connectionHolder.lastName].filter(Boolean).join(" ") || "-";
@@ -31914,70 +31928,49 @@ const ViewBreakup = _ref => {
     style: {
       margin: "10px 0px"
     }
-  }, t("WS_APPLICATION_FEE_HEADER")), breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$billSlab4 = breakUpData.billSlabData) === null || _breakUpData$billSlab4 === void 0 ? void 0 : (_breakUpData$billSlab5 = _breakUpData$billSlab4.FEE) === null || _breakUpData$billSlab5 === void 0 ? void 0 : _breakUpData$billSlab5.map(data => {
-    var _data$status;
-    return /*#__PURE__*/React.createElement(Row, {
-      className: "border-none",
-      rowContainerStyle: {
-        margin: "0px"
-      },
-      labelStyle: {
-        width: "50%"
-      },
-      key: "" + (data === null || data === void 0 ? void 0 : data.taxHeadCode),
-      label: "" + t("" + (data === null || data === void 0 ? void 0 : data.taxHeadCode)),
-      text: /*#__PURE__*/React.createElement("span", null, "\u20B9", Number(data === null || data === void 0 ? void 0 : data.amount) || 0, data !== null && data !== void 0 && data.status ? /*#__PURE__*/React.createElement("span", {
-        style: {
-          color: (data === null || data === void 0 ? void 0 : (_data$status = data.status) === null || _data$status === void 0 ? void 0 : _data$status.toUpperCase()) === "PAID" ? "green" : "red"
-        }
-      }, " (" + (data === null || data === void 0 ? void 0 : data.status) + ")") : ""),
-      textStyle: {
-        textAlign: "right"
-      }
-    });
-  }), breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$billSlab6 = breakUpData.billSlabData) === null || _breakUpData$billSlab6 === void 0 ? void 0 : (_breakUpData$billSlab7 = _breakUpData$billSlab6.CHARGES) === null || _breakUpData$billSlab7 === void 0 ? void 0 : _breakUpData$billSlab7.map(data => {
-    var _data$status2;
-    return /*#__PURE__*/React.createElement(Row, {
-      className: "border-none",
-      rowContainerStyle: {
-        margin: "0px"
-      },
-      labelStyle: {
-        width: "50%"
-      },
-      key: "" + (data === null || data === void 0 ? void 0 : data.taxHeadCode),
-      label: "" + t("" + (data === null || data === void 0 ? void 0 : data.taxHeadCode)),
-      text: /*#__PURE__*/React.createElement("span", null, "\u20B9", Number(data === null || data === void 0 ? void 0 : data.amount) || 0, data !== null && data !== void 0 && data.status ? /*#__PURE__*/React.createElement("span", {
-        style: {
-          color: (data === null || data === void 0 ? void 0 : (_data$status2 = data.status) === null || _data$status2 === void 0 ? void 0 : _data$status2.toUpperCase()) === "PAID" ? "green" : "red"
-        }
-      }, " (" + (data === null || data === void 0 ? void 0 : data.status) + ")") : ""),
-      textStyle: {
-        textAlign: "right"
-      }
-    });
-  }), breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$billSlab8 = breakUpData.billSlabData) === null || _breakUpData$billSlab8 === void 0 ? void 0 : (_breakUpData$billSlab9 = _breakUpData$billSlab8.TAX) === null || _breakUpData$billSlab9 === void 0 ? void 0 : _breakUpData$billSlab9.map(data => {
-    var _data$status3;
-    return /*#__PURE__*/React.createElement(Row, {
-      className: "border-none",
-      rowContainerStyle: {
-        margin: "0px"
-      },
-      labelStyle: {
-        width: "50%"
-      },
-      key: "" + (data === null || data === void 0 ? void 0 : data.taxHeadCode),
-      label: "" + t("" + (data === null || data === void 0 ? void 0 : data.taxHeadCode)),
-      text: /*#__PURE__*/React.createElement("span", null, "\u20B9", Number(data === null || data === void 0 ? void 0 : data.amount) || 0, data !== null && data !== void 0 && data.status ? /*#__PURE__*/React.createElement("span", {
-        style: {
-          color: (data === null || data === void 0 ? void 0 : (_data$status3 = data.status) === null || _data$status3 === void 0 ? void 0 : _data$status3.toUpperCase()) === "PAID" ? "green" : "red"
-        }
-      }, " (" + (data === null || data === void 0 ? void 0 : data.status) + ")") : ""),
-      textStyle: {
-        textAlign: "right"
-      }
-    });
-  }), propertyRows.length > 0 && /*#__PURE__*/React.createElement(Fragment$2, null, /*#__PURE__*/React.createElement(CardSectionHeader, {
+  }, t("WS_APPLICATION_FEE_HEADER")), breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$billSlab4 = breakUpData.billSlabData) === null || _breakUpData$billSlab4 === void 0 ? void 0 : (_breakUpData$billSlab5 = _breakUpData$billSlab4.FEE) === null || _breakUpData$billSlab5 === void 0 ? void 0 : _breakUpData$billSlab5.map(data => /*#__PURE__*/React.createElement(Row, {
+    className: "border-none",
+    rowContainerStyle: {
+      margin: "0px"
+    },
+    labelStyle: {
+      width: "50%"
+    },
+    key: "" + (data === null || data === void 0 ? void 0 : data.taxHeadCode),
+    label: "" + t("" + (data === null || data === void 0 ? void 0 : data.taxHeadCode)),
+    text: /*#__PURE__*/React.createElement("span", null, "\u20B9", Number(data === null || data === void 0 ? void 0 : data.amount) || 0),
+    textStyle: {
+      textAlign: "right"
+    }
+  })), breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$billSlab6 = breakUpData.billSlabData) === null || _breakUpData$billSlab6 === void 0 ? void 0 : (_breakUpData$billSlab7 = _breakUpData$billSlab6.CHARGES) === null || _breakUpData$billSlab7 === void 0 ? void 0 : _breakUpData$billSlab7.map(data => /*#__PURE__*/React.createElement(Row, {
+    className: "border-none",
+    rowContainerStyle: {
+      margin: "0px"
+    },
+    labelStyle: {
+      width: "50%"
+    },
+    key: "" + (data === null || data === void 0 ? void 0 : data.taxHeadCode),
+    label: "" + t("" + (data === null || data === void 0 ? void 0 : data.taxHeadCode)),
+    text: /*#__PURE__*/React.createElement("span", null, "\u20B9", Number(data === null || data === void 0 ? void 0 : data.amount) || 0),
+    textStyle: {
+      textAlign: "right"
+    }
+  })), breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$billSlab8 = breakUpData.billSlabData) === null || _breakUpData$billSlab8 === void 0 ? void 0 : (_breakUpData$billSlab9 = _breakUpData$billSlab8.TAX) === null || _breakUpData$billSlab9 === void 0 ? void 0 : _breakUpData$billSlab9.map(data => /*#__PURE__*/React.createElement(Row, {
+    className: "border-none",
+    rowContainerStyle: {
+      margin: "0px"
+    },
+    labelStyle: {
+      width: "50%"
+    },
+    key: "" + (data === null || data === void 0 ? void 0 : data.taxHeadCode),
+    label: "" + t("" + (data === null || data === void 0 ? void 0 : data.taxHeadCode)),
+    text: /*#__PURE__*/React.createElement("span", null, "\u20B9", Number(data === null || data === void 0 ? void 0 : data.amount) || 0),
+    textStyle: {
+      textAlign: "right"
+    }
+  })), propertyRows.length > 0 && /*#__PURE__*/React.createElement(Fragment$2, null, /*#__PURE__*/React.createElement(CardSectionHeader, {
     style: {
       margin: "10px 0px"
     }
@@ -32024,7 +32017,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$, _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$SewerageConnect121, _data$SewerageConnect122, _PTData$Properties4, _PTData$Properties4$, _PTData$Properties4$$, _PTData$Properties4$$2, _PTData$Properties5, _PTData$Properties5$, _PTData$Properties6, _PTData$Properties6$, _PTData$Properties6$$, _PTData$Properties6$$2, _PTData$Properties7, _PTData$Properties7$, _data$WaterConnection128, _data$WaterConnection129, _data$SewerageConnect123, _data$SewerageConnect124, _data$WaterConnection130, _data$WaterConnection131, _data$SewerageConnect125, _data$SewerageConnect126, _propertyAddress$zro, _propertyAddress$addi, _propertyAddress$addr, _propertyAddress$addr2, _propertyAddress$city, _propertyAddress$city2, _propertyAddress$loca, _propertyAddress$loca2, _propertyAddress$subL, _propertyAddress$subL2, _propertyAddress$asse, _propertyAddress$asse2, _propertyAddress$bloc, _propertyAddress$bloc2, _propertyAddress$ward, _propertyAddress$ward2, _propertyAddress$zone, _propertyAddress$zone2, _useDetails$categoryT, _useDetails$categoryT2, _useDetails$propertyC, _useDetails$propertyC2, _useDetails$propertyT, _useDetails$propertyT2, _useDetails$WaterConn, _useDetails$WaterConn2, _useDetails$waterConn, _useDetails$waterConn2, _useDetails$noOfFloor, _useDetails$noOfFloor2, _useDetails$SelectYea, _useDetails$SelectYea2, _useDetails$SelectYea3, _useDetails$construct, _useDetails$construct2, _data$WaterConnection132, _data$WaterConnection133, _data$WaterConnection134, _data$WaterConnection135, _data$SewerageConnect127, _data$SewerageConnect128, _data$SewerageConnect129, _data$SewerageConnect130, _data$WaterConnection140, _data$WaterConnection141, _data$WaterConnection142, _data$WaterConnection143, _data$WaterConnection144, _data$WaterConnection145, _data$SewerageConnect135, _data$SewerageConnect136, _data$SewerageConnect137, _data$SewerageConnect138, _data$SewerageConnect139, _data$SewerageConnect140, _paymentDetails$data, _paymentDetails$data$, _paymentDetails$data$2, _paymentDetails$data2, _paymentDetails$data3, _paymentDetails$data4, _data$WaterConnection146, _data$WaterConnection147, _data$SewerageConnect141, _data$SewerageConnect142, _data$WaterConnection148, _data$WaterConnection149, _data$WaterConnection150, _data$SewerageConnect143, _data$SewerageConnect144, _data$SewerageConnect145, _PTData$Properties8, _PTData$Properties8$, _PTData$Properties8$$, _paymentDetails$data5, _paymentDetails$data6, _paymentDetails$data7, _data$WaterConnection151, _data$WaterConnection152, _data$WaterConnection153, _data$WaterConnection154, _data$SewerageConnect146, _data$SewerageConnect147, _data$SewerageConnect148, _data$SewerageConnect149, _data$WaterConnection155, _data$WaterConnection156, _data$SewerageConnect150, _data$SewerageConnect151, _data$WaterConnection157, _data$WaterConnection158, _data$SewerageConnect152, _data$SewerageConnect153, _data$WaterConnection159, _data$WaterConnection160, _data$SewerageConnect154, _data$SewerageConnect155, _data$WaterConnection161, _data$WaterConnection162, _data$WaterConnection163, _data$SewerageConnect156, _data$SewerageConnect157, _data$WaterConnection164, _data$WaterConnection165, _data$SewerageConnect158, _data$SewerageConnect159, _data$WaterConnection166, _data$WaterConnection167, _data$WaterConnection168, _data$WaterConnection169, _data$SewerageConnect160, _data$SewerageConnect161, _data$SewerageConnect162, _data$SewerageConnect163, _data$WaterConnection170, _data$WaterConnection171, _data$SewerageConnect164, _data$SewerageConnect165, _data$SewerageConnect166, _data$SewerageConnect167, _data$SewerageConnect168, _data$SewerageConnect169, _data$SewerageConnect170, _data$SewerageConnect171, _data$SewerageConnect172, _data$SewerageConnect173, _data$SewerageConnect174, _data$WaterConnection172, _data$WaterConnection173, _data$WaterConnection174, _data$WaterConnection175, _data$WaterConnection176, _data$WaterConnection177, _data$WaterConnection178, _data$WaterConnection179, _data$WaterConnection180;
+  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$, _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$SewerageConnect121, _data$SewerageConnect122, _PTData$Properties4, _PTData$Properties4$, _PTData$Properties4$$, _PTData$Properties4$$2, _PTData$Properties5, _PTData$Properties5$, _PTData$Properties6, _PTData$Properties6$, _PTData$Properties6$$, _PTData$Properties6$$2, _PTData$Properties7, _PTData$Properties7$, _data$WaterConnection128, _data$WaterConnection129, _data$SewerageConnect123, _data$SewerageConnect124, _data$WaterConnection130, _data$WaterConnection131, _data$SewerageConnect125, _data$SewerageConnect126, _propertyAddress$zro, _propertyAddress$addi, _propertyAddress$addr, _propertyAddress$addr2, _propertyAddress$city, _propertyAddress$city2, _propertyAddress$loca, _propertyAddress$loca2, _propertyAddress$subL, _propertyAddress$subL2, _propertyAddress$asse, _propertyAddress$asse2, _propertyAddress$bloc, _propertyAddress$bloc2, _propertyAddress$ward, _propertyAddress$ward2, _propertyAddress$zone, _propertyAddress$zone2, _propertyAddress$zone3, _propertyAddress$zone4, _useDetails$categoryT, _useDetails$categoryT2, _useDetails$propertyC, _useDetails$propertyC2, _useDetails$propertyT, _useDetails$propertyT2, _useDetails$WaterConn, _useDetails$WaterConn2, _useDetails$waterConn, _useDetails$waterConn2, _useDetails$noOfFloor, _useDetails$noOfFloor2, _useDetails$SelectYea, _useDetails$SelectYea2, _useDetails$SelectYea3, _useDetails$construct, _useDetails$construct2, _data$WaterConnection132, _data$WaterConnection133, _data$WaterConnection134, _data$WaterConnection135, _data$SewerageConnect127, _data$SewerageConnect128, _data$SewerageConnect129, _data$SewerageConnect130, _data$WaterConnection140, _data$WaterConnection141, _data$WaterConnection142, _data$WaterConnection143, _data$WaterConnection144, _data$WaterConnection145, _data$SewerageConnect135, _data$SewerageConnect136, _data$SewerageConnect137, _data$SewerageConnect138, _data$SewerageConnect139, _data$SewerageConnect140, _paymentDetails$data, _paymentDetails$data$, _paymentDetails$data$2, _paymentDetails$data2, _paymentDetails$data3, _paymentDetails$data4, _data$WaterConnection146, _data$WaterConnection147, _data$SewerageConnect141, _data$SewerageConnect142, _data$WaterConnection148, _data$WaterConnection149, _data$WaterConnection150, _data$SewerageConnect143, _data$SewerageConnect144, _data$SewerageConnect145, _PTData$Properties8, _PTData$Properties8$, _PTData$Properties8$$, _paymentDetails$data5, _paymentDetails$data6, _paymentDetails$data7, _data$WaterConnection151, _data$WaterConnection152, _data$WaterConnection153, _data$WaterConnection154, _data$SewerageConnect146, _data$SewerageConnect147, _data$SewerageConnect148, _data$SewerageConnect149, _data$WaterConnection155, _data$WaterConnection156, _data$SewerageConnect150, _data$SewerageConnect151, _data$WaterConnection157, _data$WaterConnection158, _data$SewerageConnect152, _data$SewerageConnect153, _data$WaterConnection159, _data$WaterConnection160, _data$SewerageConnect154, _data$SewerageConnect155, _data$WaterConnection161, _data$WaterConnection162, _data$WaterConnection163, _data$SewerageConnect156, _data$SewerageConnect157, _data$WaterConnection164, _data$WaterConnection165, _data$SewerageConnect158, _data$SewerageConnect159, _data$WaterConnection166, _data$WaterConnection167, _data$WaterConnection168, _data$WaterConnection169, _data$SewerageConnect160, _data$SewerageConnect161, _data$SewerageConnect162, _data$SewerageConnect163, _data$WaterConnection170, _data$WaterConnection171, _data$SewerageConnect164, _data$SewerageConnect165, _data$SewerageConnect166, _data$SewerageConnect167, _data$SewerageConnect168, _data$SewerageConnect169, _data$SewerageConnect170, _data$SewerageConnect171, _data$SewerageConnect172, _data$SewerageConnect173, _data$SewerageConnect174, _data$WaterConnection172, _data$WaterConnection173, _data$WaterConnection174, _data$WaterConnection175, _data$WaterConnection176, _data$WaterConnection177, _data$WaterConnection178, _data$WaterConnection179, _data$WaterConnection180;
   const getDisconnectionNoticeSearch = function () {
     try {
       var _data$WaterConnection182, _data$WaterConnection183, _data$SewerageConnect176, _data$SewerageConnect177;
@@ -32296,8 +32289,8 @@ const WSApplicationDetails = () => {
   }, /*#__PURE__*/React.createElement("div", {
     className: "workflow-timeline-wrapper no-scrollbar",
     style: {
-      flex: "1 1 280px",
-      maxWidth: "400px",
+      flex: "0 0 300px",
+      maxWidth: "350px",
       minWidth: "240px"
     }
   }, /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement("div", {
@@ -32308,7 +32301,7 @@ const WSApplicationDetails = () => {
     paymentbuttonenabled: false
   })))), /*#__PURE__*/React.createElement("div", {
     style: {
-      flex: "2 1 300px",
+      flex: "1 1 0%",
       minWidth: 0
     }
   }, /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement("div", {
@@ -32469,7 +32462,7 @@ const WSApplicationDetails = () => {
         isArray: false
       }
     }
-  }), /*#__PURE__*/React.createElement(Row, {
+  }), !isMutation && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
     label: t("WS_OWN_DETAIL_FATHER_OR_HUSBAND_NAME"),
     text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection94 = data.WaterConnection) === null || _data$WaterConnection94 === void 0 ? void 0 : (_data$WaterConnection95 = _data$WaterConnection94[0]) === null || _data$WaterConnection95 === void 0 ? void 0 : (_data$WaterConnection96 = _data$WaterConnection95.connectionHolders) === null || _data$WaterConnection96 === void 0 ? void 0 : (_data$WaterConnection97 = _data$WaterConnection96[0]) === null || _data$WaterConnection97 === void 0 ? void 0 : _data$WaterConnection97.fatherOrHusbandName) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect89 = data.SewerageConnections) === null || _data$SewerageConnect89 === void 0 ? void 0 : (_data$SewerageConnect90 = _data$SewerageConnect89[0]) === null || _data$SewerageConnect90 === void 0 ? void 0 : (_data$SewerageConnect91 = _data$SewerageConnect90.connectionHolders) === null || _data$SewerageConnect91 === void 0 ? void 0 : (_data$SewerageConnect92 = _data$SewerageConnect91[0]) === null || _data$SewerageConnect92 === void 0 ? void 0 : _data$SewerageConnect92.fatherOrHusbandName) || t("CS_NA"),
     textStyle: {
@@ -32513,7 +32506,7 @@ const WSApplicationDetails = () => {
         isArray: false
       }
     }
-  }), /*#__PURE__*/React.createElement(Row, {
+  })), /*#__PURE__*/React.createElement(Row, {
     label: t("WS_OWN_DETAIL_CROSADD"),
     text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection110 = data.WaterConnection) === null || _data$WaterConnection110 === void 0 ? void 0 : (_data$WaterConnection111 = _data$WaterConnection110[0]) === null || _data$WaterConnection111 === void 0 ? void 0 : (_data$WaterConnection112 = _data$WaterConnection111.connectionHolders) === null || _data$WaterConnection112 === void 0 ? void 0 : (_data$WaterConnection113 = _data$WaterConnection112[0]) === null || _data$WaterConnection113 === void 0 ? void 0 : _data$WaterConnection113.correspondenceAddress) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect105 = data.SewerageConnections) === null || _data$SewerageConnect105 === void 0 ? void 0 : (_data$SewerageConnect106 = _data$SewerageConnect105[0]) === null || _data$SewerageConnect106 === void 0 ? void 0 : (_data$SewerageConnect107 = _data$SewerageConnect106.connectionHolders) === null || _data$SewerageConnect107 === void 0 ? void 0 : (_data$SewerageConnect108 = _data$SewerageConnect107[0]) === null || _data$SewerageConnect108 === void 0 ? void 0 : _data$SewerageConnect108.correspondenceAddress) || t("CS_NA"),
     privacy: {
@@ -32669,7 +32662,7 @@ const WSApplicationDetails = () => {
     text: "" + t(checkForNA$1((propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.actualWard) || (additionalDetails === null || additionalDetails === void 0 ? void 0 : additionalDetails.actualWard)))
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("COMMON_CURRENT_ZONE"),
-    text: "" + t(checkForNA$1((propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.actualZone) || (additionalDetails === null || additionalDetails === void 0 ? void 0 : additionalDetails.actualZone)))
+    text: "" + t(checkForNA$1((propertyAddress === null || propertyAddress === void 0 ? void 0 : (_propertyAddress$zone3 = propertyAddress.zone) === null || _propertyAddress$zone3 === void 0 ? void 0 : _propertyAddress$zone3.name) || (propertyAddress === null || propertyAddress === void 0 ? void 0 : (_propertyAddress$zone4 = propertyAddress.zone) === null || _propertyAddress$zone4 === void 0 ? void 0 : _propertyAddress$zone4.code) || (propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.zone) || (propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.actualZone) || (additionalDetails === null || additionalDetails === void 0 ? void 0 : additionalDetails.actualZone)))
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("LANDMARK"),
     text: "" + t(checkForNA$1(propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.landmark))
@@ -32730,7 +32723,7 @@ const WSApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("WS_EMPLOYEE_DESIGNATION"),
     text: "" + t(checkForNA$1(djbEmployee === null || djbEmployee === void 0 ? void 0 : djbEmployee.designation))
-  }))), /*#__PURE__*/React.createElement(CardHeader, {
+  }))), !isMutation && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardHeader, {
     styles: {
       fontSize: "28px"
     }
@@ -32751,7 +32744,7 @@ const WSApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("WS_BANK_ACCOUNT_NO"),
     text: "" + t(checkForNA$1((bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.bankAccountNumber) || (bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.accountNumber)))
-  })), /*#__PURE__*/React.createElement(CardHeader, {
+  }))), /*#__PURE__*/React.createElement(CardHeader, {
     styles: {
       fontSize: "28px"
     }
@@ -32793,7 +32786,9 @@ const WSApplicationDetails = () => {
     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$WaterConnection146 = data.WaterConnection) === null || _data$WaterConnection146 === void 0 ? void 0 : (_data$WaterConnection147 = _data$WaterConnection146[0]) === null || _data$WaterConnection147 === void 0 ? void 0 : _data$WaterConnection147.tenantId) || (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.tenantId)) + "&ConsumerName=" + ((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$WaterConnection150 = _data$WaterConnection149.connectionHolders) === null || _data$WaterConnection150 === void 0 ? void 0 : _data$WaterConnection150.map(owner => owner.name).join(",")) || (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$SewerageConnect145 = _data$SewerageConnect144.connectionHolders) === null || _data$SewerageConnect145 === void 0 ? void 0 : _data$SewerageConnect145.map(owner => owner.name).join(",")) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties8 = PTData.Properties) === null || _PTData$Properties8 === void 0 ? void 0 : (_PTData$Properties8$ = _PTData$Properties8[0]) === null || _PTData$Properties8$ === void 0 ? void 0 : (_PTData$Properties8$$ = _PTData$Properties8$.owners) === null || _PTData$Properties8$$ === void 0 ? void 0 : _PTData$Properties8$$.map(owner => owner.name).join(","))) + "&isDisoconnectFlow=" + (applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? true : false) + "&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: {}
+      state: {
+        fromApplicationDetails: true
+      }
     }
   }, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("MAKE_PAYMENT")
@@ -33364,7 +33359,7 @@ const ConnectionDetails$5 = () => {
   const applicationDownloadObject = {
     order: 2,
     label: t("WS_APPLICATION"),
-    onClick: () => handleDownloadPdf
+    onClick: () => handleDownloadPdf()
   };
   const receiptApplicationFeeDownloadObject = {
     order: 3,
@@ -33485,27 +33480,27 @@ const ConnectionDetails$5 = () => {
   }
   sessionStorage.setItem("ApplicationNoState", (_state3 = state) === null || _state3 === void 0 ? void 0 : _state3.applicationNo);
   let serviceType = (_state4 = state) !== null && _state4 !== void 0 && (_state4$applicationTy = _state4.applicationType) !== null && _state4$applicationTy !== void 0 && _state4$applicationTy.includes("WATER") ? "WATER" : "SEWERAGE";
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "cardHeaderWithOptions",
+  return /*#__PURE__*/React.createElement(React.Fragment, null, checkifPrivacyenabled && /*#__PURE__*/React.createElement(WSInfoLabel, {
+    t: t
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "hide-seperator"
+  }, /*#__PURE__*/React.createElement(Card, null, downloadOptions && downloadOptions.length > 0 && /*#__PURE__*/React.createElement("div", {
     style: {
-      marginRight: "auto",
-      maxWidth: "960px"
+      position: "absolute",
+      right: "24px",
+      zIndex: 11
     }
-  }, downloadOptions && downloadOptions.length > 0 && /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
     ref: menuRef
   }, /*#__PURE__*/React.createElement(MultiLink, {
-    className: "multilinkWrapper",
+    label: t("CS_COMMON_DOWNLOAD"),
+    className: "multilinkWrapper employee-mulitlink-main-divNew",
     onHeadClick: () => setShowOptions(!showOptions),
     displayOptions: showOptions,
     options: downloadOptions,
-    optionsStyle: {
-      margin: "0px"
-    }
-  }))), checkifPrivacyenabled && /*#__PURE__*/React.createElement(WSInfoLabel, {
-    t: t
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "hide-seperator"
-  }, /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
+    downloadBtnClassName: "employee-download-btn-className",
+    optionsClassName: "employee-options-btn-className"
+  }))), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("WS_MYCONNECTIONS_CONSUMER_NO"),
     text: (_state5 = state) === null || _state5 === void 0 ? void 0 : _state5.connectionNo
@@ -33902,47 +33897,27 @@ 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.createElement(ActionBar, {
+  })), (((_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.createElement("div", {
     style: {
-      position: "relative",
-      boxShadow: "none",
-      minWidth: "240px",
-      maxWidth: "620px",
-      padding: "0px",
-      marginTop: "15px",
       display: "flex",
-      gap: "10px"
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
+      justifyContent: "flex-end",
+      marginTop: "15px",
       width: "100%"
     }
   }, /*#__PURE__*/React.createElement(SubmitBar, {
-    style: {
-      width: "100%"
-    },
     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.createElement(ActionBar, {
-    style: {
-      position: "relative",
-      boxShadow: "none",
-      minWidth: "240px",
-      maxWidth: "310px",
-      padding: "0px",
-      marginTop: "15px"
-    }
-  }, /*#__PURE__*/React.createElement("div", {
+  })) : ((_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.createElement("div", {
     style: {
+      display: "flex",
+      justifyContent: "flex-end",
+      marginTop: "15px",
       width: "100%"
     }
   }, /*#__PURE__*/React.createElement(SubmitBar, {
-    style: {
-      width: "100%"
-    },
     label: t("WS_RECONNECTION_BUTTON"),
     onSubmit: onActionSelectRestoration
-  }))), showModal ? /*#__PURE__*/React.createElement(Modal, {
+  })), showModal ? /*#__PURE__*/React.createElement(Modal, {
     open: showModal,
     headerBarMain: /*#__PURE__*/React.createElement(Heading, {
       label: t("WS_PENDING_DUES_LABEL")
@@ -34724,7 +34699,7 @@ const ReSubmitDisconnectionApplication = () => {
 };
 
 const CheckPage = _ref => {
-  var _value$ConnectionDeta, _value$waterConnectio, _cpt$details12, _cpt$details13, _cpt$details14, _reversedOwners$, _cpt$details15, _cpt$details16, _cpt$details17, _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, _ConnectionHolderDeta, _ConnectionHolderDeta2, _ConnectionHolderDeta3, _ConnectionHolderDeta4, _ConnectionHolderDeta5, _ConnectionHolderDeta6, _ConnectionHolderDeta7, _ConnectionHolderDeta8, _ConnectionHolderDeta9, _ConnectionHolderDeta0, _propertyAddress$zro, _propertyAddress$addi, _propertyAddress$addr, _propertyAddress$addr2, _propertyAddress$city, _propertyAddress$city2, _propertyAddress$loca, _propertyAddress$loca2, _propertyAddress$subL, _propertyAddress$subL2, _propertyAddress$asse, _propertyAddress$asse2, _propertyAddress$bloc, _propertyAddress$bloc2, _propertyAddress$ward, _propertyAddress$ward2, _propertyAddress$zone, _propertyAddress$zone2, _useDetails$categoryT, _useDetails$categoryT2, _useDetails$propertyC, _useDetails$propertyC2, _useDetails$propertyT, _useDetails$propertyT2, _useDetails$WaterConn, _useDetails$WaterConn2, _useDetails$waterConn, _useDetails$waterConn2, _useDetails$noOfFloor, _useDetails$noOfFloor2, _useDetails$SelectYea, _useDetails$SelectYea2, _useDetails$SelectYea3, _useDetails$construct, _useDetails$construct2;
+  var _value$ConnectionDeta, _value$waterConnectio, _cpt$details12, _cpt$details13, _cpt$details14, _reversedOwners$, _cpt$details15, _cpt$details16, _cpt$details17, _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, _ConnectionHolderDeta, _ConnectionHolderDeta2, _ConnectionHolderDeta3, _ConnectionHolderDeta4, _ConnectionHolderDeta5, _ConnectionHolderDeta6, _ConnectionHolderDeta7, _ConnectionHolderDeta8, _ConnectionHolderDeta9, _ConnectionHolderDeta0, _propertyAddress$zro, _propertyAddress$addi, _propertyAddress$addr, _propertyAddress$addr2, _propertyAddress$city, _propertyAddress$city2, _propertyAddress$loca, _propertyAddress$loca2, _propertyAddress$subL, _propertyAddress$subL2, _propertyAddress$asse, _propertyAddress$asse2, _propertyAddress$bloc, _propertyAddress$bloc2, _propertyAddress$ward, _propertyAddress$ward2, _propertyAddress$zone, _propertyAddress$zone2, _propertyAddress$zone3, _propertyAddress$zone4, _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;
   let onSubmit = _ref.onSubmit,
     value = _ref.value;
   const _useTranslation = useTranslation(),
@@ -34971,7 +34946,7 @@ const CheckPage = _ref => {
     text: "" + t(checkForNA((propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.actualWard) || (additionalDetails === null || additionalDetails === void 0 ? void 0 : additionalDetails.actualWard)))
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("COMMON_CURRENT_ZONE"),
-    text: "" + t(checkForNA((propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.actualZone) || (additionalDetails === null || additionalDetails === void 0 ? void 0 : additionalDetails.actualZone)))
+    text: "" + t(checkForNA((propertyAddress === null || propertyAddress === void 0 ? void 0 : (_propertyAddress$zone3 = propertyAddress.zone) === null || _propertyAddress$zone3 === void 0 ? void 0 : _propertyAddress$zone3.name) || (propertyAddress === null || propertyAddress === void 0 ? void 0 : (_propertyAddress$zone4 = propertyAddress.zone) === null || _propertyAddress$zone4 === void 0 ? void 0 : _propertyAddress$zone4.code) || (propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.zone) || (propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.actualZone) || (additionalDetails === null || additionalDetails === void 0 ? void 0 : additionalDetails.actualZone)))
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("LANDMARK"),
     text: "" + t(checkForNA(propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.landmark))
@@ -35788,13 +35763,19 @@ const CheckPage$1 = () => {
   if (isEnableLoader) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Header, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "employee-form-section-wrapper"
+  }, /*#__PURE__*/React.createElement(DisconnectTimeline, {
+    currentStep: 3
+  }), /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: "100%"
+    }
+  }, /*#__PURE__*/React.createElement(Header, {
     styles: {
       fontSize: "32px"
     }
-  }, t("WS_COMMON_SUMMARY")), /*#__PURE__*/React.createElement(DisconnectTimeline, {
-    currentStep: 3
-  }), /*#__PURE__*/React.createElement(Card, {
+  }, t("WS_COMMON_SUMMARY")), /*#__PURE__*/React.createElement(Card, {
     style: {
       paddingRight: "16px"
     }
@@ -35889,7 +35870,7 @@ const CheckPage$1 = () => {
   })), /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("CS_COMMON_SUBMIT"),
     onSubmit: () => onSubmit(value === null || value === void 0 ? void 0 : value.WSDisconnectionForm)
-  })));
+  })))));
 };
 
 const CheckPage$2 = () => {
@@ -36058,13 +36039,20 @@ const CheckPage$2 = () => {
   if (isEnableLoader) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Header, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "employee-form-section-wrapper"
+  }, /*#__PURE__*/React.createElement(DisconnectTimeline, {
+    currentStep: 3,
+    flow: "RESTORATION"
+  }), /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: "100%"
+    }
+  }, /*#__PURE__*/React.createElement(Header, {
     styles: {
       fontSize: "32px"
     }
-  }, t("WS_COMMON_SUMMARY")), /*#__PURE__*/React.createElement(DisconnectTimeline, {
-    currentStep: 3
-  }), /*#__PURE__*/React.createElement(Card, {
+  }, t("WS_COMMON_SUMMARY")), /*#__PURE__*/React.createElement(Card, {
     style: {
       paddingRight: "16px"
     }
@@ -36113,7 +36101,7 @@ const CheckPage$2 = () => {
     error: (error === null || error === void 0 ? void 0 : error.key) === "error" ? true : false,
     label: t(error === null || error === void 0 ? void 0 : error.message),
     onClose: () => setError(null)
-  }));
+  }))));
 };
 
 const CheckPage$3 = () => {
@@ -36220,13 +36208,19 @@ const CheckPage$3 = () => {
   if (isEnableLoader) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Header, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "employee-form-section-wrapper"
+  }, /*#__PURE__*/React.createElement(DisconnectTimeline, {
+    currentStep: 3
+  }), /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: "100%"
+    }
+  }, /*#__PURE__*/React.createElement(Header, {
     styles: {
       fontSize: "32px"
     }
-  }, t("WS_COMMON_SUMMARY")), /*#__PURE__*/React.createElement(DisconnectTimeline, {
-    currentStep: 3
-  }), /*#__PURE__*/React.createElement(Card, {
+  }, t("WS_COMMON_SUMMARY")), /*#__PURE__*/React.createElement(Card, {
     style: {
       paddingRight: "16px"
     }
@@ -36317,7 +36311,7 @@ const CheckPage$3 = () => {
   })), /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("CS_COMMON_SUBMIT"),
     onSubmit: () => onSubmit(value === null || value === void 0 ? void 0 : value.WSDisconnectionForm)
-  })));
+  })))));
 };
 
 const config$2 = [{
@@ -38379,7 +38373,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$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;
+  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$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;
   const _useTranslation2 = useTranslation(),
     t = _useTranslation2.t;
   const history = useHistory();
@@ -40412,9 +40406,6 @@ const NewApplication = () => {
   })), /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "declaration.signatureFile",
-    rules: {
-      validate: value => !!value || "Signature upload is required."
-    },
     render: props => /*#__PURE__*/React.createElement(FileUploadField, {
       error: getFieldError("declaration.signatureFile"),
       id: "signature-file",
@@ -40422,7 +40413,6 @@ const NewApplication = () => {
       label: "Upload Signature",
       onDelete: () => clearUploadedFile("declaration.signatureFile", props.onChange),
       onUpload: event => uploadFile(event, "declaration.signatureFile", props.onChange),
-      required: true,
       value: props.value
     })
   })))), previewMode && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SectionCard, {
@@ -40734,7 +40724,7 @@ const NewApplication = () => {
     onSubmit: onReset,
     style: secondaryButtonStyle
   }), /*#__PURE__*/React.createElement(SubmitBar, {
-    disabled: hasPendingUpload,
+    disabled: hasPendingUpload || !(formValues !== null && formValues !== void 0 && (_formValues$declarati4 = formValues.declaration) !== null && _formValues$declarati4 !== void 0 && _formValues$declarati4.agree),
     label: hasPendingUpload ? "Uploading..." : "Preview",
     onSubmit: handleSubmit(onPreview)
   })) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SubmitBar, {
@@ -40742,7 +40732,7 @@ const NewApplication = () => {
     onSubmit: onEdit,
     style: secondaryButtonStyle
   }), /*#__PURE__*/React.createElement(SubmitBar, {
-    disabled: hasPendingUpload,
+    disabled: hasPendingUpload || !(formValues !== null && formValues !== void 0 && (_formValues$declarati5 = formValues.declaration) !== null && _formValues$declarati5 !== void 0 && _formValues$declarati5.agree),
     label: hasPendingUpload ? "Uploading..." : "Submit",
     onSubmit: handleSubmit(onSubmit)
   }))), showToast ? /*#__PURE__*/React.createElement(Toast, {
@@ -41184,8 +41174,70 @@ const configWSApproverApplication = _ref => {
     uploadedFile = _ref.uploadedFile,
     setUploadedFile = _ref.setUploadedFile,
     businessService = _ref.businessService,
-    error = _ref.error;
+    error = _ref.error,
+    isReasonRequiredAction = _ref.isReasonRequiredAction,
+    selectedReason = _ref.selectedReason,
+    setSelectedReason = _ref.setSelectedReason,
+    otherReasonText = _ref.otherReasonText,
+    setOtherReasonText = _ref.setOtherReasonText;
   if (action !== null && action !== void 0 && (_action$action = action.action) !== null && _action$action !== void 0 && _action$action.includes("SEND_BACK") || (action === null || action === void 0 ? void 0 : action.action) == "APPROVE_FOR_CONNECTION") ;
+  const reasonOptions = [{
+    code: "INCOMPLETE_DOCUMENTS",
+    name: "Incomplete / Incorrect Documents",
+    i18nKey: "WS_MUTATION_REASON_INCOMPLETE_DOCUMENTS"
+  }, {
+    code: "MISMATCH_DETAILS",
+    name: "Mismatch in Owner / Consumer Details",
+    i18nKey: "WS_MUTATION_REASON_MISMATCH_DETAILS"
+  }, {
+    code: "INVALID_PROOF",
+    name: "Invalid / Unverified Proof Provided",
+    i18nKey: "WS_MUTATION_REASON_INVALID_PROOF"
+  }, {
+    code: "OTHER",
+    name: "Other",
+    i18nKey: "WS_MUTATION_REASON_OTHER"
+  }];
+  const commentsField = isReasonRequiredAction ? [{
+    label: t("WF_REASON_LABEL") || t("Reason"),
+    isMandatory: true,
+    populators: /*#__PURE__*/React.createElement(Dropdown, {
+      option: reasonOptions,
+      autoComplete: "off",
+      optionKey: "name",
+      id: "mutationActionReason",
+      select: val => {
+        setSelectedReason(val);
+        if ((val === null || val === void 0 ? void 0 : val.code) !== "OTHER") {
+          setOtherReasonText("");
+        }
+      },
+      selected: selectedReason,
+      t: t,
+      placeholder: t("WF_SELECT_REASON_PLACEHOLDER") || "Select Reason"
+    })
+  }, ...((selectedReason === null || selectedReason === void 0 ? void 0 : selectedReason.code) === "OTHER" ? [{
+    label: t("WF_OTHER_REASON_LABEL") || t("Please specify reason"),
+    isMandatory: true,
+    populators: /*#__PURE__*/React.createElement("textarea", {
+      className: "employee-card-input",
+      style: {
+        width: "100%",
+        height: "80px",
+        resize: "vertical",
+        marginTop: "4px"
+      },
+      value: otherReasonText,
+      onChange: e => setOtherReasonText(e.target.value),
+      placeholder: t("WF_ENTER_OTHER_REASON_PLACEHOLDER") || "Enter reason details..."
+    })
+  }] : [])] : [{
+    label: t("WF_COMMON_COMMENTS"),
+    type: "textarea",
+    populators: {
+      name: "comments"
+    }
+  }];
   return {
     label: {
       heading: "WF_" + (action === null || action === void 0 ? void 0 : action.action) + "_APPLICATION",
@@ -41193,13 +41245,7 @@ const configWSApproverApplication = _ref => {
       cancel: "CS_COMMON_CANCEL"
     },
     form: [{
-      body: [{
-        label: t("WF_COMMON_COMMENTS"),
-        type: "textarea",
-        populators: {
-          name: "comments"
-        }
-      }, {
+      body: [...commentsField, {
         label: t("WS_APPROVAL_CHECKLIST_BUTTON_UP_FILE"),
         populators: /*#__PURE__*/React.createElement(UploadFile, {
           id: "workflow-doc",
@@ -42704,7 +42750,7 @@ const convertDateToEpochNew$1 = function (dateString, dayStartOrEnd) {
   }
 };
 const ActionModal$5 = _ref => {
-  var _action$assigneeRoles, _action$assigneeRoles2;
+  var _action$assigneeRoles, _action$assigneeRoles2, _applicationData, _applicationData$appl, _applicationData2, _applicationData2$bus, _applicationData3, _applicationData3$app, _action$action, _action$action2;
   let t = _ref.t,
     action = _ref.action,
     tenantId = _ref.tenantId,
@@ -42746,6 +42792,14 @@ const ActionModal$5 = _ref => {
   const _useState7 = useState(null),
     error = _useState7[0],
     setError = _useState7[1];
+  const _useState8 = useState(null),
+    selectedReason = _useState8[0],
+    setSelectedReason = _useState8[1];
+  const _useState9 = useState(""),
+    otherReasonText = _useState9[0],
+    setOtherReasonText = _useState9[1];
+  const isMutationApp = ((_applicationData = applicationData) === null || _applicationData === void 0 ? void 0 : (_applicationData$appl = _applicationData.applicationType) === null || _applicationData$appl === void 0 ? void 0 : _applicationData$appl.includes("MUTATION")) || ((_applicationData2 = applicationData) === null || _applicationData2 === void 0 ? void 0 : (_applicationData2$bus = _applicationData2.businessService) === null || _applicationData2$bus === void 0 ? void 0 : _applicationData2$bus.includes("MUTATION")) || (businessService === null || businessService === void 0 ? void 0 : businessService.includes("MUTATION")) || ((_applicationData3 = applicationData) === null || _applicationData3 === void 0 ? void 0 : (_applicationData3$app = _applicationData3.applicationNo) === null || _applicationData3$app === void 0 ? void 0 : _applicationData3$app.includes("MUT"));
+  const isReasonRequiredAction = isMutationApp && ((action === null || action === void 0 ? void 0 : (_action$action = action.action) === null || _action$action === void 0 ? void 0 : _action$action.includes("SEND_BACK")) || (action === null || action === void 0 ? void 0 : (_action$action2 = action.action) === null || _action$action2 === void 0 ? void 0 : _action$action2.includes("REJECT")));
   const isMobile = window.Digit.Utils.browser.isMobile();
   const isEmployee = window.location.href.includes("/employee");
   useEffect(() => {
@@ -42806,24 +42860,40 @@ const ActionModal$5 = _ref => {
     })();
   }, [file]);
   function submit(data) {
-    var _applicationData, _applicationData7, _applicationData8, _applicationData8$app, _applicationData9, _applicationData9$pro, _applicationData0, _applicationData0$pro, _applicationData10, _applicationData11;
-    if ((_applicationData = applicationData) !== null && _applicationData !== void 0 && _applicationData.isBillAmend) {
-      var _applicationData2, _applicationData2$bil, _applicationData3, _applicationData4, _applicationData4$bil, _applicationData5, _applicationData5$app, _applicationData6, _applicationData6$app;
-      const comments = data !== null && data !== void 0 && data.comments ? data.comments : null;
-      const additionalDetails = _extends({}, (_applicationData2 = applicationData) === null || _applicationData2 === void 0 ? void 0 : (_applicationData2$bil = _applicationData2.billAmendmentDetails) === null || _applicationData2$bil === void 0 ? void 0 : _applicationData2$bil.additionalDetails, {
+    var _applicationData4, _applicationData0, _applicationData1, _applicationData1$app, _applicationData10, _applicationData10$pr, _applicationData11, _applicationData11$pr, _applicationData13, _applicationData14;
+    let commentValue = (data === null || data === void 0 ? void 0 : data.comments) || "";
+    if (isReasonRequiredAction) {
+      if (!selectedReason) {
+        setError(t("PLEASE_SELECT_REASON") || "Please select a reason");
+        return;
+      }
+      if ((selectedReason === null || selectedReason === void 0 ? void 0 : selectedReason.code) === "OTHER") {
+        if (!otherReasonText || otherReasonText.trim() === "") {
+          setError(t("PLEASE_ENTER_REASON") || "Please enter the reason");
+          return;
+        }
+        commentValue = otherReasonText.trim();
+      } else {
+        commentValue = (selectedReason === null || selectedReason === void 0 ? void 0 : selectedReason.name) || (selectedReason !== null && selectedReason !== void 0 && selectedReason.i18nKey ? t(selectedReason === null || selectedReason === void 0 ? void 0 : selectedReason.i18nKey) : selectedReason === null || selectedReason === void 0 ? void 0 : selectedReason.code);
+      }
+    }
+    if ((_applicationData4 = applicationData) !== null && _applicationData4 !== void 0 && _applicationData4.isBillAmend) {
+      var _applicationData5, _applicationData5$bil, _applicationData6, _applicationData7, _applicationData7$bil, _applicationData8, _applicationData8$app, _applicationData9, _applicationData9$app;
+      const comments = commentValue || (data !== null && data !== void 0 && data.comments ? data.comments : null);
+      const additionalDetails = _extends({}, (_applicationData5 = applicationData) === null || _applicationData5 === void 0 ? void 0 : (_applicationData5$bil = _applicationData5.billAmendmentDetails) === null || _applicationData5$bil === void 0 ? void 0 : _applicationData5$bil.additionalDetails, {
         comments
       });
-      const amendment = _extends({}, (_applicationData3 = applicationData) === null || _applicationData3 === void 0 ? void 0 : _applicationData3.billAmendmentDetails, {
+      const amendment = _extends({}, (_applicationData6 = applicationData) === null || _applicationData6 === void 0 ? void 0 : _applicationData6.billAmendmentDetails, {
         workflow: {
-          businessId: (_applicationData4 = applicationData) === null || _applicationData4 === void 0 ? void 0 : (_applicationData4$bil = _applicationData4.billAmendmentDetails) === null || _applicationData4$bil === void 0 ? void 0 : _applicationData4$bil.amendmentId,
+          businessId: (_applicationData7 = applicationData) === null || _applicationData7 === void 0 ? void 0 : (_applicationData7$bil = _applicationData7.billAmendmentDetails) === null || _applicationData7$bil === void 0 ? void 0 : _applicationData7$bil.amendmentId,
           action: action === null || action === void 0 ? void 0 : action.action,
           tenantId: tenantId,
-          businessService: (_applicationData5 = applicationData) !== null && _applicationData5 !== void 0 && (_applicationData5$app = _applicationData5.applicationType) !== null && _applicationData5$app !== void 0 && _applicationData5$app.includes("WATER") ? "WS.AMENDMENT" : "SW.AMENDMENT",
-          moduleName: (_applicationData6 = applicationData) !== null && _applicationData6 !== void 0 && (_applicationData6$app = _applicationData6.applicationType) !== null && _applicationData6$app !== void 0 && _applicationData6$app.includes("WATER") ? "WS" : "SW",
+          businessService: (_applicationData8 = applicationData) !== null && _applicationData8 !== void 0 && (_applicationData8$app = _applicationData8.applicationType) !== null && _applicationData8$app !== void 0 && _applicationData8$app.includes("WATER") ? "WS.AMENDMENT" : "SW.AMENDMENT",
+          moduleName: (_applicationData9 = applicationData) !== null && _applicationData9 !== void 0 && (_applicationData9$app = _applicationData9.applicationType) !== null && _applicationData9$app !== void 0 && _applicationData9$app.includes("WATER") ? "WS" : "SW",
           assignes: !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? [] : [{
             uuid: selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid
           }],
-          comment: (data === null || data === void 0 ? void 0 : data.comments) || "",
+          comment: commentValue || (data === null || data === void 0 ? void 0 : data.comments) || "",
           documents: uploadedFile ? [{
             documentType: (action === null || action === void 0 ? void 0 : action.action) + " DOC",
             fileName: file === null || file === void 0 ? void 0 : file.name,
@@ -42831,7 +42901,7 @@ const ActionModal$5 = _ref => {
           }] : []
         },
         additionalDetails,
-        comment: (data === null || data === void 0 ? void 0 : data.comments) || "",
+        comment: commentValue || (data === null || data === void 0 ? void 0 : data.comments) || "",
         wfDocuments: uploadedFile ? [{
           documentType: (action === null || action === void 0 ? void 0 : action.action) + " DOC",
           fileName: file === null || file === void 0 ? void 0 : file.name,
@@ -42842,7 +42912,7 @@ const ActionModal$5 = _ref => {
           assignes: !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? [] : [{
             uuid: selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid
           }],
-          comment: (data === null || data === void 0 ? void 0 : data.comments) || "",
+          comment: commentValue || (data === null || data === void 0 ? void 0 : data.comments) || "",
           documents: uploadedFile ? [{
             documentType: (action === null || action === void 0 ? void 0 : action.action) + " DOC",
             fileName: file === null || file === void 0 ? void 0 : file.name,
@@ -42857,7 +42927,7 @@ const ActionModal$5 = _ref => {
     }
     applicationData = _extends({}, applicationData, {
       action: action === null || action === void 0 ? void 0 : action.action,
-      comment: (data === null || data === void 0 ? void 0 : data.comments) || "",
+      comment: commentValue,
       assignee: !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? [] : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
       assignes: !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? [] : [{
         uuid: selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid
@@ -42867,12 +42937,12 @@ const ActionModal$5 = _ref => {
         fileName: file === null || file === void 0 ? void 0 : file.name,
         fileStoreId: uploadedFile
       }] : null,
-      processInstance: _extends({}, (_applicationData7 = applicationData) === null || _applicationData7 === void 0 ? void 0 : _applicationData7.processInstance, {
+      processInstance: _extends({}, (_applicationData0 = applicationData) === null || _applicationData0 === void 0 ? void 0 : _applicationData0.processInstance, {
         action: action === null || action === void 0 ? void 0 : action.action,
         assignes: !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? [] : [{
           uuid: selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid
         }],
-        comment: (data === null || data === void 0 ? void 0 : data.comments) || "",
+        comment: commentValue,
         documents: uploadedFile ? [{
           documentType: (action === null || action === void 0 ? void 0 : action.action) + " DOC",
           fileName: file === null || file === void 0 ? void 0 : file.name,
@@ -42880,36 +42950,36 @@ const ActionModal$5 = _ref => {
         }] : []
       })
     });
-    if (data !== null && data !== void 0 && data.date && (_applicationData8 = applicationData) !== null && _applicationData8 !== void 0 && (_applicationData8$app = _applicationData8.applicationType) !== null && _applicationData8$app !== void 0 && _applicationData8$app.includes("DISCONNECT")) {
+    if (data !== null && data !== void 0 && data.date && (_applicationData1 = applicationData) !== null && _applicationData1 !== void 0 && (_applicationData1$app = _applicationData1.applicationType) !== null && _applicationData1$app !== void 0 && _applicationData1$app.includes("DISCONNECT")) {
       const disconnectionExecutionDate = cloneDeep_1(data === null || data === void 0 ? void 0 : data.date);
       applicationData.disconnectionExecutionDate = convertDateToEpochNew$1(disconnectionExecutionDate);
     } else if (data !== null && data !== void 0 && data.date) {
       const connectionExecutionDate = cloneDeep_1(data === null || data === void 0 ? void 0 : data.date);
       applicationData.connectionExecutionDate = convertDateToEpochNew$1(connectionExecutionDate);
     }
-    if (((_applicationData9 = applicationData) === null || _applicationData9 === void 0 ? void 0 : (_applicationData9$pro = _applicationData9.processInstance) === null || _applicationData9$pro === void 0 ? void 0 : _applicationData9$pro.businessService) == "DisconnectWSConnection" || ((_applicationData0 = applicationData) === null || _applicationData0 === void 0 ? void 0 : (_applicationData0$pro = _applicationData0.processInstance) === null || _applicationData0$pro === void 0 ? void 0 : _applicationData0$pro.businessService) == "DisconnectSWConnection" || window.location.href.includes("disconnection")) {
-      var _applicationData1;
-      ((_applicationData1 = applicationData) === null || _applicationData1 === void 0 ? void 0 : _applicationData1.serviceType) == "WATER" ? submitAction({
+    if (((_applicationData10 = applicationData) === null || _applicationData10 === void 0 ? void 0 : (_applicationData10$pr = _applicationData10.processInstance) === null || _applicationData10$pr === void 0 ? void 0 : _applicationData10$pr.businessService) == "DisconnectWSConnection" || ((_applicationData11 = applicationData) === null || _applicationData11 === void 0 ? void 0 : (_applicationData11$pr = _applicationData11.processInstance) === null || _applicationData11$pr === void 0 ? void 0 : _applicationData11$pr.businessService) == "DisconnectSWConnection" || window.location.href.includes("disconnection")) {
+      var _applicationData12;
+      ((_applicationData12 = applicationData) === null || _applicationData12 === void 0 ? void 0 : _applicationData12.serviceType) == "WATER" ? submitAction({
         WaterConnection: applicationData,
         disconnectRequest: true
       }) : submitAction({
         SewerageConnection: applicationData,
         disconnectRequest: true
       });
-    } else if (((_applicationData10 = applicationData) === null || _applicationData10 === void 0 ? void 0 : _applicationData10.applicationType) == "SEWERAGE_RECONNECTION") {
+    } else if (((_applicationData13 = applicationData) === null || _applicationData13 === void 0 ? void 0 : _applicationData13.applicationType) == "SEWERAGE_RECONNECTION") {
       submitAction({
         SewerageConnection: applicationData,
         disconnectRequest: false,
         reconnectRequest: true
       });
-    } else if (((_applicationData11 = applicationData) === null || _applicationData11 === void 0 ? void 0 : _applicationData11.applicationType) == "WATER_RECONNECTION") {
+    } else if (((_applicationData14 = applicationData) === null || _applicationData14 === void 0 ? void 0 : _applicationData14.applicationType) == "WATER_RECONNECTION") {
       submitAction({
         WaterConnection: applicationData,
         disconnectRequest: false,
         reconnectRequest: true
       });
     } else {
-      var _parsedAdhocRebateDat, _parsedAdhocRebateDat2, _parsedAdhocRebateDat3, _parsedAdhocRebateDat4, _parsedAdhocRebateDat5, _parsedAdhocRebateDat6, _parsedAdhocRebateDat7, _parsedAdhocRebateDat8, _parsedAdhocRebateDat9, _parsedAdhocRebateDat0, _parsedAdhocRebateDat1, _parsedAdhocRebateDat10, _applicationData12;
+      var _parsedAdhocRebateDat, _parsedAdhocRebateDat2, _parsedAdhocRebateDat3, _parsedAdhocRebateDat4, _parsedAdhocRebateDat5, _parsedAdhocRebateDat6, _parsedAdhocRebateDat7, _parsedAdhocRebateDat8, _parsedAdhocRebateDat9, _parsedAdhocRebateDat0, _parsedAdhocRebateDat1, _parsedAdhocRebateDat10, _applicationData15;
       const adhocRebateData = sessionStorage.getItem("Digit.ADHOC_ADD_REBATE_DATA");
       const parsedAdhocRebateData = adhocRebateData ? JSON.parse(adhocRebateData) : "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat !== void 0 && _parsedAdhocRebateDat.adhocPenalty) applicationData.additionalDetails.adhocPenalty = parseInt(parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat2 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat2 === void 0 ? void 0 : _parsedAdhocRebateDat2.adhocPenalty) || "";
@@ -42918,7 +42988,7 @@ const ActionModal$5 = _ref => {
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat7 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat7 !== void 0 && _parsedAdhocRebateDat7.adhocRebate) applicationData.additionalDetails.adhocRebate = parseInt(parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat8 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat8 === void 0 ? void 0 : _parsedAdhocRebateDat8.adhocRebate) || "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat9 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat9 !== void 0 && _parsedAdhocRebateDat9.adhocRebateComment) applicationData.additionalDetails.adhocRebateComment = (parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat0 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat0 === void 0 ? void 0 : _parsedAdhocRebateDat0.adhocRebateComment) || "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat1 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat1 !== void 0 && _parsedAdhocRebateDat1.adhocRebateReason) applicationData.additionalDetails.adhocRebateReason = (parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat10 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat10 === void 0 ? void 0 : _parsedAdhocRebateDat10.adhocRebateReason) || "";
-      ((_applicationData12 = applicationData) === null || _applicationData12 === void 0 ? void 0 : _applicationData12.serviceType) == "WATER" ? submitAction({
+      ((_applicationData15 = applicationData) === null || _applicationData15 === void 0 ? void 0 : _applicationData15.serviceType) == "WATER" ? submitAction({
         WaterConnection: applicationData,
         disconnectRequest: false,
         reconnectRequest: false
@@ -42930,8 +43000,8 @@ const ActionModal$5 = _ref => {
     }
   }
   useEffect(() => {
-    var _applicationData13, _applicationData13$pr, _applicationData14, _applicationData14$pr;
-    if (((_applicationData13 = applicationData) === null || _applicationData13 === void 0 ? void 0 : (_applicationData13$pr = _applicationData13.processInstance) === null || _applicationData13$pr === void 0 ? void 0 : _applicationData13$pr.businessService) == "DisconnectWSConnection" || ((_applicationData14 = applicationData) === null || _applicationData14 === void 0 ? void 0 : (_applicationData14$pr = _applicationData14.processInstance) === null || _applicationData14$pr === void 0 ? void 0 : _applicationData14$pr.businessService) == "DisconnectSWConnection") {
+    var _applicationData16, _applicationData16$pr, _applicationData17, _applicationData17$pr;
+    if (((_applicationData16 = applicationData) === null || _applicationData16 === void 0 ? void 0 : (_applicationData16$pr = _applicationData16.processInstance) === null || _applicationData16$pr === void 0 ? void 0 : _applicationData16$pr.businessService) == "DisconnectWSConnection" || ((_applicationData17 = applicationData) === null || _applicationData17 === void 0 ? void 0 : (_applicationData17$pr = _applicationData17.processInstance) === null || _applicationData17$pr === void 0 ? void 0 : _applicationData17$pr.businessService) == "DisconnectSWConnection") {
       if (action) {
         setConfig(configWSDisConnectApplication({
           t,
@@ -42958,11 +43028,16 @@ const ActionModal$5 = _ref => {
           uploadedFile,
           setUploadedFile,
           businessService,
-          error
+          error,
+          isReasonRequiredAction,
+          selectedReason,
+          setSelectedReason,
+          otherReasonText,
+          setOtherReasonText
         }));
       }
     }
-  }, [action, approvers, uploadedFile, error]);
+  }, [action, approvers, uploadedFile, error, isReasonRequiredAction, selectedReason, otherReasonText]);
   return action && config.form ? /*#__PURE__*/React.createElement(Modal, {
     headerBarMain: /*#__PURE__*/React.createElement(Heading$5, {
       label: t(config.label.heading)
@@ -42979,7 +43054,13 @@ const ActionModal$5 = _ref => {
       width: "100%",
       height: "auto"
     } : {}
-  }, PTALoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement(FormComposer, {
+  }, PTALoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement(React.Fragment, null, error && /*#__PURE__*/React.createElement(CardLabelError, {
+    style: {
+      marginBottom: "12px",
+      marginLeft: "12px",
+      marginRight: "12px"
+    }
+  }, error), /*#__PURE__*/React.createElement(FormComposer, {
     config: config.form,
     noBoxShadow: true,
     inline: true,
@@ -42991,7 +43072,7 @@ const ActionModal$5 = _ref => {
     cardFormWrapperClassName: cardFormWrapperClassName,
     cardClassName: cardClassName,
     formClassName: formClassName
-  })) : /*#__PURE__*/React.createElement(Loader, null);
+  }))) : /*#__PURE__*/React.createElement(Loader, null);
 };
 
 const Heading$6 = props => {
@@ -52030,7 +52111,7 @@ const Step4_Preview = _ref => {
       "LEGAL_HEIR": "Legal Heir",
       "OTHER": "Other"
     };
-    return map[code] || code;
+    return map[code] || code || "NA";
   };
   const getReasonName = code => {
     if (code !== null && code !== void 0 && code.code) return code.i18nKey;
@@ -55256,6 +55337,7 @@ const CheckPage$4 = _ref2 => {
 };
 
 const OLDApplication = () => {
+  var _sessionFormData$decl;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const history = useHistory();
@@ -55467,7 +55549,7 @@ const OLDApplication = () => {
     }).length > 0)) {
       console.warn("[WS] onSubmit EXIT: formState errors blocking submit", formStateErros);
       setShowToast({
-        warning: true,
+        key: "error",
         message: "PLEASE_FILL_MANDATORY_DETAILS"
       });
       return;
@@ -55850,7 +55932,8 @@ const OLDApplication = () => {
     defaultValues: sessionFormData,
     noCard: true,
     noBreakLine: true,
-    cardFormWrapperClassName: "new-application-card"
+    cardFormWrapperClassName: "new-application-card",
+    isDisabled: !(sessionFormData !== null && sessionFormData !== void 0 && (_sessionFormData$decl = sessionFormData.declarationData) !== null && _sessionFormData$decl !== void 0 && _sessionFormData$decl.agree)
   }), showToast && /*#__PURE__*/React.createElement(Toast, {
     isDleteBtn: true,
     duration: 5000,