@djb25/digit-ui-module-ws 1.0.55 → 1.0.57

package/dist/index.modern.js

@@ -1,7 +1,7 @@
 import React, { useState, useMemo, useEffect, useRef, Fragment as Fragment$1, useReducer, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link, useHistory, useLocation, Switch, Route, useRouteMatch, Redirect, useParams } from 'react-router-dom';
-import { Loader, Card, KeyNote, SubmitBar, InfoBannerIcon, SearchForm, SearchField, Dropdown, TextInput, Table, Banner, CardText, ActionBar, HomeIcon, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, VerticalTimeline, CollapsibleCardPage, LabelFieldPair, CardLabel, CardLabelError, LayoutWrapper, PrintBtnCommon, MultiLink, LinkButton, Toast, TickMark, FormStep, RadioOrSelect, CardHeader, CitizenInfoLabel, CardSubHeader, DatePicker, RadioButtons, UploadFile, ViewsIcon, Modal, DeleteIcon, WrapUnMaskComponent, MobileNumber, CheckBox, StatusTable, Row, Header, CardSectionHeader, InfoIcon, TextArea, FilterFormField, RemoveableTag, MultiSelectDropdown, InboxComposer, DropIcon, WSICon, EmployeeModuleCard, SearchAction, PopUp, DetailsCard, CloseSvg, Localities, DownloadBtnCommon, CollectionIcon, ResponseComposer, TelePhone, DisplayPhotos, PDFSvg, GenericFileIcon, EditIcon, Label, CardSectionSubText, DownloadIcon, CardLabelDesc, FormComposer, MultiUploadWrapper, Close as Close$e, BreakLine, AddIcon, CheckPoint, ConnectingCheckPoints, Menu, ButtonSelector, CitizenHomeCard } from '@djb25/digit-ui-react-components';
+import { Loader, Card, KeyNote, SubmitBar, InfoBannerIcon, SearchForm, SearchField, Dropdown, TextInput, Table, Banner, CardText, ActionBar, HomeIcon, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, VerticalTimeline, CollapsibleCardPage, LabelFieldPair, CardLabel, CardLabelError, CheckBox, LayoutWrapper, PrintBtnCommon, MultiLink, LinkButton, Toast, TickMark, FormStep, RadioOrSelect, CardHeader, CitizenInfoLabel, CardSubHeader, DatePicker, RadioButtons, UploadFile, ViewsIcon, Modal, DeleteIcon, WrapUnMaskComponent, MobileNumber, StatusTable, Row, Header, CardSectionHeader, InfoIcon, TextArea, FilterFormField, RemoveableTag, MultiSelectDropdown, InboxComposer, DropIcon, WSICon, EmployeeModuleCard, SearchAction, PopUp, DetailsCard, CloseSvg, Localities, DownloadBtnCommon, CollectionIcon, ResponseComposer, TelePhone, DisplayPhotos, PDFSvg, GenericFileIcon, EditIcon, Label, CardSectionSubText, DownloadIcon, CardLabelDesc, FormComposer, MultiUploadWrapper, Close as Close$e, BreakLine, AddIcon, CheckPoint, ConnectingCheckPoints, Menu, ButtonSelector, CitizenHomeCard } from '@djb25/digit-ui-react-components';
 import { useForm, Controller, useWatch, useFormContext } from 'react-hook-form';
 import { read, utils as utils$1 } from 'xlsx';
 import { useQueryClient } from 'react-query';
@@ -1870,7 +1870,8 @@ const WSCalculationPayload = (data, tenantId) => {
     numberOfFloors: useDetails !== null && useDetails !== void 0 && (_useDetails$noOfFloor = useDetails.noOfFloors) !== null && _useDetails$noOfFloor !== void 0 && _useDetails$noOfFloor.code ? Number(useDetails.noOfFloors.code) : 0,
     numberOfStudents: useDetails !== null && useDetails !== void 0 && useDetails.numberOfStudents ? Number(useDetails.numberOfStudents) : 0,
     numberOfBeds: useDetails !== null && useDetails !== void 0 && useDetails.numberOfBeds ? Number(useDetails.numberOfBeds) : 0,
-    servantQuarterArea: useDetails !== null && useDetails !== void 0 && useDetails.servantQuarterArea ? Number(useDetails.servantQuarterArea) : 0
+    servantQuarterArea: useDetails !== null && useDetails !== void 0 && useDetails.servantQuarterArea ? Number(useDetails.servantQuarterArea) : 0,
+    is12ABCertificate: useDetails !== null && useDetails !== void 0 && useDetails.is12ABCertificate ? true : false
   };
   if (useDetails !== null && useDetails !== void 0 && useDetails.NumberofRooms) payload.numberOfRooms = Number(useDetails.NumberofRooms);
   if (useDetails !== null && useDetails !== void 0 && useDetails.NumberofDwellingUnits) payload.numberOfDwellingUnits = Number(useDetails.NumberofDwellingUnits);
@@ -9645,7 +9646,7 @@ const colonyNameOptions = [{
 const NUMBER_PATTERN = /^\d+$/;
 const DECIMAL_PATTERN = /^\d+(\.\d{1,2})?$/;
 const WSCalculation = _ref => {
-  var _formData$cpt2, _errors$useDetails, _errors$useDetails2, _errors$useDetails3, _errors$useDetails4, _errors$useDetails5, _errors$useDetails6, _errors$useDetails7, _errors$useDetails8, _errors$useDetails9, _errors$useDetails0, _errors$useDetails1, _errors$useDetails10, _errors$useDetails11;
+  var _formData$cpt2, _errors$useDetails, _errors$useDetails2, _errors$useDetails3, _errors$useDetails4, _errors$useDetails5, _errors$useDetails6, _errors$useDetails7, _errors$useDetails8, _formValue$useDetails3, _formValue$useDetails4, _formValue$useDetails5, _formValue$useDetails6, _errors$useDetails9, _errors$useDetails0, _errors$useDetails1, _errors$useDetails10, _errors$useDetails11;
   let config = _ref.config,
     onSelect = _ref.onSelect,
     formData = _ref.formData,
@@ -9666,7 +9667,8 @@ const WSCalculation = _ref => {
           numberOfBeds: "",
           numberOfStudents: "",
           servantQuarterArea: "",
-          colonyName: ""
+          colonyName: "",
+          is12ABCertificate: false
         }
       }
     }),
@@ -9717,7 +9719,7 @@ const WSCalculation = _ref => {
   const isHospitalProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOSPITAL_NURSING_HOME" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "DharamshalasOrHostels" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HospitalNursingHome";
   const isHotelRestaurantProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOTEL_OR_RESTAURANT" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HotelOrRestaurant";
   const isSchoolCollegeProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "School" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "College";
-  const isDwellingUnit = (watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : watchPropertyCategory.code) === "RESIDENTIAL" || (watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : watchPropertyCategory.code) === "RESIDENTIAL";
+  const isDwellingUnit = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "Apartment" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "FlatOrApartment" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "IndividualHouse";
   const isServentHouse = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "Apartment" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "FlatOrApartment" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "IndividualHouse";
   const categoryOptions = useMemo(() => {
     var _ptServicesMastersDat, _ptServicesMastersDat2;
@@ -9825,6 +9827,7 @@ const WSCalculation = _ref => {
       setValue("useDetails.numberOfStudents", "");
       setValue("useDetails.servantQuarterArea", "");
       setValue("useDetails.colonyName", "");
+      setValue("useDetails.is12ABCertificate", false);
     }
   }, [formData === null || formData === void 0 ? void 0 : (_formData$cpt2 = formData.cpt) === null || _formData$cpt2 === void 0 ? void 0 : _formData$cpt2.details, formData === null || formData === void 0 ? void 0 : formData.cpt, categoryOptions, propertyTypeOptions, usageTypeOptions, categoryTypeList, setValue]);
   const lastErrorState = React.useRef(null);
@@ -10264,7 +10267,7 @@ const WSCalculation = _ref => {
     name: "useDetails.plotArea"
   }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails6 = errors.useDetails) === null || _errors$useDetails6 === void 0 ? void 0 : _errors$useDetails6.plotArea) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, errors.useDetails.plotArea.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, "" + t("WS_BUILT_UP_AREA")), /*#__PURE__*/React.createElement("div", {
+  }, errors.useDetails.plotArea.message), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, "" + t("WS_BUILT_UP_AREA")), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
   }, /*#__PURE__*/React.createElement(TextInput, {
     t: t,
@@ -10277,7 +10280,7 @@ const WSCalculation = _ref => {
     name: "useDetails.builtUpArea"
   }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails7 = errors.useDetails) === null || _errors$useDetails7 === void 0 ? void 0 : _errors$useDetails7.builtUpArea) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, errors.useDetails.builtUpArea.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, "" + t("WS_FAR_AREA")), /*#__PURE__*/React.createElement("div", {
+  }, errors.useDetails.builtUpArea.message)), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, "" + t("WS_FAR_AREA")), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
   }, /*#__PURE__*/React.createElement(TextInput, {
     t: t,
@@ -10285,12 +10288,25 @@ const WSCalculation = _ref => {
       pattern: {
         value: DECIMAL_PATTERN,
         message: t("ERR_INVALID_DECIMAL")
+      },
+      validate: value => {
+        var _formValue$useDetails, _formValue$useDetails2;
+        if (formValue !== null && formValue !== void 0 && (_formValue$useDetails = formValue.useDetails) !== null && _formValue$useDetails !== void 0 && _formValue$useDetails.builtUpArea && parseFloat(value) > parseFloat(formValue === null || formValue === void 0 ? void 0 : (_formValue$useDetails2 = formValue.useDetails) === null || _formValue$useDetails2 === void 0 ? void 0 : _formValue$useDetails2.builtUpArea)) {
+          return t("WS_FAR_AREA_IS_SMALLER_THAN_BUILT_UP_AREA");
+        }
       }
     }),
     name: "useDetails.farArea"
   }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails8 = errors.useDetails) === null || _errors$useDetails8 === void 0 ? void 0 : _errors$useDetails8.farArea) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, errors.useDetails.farArea.message), isDwellingUnit ? /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, "" + t("WS_NUMBER_OF_DWELLING_UNITS")), /*#__PURE__*/React.createElement("div", {
+  }, errors.useDetails.farArea.message), (formValue === null || formValue === void 0 ? void 0 : (_formValue$useDetails3 = formValue.useDetails) === null || _formValue$useDetails3 === void 0 ? void 0 : _formValue$useDetails3.farArea) && (formValue === null || formValue === void 0 ? void 0 : (_formValue$useDetails4 = formValue.useDetails) === null || _formValue$useDetails4 === void 0 ? void 0 : _formValue$useDetails4.builtUpArea) && parseFloat(formValue === null || formValue === void 0 ? void 0 : (_formValue$useDetails5 = formValue.useDetails) === null || _formValue$useDetails5 === void 0 ? void 0 : _formValue$useDetails5.farArea) > parseFloat(formValue === null || formValue === void 0 ? void 0 : (_formValue$useDetails6 = formValue.useDetails) === null || _formValue$useDetails6 === void 0 ? void 0 : _formValue$useDetails6.builtUpArea) && /*#__PURE__*/React.createElement(CardLabelError, {
+    style: {
+      width: "70%",
+      marginLeft: "30%",
+      fontSize: "12px",
+      marginTop: "5px"
+    }
+  }, t("WS_FAR_AREA_IS_SMALLER_THAN_BUILT_UP_AREA"))), isDwellingUnit ? /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, "" + t("WS_NUMBER_OF_DWELLING_UNITS")), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
   }, /*#__PURE__*/React.createElement(TextInput, {
     t: t,
@@ -10357,7 +10373,21 @@ const WSCalculation = _ref => {
     name: "useDetails.servantQuarterArea"
   }))) : null, isServentHouse && (errors === null || errors === void 0 ? void 0 : (_errors$useDetails11 = errors.useDetails) === null || _errors$useDetails11 === void 0 ? void 0 : _errors$useDetails11.servantQuarterArea) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, errors.useDetails.servantQuarterArea.message))), /*#__PURE__*/React.createElement("div", {
+  }, errors.useDetails.servantQuarterArea.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement("div", {
+    className: "form-field"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "useDetails.is12ABCertificate",
+    render: _ref3 => {
+      let value = _ref3.value,
+        onChange = _ref3.onChange;
+      return /*#__PURE__*/React.createElement(CheckBox, {
+        checked: value,
+        onChange: e => onChange(e.target.checked),
+        label: t("WS_12_AB_CERTIFICATE_LABEL")
+      });
+    }
+  }))))), /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
       marginTop: "24px",
@@ -10833,7 +10863,7 @@ const BILLSBreadCrumbs = _ref => {
   }), /*#__PURE__*/React.createElement(ModuleHeader, {
     leftContent: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ArrowLeft, {
       className: "icon"
-    }), "Back"),
+    }), t("CS_COMMON_BACK")),
     onLeftClick: () => window.history.back(),
     breadcrumbs: getDynamicBreadcrumbs()
   }));
@@ -15124,7 +15154,7 @@ const WSActivationConnectionDetails = _ref => {
   }, commonProps)))));
 };
 const ConnectionDetails$2 = _props => {
-  var _errors$connectionTyp2, _errors$waterSource2, _errors$sourceSubData2, _errors$pipeSize2, _errors$noOfTaps2, _errors$noOfWaterClos2, _errors$noOfToilets2;
+  var _errors$connectionTyp2, _errors$connectionTyp3, _errors$waterSource2, _errors$waterSource3, _errors$sourceSubData2, _errors$sourceSubData3, _errors$pipeSize2, _errors$pipeSize3, _errors$noOfTaps2, _errors$noOfTaps3, _errors$noOfWaterClos2, _errors$noOfWaterClos3, _errors$noOfToilets2, _errors$noOfToilets3;
   const connectionDetail = _props.connectionDetail,
     focusIndex = _props.focusIndex,
     setFocusIndex = _props.setFocusIndex,
@@ -15191,35 +15221,17 @@ const ConnectionDetails$2 = _props => {
     }
   }, [errors]);
   const errorStyle = {
-    width: "70%",
-    marginLeft: "30%",
+    width: "100%",
+    marginLeft: "0px",
     fontSize: "12px",
     marginTop: "-21px"
   };
-  return /*#__PURE__*/React.createElement("div", {
-    className: "formcomposer-section-grid"
-  }, !window.location.href.includes("by-config") && !window.location.href.includes("ws/modify-application") ? /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    style: isMobile && isEmployee ? {
-      fontWeight: "700",
-      width: "100%"
-    } : {
-      fontWeight: "700"
-    },
-    className: "card-label-smaller"
-  }, t("WS_ACK_COMMON_APP_NO_LABEL") + "*"), /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, !window.location.href.includes("by-config") && !window.location.href.includes("ws/modify-application") ? /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_ACK_COMMON_APP_NO_LABEL") + "*"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(TextInput, {
     disabled: true,
     value: filters === null || filters === void 0 ? void 0 : filters.applicationNumber
-  }))) : null, (filters === null || filters === void 0 ? void 0 : filters.service) === "WATER" ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    style: isMobile && isEmployee ? {
-      fontWeight: "700",
-      width: "100%"
-    } : {
-      fontWeight: "700"
-    },
-    className: "card-label-smaller"
-  }, t("WS_SERV_DETAIL_CONN_TYPE") + "*"), /*#__PURE__*/React.createElement(Controller, {
+  }))) : null, (filters === null || filters === void 0 ? void 0 : filters.service) === "WATER" ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_SERV_DETAIL_CONN_TYPE") + "*"), /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "connectionType",
     defaultValue: connectionDetail === null || connectionDetail === void 0 ? void 0 : connectionDetail.connectionType,
@@ -15243,17 +15255,9 @@ const ConnectionDetails$2 = _props => {
         t: t
       });
     }
-  })), localFormState.touched.connectionType ? /*#__PURE__*/React.createElement(CardLabelError, {
+  }), localFormState.touched.connectionType && errors !== null && errors !== void 0 && (_errors$connectionTyp2 = errors.connectionType) !== null && _errors$connectionTyp2 !== void 0 && _errors$connectionTyp2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$connectionTyp2 = errors.connectionType) === null || _errors$connectionTyp2 === void 0 ? void 0 : _errors$connectionTyp2.message) : null), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    style: isMobile && isEmployee ? {
-      fontWeight: "700",
-      width: "100%"
-    } : {
-      fontWeight: "700"
-    },
-    className: "card-label-smaller"
-  }, t("WS_SERV_DETAIL_WATER_SOURCE") + "*"), /*#__PURE__*/React.createElement(Controller, {
+  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$connectionTyp3 = errors.connectionType) === null || _errors$connectionTyp3 === void 0 ? void 0 : _errors$connectionTyp3.message) : null), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_SERV_DETAIL_WATER_SOURCE") + "*"), /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "waterSource",
     defaultValue: connectionDetail === null || connectionDetail === void 0 ? void 0 : connectionDetail.waterSource,
@@ -15293,17 +15297,9 @@ const ConnectionDetails$2 = _props => {
         t: t
       });
     }
-  })), localFormState.touched.waterSource ? /*#__PURE__*/React.createElement(CardLabelError, {
+  }), localFormState.touched.waterSource && errors !== null && errors !== void 0 && (_errors$waterSource2 = errors.waterSource) !== null && _errors$waterSource2 !== void 0 && _errors$waterSource2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$waterSource2 = errors.waterSource) === null || _errors$waterSource2 === void 0 ? void 0 : _errors$waterSource2.message) : null), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    style: isMobile && isEmployee ? {
-      fontWeight: "700",
-      width: "100%"
-    } : {
-      fontWeight: "700"
-    },
-    className: "card-label-smaller"
-  }, t("WS_SERV_DETAIL_WATER_SUB_SOURCE") + "*"), /*#__PURE__*/React.createElement(Controller, {
+  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$waterSource3 = errors.waterSource) === null || _errors$waterSource3 === void 0 ? void 0 : _errors$waterSource3.message) : null), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_SERV_DETAIL_WATER_SUB_SOURCE") + "*"), /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "sourceSubData",
     defaultValue: connectionDetail === null || connectionDetail === void 0 ? void 0 : connectionDetail.sourceSubData,
@@ -15327,17 +15323,9 @@ const ConnectionDetails$2 = _props => {
         t: t
       });
     }
-  })), localFormState.touched.sourceSubData ? /*#__PURE__*/React.createElement(CardLabelError, {
+  }), localFormState.touched.sourceSubData && errors !== null && errors !== void 0 && (_errors$sourceSubData2 = errors.sourceSubData) !== null && _errors$sourceSubData2 !== void 0 && _errors$sourceSubData2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$sourceSubData2 = errors.sourceSubData) === null || _errors$sourceSubData2 === void 0 ? void 0 : _errors$sourceSubData2.message) : null), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    style: isMobile && isEmployee ? {
-      fontWeight: "700",
-      width: "100%"
-    } : {
-      fontWeight: "700"
-    },
-    className: "card-label-smaller"
-  }, t("WS_PIPE_SIZE_IN_INCHES_LABEL") + "*"), /*#__PURE__*/React.createElement(Controller, {
+  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$sourceSubData3 = errors.sourceSubData) === null || _errors$sourceSubData3 === void 0 ? void 0 : _errors$sourceSubData3.message) : null), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_PIPE_SIZE_IN_INCHES_LABEL") + "*"), /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "pipeSize",
     defaultValue: connectionDetail === null || connectionDetail === void 0 ? void 0 : connectionDetail.pipeSize,
@@ -15361,17 +15349,9 @@ const ConnectionDetails$2 = _props => {
         t: t
       });
     }
-  })), localFormState.touched.pipeSize ? /*#__PURE__*/React.createElement(CardLabelError, {
+  }), localFormState.touched.pipeSize && errors !== null && errors !== void 0 && (_errors$pipeSize2 = errors.pipeSize) !== null && _errors$pipeSize2 !== void 0 && _errors$pipeSize2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$pipeSize2 = errors.pipeSize) === null || _errors$pipeSize2 === void 0 ? void 0 : _errors$pipeSize2.message) : null), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    style: isMobile && isEmployee ? {
-      fontWeight: "700",
-      width: "100%"
-    } : {
-      fontWeight: "700"
-    },
-    className: "card-label-smaller"
-  }, t("WS_SERV_DETAIL_NO_OF_TAPS") + "*"), /*#__PURE__*/React.createElement("div", {
+  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$pipeSize3 = errors.pipeSize) === null || _errors$pipeSize3 === void 0 ? void 0 : _errors$pipeSize3.message) : null), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_SERV_DETAIL_NO_OF_TAPS") + "*"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
@@ -15403,17 +15383,9 @@ const ConnectionDetails$2 = _props => {
         onBlur: props.onBlur
       });
     }
-  }))), localFormState.touched.noOfTaps ? /*#__PURE__*/React.createElement(CardLabelError, {
+  })), localFormState.touched.noOfTaps && errors !== null && errors !== void 0 && (_errors$noOfTaps2 = errors.noOfTaps) !== null && _errors$noOfTaps2 !== void 0 && _errors$noOfTaps2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$noOfTaps2 = errors.noOfTaps) === null || _errors$noOfTaps2 === void 0 ? void 0 : _errors$noOfTaps2.message) : null)) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    style: isMobile && isEmployee ? {
-      fontWeight: "700",
-      width: "100%"
-    } : {
-      fontWeight: "700"
-    },
-    className: "card-label-smaller"
-  }, t("WS_NUMBER_WATER_CLOSETS_LABEL") + "*"), /*#__PURE__*/React.createElement("div", {
+  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$noOfTaps3 = errors.noOfTaps) === null || _errors$noOfTaps3 === void 0 ? void 0 : _errors$noOfTaps3.message) : null)) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_NUMBER_WATER_CLOSETS_LABEL") + "*"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
@@ -15445,17 +15417,9 @@ const ConnectionDetails$2 = _props => {
         onBlur: props.onBlur
       });
     }
-  }))), localFormState.touched.noOfWaterClosets ? /*#__PURE__*/React.createElement(CardLabelError, {
+  })), localFormState.touched.noOfWaterClosets && errors !== null && errors !== void 0 && (_errors$noOfWaterClos2 = errors.noOfWaterClosets) !== null && _errors$noOfWaterClos2 !== void 0 && _errors$noOfWaterClos2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$noOfWaterClos2 = errors.noOfWaterClosets) === null || _errors$noOfWaterClos2 === void 0 ? void 0 : _errors$noOfWaterClos2.message) : null), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    style: isMobile && isEmployee ? {
-      fontWeight: "700",
-      width: "100%"
-    } : {
-      fontWeight: "700"
-    },
-    className: "card-label-smaller"
-  }, t("WS_SERV_DETAIL_NO_OF_TOILETS") + "*"), /*#__PURE__*/React.createElement("div", {
+  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$noOfWaterClos3 = errors.noOfWaterClosets) === null || _errors$noOfWaterClos3 === void 0 ? void 0 : _errors$noOfWaterClos3.message) : null), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_SERV_DETAIL_NO_OF_TOILETS") + "*"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
@@ -15487,9 +15451,9 @@ const ConnectionDetails$2 = _props => {
         onBlur: props.onBlur
       });
     }
-  }))), localFormState.touched.noOfToilets ? /*#__PURE__*/React.createElement(CardLabelError, {
+  })), localFormState.touched.noOfToilets && errors !== null && errors !== void 0 && (_errors$noOfToilets2 = errors.noOfToilets) !== null && _errors$noOfToilets2 !== void 0 && _errors$noOfToilets2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$noOfToilets2 = errors.noOfToilets) === null || _errors$noOfToilets2 === void 0 ? void 0 : _errors$noOfToilets2.message) : null)));
+  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$noOfToilets3 = errors.noOfToilets) === null || _errors$noOfToilets3 === void 0 ? void 0 : _errors$noOfToilets3.message) : null)));
 };
 
 const createPlumberDetails = () => ({
@@ -15559,7 +15523,7 @@ const WSActivationPlumberDetails = _ref => {
   }, commonProps))));
 };
 const PlumberDetails = _props => {
-  var _plumberDetails$, _formData$disConnecti, _errors$detailsProvid2, _plumberDetail$detail, _plumberDetail$detail2, _errors$plumberLicens2, _errors$plumberName2, _errors$plumberMobile2;
+  var _plumberDetails$, _formData$disConnecti, _errors$detailsProvid2, _errors$detailsProvid3, _plumberDetail$detail, _plumberDetail$detail2, _errors$plumberLicens2, _errors$plumberLicens3, _errors$plumberName2, _errors$plumberName3, _errors$plumberMobile2, _errors$plumberMobile3;
   const plumberDetail = _props.plumberDetail,
     focusIndex = _props.focusIndex,
     setFocusIndex = _props.setFocusIndex,
@@ -15621,22 +15585,12 @@ const PlumberDetails = _props => {
     }
   }, [errors]);
   const errorStyle = {
-    width: "70%",
-    marginLeft: "30%",
+    width: "100%",
+    marginLeft: "0px",
     fontSize: "12px",
     marginTop: "-21px"
   };
-  return /*#__PURE__*/React.createElement("div", {
-    className: "formcomposer-section-grid"
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    style: isMobile && isEmployee ? {
-      fontWeight: "700",
-      width: "100%"
-    } : {
-      fontWeight: "700"
-    },
-    className: "card-label-smaller"
-  }, t("WS_ADDN_DETAILS_PLUMBER_PROVIDED_BY") + "*"), /*#__PURE__*/React.createElement(Controller, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_ADDN_DETAILS_PLUMBER_PROVIDED_BY") + "*"), /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "detailsProvidedBy",
     defaultValue: plumberDetail === null || plumberDetail === void 0 ? void 0 : plumberDetail.detailsProvidedBy,
@@ -15674,17 +15628,9 @@ const PlumberDetails = _props => {
         t: t
       });
     }
-  })), localFormState.touched.detailsProvidedBy ? /*#__PURE__*/React.createElement(CardLabelError, {
+  }), localFormState.touched.detailsProvidedBy && errors !== null && errors !== void 0 && (_errors$detailsProvid2 = errors.detailsProvidedBy) !== null && _errors$detailsProvid2 !== void 0 && _errors$detailsProvid2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$detailsProvid2 = errors.detailsProvidedBy) === null || _errors$detailsProvid2 === void 0 ? void 0 : _errors$detailsProvid2.message) : null), !(plumberDetail !== null && plumberDetail !== void 0 && (_plumberDetail$detail = plumberDetail.detailsProvidedBy) !== null && _plumberDetail$detail !== void 0 && _plumberDetail$detail.code) || (plumberDetail === null || plumberDetail === void 0 ? void 0 : (_plumberDetail$detail2 = plumberDetail.detailsProvidedBy) === null || _plumberDetail$detail2 === void 0 ? void 0 : _plumberDetail$detail2.code) == "ULB" ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    style: isMobile && isEmployee ? {
-      fontWeight: "700",
-      width: "100%"
-    } : {
-      fontWeight: "700"
-    },
-    className: "card-label-smaller"
-  }, t("WS_PLIMBER_LICENSE_NO_LABEL") + "*"), /*#__PURE__*/React.createElement("div", {
+  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$detailsProvid3 = errors.detailsProvidedBy) === null || _errors$detailsProvid3 === void 0 ? void 0 : _errors$detailsProvid3.message) : null), !(plumberDetail !== null && plumberDetail !== void 0 && (_plumberDetail$detail = plumberDetail.detailsProvidedBy) !== null && _plumberDetail$detail !== void 0 && _plumberDetail$detail.code) || (plumberDetail === null || plumberDetail === void 0 ? void 0 : (_plumberDetail$detail2 = plumberDetail.detailsProvidedBy) === null || _plumberDetail$detail2 === void 0 ? void 0 : _plumberDetail$detail2.code) == "ULB" ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_PLIMBER_LICENSE_NO_LABEL") + "*"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
@@ -15714,17 +15660,9 @@ const PlumberDetails = _props => {
         onBlur: props.onBlur
       });
     }
-  }))), localFormState.touched.plumberLicenseNo ? /*#__PURE__*/React.createElement(CardLabelError, {
+  })), localFormState.touched.plumberLicenseNo && errors !== null && errors !== void 0 && (_errors$plumberLicens2 = errors.plumberLicenseNo) !== null && _errors$plumberLicens2 !== void 0 && _errors$plumberLicens2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, errors === null || errors === void 0 ? void 0 : (_errors$plumberLicens2 = errors.plumberLicenseNo) === null || _errors$plumberLicens2 === void 0 ? void 0 : _errors$plumberLicens2.message) : null), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    style: isMobile && isEmployee ? {
-      fontWeight: "700",
-      width: "100%"
-    } : {
-      fontWeight: "700"
-    },
-    className: "card-label-smaller"
-  }, t("WS_ADDN_DETAILS_PLUMBER_NAME_LABEL") + "*"), /*#__PURE__*/React.createElement("div", {
+  }, errors === null || errors === void 0 ? void 0 : (_errors$plumberLicens3 = errors.plumberLicenseNo) === null || _errors$plumberLicens3 === void 0 ? void 0 : _errors$plumberLicens3.message) : null), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_ADDN_DETAILS_PLUMBER_NAME_LABEL") + "*"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
@@ -15754,17 +15692,9 @@ const PlumberDetails = _props => {
         onBlur: props.onBlur
       });
     }
-  }))), localFormState.touched.plumberName ? /*#__PURE__*/React.createElement(CardLabelError, {
+  })), localFormState.touched.plumberName && errors !== null && errors !== void 0 && (_errors$plumberName2 = errors.plumberName) !== null && _errors$plumberName2 !== void 0 && _errors$plumberName2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$plumberName2 = errors.plumberName) === null || _errors$plumberName2 === void 0 ? void 0 : _errors$plumberName2.message) : null), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    style: isMobile && isEmployee ? {
-      fontWeight: "700",
-      width: "100%"
-    } : {
-      fontWeight: "700"
-    },
-    className: "card-label-smaller"
-  }, t("WS_PLUMBER_MOBILE_NO_LABEL") + "*"), /*#__PURE__*/React.createElement("div", {
+  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$plumberName3 = errors.plumberName) === null || _errors$plumberName3 === void 0 ? void 0 : _errors$plumberName3.message) : null), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_PLUMBER_MOBILE_NO_LABEL") + "*"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
@@ -15839,9 +15769,9 @@ const PlumberDetails = _props => {
         }
       })));
     }
-  }))), localFormState.touched.plumberMobileNo ? /*#__PURE__*/React.createElement(CardLabelError, {
+  })), localFormState.touched.plumberMobileNo && errors !== null && errors !== void 0 && (_errors$plumberMobile2 = errors.plumberMobileNo) !== null && _errors$plumberMobile2 !== void 0 && _errors$plumberMobile2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$plumberMobile2 = errors.plumberMobileNo) === null || _errors$plumberMobile2 === void 0 ? void 0 : _errors$plumberMobile2.message) : null)) : null);
+  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$plumberMobile3 = errors.plumberMobileNo) === null || _errors$plumberMobile3 === void 0 ? void 0 : _errors$plumberMobile3.message) : null)) : null);
 };
 
 const createActivationDetails = () => ({
@@ -15910,7 +15840,7 @@ const WSActivationPageDetails = _ref => {
   }, commonProps))));
 };
 const ConnectionDetails$3 = _props => {
-  var _formData$connectionD, _formData$connectionD2, _formData$connectionD3, _formData$connectionD4, _formData$connectionD5, _formData$connectionD6, _formData2$connection, _formData2$connection2, _formData2$connection3, _formData2$connection4, _errors$meterId2, _errors$meterInstalla, _errors$meterInitialR2, _errors$connectionExe2, _errors$dateEffective2;
+  var _formData$connectionD, _formData$connectionD2, _formData$connectionD3, _formData$connectionD4, _formData$connectionD5, _formData$connectionD6, _formData2$connection, _formData2$connection2, _formData2$connection3, _formData2$connection4, _errors$meterId2, _errors$meterId3, _errors$meterInstalla, _errors$meterInstalla2, _errors$meterInitialR2, _errors$meterInitialR3, _errors$connectionExe2, _errors$connectionExe3, _errors$dateEffective2, _errors$dateEffective3;
   const activationDetail = _props.activationDetail,
     focusIndex = _props.focusIndex,
     setFocusIndex = _props.setFocusIndex,
@@ -15975,25 +15905,12 @@ const ConnectionDetails$3 = _props => {
     }
   }, [errors]);
   const errorStyle = {
-    width: "70%",
-    marginLeft: "30%",
+    width: "100%",
+    marginLeft: "0px",
     fontSize: "12px",
     marginTop: "-21px"
   };
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
-    style: {
-      marginBottom: "16px"
-    }
-  }, (filters === null || filters === void 0 ? void 0 : filters.service) === "WATER" && (formData === null || formData === void 0 ? void 0 : (_formData$connectionD3 = formData.connectionDetails) === null || _formData$connectionD3 === void 0 ? void 0 : (_formData$connectionD4 = _formData$connectionD3[0]) === null || _formData$connectionD4 === void 0 ? void 0 : (_formData$connectionD5 = _formData$connectionD4.connectionType) === null || _formData$connectionD5 === void 0 ? void 0 : (_formData$connectionD6 = _formData$connectionD5.code) === null || _formData$connectionD6 === void 0 ? void 0 : _formData$connectionD6.toUpperCase()) === "METERED" && (formData2 === null || formData2 === void 0 ? void 0 : (_formData2$connection = formData2.connectionDetails) === null || _formData2$connection === void 0 ? void 0 : (_formData2$connection2 = _formData2$connection[0]) === null || _formData2$connection2 === void 0 ? void 0 : (_formData2$connection3 = _formData2$connection2.formDetails) === null || _formData2$connection3 === void 0 ? void 0 : (_formData2$connection4 = _formData2$connection3.applicationData) === null || _formData2$connection4 === void 0 ? void 0 : _formData2$connection4.applicationType) !== "WATER_RECONNECTION" ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    style: isMobile && isEmployee ? {
-      fontWeight: "700",
-      width: "100%"
-    } : {
-      marginTop: "-5px",
-      fontWeight: "700"
-    },
-    className: "card-label-smaller"
-  }, t("WS_SERV_DETAIL_METER_ID") + "*"), /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, (filters === null || filters === void 0 ? void 0 : filters.service) === "WATER" && (formData === null || formData === void 0 ? void 0 : (_formData$connectionD3 = formData.connectionDetails) === null || _formData$connectionD3 === void 0 ? void 0 : (_formData$connectionD4 = _formData$connectionD3[0]) === null || _formData$connectionD4 === void 0 ? void 0 : (_formData$connectionD5 = _formData$connectionD4.connectionType) === null || _formData$connectionD5 === void 0 ? void 0 : (_formData$connectionD6 = _formData$connectionD5.code) === null || _formData$connectionD6 === void 0 ? void 0 : _formData$connectionD6.toUpperCase()) === "METERED" && (formData2 === null || formData2 === void 0 ? void 0 : (_formData2$connection = formData2.connectionDetails) === null || _formData2$connection === void 0 ? void 0 : (_formData2$connection2 = _formData2$connection[0]) === null || _formData2$connection2 === void 0 ? void 0 : (_formData2$connection3 = _formData2$connection2.formDetails) === null || _formData2$connection3 === void 0 ? void 0 : (_formData2$connection4 = _formData2$connection3.applicationData) === null || _formData2$connection4 === void 0 ? void 0 : _formData2$connection4.applicationType) !== "WATER_RECONNECTION" ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_SERV_DETAIL_METER_ID") + "*"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
@@ -16025,18 +15942,9 @@ const ConnectionDetails$3 = _props => {
         onBlur: props.onBlur
       });
     }
-  }))), /*#__PURE__*/React.createElement(CardLabelError, {
+  })), localFormState.touched.meterId && errors !== null && errors !== void 0 && (_errors$meterId2 = errors.meterId) !== null && _errors$meterId2 !== void 0 && _errors$meterId2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, localFormState.touched.meterId ? errors === null || errors === void 0 ? void 0 : (_errors$meterId2 = errors.meterId) === null || _errors$meterId2 === void 0 ? void 0 : _errors$meterId2.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    style: isMobile && isEmployee ? {
-      fontWeight: "700",
-      width: "100%"
-    } : {
-      marginTop: "-5px",
-      fontWeight: "700"
-    },
-    className: "card-label-smaller"
-  }, t("WS_ADDN_DETAIL_METER_INSTALL_DATE") + "*"), /*#__PURE__*/React.createElement("div", {
+  }, errors === null || errors === void 0 ? void 0 : (_errors$meterId3 = errors.meterId) === null || _errors$meterId3 === void 0 ? void 0 : _errors$meterId3.message) : null), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_ADDN_DETAIL_METER_INSTALL_DATE") + "*"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
     name: "meterInstallationDate",
@@ -16050,18 +15958,9 @@ const ConnectionDetails$3 = _props => {
       name: "meterInstallationDate",
       onChange: props.onChange
     })
-  }))), /*#__PURE__*/React.createElement(CardLabelError, {
+  })), localFormState.touched.meterInstallationDate && errors !== null && errors !== void 0 && (_errors$meterInstalla = errors.meterInstallationDate) !== null && _errors$meterInstalla !== void 0 && _errors$meterInstalla.message ? /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, localFormState.touched.meterInstallationDate ? errors === null || errors === void 0 ? void 0 : (_errors$meterInstalla = errors.meterInstallationDate) === null || _errors$meterInstalla === void 0 ? void 0 : _errors$meterInstalla.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    style: isMobile && isEmployee ? {
-      fontWeight: "700",
-      width: "100%"
-    } : {
-      marginTop: "-5px",
-      fontWeight: "700"
-    },
-    className: "card-label-smaller"
-  }, t("WS_INITIAL_METER_READING_LABEL") + "*"), /*#__PURE__*/React.createElement("div", {
+  }, errors === null || errors === void 0 ? void 0 : (_errors$meterInstalla2 = errors.meterInstallationDate) === null || _errors$meterInstalla2 === void 0 ? void 0 : _errors$meterInstalla2.message) : null), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_INITIAL_METER_READING_LABEL") + "*"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
     type: "number",
@@ -16093,18 +15992,9 @@ const ConnectionDetails$3 = _props => {
         onBlur: props.onBlur
       });
     }
-  }))), /*#__PURE__*/React.createElement(CardLabelError, {
+  })), localFormState.touched.meterInitialReading && errors !== null && errors !== void 0 && (_errors$meterInitialR2 = errors.meterInitialReading) !== null && _errors$meterInitialR2 !== void 0 && _errors$meterInitialR2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, localFormState.touched.meterInitialReading ? errors === null || errors === void 0 ? void 0 : (_errors$meterInitialR2 = errors.meterInitialReading) === null || _errors$meterInitialR2 === void 0 ? void 0 : _errors$meterInitialR2.message : "")) : null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    style: isMobile && isEmployee ? {
-      fontWeight: "700",
-      width: "100%"
-    } : {
-      marginTop: "-5px",
-      fontWeight: "700"
-    },
-    className: "card-label-smaller"
-  }, t("WS_SERV_DETAIL_CONN_EXECUTION_DATE") + "*"), /*#__PURE__*/React.createElement("div", {
+  }, errors === null || errors === void 0 ? void 0 : (_errors$meterInitialR3 = errors.meterInitialReading) === null || _errors$meterInitialR3 === void 0 ? void 0 : _errors$meterInitialR3.message) : null)) : null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_SERV_DETAIL_CONN_EXECUTION_DATE") + "*"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
     name: "connectionExecutionDate",
@@ -16123,18 +16013,9 @@ const ConnectionDetails$3 = _props => {
         errorStyle: localFormState.touched.connectionExecutionDate && errors !== null && errors !== void 0 && (_errors$connectionExe = errors.connectionExecutionDate) !== null && _errors$connectionExe !== void 0 && _errors$connectionExe.message ? true : false
       });
     }
-  }))), /*#__PURE__*/React.createElement(CardLabelError, {
+  })), localFormState.touched.connectionExecutionDate && errors !== null && errors !== void 0 && (_errors$connectionExe2 = errors.connectionExecutionDate) !== null && _errors$connectionExe2 !== void 0 && _errors$connectionExe2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, localFormState.touched.connectionExecutionDate ? errors === null || errors === void 0 ? void 0 : (_errors$connectionExe2 = errors.connectionExecutionDate) === null || _errors$connectionExe2 === void 0 ? void 0 : _errors$connectionExe2.message : ""), window.location.href.includes("modify") || window.location.href.includes("mutation") ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    style: isMobile && isEmployee ? {
-      fontWeight: "700",
-      width: "100%"
-    } : {
-      marginTop: "-5px",
-      fontWeight: "700"
-    },
-    className: "card-label-smaller"
-  }, t("WS_MODIFICATIONS_EFFECTIVE_FROM") + "*"), /*#__PURE__*/React.createElement("div", {
+  }, errors === null || errors === void 0 ? void 0 : (_errors$connectionExe3 = errors.connectionExecutionDate) === null || _errors$connectionExe3 === void 0 ? void 0 : _errors$connectionExe3.message) : null), window.location.href.includes("modify") || window.location.href.includes("mutation") ? /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_MODIFICATIONS_EFFECTIVE_FROM") + "*"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
     name: "dateEffectiveFrom",
@@ -16154,9 +16035,9 @@ const ConnectionDetails$3 = _props => {
         errorStyle: localFormState.touched.dateEffectiveFrom && errors !== null && errors !== void 0 && (_errors$dateEffective = errors.dateEffectiveFrom) !== null && _errors$dateEffective !== void 0 && _errors$dateEffective.message ? true : false
       });
     }
-  }))), /*#__PURE__*/React.createElement(CardLabelError, {
+  })), localFormState.touched.dateEffectiveFrom && errors !== null && errors !== void 0 && (_errors$dateEffective2 = errors.dateEffectiveFrom) !== null && _errors$dateEffective2 !== void 0 && _errors$dateEffective2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, localFormState.touched.dateEffectiveFrom ? errors === null || errors === void 0 ? void 0 : (_errors$dateEffective2 = errors.dateEffectiveFrom) === null || _errors$dateEffective2 === void 0 ? void 0 : _errors$dateEffective2.message : "")) : null));
+  }, errors === null || errors === void 0 ? void 0 : (_errors$dateEffective3 = errors.dateEffectiveFrom) === null || _errors$dateEffective3 === void 0 ? void 0 : _errors$dateEffective3.message) : null) : null);
 };
 
 const WSActivationCommentsDetails = _ref => {
@@ -16178,12 +16059,7 @@ const WSActivationCommentsDetails = _ref => {
       onSelect(config.key, _extends({}, formData[config.key], comments));
     }
   }, [comments]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    style: {
-      fontWeight: "700"
-    },
-    className: "card-label-smaller"
-  }, t("WF_COMMON_COMMENTS"), ":"), /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WF_COMMON_COMMENTS"), ":"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(TextInput, {
     key: config.key,
@@ -16286,12 +16162,7 @@ const WSActivationSupportingDocuments = _ref => {
       });
     }
   }, [uploadedFile]);
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller",
-    style: {
-      fontWeight: "700"
-    }
-  }, t("WF_APPROVAL_UPLOAD_HEAD"), ":"), /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WF_APPROVAL_UPLOAD_HEAD"), ":"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(UploadFile, {
     onUpload: e => {
@@ -21432,7 +21303,7 @@ const _excluded$1 = ["t", "config", "onSelect", "formData", "formState", "setErr
 const NUMBER_PATTERN$1 = /^\d+$/;
 const DECIMAL_PATTERN$1 = /^\d+(\.\d{1,2})?$/;
 const PropertyWaterConnection = _ref => {
-  var _formData$cpt2, _errors$useDetails, _errors$useDetails2, _errors$useDetails3, _errors$useDetails4, _errors$useDetails5, _errors$useDetails6, _errors$useDetails7, _errors$useDetails8, _errors$useDetails9, _errors$useDetails0, _errors$useDetails1, _errors$useDetails10, _errors$useDetails11, _errors$useDetails12;
+  var _formData$cpt2, _errors$useDetails, _errors$useDetails2, _errors$useDetails3, _errors$useDetails4, _errors$useDetails5, _errors$useDetails6, _errors$useDetails7, _errors$useDetails8, _formValue$useDetails3, _formValue$useDetails4, _formValue$useDetails5, _formValue$useDetails6, _errors$useDetails9, _errors$useDetails0, _errors$useDetails1, _errors$useDetails10, _errors$useDetails11, _errors$useDetails12;
   let t = _ref.t,
     config = _ref.config,
     onSelect = _ref.onSelect,
@@ -21494,7 +21365,7 @@ const PropertyWaterConnection = _ref => {
   const isHospitalProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOSPITAL_NURSING_HOME" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "DharamshalasOrHostels" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HospitalNursingHome";
   const isHotelRestaurantProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOTEL_OR_RESTAURANT" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HotelOrRestaurant";
   const isSchoolCollegeProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "School" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "College";
-  const isDwellingUnit = (watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : watchPropertyCategory.code) === "RESIDENTIAL" || (watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : watchPropertyCategory.code) === "RESIDENTIAL";
+  const isDwellingUnit = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "Apartment" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "FlatOrApartment" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "IndividualHouse";
   const isServentHouse = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "Apartment" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "FlatOrApartment" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "IndividualHouse";
   const yearOptions = useMemo(() => {
     const currentYear = new Date().getFullYear();
@@ -21763,7 +21634,7 @@ const PropertyWaterConnection = _ref => {
     disabled: isPropertyFound
   }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails6 = errors.useDetails) === null || _errors$useDetails6 === void 0 ? void 0 : _errors$useDetails6.plotArea) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, errors.useDetails.plotArea.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, "" + t("WS_BUILT_UP_AREA")), /*#__PURE__*/React.createElement("div", {
+  }, errors.useDetails.plotArea.message), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, "" + t("WS_BUILT_UP_AREA")), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
   }, /*#__PURE__*/React.createElement(TextInput, {
     t: t,
@@ -21777,7 +21648,7 @@ const PropertyWaterConnection = _ref => {
     disabled: isPropertyFound
   }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails7 = errors.useDetails) === null || _errors$useDetails7 === void 0 ? void 0 : _errors$useDetails7.builtUpArea) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, errors.useDetails.builtUpArea.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, "" + t("WS_FAR_AREA")), /*#__PURE__*/React.createElement("div", {
+  }, errors.useDetails.builtUpArea.message)), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, "" + t("WS_FAR_AREA")), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
   }, /*#__PURE__*/React.createElement(TextInput, {
     t: t,
@@ -21785,13 +21656,26 @@ const PropertyWaterConnection = _ref => {
       pattern: {
         value: DECIMAL_PATTERN$1,
         message: t("ERR_INVALID_DECIMAL")
+      },
+      validate: value => {
+        var _formValue$useDetails, _formValue$useDetails2;
+        if (formValue !== null && formValue !== void 0 && (_formValue$useDetails = formValue.useDetails) !== null && _formValue$useDetails !== void 0 && _formValue$useDetails.builtUpArea && parseFloat(value) > parseFloat(formValue === null || formValue === void 0 ? void 0 : (_formValue$useDetails2 = formValue.useDetails) === null || _formValue$useDetails2 === void 0 ? void 0 : _formValue$useDetails2.builtUpArea)) {
+          return t("WS_FAR_AREA_IS_SMALLER_THAN_BUILT_UP_AREA");
+        }
       }
     }),
     name: "useDetails.farArea",
     disabled: isPropertyFound
   }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails8 = errors.useDetails) === null || _errors$useDetails8 === void 0 ? void 0 : _errors$useDetails8.farArea) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, errors.useDetails.farArea.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_SELECT_YEAR_OF_CONSTRUCTION") + "*"), /*#__PURE__*/React.createElement("div", {
+  }, errors.useDetails.farArea.message), (formValue === null || formValue === void 0 ? void 0 : (_formValue$useDetails3 = formValue.useDetails) === null || _formValue$useDetails3 === void 0 ? void 0 : _formValue$useDetails3.farArea) && (formValue === null || formValue === void 0 ? void 0 : (_formValue$useDetails4 = formValue.useDetails) === null || _formValue$useDetails4 === void 0 ? void 0 : _formValue$useDetails4.builtUpArea) && parseFloat(formValue === null || formValue === void 0 ? void 0 : (_formValue$useDetails5 = formValue.useDetails) === null || _formValue$useDetails5 === void 0 ? void 0 : _formValue$useDetails5.farArea) > parseFloat(formValue === null || formValue === void 0 ? void 0 : (_formValue$useDetails6 = formValue.useDetails) === null || _formValue$useDetails6 === void 0 ? void 0 : _formValue$useDetails6.builtUpArea) && /*#__PURE__*/React.createElement(CardLabelError, {
+    style: {
+      width: "70%",
+      marginLeft: "30%",
+      fontSize: "12px",
+      marginTop: "5px"
+    }
+  }, t("WS_FAR_AREA_IS_SMALLER_THAN_BUILT_UP_AREA"))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_SELECT_YEAR_OF_CONSTRUCTION") + "*"), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
@@ -29468,23 +29352,30 @@ const WSFeeEstimation = _ref => {
     var _wsAdditionalDetails$2, _wsAdditionalDetails$3, _sessionFormData$bill;
     const data = _extends({}, 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$3.additionalDetails);
     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;
-      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) || [];
-      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))
-      })) : [{
+      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) + ")") : "")
+        };
+      }) : [{
         title: "WS_APPLICATION_FEE_HEADER",
-        value: /*#__PURE__*/React.createElement("span", null, "\u20B9", 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.fee)
+        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)
       }, {
         title: "WS_SERVICE_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.charge)
+        value: /*#__PURE__*/React.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill8 = sessionFormData.billDetails) === null || _sessionFormData$bill8 === void 0 ? void 0 : (_sessionFormData$bill9 = _sessionFormData$bill8[0]) === null || _sessionFormData$bill9 === void 0 ? void 0 : _sessionFormData$bill9.charge)
       }, {
         title: "WS_TAX_HEADER",
-        value: /*#__PURE__*/React.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill8 = sessionFormData.billDetails) === null || _sessionFormData$bill8 === void 0 ? void 0 : (_sessionFormData$bill9 = _sessionFormData$bill8[0]) === null || _sessionFormData$bill9 === void 0 ? void 0 : _sessionFormData$bill9.taxAmount)
+        value: /*#__PURE__*/React.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill0 = sessionFormData.billDetails) === null || _sessionFormData$bill0 === void 0 ? void 0 : (_sessionFormData$bill1 = _sessionFormData$bill0[0]) === null || _sessionFormData$bill1 === void 0 ? void 0 : _sessionFormData$bill1.taxAmount)
       }];
       setValues(values);
-      setBillDetails(sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill0 = sessionFormData.billDetails) === null || _sessionFormData$bill0 === void 0 ? void 0 : _sessionFormData$bill0[0]);
+      setBillDetails(sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill10 = sessionFormData.billDetails) === null || _sessionFormData$bill10 === void 0 ? void 0 : _sessionFormData$bill10[0]);
     } else {
       setSessionFormData(data);
       setFields(data);
@@ -29555,10 +29446,17 @@ 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 => ({
-            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))
-          })) : [{
+          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) + ")") : "")
+            };
+          }) : [{
             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
           }, {
@@ -29893,10 +29791,17 @@ const ViewBreakup = _ref => {
       if (rows === void 0) {
         rows = [];
       }
-      return rows.map(row => ({
-        title: t(row === null || row === void 0 ? void 0 : row.taxHeadCode),
-        value: "\u20B9" + formatNumber(row === null || row === void 0 ? void 0 : row.amount)
-      }));
+      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) + ")") : "")
+        };
+      });
     };
     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(" ") || "-";
@@ -30151,49 +30056,70 @@ 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 => /*#__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$1, 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 => {
+    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$1, null, /*#__PURE__*/React.createElement(CardSectionHeader, {
     style: {
       margin: "10px 0px"
     }
@@ -30240,31 +30166,31 @@ const checkForNA$1 = value => {
   return value ? value : "CS_NA";
 };
 const WSApplicationDetails = () => {
-  var _user$info, _user$info$userName, _user$info2, _user$info3, _Digit$SessionStorage, _user$info4, _data$WaterConnection, _data$WaterConnection2, _data$SewerageConnect, _data$SewerageConnect2, _data$WaterConnection3, _data$WaterConnection4, _data$SewerageConnect3, _data$SewerageConnect4, _data$WaterConnection5, _data$WaterConnection6, _data$SewerageConnect5, _data$SewerageConnect6, _data$WaterConnection7, _data$WaterConnection8, _data$SewerageConnect7, _data$SewerageConnect8, _data$WaterConnection9, _data$WaterConnection0, _data$SewerageConnect9, _data$SewerageConnect0, _data$WaterConnection1, _data$SewerageConnect1, _PTData$Properties, _PTData$Properties$, _data$WaterConnection10, _data$WaterConnection11, _data$WaterConnection12, _data$WaterConnection13, _data$SewerageConnect10, _data$SewerageConnect11, _data$SewerageConnect12, _data$SewerageConnect13, _data$WaterConnection14, _data$WaterConnection15, _data$SewerageConnect14, _data$SewerageConnect15, _appDetailsData$appli, _data$WaterConnection34, _data$WaterConnection35, _data$SewerageConnect30, _data$SewerageConnect31, _data$WaterConnection36, _data$WaterConnection37, _data$SewerageConnect32, _data$SewerageConnect33, _data$WaterConnection38, _data$WaterConnection39, _data$SewerageConnect34, _data$SewerageConnect35, _data$WaterConnection40, _data$WaterConnection41, _data$SewerageConnect36, _data$SewerageConnect37, _data$WaterConnection42, _data$WaterConnection43, _data$SewerageConnect38, _data$WaterConnection44, _data$WaterConnection45, _data$SewerageConnect39, _data$SewerageConnect40, _data$WaterConnection46, _data$WaterConnection47, _data$SewerageConnect41, _data$SewerageConnect42, _data$WaterConnection48, _data$WaterConnection49, _data$SewerageConnect43, _data$SewerageConnect44, _data$WaterConnection50, _data$WaterConnection51, _data$SewerageConnect45, _data$SewerageConnect46, _data$WaterConnection52, _data$WaterConnection53, _data$SewerageConnect47, _data$SewerageConnect48, _data$WaterConnection54, _data$WaterConnection55, _data$SewerageConnect49, _data$SewerageConnect50, _data$WaterConnection56, _data$WaterConnection57, _data$SewerageConnect51, _data$SewerageConnect52, _data$WaterConnection58, _data$WaterConnection59, _data$SewerageConnect53, _data$SewerageConnect54, _data$WaterConnection60, _data$WaterConnection61, _data$SewerageConnect55, _data$SewerageConnect56, _data$WaterConnection62, _data$WaterConnection63, _data$SewerageConnect57, _data$SewerageConnect58, _data$WaterConnection64, _data$WaterConnection65, _data$WaterConnection66, _data$WaterConnection67, _data$SewerageConnect59, _data$SewerageConnect60, _data$SewerageConnect61, _data$SewerageConnect62, _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$WaterConnection68, _data$WaterConnection69, _data$WaterConnection70, _data$SewerageConnect63, _data$SewerageConnect64, _data$SewerageConnect65, _data$WaterConnection71, _data$WaterConnection72, _data$WaterConnection73, _data$WaterConnection74, _data$SewerageConnect66, _data$SewerageConnect67, _data$SewerageConnect68, _data$SewerageConnect69, _data$WaterConnection75, _data$WaterConnection76, _data$WaterConnection77, _data$WaterConnection78, _data$SewerageConnect70, _data$SewerageConnect71, _data$SewerageConnect72, _data$SewerageConnect73, _data$WaterConnection79, _data$WaterConnection80, _data$WaterConnection81, _data$WaterConnection82, _data$SewerageConnect74, _data$SewerageConnect75, _data$SewerageConnect76, _data$SewerageConnect77, _data$WaterConnection83, _data$WaterConnection84, _data$WaterConnection85, _data$WaterConnection86, _data$SewerageConnect78, _data$SewerageConnect79, _data$SewerageConnect80, _data$SewerageConnect81, _data$WaterConnection87, _data$WaterConnection88, _data$WaterConnection89, _data$WaterConnection90, _data$SewerageConnect82, _data$SewerageConnect83, _data$SewerageConnect84, _data$SewerageConnect85, _data$WaterConnection91, _data$WaterConnection92, _data$WaterConnection93, _data$WaterConnection94, _data$SewerageConnect86, _data$SewerageConnect87, _data$SewerageConnect88, _data$SewerageConnect89, _data$WaterConnection95, _data$WaterConnection96, _data$WaterConnection97, _data$WaterConnection98, _data$SewerageConnect90, _data$SewerageConnect91, _data$SewerageConnect92, _data$SewerageConnect93, _data$WaterConnection99, _data$WaterConnection100, _data$WaterConnection101, _data$WaterConnection102, _data$SewerageConnect94, _data$SewerageConnect95, _data$SewerageConnect96, _data$SewerageConnect97, _data$WaterConnection103, _data$WaterConnection104, _data$WaterConnection105, _data$WaterConnection106, _data$SewerageConnect98, _data$SewerageConnect99, _data$SewerageConnect100, _data$SewerageConnect101, _data$WaterConnection107, _data$WaterConnection108, _data$WaterConnection109, _data$WaterConnection110, _data$SewerageConnect102, _data$SewerageConnect103, _data$SewerageConnect104, _data$SewerageConnect105, _data$WaterConnection111, _data$WaterConnection112, _data$WaterConnection113, _data$WaterConnection114, _data$SewerageConnect106, _data$SewerageConnect107, _data$SewerageConnect108, _data$SewerageConnect109, _data$WaterConnection115, _data$WaterConnection116, _data$WaterConnection117, _data$WaterConnection118, _data$SewerageConnect110, _data$SewerageConnect111, _data$SewerageConnect112, _data$SewerageConnect113, _data$WaterConnection119, _data$WaterConnection120, _data$WaterConnection121, _data$WaterConnection122, _data$SewerageConnect114, _data$SewerageConnect115, _data$SewerageConnect116, _data$SewerageConnect117, _data$WaterConnection123, _data$WaterConnection124, _data$SewerageConnect118, _data$SewerageConnect119, _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$WaterConnection125, _data$WaterConnection126, _data$SewerageConnect120, _data$SewerageConnect121, _data$WaterConnection127, _data$WaterConnection128, _data$SewerageConnect122, _data$SewerageConnect123, _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$WaterConnection129, _data$WaterConnection130, _data$WaterConnection131, _data$WaterConnection132, _data$SewerageConnect124, _data$SewerageConnect125, _data$SewerageConnect126, _data$SewerageConnect127, _data$WaterConnection137, _data$WaterConnection138, _data$SewerageConnect132, _data$SewerageConnect133, _paymentDetails$data, _paymentDetails$data$, _paymentDetails$data$2, _data$WaterConnection139, _data$WaterConnection140, _data$SewerageConnect134, _data$SewerageConnect135, _data$WaterConnection141, _data$WaterConnection142, _data$SewerageConnect136, _data$SewerageConnect137, _data$WaterConnection143, _data$WaterConnection144, _data$SewerageConnect138, _data$SewerageConnect139, _data$WaterConnection145, _data$WaterConnection146, _data$WaterConnection147, _data$SewerageConnect140, _data$SewerageConnect141, _data$SewerageConnect142, _PTData$Properties8, _PTData$Properties8$, _PTData$Properties8$$, _data$WaterConnection148, _data$WaterConnection149, _data$WaterConnection150, _data$WaterConnection151, _data$SewerageConnect143, _data$SewerageConnect144, _data$SewerageConnect145, _data$SewerageConnect146, _data$WaterConnection152, _data$WaterConnection153, _data$SewerageConnect147, _data$SewerageConnect148, _data$WaterConnection154, _data$WaterConnection155, _data$SewerageConnect149, _data$SewerageConnect150, _data$WaterConnection156, _data$WaterConnection157, _data$WaterConnection158, _data$WaterConnection159, _data$SewerageConnect151, _data$SewerageConnect152, _data$SewerageConnect153, _data$SewerageConnect154, _data$WaterConnection160, _data$WaterConnection161, _data$SewerageConnect155, _data$SewerageConnect156, _data$SewerageConnect157, _data$SewerageConnect158, _data$SewerageConnect159, _data$SewerageConnect160, _data$SewerageConnect161, _data$SewerageConnect162, _data$SewerageConnect163, _data$SewerageConnect164, _data$SewerageConnect165, _data$WaterConnection162, _data$WaterConnection163, _data$WaterConnection164, _data$WaterConnection165, _data$WaterConnection166, _data$WaterConnection167, _data$WaterConnection168, _data$WaterConnection169, _data$WaterConnection170;
+  var _user$info, _user$info$userName, _user$info2, _user$info3, _Digit$SessionStorage, _user$info4, _data$WaterConnection, _data$WaterConnection2, _data$SewerageConnect, _data$SewerageConnect2, _data$WaterConnection3, _data$WaterConnection4, _data$SewerageConnect3, _data$SewerageConnect4, _data$WaterConnection5, _data$WaterConnection6, _data$SewerageConnect5, _data$SewerageConnect6, _data$WaterConnection7, _data$WaterConnection8, _data$SewerageConnect7, _data$SewerageConnect8, _data$WaterConnection9, _data$WaterConnection0, _data$SewerageConnect9, _data$SewerageConnect0, _data$WaterConnection1, _data$SewerageConnect1, _PTData$Properties, _PTData$Properties$, _data$WaterConnection10, _data$WaterConnection11, _data$WaterConnection12, _data$WaterConnection13, _data$SewerageConnect10, _data$SewerageConnect11, _data$SewerageConnect12, _data$SewerageConnect13, _data$WaterConnection14, _data$WaterConnection15, _data$SewerageConnect14, _data$SewerageConnect15, _appDetailsData$appli, _data$WaterConnection34, _data$WaterConnection35, _data$SewerageConnect30, _data$SewerageConnect31, _data$WaterConnection36, _data$WaterConnection37, _data$SewerageConnect32, _data$SewerageConnect33, _data$WaterConnection38, _data$WaterConnection39, _data$SewerageConnect34, _data$SewerageConnect35, _data$WaterConnection40, _data$WaterConnection41, _data$SewerageConnect36, _data$SewerageConnect37, _data$WaterConnection42, _data$WaterConnection43, _data$SewerageConnect38, _data$WaterConnection44, _data$WaterConnection45, _data$SewerageConnect39, _data$SewerageConnect40, _data$WaterConnection46, _data$WaterConnection47, _data$SewerageConnect41, _data$SewerageConnect42, _data$WaterConnection48, _data$WaterConnection49, _data$SewerageConnect43, _data$SewerageConnect44, _data$WaterConnection50, _data$WaterConnection51, _data$SewerageConnect45, _data$SewerageConnect46, _data$WaterConnection52, _data$WaterConnection53, _data$SewerageConnect47, _data$SewerageConnect48, _data$WaterConnection54, _data$WaterConnection55, _data$SewerageConnect49, _data$SewerageConnect50, _data$WaterConnection56, _data$WaterConnection57, _data$SewerageConnect51, _data$SewerageConnect52, _data$WaterConnection58, _data$WaterConnection59, _data$SewerageConnect53, _data$SewerageConnect54, _data$WaterConnection60, _data$WaterConnection61, _data$SewerageConnect55, _data$SewerageConnect56, _data$WaterConnection62, _data$WaterConnection63, _data$SewerageConnect57, _data$SewerageConnect58, _data$WaterConnection64, _data$WaterConnection65, _data$WaterConnection66, _data$WaterConnection67, _data$SewerageConnect59, _data$SewerageConnect60, _data$SewerageConnect61, _data$SewerageConnect62, _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$WaterConnection68, _data$WaterConnection69, _data$WaterConnection70, _data$SewerageConnect63, _data$SewerageConnect64, _data$SewerageConnect65, _data$WaterConnection71, _data$WaterConnection72, _data$WaterConnection73, _data$WaterConnection74, _data$SewerageConnect66, _data$SewerageConnect67, _data$SewerageConnect68, _data$SewerageConnect69, _data$WaterConnection75, _data$WaterConnection76, _data$WaterConnection77, _data$WaterConnection78, _data$SewerageConnect70, _data$SewerageConnect71, _data$SewerageConnect72, _data$SewerageConnect73, _data$WaterConnection79, _data$WaterConnection80, _data$WaterConnection81, _data$WaterConnection82, _data$SewerageConnect74, _data$SewerageConnect75, _data$SewerageConnect76, _data$SewerageConnect77, _data$WaterConnection83, _data$WaterConnection84, _data$WaterConnection85, _data$WaterConnection86, _data$SewerageConnect78, _data$SewerageConnect79, _data$SewerageConnect80, _data$SewerageConnect81, _data$WaterConnection87, _data$WaterConnection88, _data$WaterConnection89, _data$WaterConnection90, _data$SewerageConnect82, _data$SewerageConnect83, _data$SewerageConnect84, _data$SewerageConnect85, _data$WaterConnection91, _data$WaterConnection92, _data$WaterConnection93, _data$WaterConnection94, _data$SewerageConnect86, _data$SewerageConnect87, _data$SewerageConnect88, _data$SewerageConnect89, _data$WaterConnection95, _data$WaterConnection96, _data$WaterConnection97, _data$WaterConnection98, _data$SewerageConnect90, _data$SewerageConnect91, _data$SewerageConnect92, _data$SewerageConnect93, _data$WaterConnection99, _data$WaterConnection100, _data$WaterConnection101, _data$WaterConnection102, _data$SewerageConnect94, _data$SewerageConnect95, _data$SewerageConnect96, _data$SewerageConnect97, _data$WaterConnection103, _data$WaterConnection104, _data$WaterConnection105, _data$WaterConnection106, _data$SewerageConnect98, _data$SewerageConnect99, _data$SewerageConnect100, _data$SewerageConnect101, _data$WaterConnection107, _data$WaterConnection108, _data$WaterConnection109, _data$WaterConnection110, _data$SewerageConnect102, _data$SewerageConnect103, _data$SewerageConnect104, _data$SewerageConnect105, _data$WaterConnection111, _data$WaterConnection112, _data$WaterConnection113, _data$WaterConnection114, _data$SewerageConnect106, _data$SewerageConnect107, _data$SewerageConnect108, _data$SewerageConnect109, _data$WaterConnection115, _data$WaterConnection116, _data$WaterConnection117, _data$WaterConnection118, _data$SewerageConnect110, _data$SewerageConnect111, _data$SewerageConnect112, _data$SewerageConnect113, _data$WaterConnection119, _data$WaterConnection120, _data$WaterConnection121, _data$WaterConnection122, _data$SewerageConnect114, _data$SewerageConnect115, _data$SewerageConnect116, _data$SewerageConnect117, _data$WaterConnection123, _data$WaterConnection124, _data$SewerageConnect118, _data$SewerageConnect119, _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$WaterConnection125, _data$WaterConnection126, _data$SewerageConnect120, _data$SewerageConnect121, _data$WaterConnection127, _data$WaterConnection128, _data$SewerageConnect122, _data$SewerageConnect123, _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$WaterConnection129, _data$WaterConnection130, _data$WaterConnection131, _data$WaterConnection132, _data$SewerageConnect124, _data$SewerageConnect125, _data$SewerageConnect126, _data$SewerageConnect127, _data$WaterConnection137, _data$WaterConnection138, _data$WaterConnection139, _data$WaterConnection140, _data$WaterConnection141, _data$WaterConnection142, _data$SewerageConnect132, _data$SewerageConnect133, _data$SewerageConnect134, _data$SewerageConnect135, _data$SewerageConnect136, _data$SewerageConnect137, _paymentDetails$data, _paymentDetails$data$, _paymentDetails$data$2, _data$WaterConnection143, _data$WaterConnection144, _data$SewerageConnect138, _data$SewerageConnect139, _data$WaterConnection145, _data$WaterConnection146, _data$SewerageConnect140, _data$SewerageConnect141, _data$WaterConnection147, _data$WaterConnection148, _data$SewerageConnect142, _data$SewerageConnect143, _data$WaterConnection149, _data$WaterConnection150, _data$WaterConnection151, _data$SewerageConnect144, _data$SewerageConnect145, _data$SewerageConnect146, _PTData$Properties8, _PTData$Properties8$, _PTData$Properties8$$, _data$WaterConnection152, _data$WaterConnection153, _data$WaterConnection154, _data$WaterConnection155, _data$SewerageConnect147, _data$SewerageConnect148, _data$SewerageConnect149, _data$SewerageConnect150, _data$WaterConnection156, _data$WaterConnection157, _data$SewerageConnect151, _data$SewerageConnect152, _data$WaterConnection158, _data$WaterConnection159, _data$SewerageConnect153, _data$SewerageConnect154, _data$WaterConnection160, _data$WaterConnection161, _data$WaterConnection162, _data$WaterConnection163, _data$SewerageConnect155, _data$SewerageConnect156, _data$SewerageConnect157, _data$SewerageConnect158, _data$WaterConnection164, _data$WaterConnection165, _data$SewerageConnect159, _data$SewerageConnect160, _data$SewerageConnect161, _data$SewerageConnect162, _data$SewerageConnect163, _data$SewerageConnect164, _data$SewerageConnect165, _data$SewerageConnect166, _data$SewerageConnect167, _data$SewerageConnect168, _data$SewerageConnect169, _data$WaterConnection166, _data$WaterConnection167, _data$WaterConnection168, _data$WaterConnection169, _data$WaterConnection170, _data$WaterConnection171, _data$WaterConnection172, _data$WaterConnection173, _data$WaterConnection174;
   const getDisconnectionNoticeSearch = function () {
     try {
-      var _data$WaterConnection172, _data$WaterConnection173, _data$SewerageConnect167, _data$SewerageConnect168;
+      var _data$WaterConnection176, _data$WaterConnection177, _data$SewerageConnect171, _data$SewerageConnect172;
       let key = "ws-waterdisconnectionnotice";
       let details = {};
       if (applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS")) {
-        var _data$WaterConnection171, _PTData$Properties9;
+        var _data$WaterConnection175, _PTData$Properties9;
         details = {
-          WaterConnection: [_extends({}, data === null || data === void 0 ? void 0 : (_data$WaterConnection171 = data.WaterConnection) === null || _data$WaterConnection171 === void 0 ? void 0 : _data$WaterConnection171[0], {
+          WaterConnection: [_extends({}, data === null || data === void 0 ? void 0 : (_data$WaterConnection175 = data.WaterConnection) === null || _data$WaterConnection175 === void 0 ? void 0 : _data$WaterConnection175[0], {
             property: PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties9 = PTData.Properties) === null || _PTData$Properties9 === void 0 ? void 0 : _PTData$Properties9[0]
           })]
         };
       } else {
-        var _data$SewerageConnect166, _PTData$Properties0;
+        var _data$SewerageConnect170, _PTData$Properties0;
         key = "ws-seweragedisconnectionnotice";
         details = {
-          SewerageConnection: [_extends({}, data === null || data === void 0 ? void 0 : (_data$SewerageConnect166 = data.SewerageConnections) === null || _data$SewerageConnect166 === void 0 ? void 0 : _data$SewerageConnect166[0], {
+          SewerageConnection: [_extends({}, data === null || data === void 0 ? void 0 : (_data$SewerageConnect170 = data.SewerageConnections) === null || _data$SewerageConnect170 === void 0 ? void 0 : _data$SewerageConnect170[0], {
             property: PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties0 = PTData.Properties) === null || _PTData$Properties0 === void 0 ? void 0 : _PTData$Properties0[0]
           })]
         };
       }
-      return Promise.resolve(Digit.WSService.WSDisconnectionNotice((data === null || data === void 0 ? void 0 : (_data$WaterConnection172 = data.WaterConnection) === null || _data$WaterConnection172 === void 0 ? void 0 : (_data$WaterConnection173 = _data$WaterConnection172[0]) === null || _data$WaterConnection173 === void 0 ? void 0 : _data$WaterConnection173.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect167 = data.SewerageConnections) === null || _data$SewerageConnect167 === void 0 ? void 0 : (_data$SewerageConnect168 = _data$SewerageConnect167[0]) === null || _data$SewerageConnect168 === void 0 ? void 0 : _data$SewerageConnect168.tenantId), details, key)).then(function (response) {
-        var _data$WaterConnection174, _data$WaterConnection175, _data$SewerageConnect169, _data$SewerageConnect170;
-        return Promise.resolve(Digit.PaymentService.printReciept((data === null || data === void 0 ? void 0 : (_data$WaterConnection174 = data.WaterConnection) === null || _data$WaterConnection174 === void 0 ? void 0 : (_data$WaterConnection175 = _data$WaterConnection174[0]) === null || _data$WaterConnection175 === void 0 ? void 0 : _data$WaterConnection175.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect169 = data.SewerageConnections) === null || _data$SewerageConnect169 === void 0 ? void 0 : (_data$SewerageConnect170 = _data$SewerageConnect169[0]) === null || _data$SewerageConnect170 === void 0 ? void 0 : _data$SewerageConnect170.tenantId), {
+      return Promise.resolve(Digit.WSService.WSDisconnectionNotice((data === null || data === void 0 ? void 0 : (_data$WaterConnection176 = data.WaterConnection) === null || _data$WaterConnection176 === void 0 ? void 0 : (_data$WaterConnection177 = _data$WaterConnection176[0]) === null || _data$WaterConnection177 === void 0 ? void 0 : _data$WaterConnection177.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect171 = data.SewerageConnections) === null || _data$SewerageConnect171 === void 0 ? void 0 : (_data$SewerageConnect172 = _data$SewerageConnect171[0]) === null || _data$SewerageConnect172 === void 0 ? void 0 : _data$SewerageConnect172.tenantId), details, key)).then(function (response) {
+        var _data$WaterConnection178, _data$WaterConnection179, _data$SewerageConnect173, _data$SewerageConnect174;
+        return Promise.resolve(Digit.PaymentService.printReciept((data === null || data === void 0 ? void 0 : (_data$WaterConnection178 = data.WaterConnection) === null || _data$WaterConnection178 === void 0 ? void 0 : (_data$WaterConnection179 = _data$WaterConnection178[0]) === null || _data$WaterConnection179 === void 0 ? void 0 : _data$WaterConnection179.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect173 = data.SewerageConnections) === null || _data$SewerageConnect173 === void 0 ? void 0 : (_data$SewerageConnect174 = _data$SewerageConnect173[0]) === null || _data$SewerageConnect174 === void 0 ? void 0 : _data$SewerageConnect174.tenantId), {
           fileStoreIds: response.filestoreIds[0]
         })).then(function (fileStore) {
           window.open(fileStore[response === null || response === void 0 ? void 0 : response.filestoreIds[0]], "_blank");
@@ -30355,7 +30281,7 @@ const WSApplicationDetails = () => {
     }
   }) || false;
   const applicationStatus = (data === null || data === void 0 ? void 0 : (_data$WaterConnection14 = data.WaterConnection) === null || _data$WaterConnection14 === void 0 ? void 0 : (_data$WaterConnection15 = _data$WaterConnection14[0]) === null || _data$WaterConnection15 === void 0 ? void 0 : _data$WaterConnection15.applicationStatus) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect14 = data.SewerageConnections) === null || _data$SewerageConnect14 === void 0 ? void 0 : (_data$SewerageConnect15 = _data$SewerageConnect14[0]) === null || _data$SewerageConnect15 === void 0 ? void 0 : _data$SewerageConnect15.applicationStatus);
-  const isPaid = applicationStatus && applicationStatus !== "INITIATED" && applicationStatus !== "PENDING_FOR_PAYMENT" ? true : false;
+  const isPaid = applicationStatus && applicationStatus !== "INITIATED" && applicationStatus !== "PENDING_FOR_PAYMENT" && applicationStatus !== "PENDING_FOR_FINAL_PAYMENT" && applicationStatus !== "PENDING_FOR_ADDITIONAL_PAYMENT" ? true : false;
   const _Digit$Hooks$ws$useWS = Digit.Hooks.ws.useWSDetailsPage(t, tenantId, applicationNobyData, applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("SW") ? "SEWERAGE" : "WATER", user),
     isAppDetailsLoading = _Digit$Hooks$ws$useWS.isLoading,
     appDetailsData = _Digit$Hooks$ws$useWS.data;
@@ -31006,36 +30932,36 @@ const WSApplicationDetails = () => {
         marginBottom: "20px"
       }
     }) : null)));
-  })), (data === null || data === void 0 ? void 0 : (_data$WaterConnection137 = data.WaterConnection) === null || _data$WaterConnection137 === void 0 ? void 0 : (_data$WaterConnection138 = _data$WaterConnection137[0]) === null || _data$WaterConnection138 === void 0 ? void 0 : _data$WaterConnection138.applicationStatus) === "PENDING_FOR_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect132 = data.SewerageConnections) === null || _data$SewerageConnect132 === void 0 ? void 0 : (_data$SewerageConnect133 = _data$SewerageConnect132[0]) === null || _data$SewerageConnect133 === void 0 ? void 0 : _data$SewerageConnect133.applicationStatus) === "PENDING_FOR_PAYMENT" ? /*#__PURE__*/React.createElement(Link, {
+  })), (data === null || data === void 0 ? void 0 : (_data$WaterConnection137 = data.WaterConnection) === null || _data$WaterConnection137 === void 0 ? void 0 : (_data$WaterConnection138 = _data$WaterConnection137[0]) === null || _data$WaterConnection138 === void 0 ? void 0 : _data$WaterConnection138.applicationStatus) === "PENDING_FOR_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$WaterConnection139 = data.WaterConnection) === null || _data$WaterConnection139 === void 0 ? void 0 : (_data$WaterConnection140 = _data$WaterConnection139[0]) === null || _data$WaterConnection140 === void 0 ? void 0 : _data$WaterConnection140.applicationStatus) === "PENDING_FOR_FINAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$WaterConnection141 = data.WaterConnection) === null || _data$WaterConnection141 === void 0 ? void 0 : (_data$WaterConnection142 = _data$WaterConnection141[0]) === null || _data$WaterConnection142 === void 0 ? void 0 : _data$WaterConnection142.applicationStatus) === "PENDING_FOR_ADDITIONAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect132 = data.SewerageConnections) === null || _data$SewerageConnect132 === void 0 ? void 0 : (_data$SewerageConnect133 = _data$SewerageConnect132[0]) === null || _data$SewerageConnect133 === void 0 ? void 0 : _data$SewerageConnect133.applicationStatus) === "PENDING_FOR_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect134 = data.SewerageConnections) === null || _data$SewerageConnect134 === void 0 ? void 0 : (_data$SewerageConnect135 = _data$SewerageConnect134[0]) === null || _data$SewerageConnect135 === void 0 ? void 0 : _data$SewerageConnect135.applicationStatus) === "PENDING_FOR_FINAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect136 = data.SewerageConnections) === null || _data$SewerageConnect136 === void 0 ? void 0 : (_data$SewerageConnect137 = _data$SewerageConnect136[0]) === null || _data$SewerageConnect137 === void 0 ? void 0 : _data$SewerageConnect137.applicationStatus) === "PENDING_FOR_ADDITIONAL_PAYMENT" ? /*#__PURE__*/React.createElement(Link, {
     to: {
-      pathname: "/digit-ui/citizen/payment/my-bills/" + (paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data = paymentDetails.data) === null || _paymentDetails$data === void 0 ? void 0 : (_paymentDetails$data$ = _paymentDetails$data.Bill) === null || _paymentDetails$data$ === void 0 ? void 0 : (_paymentDetails$data$2 = _paymentDetails$data$[0]) === null || _paymentDetails$data$2 === void 0 ? void 0 : _paymentDetails$data$2.businessService) + "/" + (applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? stringReplaceAll(data === null || data === void 0 ? void 0 : (_data$WaterConnection139 = data.WaterConnection) === null || _data$WaterConnection139 === void 0 ? void 0 : (_data$WaterConnection140 = _data$WaterConnection139[0]) === null || _data$WaterConnection140 === void 0 ? void 0 : _data$WaterConnection140.connectionNo, "/", "+") || stringReplaceAll(data === null || data === void 0 ? void 0 : (_data$SewerageConnect134 = data.SewerageConnections) === null || _data$SewerageConnect134 === void 0 ? void 0 : (_data$SewerageConnect135 = _data$SewerageConnect134[0]) === null || _data$SewerageConnect135 === void 0 ? void 0 : _data$SewerageConnect135.connectionNo, "/", "+") : stringReplaceAll(data === null || data === void 0 ? void 0 : (_data$WaterConnection141 = data.WaterConnection) === null || _data$WaterConnection141 === void 0 ? void 0 : (_data$WaterConnection142 = _data$WaterConnection141[0]) === null || _data$WaterConnection142 === void 0 ? void 0 : _data$WaterConnection142.applicationNo, "/", "+") || stringReplaceAll(data === null || data === void 0 ? void 0 : (_data$SewerageConnect136 = data.SewerageConnections) === null || _data$SewerageConnect136 === void 0 ? void 0 : (_data$SewerageConnect137 = _data$SewerageConnect136[0]) === null || _data$SewerageConnect137 === void 0 ? void 0 : _data$SewerageConnect137.applicationNo, "/", "+")) + "?workflow=WNS&tenantId=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection143 = data.WaterConnection) === null || _data$WaterConnection143 === void 0 ? void 0 : (_data$WaterConnection144 = _data$WaterConnection143[0]) === null || _data$WaterConnection144 === void 0 ? void 0 : _data$WaterConnection144.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect138 = data.SewerageConnections) === null || _data$SewerageConnect138 === void 0 ? void 0 : (_data$SewerageConnect139 = _data$SewerageConnect138[0]) === null || _data$SewerageConnect139 === void 0 ? void 0 : _data$SewerageConnect139.tenantId)) + "&ConsumerName=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection145 = data.WaterConnection) === null || _data$WaterConnection145 === void 0 ? void 0 : (_data$WaterConnection146 = _data$WaterConnection145[0]) === null || _data$WaterConnection146 === void 0 ? void 0 : (_data$WaterConnection147 = _data$WaterConnection146.connectionHolders) === null || _data$WaterConnection147 === void 0 ? void 0 : _data$WaterConnection147.map(owner => owner.name).join(",")) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect140 = data.SewerageConnections) === null || _data$SewerageConnect140 === void 0 ? void 0 : (_data$SewerageConnect141 = _data$SewerageConnect140[0]) === null || _data$SewerageConnect141 === void 0 ? void 0 : (_data$SewerageConnect142 = _data$SewerageConnect141.connectionHolders) === null || _data$SewerageConnect142 === void 0 ? void 0 : _data$SewerageConnect142.map(owner => owner.name).join(",")) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties8 = PTData.Properties) === null || _PTData$Properties8 === void 0 ? void 0 : (_PTData$Properties8$ = _PTData$Properties8[0]) === null || _PTData$Properties8$ === void 0 ? void 0 : (_PTData$Properties8$$ = _PTData$Properties8$.owners) === null || _PTData$Properties8$$ === void 0 ? void 0 : _PTData$Properties8$$.map(owner => owner.name).join(","))) + "&isDisoconnectFlow=" + (applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? true : false),
+      pathname: "/digit-ui/citizen/payment/my-bills/" + (paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$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) + "/" + (applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? stringReplaceAll(data === null || data === void 0 ? void 0 : (_data$WaterConnection143 = data.WaterConnection) === null || _data$WaterConnection143 === void 0 ? void 0 : (_data$WaterConnection144 = _data$WaterConnection143[0]) === null || _data$WaterConnection144 === void 0 ? void 0 : _data$WaterConnection144.connectionNo, "/", "+") || stringReplaceAll(data === null || data === void 0 ? void 0 : (_data$SewerageConnect138 = data.SewerageConnections) === null || _data$SewerageConnect138 === void 0 ? void 0 : (_data$SewerageConnect139 = _data$SewerageConnect138[0]) === null || _data$SewerageConnect139 === void 0 ? void 0 : _data$SewerageConnect139.connectionNo, "/", "+") : stringReplaceAll(data === null || data === void 0 ? void 0 : (_data$WaterConnection145 = data.WaterConnection) === null || _data$WaterConnection145 === void 0 ? void 0 : (_data$WaterConnection146 = _data$WaterConnection145[0]) === null || _data$WaterConnection146 === void 0 ? void 0 : _data$WaterConnection146.applicationNo, "/", "+") || stringReplaceAll(data === null || data === void 0 ? void 0 : (_data$SewerageConnect140 = data.SewerageConnections) === null || _data$SewerageConnect140 === void 0 ? void 0 : (_data$SewerageConnect141 = _data$SewerageConnect140[0]) === null || _data$SewerageConnect141 === void 0 ? void 0 : _data$SewerageConnect141.applicationNo, "/", "+")) + "?workflow=WNS&tenantId=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection147 = data.WaterConnection) === null || _data$WaterConnection147 === void 0 ? void 0 : (_data$WaterConnection148 = _data$WaterConnection147[0]) === null || _data$WaterConnection148 === void 0 ? void 0 : _data$WaterConnection148.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect142 = data.SewerageConnections) === null || _data$SewerageConnect142 === void 0 ? void 0 : (_data$SewerageConnect143 = _data$SewerageConnect142[0]) === null || _data$SewerageConnect143 === void 0 ? void 0 : _data$SewerageConnect143.tenantId)) + "&ConsumerName=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection149 = data.WaterConnection) === null || _data$WaterConnection149 === void 0 ? void 0 : (_data$WaterConnection150 = _data$WaterConnection149[0]) === null || _data$WaterConnection150 === void 0 ? void 0 : (_data$WaterConnection151 = _data$WaterConnection150.connectionHolders) === null || _data$WaterConnection151 === void 0 ? void 0 : _data$WaterConnection151.map(owner => owner.name).join(",")) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect144 = data.SewerageConnections) === null || _data$SewerageConnect144 === void 0 ? void 0 : (_data$SewerageConnect145 = _data$SewerageConnect144[0]) === null || _data$SewerageConnect145 === void 0 ? void 0 : (_data$SewerageConnect146 = _data$SewerageConnect145.connectionHolders) === null || _data$SewerageConnect146 === void 0 ? void 0 : _data$SewerageConnect146.map(owner => owner.name).join(",")) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties8 = PTData.Properties) === null || _PTData$Properties8 === void 0 ? void 0 : (_PTData$Properties8$ = _PTData$Properties8[0]) === null || _PTData$Properties8$ === void 0 ? void 0 : (_PTData$Properties8$$ = _PTData$Properties8$.owners) === null || _PTData$Properties8$$ === void 0 ? void 0 : _PTData$Properties8$$.map(owner => owner.name).join(","))) + "&isDisoconnectFlow=" + (applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? true : false),
       state: {}
     }
   }, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("MAKE_PAYMENT")
-  })) : null, !(data !== null && data !== void 0 && (_data$WaterConnection148 = data.WaterConnection) !== null && _data$WaterConnection148 !== void 0 && (_data$WaterConnection149 = _data$WaterConnection148[0]) !== null && _data$WaterConnection149 !== void 0 && _data$WaterConnection149.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$WaterConnection150 = data.WaterConnection) !== null && _data$WaterConnection150 !== void 0 && (_data$WaterConnection151 = _data$WaterConnection150[0]) !== null && _data$WaterConnection151 !== void 0 && _data$WaterConnection151.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || !(data !== null && data !== void 0 && (_data$SewerageConnect143 = data.SewerageConnections) !== null && _data$SewerageConnect143 !== void 0 && (_data$SewerageConnect144 = _data$SewerageConnect143[0]) !== null && _data$SewerageConnect144 !== void 0 && _data$SewerageConnect144.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$SewerageConnect145 = data.SewerageConnections) !== null && _data$SewerageConnect145 !== void 0 && (_data$SewerageConnect146 = _data$SewerageConnect145[0]) !== null && _data$SewerageConnect146 !== void 0 && _data$SewerageConnect146.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React.createElement(Link, {
+  })) : null, !(data !== null && data !== void 0 && (_data$WaterConnection152 = data.WaterConnection) !== null && _data$WaterConnection152 !== void 0 && (_data$WaterConnection153 = _data$WaterConnection152[0]) !== null && _data$WaterConnection153 !== void 0 && _data$WaterConnection153.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$WaterConnection154 = data.WaterConnection) !== null && _data$WaterConnection154 !== void 0 && (_data$WaterConnection155 = _data$WaterConnection154[0]) !== null && _data$WaterConnection155 !== void 0 && _data$WaterConnection155.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || !(data !== null && data !== void 0 && (_data$SewerageConnect147 = data.SewerageConnections) !== null && _data$SewerageConnect147 !== void 0 && (_data$SewerageConnect148 = _data$SewerageConnect147[0]) !== null && _data$SewerageConnect148 !== void 0 && _data$SewerageConnect148.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$SewerageConnect149 = data.SewerageConnections) !== null && _data$SewerageConnect149 !== void 0 && (_data$SewerageConnect150 = _data$SewerageConnect149[0]) !== null && _data$SewerageConnect150 !== void 0 && _data$SewerageConnect150.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React.createElement(Link, {
     to: {
-      pathname: "/digit-ui/citizen/ws/edit-application/" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection152 = data.WaterConnection) === null || _data$WaterConnection152 === void 0 ? void 0 : (_data$WaterConnection153 = _data$WaterConnection152[0]) === null || _data$WaterConnection153 === void 0 ? void 0 : _data$WaterConnection153.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect147 = data.SewerageConnections) === null || _data$SewerageConnect147 === void 0 ? void 0 : (_data$SewerageConnect148 = _data$SewerageConnect147[0]) === null || _data$SewerageConnect148 === void 0 ? void 0 : _data$SewerageConnect148.tenantId)),
+      pathname: "/digit-ui/citizen/ws/edit-application/" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection156 = data.WaterConnection) === null || _data$WaterConnection156 === void 0 ? void 0 : (_data$WaterConnection157 = _data$WaterConnection156[0]) === null || _data$WaterConnection157 === void 0 ? void 0 : _data$WaterConnection157.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect151 = data.SewerageConnections) === null || _data$SewerageConnect151 === void 0 ? void 0 : (_data$SewerageConnect152 = _data$SewerageConnect151[0]) === null || _data$SewerageConnect152 === void 0 ? void 0 : _data$SewerageConnect152.tenantId)),
       state: {
-        id: "" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection154 = data.WaterConnection) === null || _data$WaterConnection154 === void 0 ? void 0 : (_data$WaterConnection155 = _data$WaterConnection154[0]) === null || _data$WaterConnection155 === void 0 ? void 0 : _data$WaterConnection155.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect149 = data.SewerageConnections) === null || _data$SewerageConnect149 === void 0 ? void 0 : (_data$SewerageConnect150 = _data$SewerageConnect149[0]) === null || _data$SewerageConnect150 === void 0 ? void 0 : _data$SewerageConnect150.applicationNo))
+        id: "" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection158 = data.WaterConnection) === null || _data$WaterConnection158 === void 0 ? void 0 : (_data$WaterConnection159 = _data$WaterConnection158[0]) === null || _data$WaterConnection159 === void 0 ? void 0 : _data$WaterConnection159.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect153 = data.SewerageConnections) === null || _data$SewerageConnect153 === void 0 ? void 0 : (_data$SewerageConnect154 = _data$SewerageConnect153[0]) === null || _data$SewerageConnect154 === void 0 ? void 0 : _data$SewerageConnect154.applicationNo))
       }
     }
   }, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("COMMON_EDIT")
-  })) : null, data !== null && data !== void 0 && (_data$WaterConnection156 = data.WaterConnection) !== null && _data$WaterConnection156 !== void 0 && (_data$WaterConnection157 = _data$WaterConnection156[0]) !== null && _data$WaterConnection157 !== void 0 && _data$WaterConnection157.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$WaterConnection158 = data.WaterConnection) !== null && _data$WaterConnection158 !== void 0 && (_data$WaterConnection159 = _data$WaterConnection158[0]) !== null && _data$WaterConnection159 !== void 0 && _data$WaterConnection159.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || data !== null && data !== void 0 && (_data$SewerageConnect151 = data.SewerageConnections) !== null && _data$SewerageConnect151 !== void 0 && (_data$SewerageConnect152 = _data$SewerageConnect151[0]) !== null && _data$SewerageConnect152 !== void 0 && _data$SewerageConnect152.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$SewerageConnect153 = data.SewerageConnections) !== null && _data$SewerageConnect153 !== void 0 && (_data$SewerageConnect154 = _data$SewerageConnect153[0]) !== null && _data$SewerageConnect154 !== void 0 && _data$SewerageConnect154.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React.createElement(Link, {
+  })) : null, data !== null && data !== void 0 && (_data$WaterConnection160 = data.WaterConnection) !== null && _data$WaterConnection160 !== void 0 && (_data$WaterConnection161 = _data$WaterConnection160[0]) !== null && _data$WaterConnection161 !== void 0 && _data$WaterConnection161.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$WaterConnection162 = data.WaterConnection) !== null && _data$WaterConnection162 !== void 0 && (_data$WaterConnection163 = _data$WaterConnection162[0]) !== null && _data$WaterConnection163 !== void 0 && _data$WaterConnection163.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || data !== null && data !== void 0 && (_data$SewerageConnect155 = data.SewerageConnections) !== null && _data$SewerageConnect155 !== void 0 && (_data$SewerageConnect156 = _data$SewerageConnect155[0]) !== null && _data$SewerageConnect156 !== void 0 && _data$SewerageConnect156.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$SewerageConnect157 = data.SewerageConnections) !== null && _data$SewerageConnect157 !== void 0 && (_data$SewerageConnect158 = _data$SewerageConnect157[0]) !== null && _data$SewerageConnect158 !== void 0 && _data$SewerageConnect158.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React.createElement(Link, {
     to: {
       pathname: "/digit-ui/citizen/ws/resubmit-disconnect-application",
       state: {
-        id: "" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection160 = data.WaterConnection) === null || _data$WaterConnection160 === void 0 ? void 0 : (_data$WaterConnection161 = _data$WaterConnection160[0]) === null || _data$WaterConnection161 === void 0 ? void 0 : _data$WaterConnection161.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect155 = data.SewerageConnections) === null || _data$SewerageConnect155 === void 0 ? void 0 : (_data$SewerageConnect156 = _data$SewerageConnect155[0]) === null || _data$SewerageConnect156 === void 0 ? void 0 : _data$SewerageConnect156.applicationNo))
+        id: "" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection164 = data.WaterConnection) === null || _data$WaterConnection164 === void 0 ? void 0 : (_data$WaterConnection165 = _data$WaterConnection164[0]) === null || _data$WaterConnection165 === void 0 ? void 0 : _data$WaterConnection165.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect159 = data.SewerageConnections) === null || _data$SewerageConnect159 === void 0 ? void 0 : (_data$SewerageConnect160 = _data$SewerageConnect159[0]) === null || _data$SewerageConnect160 === void 0 ? void 0 : _data$SewerageConnect160.applicationNo))
       }
     }
   }, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("RESUBMIT_APPLICATION"),
     onSubmit: Digit.SessionStorage.set("WS_DISCONNECTION", applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("SW") ? {
-      applicationData: data === null || data === void 0 ? void 0 : (_data$SewerageConnect157 = data.SewerageConnections) === null || _data$SewerageConnect157 === void 0 ? void 0 : _data$SewerageConnect157[0],
+      applicationData: data === null || data === void 0 ? void 0 : (_data$SewerageConnect161 = data.SewerageConnections) === null || _data$SewerageConnect161 === void 0 ? void 0 : _data$SewerageConnect161[0],
       serviceType: "SEWERAGE",
       WSDisconnectionForm: {
-        type: data !== null && data !== void 0 && (_data$SewerageConnect158 = data.SewerageConnections) !== null && _data$SewerageConnect158 !== void 0 && (_data$SewerageConnect159 = _data$SewerageConnect158[0]) !== null && _data$SewerageConnect159 !== void 0 && _data$SewerageConnect159.isDisconnectionTemporary ? {
+        type: data !== null && data !== void 0 && (_data$SewerageConnect162 = data.SewerageConnections) !== null && _data$SewerageConnect162 !== void 0 && (_data$SewerageConnect163 = _data$SewerageConnect162[0]) !== null && _data$SewerageConnect163 !== void 0 && _data$SewerageConnect163.isDisconnectionTemporary ? {
           code: "type",
           value: {
             name: "Temporary",
@@ -31052,18 +30978,18 @@ const WSApplicationDetails = () => {
             code: "Permanent"
           }
         },
-        date: convertEpochToDateDMY(data === null || data === void 0 ? void 0 : (_data$SewerageConnect160 = data.SewerageConnections) === null || _data$SewerageConnect160 === void 0 ? void 0 : (_data$SewerageConnect161 = _data$SewerageConnect160[0]) === null || _data$SewerageConnect161 === void 0 ? void 0 : _data$SewerageConnect161.dateEffectiveFrom, true),
+        date: convertEpochToDateDMY(data === null || data === void 0 ? void 0 : (_data$SewerageConnect164 = data.SewerageConnections) === null || _data$SewerageConnect164 === void 0 ? void 0 : (_data$SewerageConnect165 = _data$SewerageConnect164[0]) === null || _data$SewerageConnect165 === void 0 ? void 0 : _data$SewerageConnect165.dateEffectiveFrom, true),
         reason: {
           code: "reason",
-          value: data === null || data === void 0 ? void 0 : (_data$SewerageConnect162 = data.SewerageConnections) === null || _data$SewerageConnect162 === void 0 ? void 0 : (_data$SewerageConnect163 = _data$SewerageConnect162[0]) === null || _data$SewerageConnect163 === void 0 ? void 0 : _data$SewerageConnect163.disconnectionReason
+          value: data === null || data === void 0 ? void 0 : (_data$SewerageConnect166 = data.SewerageConnections) === null || _data$SewerageConnect166 === void 0 ? void 0 : (_data$SewerageConnect167 = _data$SewerageConnect166[0]) === null || _data$SewerageConnect167 === void 0 ? void 0 : _data$SewerageConnect167.disconnectionReason
         },
-        documents: data === null || data === void 0 ? void 0 : (_data$SewerageConnect164 = data.SewerageConnections) === null || _data$SewerageConnect164 === void 0 ? void 0 : (_data$SewerageConnect165 = _data$SewerageConnect164[0]) === null || _data$SewerageConnect165 === void 0 ? void 0 : _data$SewerageConnect165.documents
+        documents: data === null || data === void 0 ? void 0 : (_data$SewerageConnect168 = data.SewerageConnections) === null || _data$SewerageConnect168 === void 0 ? void 0 : (_data$SewerageConnect169 = _data$SewerageConnect168[0]) === null || _data$SewerageConnect169 === void 0 ? void 0 : _data$SewerageConnect169.documents
       }
     } : {
-      applicationData: data === null || data === void 0 ? void 0 : (_data$WaterConnection162 = data.WaterConnection) === null || _data$WaterConnection162 === void 0 ? void 0 : _data$WaterConnection162[0],
+      applicationData: data === null || data === void 0 ? void 0 : (_data$WaterConnection166 = data.WaterConnection) === null || _data$WaterConnection166 === void 0 ? void 0 : _data$WaterConnection166[0],
       serviceType: "WATER",
       WSDisconnectionForm: {
-        type: data !== null && data !== void 0 && (_data$WaterConnection163 = data.WaterConnection) !== null && _data$WaterConnection163 !== void 0 && (_data$WaterConnection164 = _data$WaterConnection163[0]) !== null && _data$WaterConnection164 !== void 0 && _data$WaterConnection164.isDisconnectionTemporary ? {
+        type: data !== null && data !== void 0 && (_data$WaterConnection167 = data.WaterConnection) !== null && _data$WaterConnection167 !== void 0 && (_data$WaterConnection168 = _data$WaterConnection167[0]) !== null && _data$WaterConnection168 !== void 0 && _data$WaterConnection168.isDisconnectionTemporary ? {
           code: "type",
           value: {
             name: "Temporary",
@@ -31080,12 +31006,12 @@ const WSApplicationDetails = () => {
             code: "Permanent"
           }
         },
-        date: convertEpochToDateDMY(data === null || data === void 0 ? void 0 : (_data$WaterConnection165 = data.WaterConnection) === null || _data$WaterConnection165 === void 0 ? void 0 : (_data$WaterConnection166 = _data$WaterConnection165[0]) === null || _data$WaterConnection166 === void 0 ? void 0 : _data$WaterConnection166.dateEffectiveFrom, true),
+        date: convertEpochToDateDMY(data === null || data === void 0 ? void 0 : (_data$WaterConnection169 = data.WaterConnection) === null || _data$WaterConnection169 === void 0 ? void 0 : (_data$WaterConnection170 = _data$WaterConnection169[0]) === null || _data$WaterConnection170 === void 0 ? void 0 : _data$WaterConnection170.dateEffectiveFrom, true),
         reason: {
           code: "reason",
-          value: data === null || data === void 0 ? void 0 : (_data$WaterConnection167 = data.WaterConnection) === null || _data$WaterConnection167 === void 0 ? void 0 : (_data$WaterConnection168 = _data$WaterConnection167[0]) === null || _data$WaterConnection168 === void 0 ? void 0 : _data$WaterConnection168.disconnectionReason
+          value: data === null || data === void 0 ? void 0 : (_data$WaterConnection171 = data.WaterConnection) === null || _data$WaterConnection171 === void 0 ? void 0 : (_data$WaterConnection172 = _data$WaterConnection171[0]) === null || _data$WaterConnection172 === void 0 ? void 0 : _data$WaterConnection172.disconnectionReason
         },
-        documents: data === null || data === void 0 ? void 0 : (_data$WaterConnection169 = data.WaterConnection) === null || _data$WaterConnection169 === void 0 ? void 0 : (_data$WaterConnection170 = _data$WaterConnection169[0]) === null || _data$WaterConnection170 === void 0 ? void 0 : _data$WaterConnection170.documents
+        documents: data === null || data === void 0 ? void 0 : (_data$WaterConnection173 = data.WaterConnection) === null || _data$WaterConnection173 === void 0 ? void 0 : (_data$WaterConnection174 = _data$WaterConnection173[0]) === null || _data$WaterConnection174 === void 0 ? void 0 : _data$WaterConnection174.documents
       }
     })
   })) : null)))));
@@ -44537,7 +44463,7 @@ const DueVerification = _ref => {
     });
   }, [applicationData]);
   const isPendingApproval = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_FIELD_INSPECTION";
-  const isActivation = ["PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus);
+  const isActivation = ["PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT", "PENDING_FOR_CONNECTION_ACTIVATION"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus);
   const columns = useMemo(() => {
     const baseColumns = [{
       Header: t("K No."),
@@ -44742,7 +44668,7 @@ const InspectionInformation = _ref => {
     if (!applicationData.inspectionInformation) applicationData.inspectionInformation = {};
     applicationData.inspectionInformation.inspectorName = val;
   };
-  const readOnly = ["PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus);
+  const readOnly = ["PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT", "PENDING_FOR_CONNECTION_ACTIVATION"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus);
   return /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: "20px"
@@ -45324,9 +45250,9 @@ function ApplicationDetailsContent(_ref) {
     }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet17 = detail.additionalDetails) === null || _detail$additionalDet17 === void 0 ? void 0 : _detail$additionalDet17.documents) && /*#__PURE__*/React.createElement(PropertyDocuments, {
       documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet18 = detail.additionalDetails) === null || _detail$additionalDet18 === void 0 ? void 0 : _detail$additionalDet18.documents,
       applicationStatus: applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet19 = detail.additionalDetails) === null || _detail$additionalDet19 === void 0 ? void 0 : _detail$additionalDet19.documents) && ["PENDING_FOR_FIELD_INSPECTION", "PENDING_APPROVAL_FOR_CONNECTION", "PENDING_FOR_CONNECTION_ACTIVATION", "PENDING_FOR_RECONNECTION", "PENDING_FOR_DUE_VERIFICATION", "PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) && /*#__PURE__*/React.createElement(DueVerification, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet19 = detail.additionalDetails) === null || _detail$additionalDet19 === void 0 ? void 0 : _detail$additionalDet19.documents) && ["PENDING_FOR_FIELD_INSPECTION", "PENDING_APPROVAL_FOR_CONNECTION", "PENDING_FOR_CONNECTION_ACTIVATION", "PENDING_FOR_RECONNECTION", "PENDING_FOR_DUE_VERIFICATION", "PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT", "CONNECTION_ACTIVATED", "PENDING_FOR_CONNECTION_ACTIVATION"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) && /*#__PURE__*/React.createElement(DueVerification, {
       applicationData: applicationData
-    }), " ", (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet20 = detail.additionalDetails) === null || _detail$additionalDet20 === void 0 ? void 0 : _detail$additionalDet20.documents) && ["PENDING_FOR_FIELD_INSPECTION", "PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) && /*#__PURE__*/React.createElement(InspectionInformation, {
+    }), " ", (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet20 = detail.additionalDetails) === null || _detail$additionalDet20 === void 0 ? void 0 : _detail$additionalDet20.documents) && ["PENDING_FOR_FIELD_INSPECTION", "PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT", "CONNECTION_ACTIVATED", "PENDING_FOR_CONNECTION_ACTIVATION"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) && /*#__PURE__*/React.createElement(InspectionInformation, {
       applicationData: applicationData
     }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet21 = detail.additionalDetails) === null || _detail$additionalDet21 === void 0 ? void 0 : _detail$additionalDet21.taxHeadEstimatesCalculation) && /*#__PURE__*/React.createElement(PropertyEstimates, {
       taxHeadEstimatesCalculation: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet22 = detail.additionalDetails) === null || _detail$additionalDet22 === void 0 ? void 0 : _detail$additionalDet22.taxHeadEstimatesCalculation
@@ -45969,7 +45895,7 @@ const ApplicationDetails = props => {
 };
 
 const ApplicationDetails$1 = () => {
-  var _mdmsCommonmastersDat, _commonPayInfo, _applicationDetails$p4, _applicationDetails$p5, _applicationDetails$p6, _applicationDetails$p7, _applicationDetails$a3, _applicationDetails$a4, _applicationDetails$a5, _newValueFilter$, _applicationDetails$a6, _applicationDetails$a7, _applicationDetails$a8, _applicationDetails$a9, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _workflowDetails$data15, _workflowDetails$data16, _workflowDetails$data17, _workflowDetails$data18, _workflowDetails$data21, _workflowDetails$data22, _workflowDetails$data23, _workflowDetails$data24, _workflowDetails$data25, _workflowDetails$data26, _workflowDetails$data27, _workflowDetails$data28, _workflowDetails$data29, _workflowDetails$data30, _workflowDetails$data37, _workflowDetails$data38, _workflowDetails$data39, _oldData$WaterConnect, _oldData$WaterConnect2, _oldData$SewerageConn, _oldData$SewerageConn2, _applicationDetails$a18, _applicationDetails$a19, _reciept_data$Payment2, _applicationDetails$p11, _applicationDetails$p12, _applicationDetails$p13, _applicationDetails$p14, _applicationDetails$p15, _applicationDetails$p16;
+  var _mdmsCommonmastersDat, _commonPayInfo, _applicationDetails$p4, _applicationDetails$p5, _applicationDetails$p6, _applicationDetails$p7, _applicationDetails$a3, _applicationDetails$a4, _applicationDetails$a5, _newValueFilter$, _applicationDetails$a6, _applicationDetails$a7, _applicationDetails$a8, _applicationDetails$a9, _applicationDetails$p8, _applicationDetails$p9, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _workflowDetails$data21, _workflowDetails$data22, _workflowDetails$data23, _oldData$WaterConnect, _oldData$WaterConnect2, _oldData$SewerageConn, _oldData$SewerageConn2, _applicationDetails$a18, _applicationDetails$a19, _reciept_data$Payment2, _applicationDetails$p16, _applicationDetails$p17, _applicationDetails$p18, _applicationDetails$p19, _applicationDetails$p20, _applicationDetails$p21;
   const getRecieptSearch = function (tenantId, payments, consumerCodes, receiptKey) {
     try {
       let response = null;
@@ -46128,7 +46054,35 @@ const ApplicationDetails$1 = () => {
   };
   let dowloadOptions = [],
     appStatus = (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a9 = applicationDetails.applicationData) === null || _applicationDetails$a9 === void 0 ? void 0 : _applicationDetails$a9.applicationStatus) || "";
-  workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : (_workflowDetails$data2 = _workflowDetails$data.actionState) === null || _workflowDetails$data2 === void 0 ? void 0 : (_workflowDetails$data3 = _workflowDetails$data2.nextActions) === null || _workflowDetails$data3 === void 0 ? void 0 : _workflowDetails$data3.forEach(action => {
+  if (workflowDetails !== null && workflowDetails !== void 0 && workflowDetails.data && (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p8 = applicationDetails.processInstancesDetails) === null || _applicationDetails$p8 === void 0 ? void 0 : (_applicationDetails$p9 = _applicationDetails$p8[0]) === null || _applicationDetails$p9 === void 0 ? void 0 : _applicationDetails$p9.businessService) === "NewWS1" && appStatus === "PENDING_FOR_BILLING_CLERK_REVIEW") {
+    var _applicationDetails$p0, _applicationDetails$p1, _applicationDetails$p10, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3;
+    const plotArea = Number((_applicationDetails$p0 = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p1 = applicationDetails.propertyDetails) === null || _applicationDetails$p1 === void 0 ? void 0 : (_applicationDetails$p10 = _applicationDetails$p1.additionalDetails) === null || _applicationDetails$p10 === void 0 ? void 0 : _applicationDetails$p10.plotArea) != null ? _applicationDetails$p0 : 0);
+    if (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data = workflowDetails.data) !== null && _workflowDetails$data !== void 0 && (_workflowDetails$data2 = _workflowDetails$data.actionState) !== null && _workflowDetails$data2 !== void 0 && _workflowDetails$data2.nextActions) {
+      workflowDetails.data.actionState.nextActions = workflowDetails.data.actionState.nextActions.filter(action => {
+        if (action.action !== "VERIFY_AND_FORWARD") {
+          return true;
+        }
+        if (plotArea > 200) {
+          return action.state === "PENDING_FOR_AE_APPROVAL" || action.applicationStatus === "PENDING_FOR_AE_APPROVAL";
+        }
+        return action.state === "PENDING_FOR_ASO_APPROVAL" || action.applicationStatus === "PENDING_FOR_ASO_APPROVAL";
+      });
+    }
+    if (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data3 = workflowDetails.data) !== null && _workflowDetails$data3 !== void 0 && _workflowDetails$data3.nextActions) {
+      workflowDetails.data.nextActions = workflowDetails.data.nextActions.filter(action => {
+        var _action$state;
+        if (action.action !== "VERIFY_AND_FORWARD") {
+          return true;
+        }
+        const targetStateCode = (_action$state = action.state) === null || _action$state === void 0 ? void 0 : _action$state.state;
+        if (plotArea > 200) {
+          return targetStateCode === "PENDING_FOR_AE_APPROVAL";
+        }
+        return targetStateCode === "PENDING_FOR_ASO_APPROVAL";
+      });
+    }
+  }
+  workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data4 = workflowDetails.data) === null || _workflowDetails$data4 === void 0 ? void 0 : (_workflowDetails$data5 = _workflowDetails$data4.actionState) === null || _workflowDetails$data5 === void 0 ? void 0 : (_workflowDetails$data6 = _workflowDetails$data5.nextActions) === null || _workflowDetails$data6 === void 0 ? void 0 : _workflowDetails$data6.forEach(action => {
     if ((action === null || action === void 0 ? void 0 : action.action) === "ACTIVATE_CONNECTION") {
       action.redirectionUrll = {
         action: "ACTIVATE_CONNECTION",
@@ -46137,8 +46091,8 @@ const ApplicationDetails$1 = () => {
       };
     }
     if ((action === null || action === void 0 ? void 0 : action.action) === "RESUBMIT_APPLICATION") {
-      var _applicationDetails$p8, _servicesMasterData$w, _userConfig$, _userConfig$2;
-      let pathName = "/digit-ui/employee/ws/edit-application?applicationNumber=" + applicationNumber + "&service=" + serviceType + "&propertyId=" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p8 = applicationDetails.propertyDetails) === null || _applicationDetails$p8 === void 0 ? void 0 : _applicationDetails$p8.propertyId);
+      var _applicationDetails$p11, _servicesMasterData$w, _userConfig$, _userConfig$2;
+      let pathName = "/digit-ui/employee/ws/edit-application?applicationNumber=" + applicationNumber + "&service=" + serviceType + "&propertyId=" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p11 = applicationDetails.propertyDetails) === null || _applicationDetails$p11 === void 0 ? void 0 : _applicationDetails$p11.propertyId);
       const userConfig = (servicesMasterData === null || servicesMasterData === void 0 ? void 0 : (_servicesMasterData$w = servicesMasterData["ws-services-masters"]) === null || _servicesMasterData$w === void 0 ? void 0 : _servicesMasterData$w.WSEditApplicationByConfigUser) || [];
       const editApplicationUserRole = (userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$ = userConfig[0]) === null || _userConfig$ === void 0 ? void 0 : _userConfig$.roles) || [];
       const mdmsApplicationStatus = userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$2 = userConfig[0]) === null || _userConfig$2 === void 0 ? void 0 : _userConfig$2.status;
@@ -46148,8 +46102,8 @@ const ApplicationDetails$1 = () => {
         if (isFieldInspector) return false;else return true;
       });
       if (isFieldInspector && appStatus === mdmsApplicationStatus) {
-        var _applicationDetails$p9;
-        pathName = "/digit-ui/employee/ws/edit-application-by-config?applicationNumber=" + applicationNumber + "&service=" + serviceType + "&propertyId=" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p9 = applicationDetails.propertyDetails) === null || _applicationDetails$p9 === void 0 ? void 0 : _applicationDetails$p9.propertyId);
+        var _applicationDetails$p12;
+        pathName = "/digit-ui/employee/ws/edit-application-by-config?applicationNumber=" + applicationNumber + "&service=" + serviceType + "&propertyId=" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p12 = applicationDetails.propertyDetails) === null || _applicationDetails$p12 === void 0 ? void 0 : _applicationDetails$p12.propertyId);
       }
       action.redirectionUrll = {
         action: "ACTIVATE_CONNECTION",
@@ -46161,24 +46115,18 @@ const ApplicationDetails$1 = () => {
       };
     }
     if ((action === null || action === void 0 ? void 0 : action.action) === "SUBMIT_APPLICATION") {
-      var _applicationDetails$p0;
+      var _applicationDetails$p13;
       action.redirectionUrll = {
         action: "ACTIVATE_CONNECTION",
-        pathname: "/digit-ui/employee/ws/modify-application-edit?applicationNumber=" + applicationNumber + "&service=" + serviceType + "&propertyId=" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p0 = applicationDetails.propertyDetails) === null || _applicationDetails$p0 === void 0 ? void 0 : _applicationDetails$p0.propertyId),
+        pathname: "/digit-ui/employee/ws/modify-application-edit?applicationNumber=" + applicationNumber + "&service=" + serviceType + "&propertyId=" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p13 = applicationDetails.propertyDetails) === null || _applicationDetails$p13 === void 0 ? void 0 : _applicationDetails$p13.propertyId),
         state: applicationDetails
       };
     }
   });
-  if ((workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data4 = workflowDetails.data) === null || _workflowDetails$data4 === void 0 ? void 0 : (_workflowDetails$data5 = _workflowDetails$data4.nextActions) === null || _workflowDetails$data5 === void 0 ? void 0 : _workflowDetails$data5.length) > 0 && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data6 = workflowDetails.data) === null || _workflowDetails$data6 === void 0 ? void 0 : (_workflowDetails$data7 = _workflowDetails$data6.actionState) === null || _workflowDetails$data7 === void 0 ? void 0 : (_workflowDetails$data8 = _workflowDetails$data7.nextActions) === null || _workflowDetails$data8 === void 0 ? void 0 : _workflowDetails$data8.length) > 0 && !(workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data9 = workflowDetails.data) !== null && _workflowDetails$data9 !== void 0 && (_workflowDetails$data0 = _workflowDetails$data9.actionState) !== null && _workflowDetails$data0 !== void 0 && (_workflowDetails$data1 = _workflowDetails$data0.nextActions) !== null && _workflowDetails$data1 !== void 0 && _workflowDetails$data1.find(e => e.action === "EDIT")) && !(workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data10 = workflowDetails.data) !== null && _workflowDetails$data10 !== void 0 && (_workflowDetails$data11 = _workflowDetails$data10.actionState) !== null && _workflowDetails$data11 !== void 0 && (_workflowDetails$data12 = _workflowDetails$data11.nextActions) !== null && _workflowDetails$data12 !== void 0 && _workflowDetails$data12.find(e => e.action === "RESUBMIT_APPLICATION")) && !(workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data13 = workflowDetails.data) !== null && _workflowDetails$data13 !== void 0 && (_workflowDetails$data14 = _workflowDetails$data13.actionState) !== null && _workflowDetails$data14 !== void 0 && (_workflowDetails$data15 = _workflowDetails$data14.nextActions) !== null && _workflowDetails$data15 !== void 0 && _workflowDetails$data15.find(e => e.action === "ACTIVATE_CONNECTION")) && !(workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data16 = workflowDetails.data) !== null && _workflowDetails$data16 !== void 0 && (_workflowDetails$data17 = _workflowDetails$data16.actionState) !== null && _workflowDetails$data17 !== void 0 && (_workflowDetails$data18 = _workflowDetails$data17.nextActions) !== null && _workflowDetails$data18 !== void 0 && _workflowDetails$data18.find(e => e.action === "SUBMIT_APPLICATION"))) {
-    var _workflowDetails$data19, _workflowDetails$data20;
-    workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data19 = workflowDetails.data) === null || _workflowDetails$data19 === void 0 ? void 0 : (_workflowDetails$data20 = _workflowDetails$data19.nextActions) === null || _workflowDetails$data20 === void 0 ? void 0 : _workflowDetails$data20.forEach(data => {
-      if (data.action === "EDIT") workflowDetails.data.actionState.nextActions.push(data);
-    });
-  }
-  workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data21 = workflowDetails.data) === null || _workflowDetails$data21 === void 0 ? void 0 : (_workflowDetails$data22 = _workflowDetails$data21.actionState) === null || _workflowDetails$data22 === void 0 ? void 0 : (_workflowDetails$data23 = _workflowDetails$data22.nextActions) === null || _workflowDetails$data23 === void 0 ? void 0 : _workflowDetails$data23.forEach(action => {
+  workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data7 = workflowDetails.data) === null || _workflowDetails$data7 === void 0 ? void 0 : (_workflowDetails$data8 = _workflowDetails$data7.actionState) === null || _workflowDetails$data8 === void 0 ? void 0 : (_workflowDetails$data9 = _workflowDetails$data8.nextActions) === null || _workflowDetails$data9 === void 0 ? void 0 : _workflowDetails$data9.forEach(action => {
     if ((action === null || action === void 0 ? void 0 : action.action) === "EDIT") {
-      var _applicationDetails$p1, _servicesMasterData$w2, _userConfig$3, _userConfig$4;
-      let pathName = "/digit-ui/employee/ws/edit-application?applicationNumber=" + applicationNumber + "&service=" + serviceType + "&propertyId=" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p1 = applicationDetails.propertyDetails) === null || _applicationDetails$p1 === void 0 ? void 0 : _applicationDetails$p1.propertyId);
+      var _applicationDetails$p14, _servicesMasterData$w2, _userConfig$3, _userConfig$4;
+      let pathName = "/digit-ui/employee/ws/edit-application?applicationNumber=" + applicationNumber + "&service=" + serviceType + "&propertyId=" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p14 = applicationDetails.propertyDetails) === null || _applicationDetails$p14 === void 0 ? void 0 : _applicationDetails$p14.propertyId);
       const userConfig = (servicesMasterData === null || servicesMasterData === void 0 ? void 0 : (_servicesMasterData$w2 = servicesMasterData["ws-services-masters"]) === null || _servicesMasterData$w2 === void 0 ? void 0 : _servicesMasterData$w2.WSEditApplicationByConfigUser) || [];
       const editApplicationUserRole = (userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$3 = userConfig[0]) === null || _userConfig$3 === void 0 ? void 0 : _userConfig$3.roles) || [];
       const mdmsApplicationStatus = userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$4 = userConfig[0]) === null || _userConfig$4 === void 0 ? void 0 : _userConfig$4.status;
@@ -46188,8 +46136,8 @@ const ApplicationDetails$1 = () => {
         if (isFieldInspector) return false;else return true;
       });
       if (isFieldInspector && appStatus === mdmsApplicationStatus) {
-        var _applicationDetails$p10;
-        pathName = "/digit-ui/employee/ws/edit-application-by-config?applicationNumber=" + applicationNumber + "&service=" + serviceType + "&propertyId=" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p10 = applicationDetails.propertyDetails) === null || _applicationDetails$p10 === void 0 ? void 0 : _applicationDetails$p10.propertyId);
+        var _applicationDetails$p15;
+        pathName = "/digit-ui/employee/ws/edit-application-by-config?applicationNumber=" + applicationNumber + "&service=" + serviceType + "&propertyId=" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p15 = applicationDetails.propertyDetails) === null || _applicationDetails$p15 === void 0 ? void 0 : _applicationDetails$p15.propertyId);
       }
       action.redirectionUrll = {
         action: "ACTIVATE_CONNECTION",
@@ -46201,27 +46149,27 @@ const ApplicationDetails$1 = () => {
       };
     }
   });
-  workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data24 = workflowDetails.data) === null || _workflowDetails$data24 === void 0 ? void 0 : (_workflowDetails$data25 = _workflowDetails$data24.nextActions) === null || _workflowDetails$data25 === void 0 ? void 0 : _workflowDetails$data25.forEach(action => {
+  workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data0 = workflowDetails.data) === null || _workflowDetails$data0 === void 0 ? void 0 : (_workflowDetails$data1 = _workflowDetails$data0.nextActions) === null || _workflowDetails$data1 === void 0 ? void 0 : _workflowDetails$data1.forEach(action => {
     if ((action === null || action === void 0 ? void 0 : action.action) === "VERIFY_AND_FORWARD" && appStatus === "PENDING_FOR_FIELD_INSPECTION" && !checkWSAdditionalDetails()) {
       action.isToast = true;
       action.toastMessage = "MISSING_ADDITIONAL_DETAILS";
     }
   });
-  workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data26 = workflowDetails.data) === null || _workflowDetails$data26 === void 0 ? void 0 : (_workflowDetails$data27 = _workflowDetails$data26.actionState) === null || _workflowDetails$data27 === void 0 ? void 0 : (_workflowDetails$data28 = _workflowDetails$data27.nextActions) === null || _workflowDetails$data28 === void 0 ? void 0 : _workflowDetails$data28.forEach(action => {
+  workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data10 = workflowDetails.data) === null || _workflowDetails$data10 === void 0 ? void 0 : (_workflowDetails$data11 = _workflowDetails$data10.actionState) === null || _workflowDetails$data11 === void 0 ? void 0 : (_workflowDetails$data12 = _workflowDetails$data11.nextActions) === null || _workflowDetails$data12 === void 0 ? void 0 : _workflowDetails$data12.forEach(action => {
     if ((action === null || action === void 0 ? void 0 : action.action) === "VERIFY_AND_FORWARD" && appStatus === "PENDING_FOR_FIELD_INSPECTION" && !checkWSAdditionalDetails()) {
       action.isToast = true;
       action.toastMessage = "MISSING_ADDITIONAL_DETAILS";
     }
   });
-  workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data29 = workflowDetails.data) === null || _workflowDetails$data29 === void 0 ? void 0 : (_workflowDetails$data30 = _workflowDetails$data29.nextActions) === null || _workflowDetails$data30 === void 0 ? void 0 : _workflowDetails$data30.forEach(action => {
+  workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data13 = workflowDetails.data) === null || _workflowDetails$data13 === void 0 ? void 0 : (_workflowDetails$data14 = _workflowDetails$data13.nextActions) === null || _workflowDetails$data14 === void 0 ? void 0 : _workflowDetails$data14.forEach(action => {
     if ((action === null || action === void 0 ? void 0 : action.action) === "PAY") {
-      var _workflowDetails$data31, _workflowDetails$data32, _workflowDetails$data33, _workflowDetails$data34, _workflowDetails$data35, _workflowDetails$data36;
-      if ((workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data31 = workflowDetails.data) === null || _workflowDetails$data31 === void 0 ? void 0 : (_workflowDetails$data32 = _workflowDetails$data31.processInstances) === null || _workflowDetails$data32 === void 0 ? void 0 : (_workflowDetails$data33 = _workflowDetails$data32[0]) === null || _workflowDetails$data33 === void 0 ? void 0 : _workflowDetails$data33.businessService) === "WSReconnection") {
+      var _workflowDetails$data15, _workflowDetails$data16, _workflowDetails$data17, _workflowDetails$data18, _workflowDetails$data19, _workflowDetails$data20;
+      if ((workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data15 = workflowDetails.data) === null || _workflowDetails$data15 === void 0 ? void 0 : (_workflowDetails$data16 = _workflowDetails$data15.processInstances) === null || _workflowDetails$data16 === void 0 ? void 0 : (_workflowDetails$data17 = _workflowDetails$data16[0]) === null || _workflowDetails$data17 === void 0 ? void 0 : _workflowDetails$data17.businessService) === "WSReconnection") {
         action.redirectionUrll = {
           pathname: "WSReconnection/" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationNo) + "/" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId) + "?tenantId=" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId) + "&ISWSAPP&applicationNumber=" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationNo),
           state: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId
         };
-      } else if ((workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data34 = workflowDetails.data) === null || _workflowDetails$data34 === void 0 ? void 0 : (_workflowDetails$data35 = _workflowDetails$data34.processInstances) === null || _workflowDetails$data35 === void 0 ? void 0 : (_workflowDetails$data36 = _workflowDetails$data35[0]) === null || _workflowDetails$data36 === void 0 ? void 0 : _workflowDetails$data36.businessService) === "SWReconnection") {
+      } else if ((workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data18 = workflowDetails.data) === null || _workflowDetails$data18 === void 0 ? void 0 : (_workflowDetails$data19 = _workflowDetails$data18.processInstances) === null || _workflowDetails$data19 === void 0 ? void 0 : (_workflowDetails$data20 = _workflowDetails$data19[0]) === null || _workflowDetails$data20 === void 0 ? void 0 : _workflowDetails$data20.businessService) === "SWReconnection") {
         action.redirectionUrll = {
           pathname: "SWReconnection/" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationNo) + "/" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId) + "?tenantId=" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId) + "&ISWSAPP&applicationNumber=" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationNo),
           state: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId
@@ -46234,15 +46182,15 @@ const ApplicationDetails$1 = () => {
       }
     }
   });
-  workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data37 = workflowDetails.data) === null || _workflowDetails$data37 === void 0 ? void 0 : (_workflowDetails$data38 = _workflowDetails$data37.actionState) === null || _workflowDetails$data38 === void 0 ? void 0 : (_workflowDetails$data39 = _workflowDetails$data38.nextActions) === null || _workflowDetails$data39 === void 0 ? void 0 : _workflowDetails$data39.forEach(action => {
+  workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data21 = workflowDetails.data) === null || _workflowDetails$data21 === void 0 ? void 0 : (_workflowDetails$data22 = _workflowDetails$data21.actionState) === null || _workflowDetails$data22 === void 0 ? void 0 : (_workflowDetails$data23 = _workflowDetails$data22.nextActions) === null || _workflowDetails$data23 === void 0 ? void 0 : _workflowDetails$data23.forEach(action => {
     if ((action === null || action === void 0 ? void 0 : action.action) === "PAY") {
-      var _workflowDetails$data40, _workflowDetails$data41, _workflowDetails$data42, _workflowDetails$data43, _workflowDetails$data44, _workflowDetails$data45;
-      if ((workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data40 = workflowDetails.data) === null || _workflowDetails$data40 === void 0 ? void 0 : (_workflowDetails$data41 = _workflowDetails$data40.processInstances) === null || _workflowDetails$data41 === void 0 ? void 0 : (_workflowDetails$data42 = _workflowDetails$data41[0]) === null || _workflowDetails$data42 === void 0 ? void 0 : _workflowDetails$data42.businessService) === "WSReconnection") {
+      var _workflowDetails$data24, _workflowDetails$data25, _workflowDetails$data26, _workflowDetails$data27, _workflowDetails$data28, _workflowDetails$data29;
+      if ((workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data24 = workflowDetails.data) === null || _workflowDetails$data24 === void 0 ? void 0 : (_workflowDetails$data25 = _workflowDetails$data24.processInstances) === null || _workflowDetails$data25 === void 0 ? void 0 : (_workflowDetails$data26 = _workflowDetails$data25[0]) === null || _workflowDetails$data26 === void 0 ? void 0 : _workflowDetails$data26.businessService) === "WSReconnection") {
         action.redirectionUrll = {
           pathname: "WSReconnection/" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationNo) + "/" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId) + "?tenantId=" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId) + "&ISWSAPP&applicationNumber=" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationNo),
           state: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId
         };
-      } else if ((workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data43 = workflowDetails.data) === null || _workflowDetails$data43 === void 0 ? void 0 : (_workflowDetails$data44 = _workflowDetails$data43.processInstances) === null || _workflowDetails$data44 === void 0 ? void 0 : (_workflowDetails$data45 = _workflowDetails$data44[0]) === null || _workflowDetails$data45 === void 0 ? void 0 : _workflowDetails$data45.businessService) === "SWReconnection") {
+      } else if ((workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data27 = workflowDetails.data) === null || _workflowDetails$data27 === void 0 ? void 0 : (_workflowDetails$data28 = _workflowDetails$data27.processInstances) === null || _workflowDetails$data28 === void 0 ? void 0 : (_workflowDetails$data29 = _workflowDetails$data28[0]) === null || _workflowDetails$data29 === void 0 ? void 0 : _workflowDetails$data29.businessService) === "SWReconnection") {
         action.redirectionUrll = {
           pathname: "SWReconnection/" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationNo) + "/" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId) + "?tenantId=" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId) + "&ISWSAPP&applicationNumber=" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationNo),
           state: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId
@@ -46412,12 +46360,12 @@ const ApplicationDetails$1 = () => {
     mutate: mutate,
     id: "timeline",
     workflowDetails: workflowDetails,
-    businessService: applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p11 = applicationDetails.processInstancesDetails) === null || _applicationDetails$p11 === void 0 ? void 0 : (_applicationDetails$p12 = _applicationDetails$p11[0]) === null || _applicationDetails$p12 === void 0 ? void 0 : (_applicationDetails$p13 = _applicationDetails$p12.businessService) === null || _applicationDetails$p13 === void 0 ? void 0 : _applicationDetails$p13.toUpperCase(),
+    businessService: applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p16 = applicationDetails.processInstancesDetails) === null || _applicationDetails$p16 === void 0 ? void 0 : (_applicationDetails$p17 = _applicationDetails$p16[0]) === null || _applicationDetails$p17 === void 0 ? void 0 : (_applicationDetails$p18 = _applicationDetails$p17.businessService) === null || _applicationDetails$p18 === void 0 ? void 0 : _applicationDetails$p18.toUpperCase(),
     moduleCode: "WS",
     showToast: showToast,
     setShowToast: setShowToast,
     closeToast: closeToast,
-    timelineStatusPrefix: "WF_" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p14 = applicationDetails.processInstancesDetails) === null || _applicationDetails$p14 === void 0 ? void 0 : (_applicationDetails$p15 = _applicationDetails$p14[0]) === null || _applicationDetails$p15 === void 0 ? void 0 : (_applicationDetails$p16 = _applicationDetails$p15.businessService) === null || _applicationDetails$p16 === void 0 ? void 0 : _applicationDetails$p16.toUpperCase()) + "_",
+    timelineStatusPrefix: "WF_" + (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p19 = applicationDetails.processInstancesDetails) === null || _applicationDetails$p19 === void 0 ? void 0 : (_applicationDetails$p20 = _applicationDetails$p19[0]) === null || _applicationDetails$p20 === void 0 ? void 0 : (_applicationDetails$p21 = _applicationDetails$p20.businessService) === null || _applicationDetails$p21 === void 0 ? void 0 : _applicationDetails$p21.toUpperCase()) + "_",
     oldValue: res,
     isInfoLabel: checkforPrivacyenablement(),
     clearDataDetails: clearDataDetails,
@@ -46740,17 +46688,7 @@ const GetConnectionDetails = () => {
     style: {
       display: "flex"
     }
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      width: "80%"
-    }
-  }, /*#__PURE__*/React.createElement(Header, {
-    styles: {
-      marginLeft: "0px",
-      paddingTop: "10px",
-      fontSize: "32px"
-    }
-  }, t("WS_CONNECTION_DETAILS"))), dowloadOptions && dowloadOptions.length > 0 && /*#__PURE__*/React.createElement("div", {
+  }, dowloadOptions && dowloadOptions.length > 0 && /*#__PURE__*/React.createElement("div", {
     style: {
       maxWidth: "100% !imnportant",
       zIndex: "10"
@@ -46877,7 +46815,6 @@ const ActivateConnection = () => {
     isAppDetailsPage = _useState5[0],
     setIsAppDetailsPage = _useState5[1];
   const _React$useState = React.useState({
-      head: "",
       body: []
     }),
     config = _React$useState[0],
@@ -46910,7 +46847,7 @@ const ActivateConnection = () => {
     } : "",
     waterSource: (_state7 = state) !== null && _state7 !== void 0 && (_state7$data = _state7.data) !== null && _state7$data !== void 0 && _state7$data.waterSource ? {
       code: (_state8 = state) === null || _state8 === void 0 ? void 0 : (_state8$data = _state8.data) === null || _state8$data === void 0 ? void 0 : _state8$data.waterSource,
-      i18nKey: "WS_SERVICES_MASTERS_WATERSOURCE_" + stringReplaceAll((_state9 = state) === null || _state9 === void 0 ? void 0 : (_state9$data = _state9.data) === null || _state9$data === void 0 ? void 0 : (_state9$data$waterSou = _state9$data.waterSource) === null || _state9$data$waterSou === void 0 ? void 0 : (_state9$data$waterSou2 = _state9$data$waterSou.split('.')[0]) === null || _state9$data$waterSou2 === void 0 ? void 0 : _state9$data$waterSou2.toUpperCase(), " ", "_")
+      i18nKey: "WS_SERVICES_MASTERS_WATERSOURCE_" + stringReplaceAll((_state9 = state) === null || _state9 === void 0 ? void 0 : (_state9$data = _state9.data) === null || _state9$data === void 0 ? void 0 : (_state9$data$waterSou = _state9$data.waterSource) === null || _state9$data$waterSou === void 0 ? void 0 : (_state9$data$waterSou2 = _state9$data$waterSou.split(".")[0]) === null || _state9$data$waterSou2 === void 0 ? void 0 : _state9$data$waterSou2.toUpperCase(), " ", "_")
     } : "",
     sourceSubData: (_state0 = state) !== null && _state0 !== void 0 && (_state0$data = _state0.data) !== null && _state0$data !== void 0 && _state0$data.waterSource ? {
       code: (_state1 = state) === null || _state1 === void 0 ? void 0 : (_state1$data = _state1.data) === null || _state1$data === void 0 ? void 0 : _state1$data.waterSource,
@@ -46959,9 +46896,18 @@ const ActivateConnection = () => {
   }, []);
   useEffect(() => {
     if (!isLoading && newConfig && Array.isArray(newConfig)) {
-      const config = newConfig.find(conf => conf.hideInCitizen);
-      if (config) {
-        setConfig(config);
+      const configObj = newConfig.find(conf => conf.hideInCitizen);
+      if (configObj && configObj.body) {
+        let flattenedBody = [];
+        configObj.body.forEach(section => {
+          if (section.body && Array.isArray(section.body)) {
+            flattenedBody = [...flattenedBody, ...section.body];
+          }
+        });
+        setConfig([{
+          head: "WF_EMPLOYEE_NEWSW1_ACTIVATE_CONNECTION",
+          body: flattenedBody
+        }]);
       }
     }
   }, [newConfig]);
@@ -47094,19 +47040,37 @@ const ActivateConnection = () => {
   if (isEnableLoader || isLoading || isappdetailsLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormComposer, {
-    config: config.body,
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "employee-form-section-wrapper"
+  }, /*#__PURE__*/React.createElement(VerticalTimeline, {
+    config: [{
+      timeLine: [{
+        actions: t("WF_EMPLOYEE_NEWSW1_ACTIVATE_CONNECTION"),
+        currentStep: 1
+      }]
+    }],
+    showFinalStep: false
+  }), /*#__PURE__*/React.createElement(FormComposer, {
+    config: config.map(config => {
+      return _extends({}, config, {
+        isCollapsible: true,
+        isDefaultOpen: true,
+        body: config.body
+      });
+    }),
     userType: "employee",
     defaultValues: defaultValues,
     onSubmit: onSubmit,
     label: t("WF_EMPLOYEE_NEWSW1_ACTIVATE_CONNECTION"),
-    onFormValueChange: onFormValueChange
+    onFormValueChange: onFormValueChange,
+    noBreakLine: true,
+    noCard: true
   }), showToast && /*#__PURE__*/React.createElement(Toast, {
     error: showToast.key,
     label: t(showToast === null || showToast === void 0 ? void 0 : showToast.message),
     warning: showToast === null || showToast === void 0 ? void 0 : showToast.warning,
     onClose: closeToast
-  }));
+  })));
 };
 
 const ApplicationDetailsBillAmendment = () => {
@@ -47617,7 +47581,7 @@ const EditApplication$1 = () => {
 };
 
 const ConsumptionDetails = _ref => {
-  var _user$info, _mdmsBillingPeriod$Md, _mdmsBillingPeriod$Md2, _mdmsMeterStatus$Mdms, _mdmsMeterStatus$Mdms2, _details$4, _details$5;
+  var _user$info, _mdmsBillingPeriod$Md, _mdmsBillingPeriod$Md2, _mdmsBillingPeriod$Md3, _mdmsMeterStatus$Mdms, _mdmsMeterStatus$Mdms2, _mdmsMeterStatus$Mdms3, _details$4, _details$5;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const user = Digit.UserService.getUser();
@@ -47721,7 +47685,7 @@ const ConsumptionDetails = _ref => {
       return dateString;
     }
   };
-  const getBillingPeriodFromMdms = mdmsBillingPeriod === null || mdmsBillingPeriod === void 0 ? void 0 : (_mdmsBillingPeriod$Md = mdmsBillingPeriod.MdmsRes) === null || _mdmsBillingPeriod$Md === void 0 ? void 0 : (_mdmsBillingPeriod$Md2 = _mdmsBillingPeriod$Md["ws-services-masters"]) === null || _mdmsBillingPeriod$Md2 === void 0 ? void 0 : _mdmsBillingPeriod$Md2.billingPeriod.filter(e => e.connectionType === "Metered");
+  const getBillingPeriodFromMdms = mdmsBillingPeriod === null || mdmsBillingPeriod === void 0 ? void 0 : (_mdmsBillingPeriod$Md = mdmsBillingPeriod.MdmsRes) === null || _mdmsBillingPeriod$Md === void 0 ? void 0 : (_mdmsBillingPeriod$Md2 = _mdmsBillingPeriod$Md["ws-services-masters"]) === null || _mdmsBillingPeriod$Md2 === void 0 ? void 0 : (_mdmsBillingPeriod$Md3 = _mdmsBillingPeriod$Md2.billingPeriod) === null || _mdmsBillingPeriod$Md3 === void 0 ? void 0 : _mdmsBillingPeriod$Md3.filter(e => e.connectionType === "Metered");
   const popUp = () => {
     var _response$meterReadin, _response$meterReadin2;
     setOpenModal(true);
@@ -47827,7 +47791,7 @@ const ConsumptionDetails = _ref => {
       return Promise.reject(e);
     }
   };
-  let optionsList = mdmsMeterStatus === null || mdmsMeterStatus === void 0 ? void 0 : (_mdmsMeterStatus$Mdms = mdmsMeterStatus.MdmsRes) === null || _mdmsMeterStatus$Mdms === void 0 ? void 0 : (_mdmsMeterStatus$Mdms2 = _mdmsMeterStatus$Mdms["ws-services-calculation"]) === null || _mdmsMeterStatus$Mdms2 === void 0 ? void 0 : _mdmsMeterStatus$Mdms2.MeterStatus.map(status => ({
+  let optionsList = mdmsMeterStatus === null || mdmsMeterStatus === void 0 ? void 0 : (_mdmsMeterStatus$Mdms = mdmsMeterStatus.MdmsRes) === null || _mdmsMeterStatus$Mdms === void 0 ? void 0 : (_mdmsMeterStatus$Mdms2 = _mdmsMeterStatus$Mdms["ws-services-calculation"]) === null || _mdmsMeterStatus$Mdms2 === void 0 ? void 0 : (_mdmsMeterStatus$Mdms3 = _mdmsMeterStatus$Mdms2.MeterStatus) === null || _mdmsMeterStatus$Mdms3 === void 0 ? void 0 : _mdmsMeterStatus$Mdms3.map(status => ({
     code: status,
     i18nKey: "WS_SERVICES_CALCULATION_METERSTATUS_" + Digit.Utils.locale.getTransformedLocale(status)
   }));