@djb25/digit-ui-module-ws 1.0.43 → 1.0.45

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, Table, Banner, CardText, ActionBar, HomeIcon, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, PrintBtnCommon, MultiLink, LinkButton, Toast, TickMark, FormStep, CardLabel, TextInput, RadioOrSelect, CardHeader, CitizenInfoLabel, CardSubHeader, LabelFieldPair, DatePicker, CollapsibleCardPage, Dropdown, RadioButtons, UploadFile, ViewsIcon, Modal, DeleteIcon, CardLabelError, WrapUnMaskComponent, MobileNumber, CheckBox, StatusTable, Row, Header, CardSectionHeader, InfoIcon, TextArea, SearchField, FilterFormField, RemoveableTag, MultiSelectDropdown, InboxComposer, DropIcon, WSICon, EmployeeModuleCard, SearchAction, PopUp, DetailsCard, SearchForm, CloseSvg, Localities, DownloadBtnCommon, CollectionIcon, ResponseComposer, TelePhone, DisplayPhotos, CheckPoint, ConnectingCheckPoints, ActionLinks, PDFSvg, GenericFileIcon, EditIcon, Label, CardSectionSubText, DownloadIcon, CardLabelDesc, VerticalTimeline, FormComposer, MultiUploadWrapper, Close as Close$e, BreakLine, AddIcon, Menu, ButtonSelector, CitizenHomeCard } from '@djb25/digit-ui-react-components';
+import { Loader, Card, KeyNote, SubmitBar, InfoBannerIcon, Table, Banner, CardText, ActionBar, HomeIcon, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, PrintBtnCommon, MultiLink, LinkButton, Toast, TickMark, FormStep, CardLabel, TextInput, RadioOrSelect, CardHeader, CitizenInfoLabel, CardSubHeader, LabelFieldPair, DatePicker, CollapsibleCardPage, Dropdown, RadioButtons, UploadFile, ViewsIcon, Modal, DeleteIcon, CardLabelError, WrapUnMaskComponent, MobileNumber, CheckBox, StatusTable, Row, Header, CardSectionHeader, InfoIcon, TextArea, SearchField, FilterFormField, RemoveableTag, MultiSelectDropdown, InboxComposer, DropIcon, WSICon, EmployeeModuleCard, SearchAction, PopUp, DetailsCard, SearchForm, CloseSvg, Localities, DownloadBtnCommon, CollectionIcon, ResponseComposer, TelePhone, DisplayPhotos, PDFSvg, GenericFileIcon, EditIcon, Label, CardSectionSubText, DownloadIcon, CardLabelDesc, VerticalTimeline, 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';
@@ -15493,7 +15493,7 @@ function SelectDocument(_ref2) {
   const _useState6 = useState(() => (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.fileStoreId) || null),
     uploadedFile = _useState6[0],
     setUploadedFile = _useState6[1];
-  const _useState7 = useState(() => (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.documentUid) || ""),
+  const _useState7 = useState(() => (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.documentUid) || (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.documentNumber) || ""),
     documentUid = _useState7[0],
     setDocumentUid = _useState7[1];
   const _useState8 = useState(false),
@@ -20505,6 +20505,7 @@ const PropertyWaterConnection = _ref => {
   const watchCategoryType = watch("useDetails.categoryType");
   const watchPropertyType = watch("useDetails.propertyType");
   const watchPropertyCategory = watch("useDetails.propertyCategory");
+  const watchWaterConnectionUsageType = watch("useDetails.WaterConnectionUsageType");
   const isHospitalProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOSPITAL_NURSING_HOME" || (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 yearOptions = useMemo(() => {
@@ -20564,11 +20565,29 @@ const PropertyWaterConnection = _ref => {
   }, [watchPropertyCategory, propertyTypeOptions, setValue, watchPropertyType]);
   const usageTypeOptions = useMemo(() => {
     var _ptServicesMastersDat5, _ptServicesMastersDat6;
-    return ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat5 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat5 === void 0 ? void 0 : (_ptServicesMastersDat6 = _ptServicesMastersDat5.PropertyNewUsageType) === null || _ptServicesMastersDat6 === void 0 ? void 0 : _ptServicesMastersDat6.filter(item => item.active).map(item => ({
+    let options = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat5 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat5 === void 0 ? void 0 : (_ptServicesMastersDat6 = _ptServicesMastersDat5.PropertyNewUsageType) === null || _ptServicesMastersDat6 === void 0 ? void 0 : _ptServicesMastersDat6.filter(item => item.active)) || [];
+    if (watchPropertyCategory !== null && watchPropertyCategory !== void 0 && watchPropertyCategory.code) {
+      var _watchPropertyCategor3;
+      if ((watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : (_watchPropertyCategor3 = watchPropertyCategory.code) === null || _watchPropertyCategor3 === void 0 ? void 0 : _watchPropertyCategor3.toUpperCase()) !== "MIXED") {
+        options = options.filter(item => {
+          var _item$type2, _watchPropertyCategor4;
+          return ((_item$type2 = item.type) === null || _item$type2 === void 0 ? void 0 : _item$type2.toUpperCase()) === ((_watchPropertyCategor4 = watchPropertyCategory.code) === null || _watchPropertyCategor4 === void 0 ? void 0 : _watchPropertyCategor4.toUpperCase());
+        });
+      }
+    }
+    return options.map(item => ({
       code: item.code,
       name: item.name
     }));
-  }, [ptServicesMastersData]);
+  }, [ptServicesMastersData, watchPropertyCategory]);
+  useEffect(() => {
+    if (watchPropertyType && watchWaterConnectionUsageType) {
+      const isUsageTypeValid = usageTypeOptions.some(opt => opt.code === watchWaterConnectionUsageType.code);
+      if (!isUsageTypeValid) {
+        setValue("useDetails.WaterConnectionUsageType", null);
+      }
+    }
+  }, [watchPropertyType, usageTypeOptions, setValue, watchWaterConnectionUsageType]);
   const floorOptions = useMemo(() => {
     var _ptServicesMastersDat7, _ptServicesMastersDat8;
     return ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat7 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat7 === void 0 ? void 0 : (_ptServicesMastersDat8 = _ptServicesMastersDat7.NoOfFloors) === null || _ptServicesMastersDat8 === void 0 ? void 0 : _ptServicesMastersDat8.filter(item => item.active).map(item => ({
@@ -27622,35 +27641,382 @@ const CitizenSearchResults = () => {
   })));
 };
 
-const WSWFCaption = _ref => {
+const TOKEN = {
+  textPri: "#1e293b",
+  textSec: "#475569",
+  textMut: "#94a3b8",
+  active: "#0284c7",
+  border: "#dde4f0",
+  surface: "#f0f9ff",
+  quote: "#eff6ff"
+};
+const MetaRow = _ref => {
+  let icon = _ref.icon,
+    children = _ref.children;
+  return children ? /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      alignItems: "center",
+      gap: "7px",
+      marginBottom: "6px"
+    }
+  }, /*#__PURE__*/React.createElement("span", {
+    style: {
+      fontSize: "14px",
+      opacity: 0.6
+    }
+  }, icon), /*#__PURE__*/React.createElement("span", {
+    style: {
+      fontSize: "12px",
+      color: TOKEN.textSec
+    }
+  }, children)) : null;
+};
+const WSWFCaption = _ref2 => {
   var _data$wfComment, _data$thumbnailsToSho, _data$thumbnailsToSho2;
-  let data = _ref.data,
-    OpenImage = _ref.OpenImage;
+  let data = _ref2.data,
+    OpenImage = _ref2.OpenImage;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  return /*#__PURE__*/React.createElement("div", null, data.date && /*#__PURE__*/React.createElement("p", null, data.date), /*#__PURE__*/React.createElement("p", null, data.name), data.mobileNumber && /*#__PURE__*/React.createElement(TelePhone, {
+  if (!data) return null;
+  const hasComments = (data === null || data === void 0 ? void 0 : (_data$wfComment = data.wfComment) === null || _data$wfComment === void 0 ? void 0 : _data$wfComment.length) > 0;
+  const hasThumbs = (data === null || data === void 0 ? void 0 : (_data$thumbnailsToSho = data.thumbnailsToShow) === null || _data$thumbnailsToSho === void 0 ? void 0 : (_data$thumbnailsToSho2 = _data$thumbnailsToSho.thumbs) === null || _data$thumbnailsToSho2 === void 0 ? void 0 : _data$thumbnailsToSho2.length) > 0;
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      flexDirection: "column",
+      gap: "4px"
+    }
+  }, data.date && /*#__PURE__*/React.createElement(MetaRow, {
+    icon: "\uD83D\uDD50"
+  }, typeof data.date === "number" ? (() => {
+    try {
+      return Digit.DateUtils.ConvertTimestampToDate(data.date);
+    } catch (_unused) {
+      return null;
+    }
+  })() : data.date), data.name && /*#__PURE__*/React.createElement(MetaRow, {
+    icon: "\uD83D\uDC64"
+  }, data.name), data.mobileNumber && /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      alignItems: "center",
+      gap: "7px",
+      marginBottom: "6px"
+    }
+  }, /*#__PURE__*/React.createElement("span", {
+    style: {
+      fontSize: "14px",
+      opacity: 0.6
+    }
+  }, "\uD83D\uDCDE"), /*#__PURE__*/React.createElement("span", {
+    style: {
+      fontSize: "12px",
+      color: TOKEN.textSec
+    }
+  }, /*#__PURE__*/React.createElement(TelePhone, {
     mobile: data.mobileNumber
-  }), data.source && /*#__PURE__*/React.createElement("p", null, t("ES_APPLICATION_DETAILS_APPLICATION_CHANNEL_" + data.source.toUpperCase())), data.comment && /*#__PURE__*/React.createElement(Reason, {
-    otherComment: data === null || data === void 0 ? void 0 : data.otherComment,
-    headComment: data === null || data === void 0 ? void 0 : data.comment
-  }), data !== null && data !== void 0 && data.wfComment ? /*#__PURE__*/React.createElement("div", null, data === null || data === void 0 ? void 0 : (_data$wfComment = data.wfComment) === null || _data$wfComment === void 0 ? void 0 : _data$wfComment.map(e => /*#__PURE__*/React.createElement("div", {
-    className: "TLComments"
-  }, /*#__PURE__*/React.createElement("h3", null, t("WF_COMMON_COMMENTS")), /*#__PURE__*/React.createElement("p", {
+  }))), data.source && /*#__PURE__*/React.createElement(MetaRow, {
+    icon: "\uD83D\uDCE1"
+  }, t("ES_APPLICATION_DETAILS_APPLICATION_CHANNEL_" + data.source.toUpperCase())), data.comment && /*#__PURE__*/React.createElement("p", {
     style: {
-      overflowX: "scroll"
+      margin: "0 0 6px",
+      fontSize: "12px",
+      color: TOKEN.textSec
     }
-  }, e)))) : null, (data === null || data === void 0 ? void 0 : (_data$thumbnailsToSho = data.thumbnailsToShow) === null || _data$thumbnailsToSho === void 0 ? void 0 : (_data$thumbnailsToSho2 = _data$thumbnailsToSho.thumbs) === null || _data$thumbnailsToSho2 === void 0 ? void 0 : _data$thumbnailsToSho2.length) > 0 ? /*#__PURE__*/React.createElement("div", {
-    className: "TLComments"
-  }, /*#__PURE__*/React.createElement("h3", null, t("CS_COMMON_ATTACHMENTS")), /*#__PURE__*/React.createElement(DisplayPhotos, {
-    srcs: data === null || data === void 0 ? void 0 : data.thumbnailsToShow.thumbs,
-    onClick: (src, index) => {
-      OpenImage(src, index, data === null || data === void 0 ? void 0 : data.thumbnailsToShow);
+  }, data.comment), hasComments && /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: "8px"
     }
-  })) : null);
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      alignItems: "center",
+      gap: "6px",
+      marginBottom: "6px"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: "3px",
+      height: "14px",
+      borderRadius: "2px",
+      background: TOKEN.active,
+      flexShrink: 0
+    }
+  }), /*#__PURE__*/React.createElement("span", {
+    style: {
+      fontSize: "11px",
+      fontWeight: 700,
+      letterSpacing: "0.07em",
+      textTransform: "uppercase",
+      color: TOKEN.active
+    }
+  }, t("WF_COMMON_COMMENTS"))), data.wfComment.map((comment, i) => /*#__PURE__*/React.createElement("div", {
+    key: i,
+    style: {
+      position: "relative",
+      background: TOKEN.quote,
+      border: "1px solid " + TOKEN.border,
+      borderLeft: "3px solid " + TOKEN.active,
+      borderRadius: "0 8px 8px 0",
+      padding: "8px 12px",
+      marginBottom: "6px",
+      overflowX: "auto"
+    }
+  }, /*#__PURE__*/React.createElement("span", {
+    style: {
+      position: "absolute",
+      top: "4px",
+      left: "6px",
+      fontSize: "22px",
+      opacity: 0.15,
+      lineHeight: 1,
+      color: TOKEN.active,
+      userSelect: "none"
+    }
+  }, "\""), /*#__PURE__*/React.createElement("p", {
+    style: {
+      margin: "0",
+      fontSize: "12px",
+      color: TOKEN.textPri,
+      lineHeight: "1.6",
+      paddingLeft: "8px",
+      wordBreak: "break-word"
+    }
+  }, comment)))), hasThumbs && /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: "10px"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      alignItems: "center",
+      gap: "6px",
+      marginBottom: "8px"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: "3px",
+      height: "14px",
+      borderRadius: "2px",
+      background: "#ff9800",
+      flexShrink: 0
+    }
+  }), /*#__PURE__*/React.createElement("span", {
+    style: {
+      fontSize: "11px",
+      fontWeight: 700,
+      letterSpacing: "0.07em",
+      textTransform: "uppercase",
+      color: "#ff9800"
+    }
+  }, t("CS_COMMON_ATTACHMENTS"))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      background: TOKEN.surface,
+      border: "1px solid " + TOKEN.border,
+      borderRadius: "8px",
+      padding: "8px"
+    }
+  }, /*#__PURE__*/React.createElement(DisplayPhotos, {
+    srcs: data.thumbnailsToShow.thumbs,
+    onClick: (src, index) => OpenImage === null || OpenImage === void 0 ? void 0 : OpenImage(src, index, data.thumbnailsToShow)
+  }))));
 };
 
+const safeDate = ts => {
+  if (!ts || isNaN(Number(ts)) || Number(ts) <= 0) return null;
+  try {
+    return Digit.DateUtils.ConvertTimestampToDate(Number(ts));
+  } catch (_unused) {
+    return null;
+  }
+};
+const TOKEN$1 = {
+  surface: "#f8faff",
+  surfaceHov: "#eef4ff",
+  border: "#dde4f0",
+  borderAct: "#0284c7",
+  active: "#0284c7",
+  done: "#16a34a",
+  textPri: "#1e293b",
+  textSec: "#475569",
+  textMut: "#94a3b8",
+  accent: "linear-gradient(135deg,#7c3aed,#0284c7)"
+};
+const StatusPill = _ref => {
+  let label = _ref.label,
+    isActive = _ref.isActive;
+  return /*#__PURE__*/React.createElement("span", {
+    style: {
+      display: "inline-block",
+      fontSize: "10px",
+      fontWeight: 700,
+      letterSpacing: "0.06em",
+      textTransform: "uppercase",
+      padding: "2px 10px",
+      borderRadius: "999px",
+      background: isActive ? "rgba(0,195,255,0.15)" : "rgba(0,230,118,0.12)",
+      color: isActive ? TOKEN$1.active : TOKEN$1.done,
+      border: "1px solid " + (isActive ? TOKEN$1.active : TOKEN$1.done),
+      lineHeight: "18px"
+    }
+  }, label);
+};
+const StepCard = _ref2 => {
+  var _checkpoint$auditDeta, _checkpoint$auditDeta2;
+  let checkpoint = _ref2.checkpoint,
+    isActive = _ref2.isActive,
+    t = _ref2.t,
+    getTimelineCaptions = _ref2.getTimelineCaptions;
+  const _useState = useState(isActive),
+    expanded = _useState[0],
+    setExpanded = _useState[1];
+  const stateLabel = checkpoint.state ? t("CS_" + checkpoint.state) : "NA";
+  const dotColor = isActive ? TOKEN$1.active : TOKEN$1.done;
+  const glowColor = isActive ? "0 0 14px rgba(0,195,255,0.5)" : "0 0 10px rgba(0,230,118,0.35)";
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      gap: "0",
+      alignItems: "flex-start",
+      position: "relative"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      flexDirection: "column",
+      alignItems: "center",
+      width: "36px",
+      flexShrink: 0
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: "18px",
+      height: "18px",
+      borderRadius: "50%",
+      background: dotColor,
+      boxShadow: glowColor,
+      border: "2px solid " + dotColor,
+      zIndex: 1,
+      flexShrink: 0,
+      marginTop: "16px"
+    }
+  }), /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: "2px",
+      flex: 1,
+      minHeight: "24px",
+      background: "linear-gradient(to bottom, " + dotColor + ", " + TOKEN$1.border + ")",
+      marginTop: "2px"
+    }
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: 1,
+      marginLeft: "12px",
+      marginBottom: "16px",
+      borderRadius: "12px",
+      border: "1px solid " + (expanded ? TOKEN$1.borderAct : TOKEN$1.border),
+      background: TOKEN$1.surface,
+      boxShadow: expanded ? "0 2px 12px rgba(2,132,199,0.10)" : "0 1px 4px rgba(0,0,0,0.06)",
+      overflow: "hidden",
+      transition: "all 0.3s ease"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    onClick: () => setExpanded(v => !v),
+    style: {
+      padding: "12px 16px",
+      cursor: "pointer",
+      display: "flex",
+      justifyContent: "space-between",
+      alignItems: "center",
+      gap: "8px"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      flexDirection: "column",
+      gap: "4px"
+    }
+  }, /*#__PURE__*/React.createElement("span", {
+    style: {
+      fontWeight: 600,
+      fontSize: "13px",
+      color: TOKEN$1.textPri,
+      letterSpacing: "0.01em"
+    }
+  }, stateLabel), safeDate(checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$auditDeta = checkpoint.auditDetails) === null || _checkpoint$auditDeta === void 0 ? void 0 : _checkpoint$auditDeta.lastModified) && /*#__PURE__*/React.createElement("span", {
+    style: {
+      fontSize: "11px",
+      color: TOKEN$1.textSec
+    }
+  }, safeDate(checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$auditDeta2 = checkpoint.auditDetails) === null || _checkpoint$auditDeta2 === void 0 ? void 0 : _checkpoint$auditDeta2.lastModified))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      alignItems: "center",
+      gap: "8px",
+      flexShrink: 0
+    }
+  }, /*#__PURE__*/React.createElement(StatusPill, {
+    label: isActive ? "Active" : "Done",
+    isActive: isActive
+  }), /*#__PURE__*/React.createElement("span", {
+    style: {
+      color: TOKEN$1.textMut,
+      fontSize: "16px",
+      transform: expanded ? "rotate(180deg)" : "rotate(0deg)",
+      transition: "transform 0.25s",
+      lineHeight: 1,
+      userSelect: "none"
+    }
+  }, "\u25BE"))), expanded && /*#__PURE__*/React.createElement("div", {
+    style: {
+      padding: "0 16px 14px",
+      borderTop: "1px solid " + TOKEN$1.border,
+      background: "#fff"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      paddingTop: "12px"
+    }
+  }, getTimelineCaptions(checkpoint)))));
+};
+const ActionButton = _ref3 => {
+  let label = _ref3.label,
+    to = _ref3.to,
+    state = _ref3.state;
+  return /*#__PURE__*/React.createElement(Link, {
+    to: {
+      pathname: to,
+      state
+    }
+  }, /*#__PURE__*/React.createElement("button", {
+    style: {
+      width: "100%",
+      marginTop: "8px",
+      padding: "13px 20px",
+      borderRadius: "10px",
+      border: "none",
+      cursor: "pointer",
+      background: TOKEN$1.accent,
+      color: "#fff",
+      fontWeight: 700,
+      fontSize: "14px",
+      letterSpacing: "0.04em",
+      boxShadow: "0 4px 20px rgba(124,58,237,0.4)",
+      transition: "opacity 0.2s, transform 0.2s"
+    },
+    onMouseEnter: e => {
+      e.currentTarget.style.opacity = "0.88";
+      e.currentTarget.style.transform = "translateY(-1px)";
+    },
+    onMouseLeave: e => {
+      e.currentTarget.style.opacity = "1";
+      e.currentTarget.style.transform = "translateY(0)";
+    }
+  }, label));
+};
 const WSWFApplicationTimeline = props => {
-  var _props$application, _props$application2, _data$timeline, _data$timeline2, _data$timeline$, _data$timeline3;
+  var _props$application, _props$application2, _data$timeline, _data$timeline2, _data$timeline3, _data$timeline4;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const businessService = (_props$application = props.application) === null || _props$application === void 0 ? void 0 : _props$application.applicationNo.split("_")[0];
@@ -27664,9 +28030,9 @@ const WSWFApplicationTimeline = props => {
     }),
     isLoading = _Digit$Hooks$useWorkf.isLoading,
     data = _Digit$Hooks$useWorkf.data;
-  const _useState = useState(false),
-    showAllTimeline = _useState[0],
-    setShowAllTimeline = _useState[1];
+  const _useState2 = useState(true),
+    showAllTimeline = _useState2[0],
+    setShowAllTimeline = _useState2[1];
   function OpenImage(imageSource, index, thumbnailsToShow) {
     var _thumbnailsToShow$ful;
     window.open(thumbnailsToShow === null || thumbnailsToShow === void 0 ? void 0 : (_thumbnailsToShow$ful = thumbnailsToShow.fullImage) === null || _thumbnailsToShow$ful === void 0 ? void 0 : _thumbnailsToShow$ful[0], "_blank");
@@ -27675,7 +28041,7 @@ const WSWFApplicationTimeline = props => {
     if (checkpoint.state === "OPEN") {
       var _props$application3, _props$application3$a, _props$application4;
       const caption = {
-        date: Digit.DateUtils.ConvertTimestampToDate((_props$application3 = props.application) === null || _props$application3 === void 0 ? void 0 : (_props$application3$a = _props$application3.auditDetails) === null || _props$application3$a === void 0 ? void 0 : _props$application3$a.createdTime),
+        date: safeDate((_props$application3 = props.application) === null || _props$application3 === void 0 ? void 0 : (_props$application3$a = _props$application3.auditDetails) === null || _props$application3$a === void 0 ? void 0 : _props$application3$a.createdTime),
         source: ((_props$application4 = props.application) === null || _props$application4 === void 0 ? void 0 : _props$application4.channel) || ""
       };
       return /*#__PURE__*/React.createElement(WSWFCaption, {
@@ -27685,12 +28051,19 @@ const WSWFApplicationTimeline = props => {
       var _props$application5, _props$application6;
       return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Link, {
         to: "/digit-ui/citizen/commonpt/view-property?propertyId=" + (props === null || props === void 0 ? void 0 : (_props$application5 = props.application) === null || _props$application5 === void 0 ? void 0 : _props$application5.propertyId) + "&tenantId=" + (props === null || props === void 0 ? void 0 : (_props$application6 = props.application) === null || _props$application6 === void 0 ? void 0 : _props$application6.tenantId)
-      }, /*#__PURE__*/React.createElement(ActionLinks, null, t("PT_VIEW_PROPERTY_DETAILS"))));
+      }, /*#__PURE__*/React.createElement("span", {
+        style: {
+          color: TOKEN$1.active,
+          fontSize: "13px",
+          textDecoration: "underline",
+          cursor: "pointer"
+        }
+      }, t("PT_VIEW_PROPERTY_DETAILS"))));
     } else {
-      var _props$application7, _checkpoint$auditDeta, _checkpoint$assignes, _checkpoint$assignes$, _checkpoint$assignes2, _checkpoint$assignes3;
+      var _props$application7, _checkpoint$auditDeta3, _checkpoint$assignes, _checkpoint$assignes$, _checkpoint$assignes2, _checkpoint$assignes3;
       const caption = {
         source: ((_props$application7 = props.application) === null || _props$application7 === void 0 ? void 0 : _props$application7.channel) || "",
-        date: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$auditDeta = checkpoint.auditDetails) === null || _checkpoint$auditDeta === void 0 ? void 0 : _checkpoint$auditDeta.lastModified,
+        date: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$auditDeta3 = checkpoint.auditDetails) === null || _checkpoint$auditDeta3 === void 0 ? void 0 : _checkpoint$auditDeta3.lastModified,
         name: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$assignes = checkpoint.assignes) === null || _checkpoint$assignes === void 0 ? void 0 : (_checkpoint$assignes$ = _checkpoint$assignes[0]) === null || _checkpoint$assignes$ === void 0 ? void 0 : _checkpoint$assignes$.name,
         mobileNumber: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$assignes2 = checkpoint.assignes) === null || _checkpoint$assignes2 === void 0 ? void 0 : (_checkpoint$assignes3 = _checkpoint$assignes2[0]) === null || _checkpoint$assignes3 === void 0 ? void 0 : _checkpoint$assignes3.mobileNumber,
         comment: t(checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.comment),
@@ -27705,92 +28078,110 @@ const WSWFApplicationTimeline = props => {
   };
   const showNextActions = nextActions => {
     var _nextAction;
+    if (!(nextActions !== null && nextActions !== void 0 && nextActions.length)) return null;
     let nextAction = nextActions[0];
     const next = nextActions.map(action => action.action);
     if (next.includes("PAY") || next.includes("EDIT")) {
       let currentIndex = next.indexOf("EDIT") || next.indexOf("PAY");
-      currentIndex = currentIndex != -1 ? currentIndex : next.indexOf("PAY");
+      currentIndex = currentIndex !== -1 ? currentIndex : next.indexOf("PAY");
       nextAction = nextActions[currentIndex];
     }
     switch ((_nextAction = nextAction) === null || _nextAction === void 0 ? void 0 : _nextAction.action) {
       case "PAY":
-        {
-          if ((props === null || props === void 0 ? void 0 : props.paymentbuttonenabled) !== false) return /*#__PURE__*/React.createElement("div", {
-            style: {
-              marginTop: "1em",
-              bottom: "0px",
-              width: "100%",
-              marginBottom: "1.2em"
-            }
-          }, /*#__PURE__*/React.createElement(Link, {
-            to: {
-              pathname: "/digit-ui/citizen/payment/collect/" + businessService + "/" + props.id + "?consumerCode=" + props.id + "&&workflow=WNS",
-              state: {
-                tenantId: props.application.tenantId
-              }
-            }
-          }, /*#__PURE__*/React.createElement(SubmitBar, {
-            label: t("CS_APPLICATION_DETAILS_MAKE_PAYMENT")
-          })));
-          break;
-        }
-      case "EDIT":
-        return /*#__PURE__*/React.createElement("div", {
-          style: {
-            marginTop: "1em",
-            bottom: "0px",
-            width: "100%",
-            marginBottom: "1.2em"
+        if ((props === null || props === void 0 ? void 0 : props.paymentbuttonenabled) !== false) return /*#__PURE__*/React.createElement(ActionButton, {
+          label: t("CS_APPLICATION_DETAILS_MAKE_PAYMENT"),
+          to: "/digit-ui/citizen/payment/collect/" + businessService + "/" + props.id + "?consumerCode=" + props.id + "&&workflow=WNS",
+          state: {
+            tenantId: props.application.tenantId
           }
-        }, businessService != "PT.MUTATION" && /*#__PURE__*/React.createElement(Link, {
-          to: {
-            pathname: "/digit-ui/citizen/pt/property/edit-application/action=edit-" + businessService + "/" + props.id,
-            state: {
-              tenantId: props.application.tenantId
-            }
+        });
+        break;
+      case "EDIT":
+        return businessService !== "PT.MUTATION" ? /*#__PURE__*/React.createElement(ActionButton, {
+          label: t("CS_APPLICATION_DETAILS_EDIT"),
+          to: "/digit-ui/citizen/pt/property/edit-application/action=edit-" + businessService + "/" + props.id,
+          state: {
+            tenantId: props.application.tenantId
           }
-        }, /*#__PURE__*/React.createElement(SubmitBar, {
-          label: t("CS_APPLICATION_DETAILS_EDIT")
-        })));
+        }) : null;
       case "SUBMIT_FEEDBACK":
-        return /*#__PURE__*/React.createElement("div", {
-          style: {
-            marginTop: "24px"
-          }
-        }, /*#__PURE__*/React.createElement(Link, {
+        return /*#__PURE__*/React.createElement(ActionButton, {
+          label: t("CS_APPLICATION_DETAILS_RATE"),
           to: "/digit-ui/citizen/fsm/rate/" + props.id
-        }, /*#__PURE__*/React.createElement(SubmitBar, {
-          label: t("CS_APPLICATION_DETAILS_RATE")
-        })));
+        });
+      default:
+        return null;
     }
   };
-  if (isLoading) {
-    return /*#__PURE__*/React.createElement(Loader, null);
-  }
-  const toggleTimeline = () => {
-    setShowAllTimeline(prev => !prev);
-  };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !isLoading && /*#__PURE__*/React.createElement(Fragment$1, null, (data === null || data === void 0 ? void 0 : (_data$timeline = data.timeline) === null || _data$timeline === void 0 ? void 0 : _data$timeline.length) > 0 && /*#__PURE__*/React.createElement(CardSectionHeader, {
+  if (isLoading) return /*#__PURE__*/React.createElement(Loader, null);
+  const visibleTimeline = data !== null && data !== void 0 && data.timeline ? data.timeline.slice(0, showAllTimeline ? data.timeline.length : 2) : [];
+  return /*#__PURE__*/React.createElement(Fragment$1, null, !isLoading && /*#__PURE__*/React.createElement("div", {
     style: {
-      marginBottom: "16px"
+      fontFamily: "'Inter', system-ui, sans-serif"
     }
-  }, t("CS_APPLICATION_DETAILS_APPLICATION_TIMELINE")), data !== null && data !== void 0 && data.timeline && (data === null || data === void 0 ? void 0 : (_data$timeline2 = data.timeline) === null || _data$timeline2 === void 0 ? void 0 : _data$timeline2.length) === 1 ? /*#__PURE__*/React.createElement(CheckPoint, {
-    isCompleted: true,
-    label: t((data === null || data === void 0 ? void 0 : (_data$timeline$ = data.timeline[0]) === null || _data$timeline$ === void 0 ? void 0 : _data$timeline$.state) && "CS_" + data.timeline[0].state || "NA"),
-    customChild: getTimelineCaptions(data === null || data === void 0 ? void 0 : data.timeline[0])
-  }) : /*#__PURE__*/React.createElement(ConnectingCheckPoints, null, (data === null || data === void 0 ? void 0 : data.timeline) && (data === null || data === void 0 ? void 0 : data.timeline.slice(0, showAllTimeline ? data.timeline.length : 2).map((checkpoint, index, arr) => {
-    return /*#__PURE__*/React.createElement(React.Fragment, {
-      key: index
-    }, /*#__PURE__*/React.createElement(CheckPoint, {
-      keyValue: index,
-      isCompleted: index === 0,
-      label: checkpoint.state ? t("CS_" + checkpoint.state) : "NA",
-      customChild: getTimelineCaptions(checkpoint)
-    }));
-  }))), (data === null || data === void 0 ? void 0 : (_data$timeline3 = data.timeline) === null || _data$timeline3 === void 0 ? void 0 : _data$timeline3.length) > 2 && /*#__PURE__*/React.createElement(LinkButton, {
-    label: showAllTimeline ? t("COLLAPSE") : t("VIEW_TIMELINE"),
-    onClick: toggleTimeline
-  })), data && showNextActions(data === null || data === void 0 ? void 0 : data.nextActions));
+  }, (data === null || data === void 0 ? void 0 : (_data$timeline = data.timeline) === null || _data$timeline === void 0 ? void 0 : _data$timeline.length) > 0 && /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      alignItems: "center",
+      gap: "10px",
+      marginBottom: "20px"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: "4px",
+      height: "22px",
+      borderRadius: "2px",
+      background: TOKEN$1.accent,
+      flexShrink: 0
+    }
+  }), /*#__PURE__*/React.createElement("span", {
+    style: {
+      fontWeight: 700,
+      fontSize: "15px",
+      color: TOKEN$1.textPri,
+      letterSpacing: "0.02em"
+    }
+  }, t("CS_APPLICATION_DETAILS_APPLICATION_TIMELINE"))), (data === null || data === void 0 ? void 0 : (_data$timeline2 = data.timeline) === null || _data$timeline2 === void 0 ? void 0 : _data$timeline2.length) === 1 && /*#__PURE__*/React.createElement(StepCard, {
+    checkpoint: data.timeline[0],
+    index: 0,
+    isActive: true,
+    t: t,
+    getTimelineCaptions: getTimelineCaptions
+  }), (data === null || data === void 0 ? void 0 : (_data$timeline3 = data.timeline) === null || _data$timeline3 === void 0 ? void 0 : _data$timeline3.length) > 1 && /*#__PURE__*/React.createElement("div", {
+    style: {
+      position: "relative"
+    }
+  }, visibleTimeline.map((checkpoint, index) => /*#__PURE__*/React.createElement(StepCard, {
+    key: index,
+    checkpoint: checkpoint,
+    index: index,
+    isActive: index === 0,
+    t: t,
+    getTimelineCaptions: getTimelineCaptions
+  }))), (data === null || data === void 0 ? void 0 : (_data$timeline4 = data.timeline) === null || _data$timeline4 === void 0 ? void 0 : _data$timeline4.length) > 2 && /*#__PURE__*/React.createElement("div", {
+    onClick: () => setShowAllTimeline(prev => !prev),
+    style: {
+      marginTop: "4px",
+      marginBottom: "4px",
+      display: "inline-flex",
+      alignItems: "center",
+      gap: "6px",
+      cursor: "pointer",
+      fontSize: "12px",
+      fontWeight: 600,
+      color: TOKEN$1.active,
+      letterSpacing: "0.04em",
+      padding: "6px 0",
+      userSelect: "none"
+    }
+  }, /*#__PURE__*/React.createElement("span", {
+    style: {
+      display: "inline-block",
+      transform: showAllTimeline ? "rotate(180deg)" : "rotate(0deg)",
+      transition: "transform 0.25s",
+      lineHeight: 1
+    }
+  }, "\u25BE"), showAllTimeline ? t("COLLAPSE") : t("VIEW_TIMELINE")), data && showNextActions(data === null || data === void 0 ? void 0 : data.nextActions)));
 };
 
 function WSDocument(_ref) {
@@ -30141,7 +30532,7 @@ const getPath$3 = (path, params) => {
 };
 const getEditDetails = (waterResult, sewerageresult, t) => {
   if (waterResult) {
-    var _waterResult$connecti, _waterResult$connecti2, _waterResult$connecti3, _waterResult$connecti4, _waterResult$connecti5, _waterResult$connecti6, _waterResult$connecti7, _waterResult$connecti8, _waterResult$connecti9, _waterResult$connecti0, _waterResult$connecti1, _waterResult$connecti10, _waterResult$connecti11, _waterResult$connecti12, _waterResult$connecti13, _waterResult$connecti14, _waterResult$connecti15, _waterResult$connecti16, _waterResult$connecti17, _waterResult$connecti18, _waterResult$connecti19, _waterResult$connecti20, _waterResult$connecti21, _waterResult$connecti22, _waterResult$connecti23, _waterResult$connecti24, _waterResult$connecti25, _waterResult$connecti26, _waterResult$property, _waterResult$property2, _waterResult$property3, _waterResult$property4, _waterResult$property5, _waterResult$property6, _waterResult$property7, _waterResult$property8, _waterResult$property9, _waterResult$property0, _waterResult$property1, _waterResult$property10, _waterResult$property11, _waterResult$property12, _waterResult$property13, _waterResult$property14, _waterResult$property15, _waterResult$property16, _waterResult$property17, _waterResult$property18, _waterResult$property19, _waterResult$property20, _waterResult$property21, _waterResult$property22, _waterResult$property23, _waterResult$property24, _waterResult$property25, _waterResult$property26, _waterResult$property27, _waterResult$property28, _waterResult$connecti27, _waterResult$connecti28, _waterResult$connecti29, _waterResult$connecti30, _waterResult$connecti31, _waterResult$connecti32, _waterResult$applicat, _waterResult$addition, _waterResult$addition2, _waterResult$addition3, _waterResult$addition4, _waterResult$addition5, _waterResult$addition6, _waterResult$addition7, _waterResult$addition8, _waterResult$addition9, _waterResult$addition0, _waterResult$addition1, _waterResult$addition10, _waterResult$addition11, _waterResult$addition12, _waterResult$addition13, _waterResult$addition14, _waterResult$addition15, _waterResult$addition16, _waterResult$addition17, _waterResult$addition18, _waterResult$addition19, _waterResult$addition20, _waterResult$addition21, _waterResult$addition22, _waterResult$addition23, _waterResult$addition24;
+    var _waterResult$connecti, _waterResult$connecti2, _waterResult$connecti3, _waterResult$connecti4, _waterResult$connecti5, _waterResult$connecti6, _waterResult$connecti7, _waterResult$connecti8, _waterResult$connecti9, _waterResult$connecti0, _waterResult$connecti1, _waterResult$connecti10, _waterResult$connecti11, _waterResult$connecti12, _waterResult$connecti13, _waterResult$connecti14, _waterResult$connecti15, _waterResult$connecti16, _waterResult$connecti17, _waterResult$connecti18, _waterResult$connecti19, _waterResult$connecti20, _waterResult$connecti21, _waterResult$connecti22, _waterResult$connecti23, _waterResult$connecti24, _waterResult$connecti25, _waterResult$connecti26, _waterResult$connecti27, _waterResult$connecti28, _waterResult$connecti29, _waterResult$connecti30, _waterResult$connecti31, _waterResult$connecti32, _waterResult$property, _waterResult$property2, _waterResult$property3, _waterResult$property4, _waterResult$property5, _waterResult$property6, _waterResult$property7, _waterResult$property8, _waterResult$property9, _waterResult$property0, _waterResult$property1, _waterResult$property10, _waterResult$property11, _waterResult$property12, _waterResult$property13, _waterResult$property14, _waterResult$property15, _waterResult$property16, _waterResult$property17, _waterResult$property18, _waterResult$property19, _waterResult$property20, _waterResult$property21, _waterResult$property22, _waterResult$property23, _waterResult$property24, _waterResult$property25, _waterResult$property26, _waterResult$property27, _waterResult$property28, _waterResult$connecti33, _waterResult$connecti34, _waterResult$connecti35, _waterResult$connecti36, _waterResult$connecti37, _waterResult$connecti38, _waterResult$applicat, _waterResult$addition, _waterResult$addition2, _waterResult$addition3, _waterResult$addition4, _waterResult$addition5, _waterResult$addition6, _waterResult$addition7, _waterResult$addition8, _waterResult$addition9, _waterResult$addition0, _waterResult$addition1, _waterResult$addition10, _waterResult$addition11, _waterResult$addition12, _waterResult$addition13, _waterResult$addition14, _waterResult$addition15, _waterResult$addition16, _waterResult$addition17, _waterResult$addition18, _waterResult$addition19, _waterResult$addition20, _waterResult$addition21, _waterResult$addition22, _waterResult$addition23;
     waterResult.ConnectionHolderDetails = waterResult !== null && waterResult !== void 0 && waterResult.connectionHolders ? [_extends({}, waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti = waterResult.connectionHolders) === null || _waterResult$connecti === void 0 ? void 0 : _waterResult$connecti[0], {
       address: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti2 = waterResult.connectionHolders) === null || _waterResult$connecti2 === void 0 ? void 0 : (_waterResult$connecti3 = _waterResult$connecti2[0]) === null || _waterResult$connecti3 === void 0 ? void 0 : _waterResult$connecti3.correspondenceAddress,
       documentId: "",
@@ -30154,14 +30545,15 @@ const getEditDetails = (waterResult, sewerageresult, t) => {
       guardian: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti0 = waterResult.connectionHolders) === null || _waterResult$connecti0 === void 0 ? void 0 : (_waterResult$connecti1 = _waterResult$connecti0[0]) === null || _waterResult$connecti1 === void 0 ? void 0 : _waterResult$connecti1.fatherOrHusbandName,
       isOwnerSame: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti10 = waterResult.connectionHolders) === null || _waterResult$connecti10 === void 0 ? void 0 : _waterResult$connecti10.length) > 0 ? false : true,
       mobileNumber: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti11 = waterResult.connectionHolders) === null || _waterResult$connecti11 === void 0 ? void 0 : (_waterResult$connecti12 = _waterResult$connecti11[0]) === null || _waterResult$connecti12 === void 0 ? void 0 : _waterResult$connecti12.mobileNumber,
-      name: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti13 = waterResult.connectionHolders) === null || _waterResult$connecti13 === void 0 ? void 0 : (_waterResult$connecti14 = _waterResult$connecti13[0]) === null || _waterResult$connecti14 === void 0 ? void 0 : _waterResult$connecti14.name,
-      relationship: waterResult !== null && waterResult !== void 0 && (_waterResult$connecti15 = waterResult.connectionHolders) !== null && _waterResult$connecti15 !== void 0 && (_waterResult$connecti16 = _waterResult$connecti15[0]) !== null && _waterResult$connecti16 !== void 0 && _waterResult$connecti16.relationship ? {
-        code: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti17 = waterResult.connectionHolders) === null || _waterResult$connecti17 === void 0 ? void 0 : (_waterResult$connecti18 = _waterResult$connecti17[0]) === null || _waterResult$connecti18 === void 0 ? void 0 : _waterResult$connecti18.relationship,
-        i18nKey: "COMMON_MASTERS_OWNERTYPE_" + (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti19 = waterResult.connectionHolders) === null || _waterResult$connecti19 === void 0 ? void 0 : (_waterResult$connecti20 = _waterResult$connecti19[0]) === null || _waterResult$connecti20 === void 0 ? void 0 : _waterResult$connecti20.relationship)
+      isWatsappSameAsMobile: waterResult !== null && waterResult !== void 0 && (_waterResult$connecti13 = waterResult.connectionHolders) !== null && _waterResult$connecti13 !== void 0 && (_waterResult$connecti14 = _waterResult$connecti13[0]) !== null && _waterResult$connecti14 !== void 0 && _waterResult$connecti14.mobileNumber && (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti15 = waterResult.connectionHolders) === null || _waterResult$connecti15 === void 0 ? void 0 : (_waterResult$connecti16 = _waterResult$connecti15[0]) === null || _waterResult$connecti16 === void 0 ? void 0 : _waterResult$connecti16.mobileNumber) === (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti17 = waterResult.connectionHolders) === null || _waterResult$connecti17 === void 0 ? void 0 : (_waterResult$connecti18 = _waterResult$connecti17[0]) === null || _waterResult$connecti18 === void 0 ? void 0 : _waterResult$connecti18.watsAppMobileNumber) ? true : false,
+      name: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti19 = waterResult.connectionHolders) === null || _waterResult$connecti19 === void 0 ? void 0 : (_waterResult$connecti20 = _waterResult$connecti19[0]) === null || _waterResult$connecti20 === void 0 ? void 0 : _waterResult$connecti20.name,
+      relationship: waterResult !== null && waterResult !== void 0 && (_waterResult$connecti21 = waterResult.connectionHolders) !== null && _waterResult$connecti21 !== void 0 && (_waterResult$connecti22 = _waterResult$connecti21[0]) !== null && _waterResult$connecti22 !== void 0 && _waterResult$connecti22.relationship ? {
+        code: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti23 = waterResult.connectionHolders) === null || _waterResult$connecti23 === void 0 ? void 0 : (_waterResult$connecti24 = _waterResult$connecti23[0]) === null || _waterResult$connecti24 === void 0 ? void 0 : _waterResult$connecti24.relationship,
+        i18nKey: "COMMON_MASTERS_OWNERTYPE_" + (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti25 = waterResult.connectionHolders) === null || _waterResult$connecti25 === void 0 ? void 0 : (_waterResult$connecti26 = _waterResult$connecti25[0]) === null || _waterResult$connecti26 === void 0 ? void 0 : _waterResult$connecti26.relationship)
       } : null,
-      specialCategoryType: waterResult !== null && waterResult !== void 0 && (_waterResult$connecti21 = waterResult.connectionHolders) !== null && _waterResult$connecti21 !== void 0 && (_waterResult$connecti22 = _waterResult$connecti21[0]) !== null && _waterResult$connecti22 !== void 0 && _waterResult$connecti22.ownerType ? {
-        code: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti23 = waterResult.connectionHolders) === null || _waterResult$connecti23 === void 0 ? void 0 : (_waterResult$connecti24 = _waterResult$connecti23[0]) === null || _waterResult$connecti24 === void 0 ? void 0 : _waterResult$connecti24.ownerType,
-        i18nKey: "PROPERTYTAX_OWNERTYPE_" + (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti25 = waterResult.connectionHolders) === null || _waterResult$connecti25 === void 0 ? void 0 : (_waterResult$connecti26 = _waterResult$connecti25[0]) === null || _waterResult$connecti26 === void 0 ? void 0 : _waterResult$connecti26.ownerType)
+      specialCategoryType: waterResult !== null && waterResult !== void 0 && (_waterResult$connecti27 = waterResult.connectionHolders) !== null && _waterResult$connecti27 !== void 0 && (_waterResult$connecti28 = _waterResult$connecti27[0]) !== null && _waterResult$connecti28 !== void 0 && _waterResult$connecti28.ownerType ? {
+        code: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti29 = waterResult.connectionHolders) === null || _waterResult$connecti29 === void 0 ? void 0 : (_waterResult$connecti30 = _waterResult$connecti29[0]) === null || _waterResult$connecti30 === void 0 ? void 0 : _waterResult$connecti30.ownerType,
+        i18nKey: "PROPERTYTAX_OWNERTYPE_" + (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti31 = waterResult.connectionHolders) === null || _waterResult$connecti31 === void 0 ? void 0 : (_waterResult$connecti32 = _waterResult$connecti31[0]) === null || _waterResult$connecti32 === void 0 ? void 0 : _waterResult$connecti32.ownerType)
       } : ""
     })] : [{
       address: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$property = waterResult.property) === null || _waterResult$property === void 0 ? void 0 : (_waterResult$property2 = _waterResult$property.owners) === null || _waterResult$property2 === void 0 ? void 0 : (_waterResult$property3 = _waterResult$property2[0]) === null || _waterResult$property3 === void 0 ? void 0 : _waterResult$property3.correspondenceAddress,
@@ -30180,9 +30572,9 @@ const getEditDetails = (waterResult, sewerageresult, t) => {
         code: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$property23 = waterResult.property) === null || _waterResult$property23 === void 0 ? void 0 : (_waterResult$property24 = _waterResult$property23.owners) === null || _waterResult$property24 === void 0 ? void 0 : (_waterResult$property25 = _waterResult$property24[0]) === null || _waterResult$property25 === void 0 ? void 0 : _waterResult$property25.relationship,
         i18nKey: "COMMON_MASTERS_OWNERTYPE_" + (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$property26 = waterResult.property) === null || _waterResult$property26 === void 0 ? void 0 : (_waterResult$property27 = _waterResult$property26.owners) === null || _waterResult$property27 === void 0 ? void 0 : (_waterResult$property28 = _waterResult$property27[0]) === null || _waterResult$property28 === void 0 ? void 0 : _waterResult$property28.relationship)
       } : null,
-      specialCategoryType: waterResult !== null && waterResult !== void 0 && (_waterResult$connecti27 = waterResult.connectionHolders) !== null && _waterResult$connecti27 !== void 0 && (_waterResult$connecti28 = _waterResult$connecti27[0]) !== null && _waterResult$connecti28 !== void 0 && _waterResult$connecti28.ownerType ? {
-        code: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti29 = waterResult.connectionHolders) === null || _waterResult$connecti29 === void 0 ? void 0 : (_waterResult$connecti30 = _waterResult$connecti29[0]) === null || _waterResult$connecti30 === void 0 ? void 0 : _waterResult$connecti30.ownerType,
-        i18nKey: "PROPERTYTAX_OWNERTYPE_" + (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti31 = waterResult.connectionHolders) === null || _waterResult$connecti31 === void 0 ? void 0 : (_waterResult$connecti32 = _waterResult$connecti31[0]) === null || _waterResult$connecti32 === void 0 ? void 0 : _waterResult$connecti32.ownerType)
+      specialCategoryType: waterResult !== null && waterResult !== void 0 && (_waterResult$connecti33 = waterResult.connectionHolders) !== null && _waterResult$connecti33 !== void 0 && (_waterResult$connecti34 = _waterResult$connecti33[0]) !== null && _waterResult$connecti34 !== void 0 && _waterResult$connecti34.ownerType ? {
+        code: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti35 = waterResult.connectionHolders) === null || _waterResult$connecti35 === void 0 ? void 0 : (_waterResult$connecti36 = _waterResult$connecti35[0]) === null || _waterResult$connecti36 === void 0 ? void 0 : _waterResult$connecti36.ownerType,
+        i18nKey: "PROPERTYTAX_OWNERTYPE_" + (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$connecti37 = waterResult.connectionHolders) === null || _waterResult$connecti37 === void 0 ? void 0 : (_waterResult$connecti38 = _waterResult$connecti37[0]) === null || _waterResult$connecti38 === void 0 ? void 0 : _waterResult$connecti38.ownerType)
       } : ""
     }];
     waterResult.WaterConnectionResult = {
@@ -30194,8 +30586,8 @@ const getEditDetails = (waterResult, sewerageresult, t) => {
     waterResult.cptId = {
       id: waterResult === null || waterResult === void 0 ? void 0 : waterResult.propertyId
     };
-    waterResult.documents = {
-      documents: waterResult === null || waterResult === void 0 ? void 0 : waterResult.documents
+    waterResult.DocumentsRequired = {
+      documents: (waterResult === null || waterResult === void 0 ? void 0 : waterResult.documents) || []
     };
     waterResult.plumberPreference = {
       plumberPreference: {
@@ -30225,18 +30617,21 @@ const getEditDetails = (waterResult, sewerageresult, t) => {
         code: "WATER",
         i18nKey: "WS_APPLICATION_TYPE_WATER"
       },
-      connectionType: waterResult !== null && waterResult !== void 0 && (_waterResult$addition = waterResult.additionalDetails) !== null && _waterResult$addition !== void 0 && _waterResult$addition.connectionType ? {
-        code: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition2 = waterResult.additionalDetails) === null || _waterResult$addition2 === void 0 ? void 0 : _waterResult$addition2.connectionType,
-        i18nKey: "WS_CONNECTION_" + (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition3 = waterResult.additionalDetails) === null || _waterResult$addition3 === void 0 ? void 0 : _waterResult$addition3.connectionType)
+      connectionType: waterResult !== null && waterResult !== void 0 && waterResult.connectionType ? {
+        code: waterResult === null || waterResult === void 0 ? void 0 : waterResult.connectionType,
+        i18nKey: "WS_CONNECTION_" + (waterResult === null || waterResult === void 0 ? void 0 : waterResult.connectionType)
+      } : null,
+      waterDemandType: waterResult !== null && waterResult !== void 0 && (_waterResult$addition = waterResult.additionalDetails) !== null && _waterResult$addition !== void 0 && _waterResult$addition.waterDemandType ? {
+        code: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition2 = waterResult.additionalDetails) === null || _waterResult$addition2 === void 0 ? void 0 : _waterResult$addition2.waterDemandType,
+        i18nKey: "WS_WATER_DEMAND_" + (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition3 = waterResult.additionalDetails) === null || _waterResult$addition3 === void 0 ? void 0 : _waterResult$addition3.waterDemandType)
       } : null,
-      waterDemandType: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition4 = waterResult.additionalDetails) === null || _waterResult$addition4 === void 0 ? void 0 : _waterResult$addition4.waterDemandType) || null,
-      applicantType: waterResult !== null && waterResult !== void 0 && (_waterResult$addition5 = waterResult.additionalDetails) !== null && _waterResult$addition5 !== void 0 && _waterResult$addition5.applicantType ? {
-        code: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition6 = waterResult.additionalDetails) === null || _waterResult$addition6 === void 0 ? void 0 : _waterResult$addition6.applicantType,
-        i18nKey: "WS_APPLICANT_" + (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition7 = waterResult.additionalDetails) === null || _waterResult$addition7 === void 0 ? void 0 : _waterResult$addition7.applicantType)
+      applicantType: waterResult !== null && waterResult !== void 0 && (_waterResult$addition4 = waterResult.additionalDetails) !== null && _waterResult$addition4 !== void 0 && _waterResult$addition4.applicantType ? {
+        code: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition5 = waterResult.additionalDetails) === null || _waterResult$addition5 === void 0 ? void 0 : _waterResult$addition5.applicantType,
+        i18nKey: "WS_APPLICANT_" + (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition6 = waterResult.additionalDetails) === null || _waterResult$addition6 === void 0 ? void 0 : _waterResult$addition6.applicantType)
       } : null,
-      categoryType: waterResult !== null && waterResult !== void 0 && (_waterResult$addition8 = waterResult.additionalDetails) !== null && _waterResult$addition8 !== void 0 && _waterResult$addition8.categoryType ? {
-        code: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition9 = waterResult.additionalDetails) === null || _waterResult$addition9 === void 0 ? void 0 : _waterResult$addition9.categoryType,
-        i18nKey: "WS_CATEGORY_" + (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition0 = waterResult.additionalDetails) === null || _waterResult$addition0 === void 0 ? void 0 : _waterResult$addition0.categoryType)
+      categoryType: waterResult !== null && waterResult !== void 0 && (_waterResult$addition7 = waterResult.additionalDetails) !== null && _waterResult$addition7 !== void 0 && _waterResult$addition7.categoryType ? {
+        code: waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition8 = waterResult.additionalDetails) === null || _waterResult$addition8 === void 0 ? void 0 : _waterResult$addition8.categoryType,
+        i18nKey: "WS_CATEGORY_" + (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition9 = waterResult.additionalDetails) === null || _waterResult$addition9 === void 0 ? void 0 : _waterResult$addition9.categoryType)
       } : null,
       proposedPipeSize: waterResult !== null && waterResult !== void 0 && waterResult.proposedPipeSize ? {
         code: waterResult === null || waterResult === void 0 ? void 0 : waterResult.proposedPipeSize,
@@ -30246,21 +30641,21 @@ const getEditDetails = (waterResult, sewerageresult, t) => {
       proposedTaps: waterResult === null || waterResult === void 0 ? void 0 : waterResult.proposedTaps
     }];
     waterResult.bankDetails = {
-      bankName: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition1 = waterResult.additionalDetails) === null || _waterResult$addition1 === void 0 ? void 0 : _waterResult$addition1.bankName) || "",
-      bankBranchName: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition10 = waterResult.additionalDetails) === null || _waterResult$addition10 === void 0 ? void 0 : _waterResult$addition10.bankBranchName) || (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition11 = waterResult.additionalDetails) === null || _waterResult$addition11 === void 0 ? void 0 : _waterResult$addition11.branchName) || "",
-      ifscCode: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition12 = waterResult.additionalDetails) === null || _waterResult$addition12 === void 0 ? void 0 : _waterResult$addition12.ifscCode) || "",
-      accountNumber: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition13 = waterResult.additionalDetails) === null || _waterResult$addition13 === void 0 ? void 0 : _waterResult$addition13.bankAccountNumber) || (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition14 = waterResult.additionalDetails) === null || _waterResult$addition14 === void 0 ? void 0 : _waterResult$addition14.accountNumber) || "",
-      confirmAccountNumber: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition15 = waterResult.additionalDetails) === null || _waterResult$addition15 === void 0 ? void 0 : _waterResult$addition15.confirmAccountNumber) || (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition16 = waterResult.additionalDetails) === null || _waterResult$addition16 === void 0 ? void 0 : _waterResult$addition16.bankAccountNumber) || (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition17 = waterResult.additionalDetails) === null || _waterResult$addition17 === void 0 ? void 0 : _waterResult$addition17.accountNumber) || "",
-      accountHolderName: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition18 = waterResult.additionalDetails) === null || _waterResult$addition18 === void 0 ? void 0 : _waterResult$addition18.accountHolderName) || (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition19 = waterResult.additionalDetails) === null || _waterResult$addition19 === void 0 ? void 0 : _waterResult$addition19.ownerName) || ""
+      bankName: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition0 = waterResult.additionalDetails) === null || _waterResult$addition0 === void 0 ? void 0 : _waterResult$addition0.bankName) || "",
+      bankBranchName: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition1 = waterResult.additionalDetails) === null || _waterResult$addition1 === void 0 ? void 0 : _waterResult$addition1.bankBranchName) || (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition10 = waterResult.additionalDetails) === null || _waterResult$addition10 === void 0 ? void 0 : _waterResult$addition10.branchName) || "",
+      ifscCode: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition11 = waterResult.additionalDetails) === null || _waterResult$addition11 === void 0 ? void 0 : _waterResult$addition11.ifscCode) || "",
+      accountNumber: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition12 = waterResult.additionalDetails) === null || _waterResult$addition12 === void 0 ? void 0 : _waterResult$addition12.bankAccountNumber) || (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition13 = waterResult.additionalDetails) === null || _waterResult$addition13 === void 0 ? void 0 : _waterResult$addition13.accountNumber) || "",
+      confirmAccountNumber: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition14 = waterResult.additionalDetails) === null || _waterResult$addition14 === void 0 ? void 0 : _waterResult$addition14.confirmAccountNumber) || (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition15 = waterResult.additionalDetails) === null || _waterResult$addition15 === void 0 ? void 0 : _waterResult$addition15.bankAccountNumber) || (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition16 = waterResult.additionalDetails) === null || _waterResult$addition16 === void 0 ? void 0 : _waterResult$addition16.accountNumber) || "",
+      accountHolderName: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition17 = waterResult.additionalDetails) === null || _waterResult$addition17 === void 0 ? void 0 : _waterResult$addition17.accountHolderName) || (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition18 = waterResult.additionalDetails) === null || _waterResult$addition18 === void 0 ? void 0 : _waterResult$addition18.ownerName) || ""
     };
     waterResult.djbEmployee = {
-      isDjbEmployee: String(waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition20 = waterResult.additionalDetails) === null || _waterResult$addition20 === void 0 ? void 0 : _waterResult$addition20.isDjbEmployee) === "true",
-      employeeId: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition21 = waterResult.additionalDetails) === null || _waterResult$addition21 === void 0 ? void 0 : _waterResult$addition21.employeeId) || "",
-      designation: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition22 = waterResult.additionalDetails) === null || _waterResult$addition22 === void 0 ? void 0 : _waterResult$addition22.designation) || "",
-      dor: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition23 = waterResult.additionalDetails) === null || _waterResult$addition23 === void 0 ? void 0 : _waterResult$addition23.dor) || (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition24 = waterResult.additionalDetails) === null || _waterResult$addition24 === void 0 ? void 0 : _waterResult$addition24.dorDate) || ""
+      isDjbEmployee: String(waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition19 = waterResult.additionalDetails) === null || _waterResult$addition19 === void 0 ? void 0 : _waterResult$addition19.isDjbEmployee) === "true",
+      employeeId: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition20 = waterResult.additionalDetails) === null || _waterResult$addition20 === void 0 ? void 0 : _waterResult$addition20.employeeId) || "",
+      designation: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition21 = waterResult.additionalDetails) === null || _waterResult$addition21 === void 0 ? void 0 : _waterResult$addition21.designation) || "",
+      dor: (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition22 = waterResult.additionalDetails) === null || _waterResult$addition22 === void 0 ? void 0 : _waterResult$addition22.dor) || (waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$addition23 = waterResult.additionalDetails) === null || _waterResult$addition23 === void 0 ? void 0 : _waterResult$addition23.dorDate) || ""
     };
   } else if (sewerageresult) {
-    var _sewerageresult$conne, _sewerageresult$conne2, _sewerageresult$conne3, _sewerageresult$conne4, _sewerageresult$conne5, _sewerageresult$conne6, _sewerageresult$conne7, _sewerageresult$conne8, _sewerageresult$conne9, _sewerageresult$conne0, _sewerageresult$conne1, _sewerageresult$conne10, _sewerageresult$conne11, _sewerageresult$conne12, _sewerageresult$conne13, _sewerageresult$conne14, _sewerageresult$conne15, _sewerageresult$conne16, _sewerageresult$conne17, _sewerageresult$conne18, _sewerageresult$conne19, _sewerageresult$conne20, _sewerageresult$conne21, _sewerageresult$conne22, _sewerageresult$conne23, _sewerageresult$conne24, _sewerageresult$conne25, _sewerageresult$conne26, _sewerageresult$prope, _sewerageresult$prope2, _sewerageresult$prope3, _sewerageresult$prope4, _sewerageresult$prope5, _sewerageresult$prope6, _sewerageresult$prope7, _sewerageresult$prope8, _sewerageresult$prope9, _sewerageresult$prope0, _sewerageresult$prope1, _sewerageresult$prope10, _sewerageresult$prope11, _sewerageresult$prope12, _sewerageresult$prope13, _sewerageresult$prope14, _sewerageresult$prope15, _sewerageresult$prope16, _sewerageresult$prope17, _sewerageresult$prope18, _sewerageresult$prope19, _sewerageresult$prope20, _sewerageresult$prope21, _sewerageresult$prope22, _sewerageresult$prope23, _sewerageresult$prope24, _sewerageresult$prope25, _sewerageresult$prope26, _sewerageresult$prope27, _sewerageresult$prope28, _sewerageresult$conne27, _sewerageresult$conne28, _sewerageresult$conne29, _sewerageresult$conne30, _sewerageresult$conne31, _sewerageresult$conne32, _sewerageresult$addit, _sewerageresult$addit2, _sewerageresult$addit3, _sewerageresult$addit4, _sewerageresult$addit5, _sewerageresult$addit6, _sewerageresult$addit7, _sewerageresult$addit8, _sewerageresult$addit9, _sewerageresult$addit0, _sewerageresult$addit1, _sewerageresult$addit10, _sewerageresult$addit11, _sewerageresult$addit12, _sewerageresult$addit13, _sewerageresult$addit14, _sewerageresult$addit15, _sewerageresult$addit16, _sewerageresult$addit17, _sewerageresult$addit18, _sewerageresult$addit19, _sewerageresult$addit20, _sewerageresult$addit21, _sewerageresult$addit22, _sewerageresult$addit23, _sewerageresult$addit24;
+    var _sewerageresult$conne, _sewerageresult$conne2, _sewerageresult$conne3, _sewerageresult$conne4, _sewerageresult$conne5, _sewerageresult$conne6, _sewerageresult$conne7, _sewerageresult$conne8, _sewerageresult$conne9, _sewerageresult$conne0, _sewerageresult$conne1, _sewerageresult$conne10, _sewerageresult$conne11, _sewerageresult$conne12, _sewerageresult$conne13, _sewerageresult$conne14, _sewerageresult$conne15, _sewerageresult$conne16, _sewerageresult$conne17, _sewerageresult$conne18, _sewerageresult$conne19, _sewerageresult$conne20, _sewerageresult$conne21, _sewerageresult$conne22, _sewerageresult$conne23, _sewerageresult$conne24, _sewerageresult$conne25, _sewerageresult$conne26, _sewerageresult$conne27, _sewerageresult$conne28, _sewerageresult$conne29, _sewerageresult$conne30, _sewerageresult$conne31, _sewerageresult$conne32, _sewerageresult$prope, _sewerageresult$prope2, _sewerageresult$prope3, _sewerageresult$prope4, _sewerageresult$prope5, _sewerageresult$prope6, _sewerageresult$prope7, _sewerageresult$prope8, _sewerageresult$prope9, _sewerageresult$prope0, _sewerageresult$prope1, _sewerageresult$prope10, _sewerageresult$prope11, _sewerageresult$prope12, _sewerageresult$prope13, _sewerageresult$prope14, _sewerageresult$prope15, _sewerageresult$prope16, _sewerageresult$prope17, _sewerageresult$prope18, _sewerageresult$prope19, _sewerageresult$prope20, _sewerageresult$prope21, _sewerageresult$prope22, _sewerageresult$prope23, _sewerageresult$prope24, _sewerageresult$prope25, _sewerageresult$prope26, _sewerageresult$prope27, _sewerageresult$prope28, _sewerageresult$conne33, _sewerageresult$conne34, _sewerageresult$conne35, _sewerageresult$conne36, _sewerageresult$conne37, _sewerageresult$conne38, _sewerageresult$addit, _sewerageresult$addit2, _sewerageresult$addit3, _sewerageresult$addit4, _sewerageresult$addit5, _sewerageresult$addit6, _sewerageresult$addit7, _sewerageresult$addit8, _sewerageresult$addit9, _sewerageresult$addit0, _sewerageresult$addit1, _sewerageresult$addit10, _sewerageresult$addit11, _sewerageresult$addit12, _sewerageresult$addit13, _sewerageresult$addit14, _sewerageresult$addit15, _sewerageresult$addit16, _sewerageresult$addit17, _sewerageresult$addit18, _sewerageresult$addit19, _sewerageresult$addit20, _sewerageresult$addit21, _sewerageresult$addit22, _sewerageresult$addit23;
     sewerageresult.ConnectionHolderDetails = sewerageresult !== null && sewerageresult !== void 0 && sewerageresult.connectionHolders ? [_extends({}, sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne = sewerageresult.connectionHolders) === null || _sewerageresult$conne === void 0 ? void 0 : _sewerageresult$conne[0], {
       address: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne2 = sewerageresult.connectionHolders) === null || _sewerageresult$conne2 === void 0 ? void 0 : (_sewerageresult$conne3 = _sewerageresult$conne2[0]) === null || _sewerageresult$conne3 === void 0 ? void 0 : _sewerageresult$conne3.correspondenceAddress,
       documentId: "",
@@ -30273,14 +30668,15 @@ const getEditDetails = (waterResult, sewerageresult, t) => {
       guardian: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne0 = sewerageresult.connectionHolders) === null || _sewerageresult$conne0 === void 0 ? void 0 : (_sewerageresult$conne1 = _sewerageresult$conne0[0]) === null || _sewerageresult$conne1 === void 0 ? void 0 : _sewerageresult$conne1.fatherOrHusbandName,
       isOwnerSame: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne10 = sewerageresult.connectionHolders) === null || _sewerageresult$conne10 === void 0 ? void 0 : _sewerageresult$conne10.length) > 0 ? false : true,
       mobileNumber: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne11 = sewerageresult.connectionHolders) === null || _sewerageresult$conne11 === void 0 ? void 0 : (_sewerageresult$conne12 = _sewerageresult$conne11[0]) === null || _sewerageresult$conne12 === void 0 ? void 0 : _sewerageresult$conne12.mobileNumber,
-      name: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne13 = sewerageresult.connectionHolders) === null || _sewerageresult$conne13 === void 0 ? void 0 : (_sewerageresult$conne14 = _sewerageresult$conne13[0]) === null || _sewerageresult$conne14 === void 0 ? void 0 : _sewerageresult$conne14.name,
-      relationship: sewerageresult !== null && sewerageresult !== void 0 && (_sewerageresult$conne15 = sewerageresult.connectionHolders) !== null && _sewerageresult$conne15 !== void 0 && (_sewerageresult$conne16 = _sewerageresult$conne15[0]) !== null && _sewerageresult$conne16 !== void 0 && _sewerageresult$conne16.relationship ? {
-        code: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne17 = sewerageresult.connectionHolders) === null || _sewerageresult$conne17 === void 0 ? void 0 : (_sewerageresult$conne18 = _sewerageresult$conne17[0]) === null || _sewerageresult$conne18 === void 0 ? void 0 : _sewerageresult$conne18.relationship,
-        i18nKey: "COMMON_MASTERS_OWNERTYPE_" + (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne19 = sewerageresult.connectionHolders) === null || _sewerageresult$conne19 === void 0 ? void 0 : (_sewerageresult$conne20 = _sewerageresult$conne19[0]) === null || _sewerageresult$conne20 === void 0 ? void 0 : _sewerageresult$conne20.relationship)
+      isWatsappSameAsMobile: sewerageresult !== null && sewerageresult !== void 0 && (_sewerageresult$conne13 = sewerageresult.connectionHolders) !== null && _sewerageresult$conne13 !== void 0 && (_sewerageresult$conne14 = _sewerageresult$conne13[0]) !== null && _sewerageresult$conne14 !== void 0 && _sewerageresult$conne14.mobileNumber && (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne15 = sewerageresult.connectionHolders) === null || _sewerageresult$conne15 === void 0 ? void 0 : (_sewerageresult$conne16 = _sewerageresult$conne15[0]) === null || _sewerageresult$conne16 === void 0 ? void 0 : _sewerageresult$conne16.mobileNumber) === (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne17 = sewerageresult.connectionHolders) === null || _sewerageresult$conne17 === void 0 ? void 0 : (_sewerageresult$conne18 = _sewerageresult$conne17[0]) === null || _sewerageresult$conne18 === void 0 ? void 0 : _sewerageresult$conne18.watsAppMobileNumber) ? true : false,
+      name: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne19 = sewerageresult.connectionHolders) === null || _sewerageresult$conne19 === void 0 ? void 0 : (_sewerageresult$conne20 = _sewerageresult$conne19[0]) === null || _sewerageresult$conne20 === void 0 ? void 0 : _sewerageresult$conne20.name,
+      relationship: sewerageresult !== null && sewerageresult !== void 0 && (_sewerageresult$conne21 = sewerageresult.connectionHolders) !== null && _sewerageresult$conne21 !== void 0 && (_sewerageresult$conne22 = _sewerageresult$conne21[0]) !== null && _sewerageresult$conne22 !== void 0 && _sewerageresult$conne22.relationship ? {
+        code: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne23 = sewerageresult.connectionHolders) === null || _sewerageresult$conne23 === void 0 ? void 0 : (_sewerageresult$conne24 = _sewerageresult$conne23[0]) === null || _sewerageresult$conne24 === void 0 ? void 0 : _sewerageresult$conne24.relationship,
+        i18nKey: "COMMON_MASTERS_OWNERTYPE_" + (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne25 = sewerageresult.connectionHolders) === null || _sewerageresult$conne25 === void 0 ? void 0 : (_sewerageresult$conne26 = _sewerageresult$conne25[0]) === null || _sewerageresult$conne26 === void 0 ? void 0 : _sewerageresult$conne26.relationship)
       } : null,
-      specialCategoryType: sewerageresult !== null && sewerageresult !== void 0 && (_sewerageresult$conne21 = sewerageresult.connectionHolders) !== null && _sewerageresult$conne21 !== void 0 && (_sewerageresult$conne22 = _sewerageresult$conne21[0]) !== null && _sewerageresult$conne22 !== void 0 && _sewerageresult$conne22.ownerType ? {
-        code: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne23 = sewerageresult.connectionHolders) === null || _sewerageresult$conne23 === void 0 ? void 0 : (_sewerageresult$conne24 = _sewerageresult$conne23[0]) === null || _sewerageresult$conne24 === void 0 ? void 0 : _sewerageresult$conne24.ownerType,
-        i18nKey: "PROPERTYTAX_OWNERTYPE_" + (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne25 = sewerageresult.connectionHolders) === null || _sewerageresult$conne25 === void 0 ? void 0 : (_sewerageresult$conne26 = _sewerageresult$conne25[0]) === null || _sewerageresult$conne26 === void 0 ? void 0 : _sewerageresult$conne26.ownerType)
+      specialCategoryType: sewerageresult !== null && sewerageresult !== void 0 && (_sewerageresult$conne27 = sewerageresult.connectionHolders) !== null && _sewerageresult$conne27 !== void 0 && (_sewerageresult$conne28 = _sewerageresult$conne27[0]) !== null && _sewerageresult$conne28 !== void 0 && _sewerageresult$conne28.ownerType ? {
+        code: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne29 = sewerageresult.connectionHolders) === null || _sewerageresult$conne29 === void 0 ? void 0 : (_sewerageresult$conne30 = _sewerageresult$conne29[0]) === null || _sewerageresult$conne30 === void 0 ? void 0 : _sewerageresult$conne30.ownerType,
+        i18nKey: "PROPERTYTAX_OWNERTYPE_" + (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne31 = sewerageresult.connectionHolders) === null || _sewerageresult$conne31 === void 0 ? void 0 : (_sewerageresult$conne32 = _sewerageresult$conne31[0]) === null || _sewerageresult$conne32 === void 0 ? void 0 : _sewerageresult$conne32.ownerType)
       } : ""
     })] : [{
       address: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$prope = sewerageresult.property) === null || _sewerageresult$prope === void 0 ? void 0 : (_sewerageresult$prope2 = _sewerageresult$prope.owners) === null || _sewerageresult$prope2 === void 0 ? void 0 : (_sewerageresult$prope3 = _sewerageresult$prope2[0]) === null || _sewerageresult$prope3 === void 0 ? void 0 : _sewerageresult$prope3.correspondenceAddress,
@@ -30299,9 +30695,9 @@ const getEditDetails = (waterResult, sewerageresult, t) => {
         code: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$prope23 = sewerageresult.property) === null || _sewerageresult$prope23 === void 0 ? void 0 : (_sewerageresult$prope24 = _sewerageresult$prope23.owners) === null || _sewerageresult$prope24 === void 0 ? void 0 : (_sewerageresult$prope25 = _sewerageresult$prope24[0]) === null || _sewerageresult$prope25 === void 0 ? void 0 : _sewerageresult$prope25.relationship,
         i18nKey: "COMMON_MASTERS_OWNERTYPE_" + (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$prope26 = sewerageresult.property) === null || _sewerageresult$prope26 === void 0 ? void 0 : (_sewerageresult$prope27 = _sewerageresult$prope26.owners) === null || _sewerageresult$prope27 === void 0 ? void 0 : (_sewerageresult$prope28 = _sewerageresult$prope27[0]) === null || _sewerageresult$prope28 === void 0 ? void 0 : _sewerageresult$prope28.relationship)
       } : null,
-      specialCategoryType: sewerageresult !== null && sewerageresult !== void 0 && (_sewerageresult$conne27 = sewerageresult.connectionHolders) !== null && _sewerageresult$conne27 !== void 0 && (_sewerageresult$conne28 = _sewerageresult$conne27[0]) !== null && _sewerageresult$conne28 !== void 0 && _sewerageresult$conne28.ownerType ? {
-        code: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne29 = sewerageresult.connectionHolders) === null || _sewerageresult$conne29 === void 0 ? void 0 : (_sewerageresult$conne30 = _sewerageresult$conne29[0]) === null || _sewerageresult$conne30 === void 0 ? void 0 : _sewerageresult$conne30.ownerType,
-        i18nKey: "PROPERTYTAX_OWNERTYPE_" + (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne31 = sewerageresult.connectionHolders) === null || _sewerageresult$conne31 === void 0 ? void 0 : (_sewerageresult$conne32 = _sewerageresult$conne31[0]) === null || _sewerageresult$conne32 === void 0 ? void 0 : _sewerageresult$conne32.ownerType)
+      specialCategoryType: sewerageresult !== null && sewerageresult !== void 0 && (_sewerageresult$conne33 = sewerageresult.connectionHolders) !== null && _sewerageresult$conne33 !== void 0 && (_sewerageresult$conne34 = _sewerageresult$conne33[0]) !== null && _sewerageresult$conne34 !== void 0 && _sewerageresult$conne34.ownerType ? {
+        code: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne35 = sewerageresult.connectionHolders) === null || _sewerageresult$conne35 === void 0 ? void 0 : (_sewerageresult$conne36 = _sewerageresult$conne35[0]) === null || _sewerageresult$conne36 === void 0 ? void 0 : _sewerageresult$conne36.ownerType,
+        i18nKey: "PROPERTYTAX_OWNERTYPE_" + (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$conne37 = sewerageresult.connectionHolders) === null || _sewerageresult$conne37 === void 0 ? void 0 : (_sewerageresult$conne38 = _sewerageresult$conne37[0]) === null || _sewerageresult$conne38 === void 0 ? void 0 : _sewerageresult$conne38.ownerType)
       } : ""
     }];
     sewerageresult.SewerageConnectionResult = {
@@ -30313,8 +30709,8 @@ const getEditDetails = (waterResult, sewerageresult, t) => {
     sewerageresult.cptId = {
       id: sewerageresult === null || sewerageresult === void 0 ? void 0 : sewerageresult.propertyId
     };
-    sewerageresult.documents = {
-      documents: [...(sewerageresult === null || sewerageresult === void 0 ? void 0 : sewerageresult.documents)]
+    sewerageresult.DocumentsRequired = {
+      documents: (sewerageresult === null || sewerageresult === void 0 ? void 0 : sewerageresult.documents) || []
     };
     sewerageresult.plumberPreference = {
       plumberPreference: {
@@ -30340,41 +30736,47 @@ const getEditDetails = (waterResult, sewerageresult, t) => {
         code: "SEWERAGE",
         i18nKey: "WS_APPLICATION_TYPE_SEWERAGE"
       },
-      connectionType: sewerageresult !== null && sewerageresult !== void 0 && (_sewerageresult$addit = sewerageresult.additionalDetails) !== null && _sewerageresult$addit !== void 0 && _sewerageresult$addit.connectionType ? {
-        code: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit2 = sewerageresult.additionalDetails) === null || _sewerageresult$addit2 === void 0 ? void 0 : _sewerageresult$addit2.connectionType,
-        i18nKey: "WS_CONNECTION_" + (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit3 = sewerageresult.additionalDetails) === null || _sewerageresult$addit3 === void 0 ? void 0 : _sewerageresult$addit3.connectionType)
+      connectionType: sewerageresult !== null && sewerageresult !== void 0 && sewerageresult.connectionType ? {
+        code: sewerageresult === null || sewerageresult === void 0 ? void 0 : sewerageresult.connectionType,
+        i18nKey: "WS_CONNECTION_" + (sewerageresult === null || sewerageresult === void 0 ? void 0 : sewerageresult.connectionType)
+      } : {
+        code: "Non Metered",
+        i18nKey: "WS_CONNECTION_Non Metered"
+      },
+      waterDemandType: sewerageresult !== null && sewerageresult !== void 0 && (_sewerageresult$addit = sewerageresult.additionalDetails) !== null && _sewerageresult$addit !== void 0 && _sewerageresult$addit.waterDemandType ? {
+        code: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit2 = sewerageresult.additionalDetails) === null || _sewerageresult$addit2 === void 0 ? void 0 : _sewerageresult$addit2.waterDemandType,
+        i18nKey: "WS_WATER_DEMAND_" + (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit3 = sewerageresult.additionalDetails) === null || _sewerageresult$addit3 === void 0 ? void 0 : _sewerageresult$addit3.waterDemandType)
       } : null,
-      waterDemandType: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit4 = sewerageresult.additionalDetails) === null || _sewerageresult$addit4 === void 0 ? void 0 : _sewerageresult$addit4.waterDemandType) || null,
-      applicantType: sewerageresult !== null && sewerageresult !== void 0 && (_sewerageresult$addit5 = sewerageresult.additionalDetails) !== null && _sewerageresult$addit5 !== void 0 && _sewerageresult$addit5.applicantType ? {
-        code: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit6 = sewerageresult.additionalDetails) === null || _sewerageresult$addit6 === void 0 ? void 0 : _sewerageresult$addit6.applicantType,
-        i18nKey: "WS_APPLICANT_" + (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit7 = sewerageresult.additionalDetails) === null || _sewerageresult$addit7 === void 0 ? void 0 : _sewerageresult$addit7.applicantType)
+      applicantType: sewerageresult !== null && sewerageresult !== void 0 && (_sewerageresult$addit4 = sewerageresult.additionalDetails) !== null && _sewerageresult$addit4 !== void 0 && _sewerageresult$addit4.applicantType ? {
+        code: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit5 = sewerageresult.additionalDetails) === null || _sewerageresult$addit5 === void 0 ? void 0 : _sewerageresult$addit5.applicantType,
+        i18nKey: "WS_APPLICANT_" + (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit6 = sewerageresult.additionalDetails) === null || _sewerageresult$addit6 === void 0 ? void 0 : _sewerageresult$addit6.applicantType)
       } : null,
-      categoryType: sewerageresult !== null && sewerageresult !== void 0 && (_sewerageresult$addit8 = sewerageresult.additionalDetails) !== null && _sewerageresult$addit8 !== void 0 && _sewerageresult$addit8.categoryType ? {
-        code: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit9 = sewerageresult.additionalDetails) === null || _sewerageresult$addit9 === void 0 ? void 0 : _sewerageresult$addit9.categoryType,
-        i18nKey: "WS_CATEGORY_" + (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit0 = sewerageresult.additionalDetails) === null || _sewerageresult$addit0 === void 0 ? void 0 : _sewerageresult$addit0.categoryType)
+      categoryType: sewerageresult !== null && sewerageresult !== void 0 && (_sewerageresult$addit7 = sewerageresult.additionalDetails) !== null && _sewerageresult$addit7 !== void 0 && _sewerageresult$addit7.categoryType ? {
+        code: sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit8 = sewerageresult.additionalDetails) === null || _sewerageresult$addit8 === void 0 ? void 0 : _sewerageresult$addit8.categoryType,
+        i18nKey: "WS_CATEGORY_" + (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit9 = sewerageresult.additionalDetails) === null || _sewerageresult$addit9 === void 0 ? void 0 : _sewerageresult$addit9.categoryType)
       } : null,
       proposedToilets: sewerageresult === null || sewerageresult === void 0 ? void 0 : sewerageresult.proposedToilets,
       proposedWaterClosets: sewerageresult === null || sewerageresult === void 0 ? void 0 : sewerageresult.proposedWaterClosets
     }];
     sewerageresult.bankDetails = {
-      bankName: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit1 = sewerageresult.additionalDetails) === null || _sewerageresult$addit1 === void 0 ? void 0 : _sewerageresult$addit1.bankName) || "",
-      bankBranchName: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit10 = sewerageresult.additionalDetails) === null || _sewerageresult$addit10 === void 0 ? void 0 : _sewerageresult$addit10.bankBranchName) || (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit11 = sewerageresult.additionalDetails) === null || _sewerageresult$addit11 === void 0 ? void 0 : _sewerageresult$addit11.branchName) || "",
-      ifscCode: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit12 = sewerageresult.additionalDetails) === null || _sewerageresult$addit12 === void 0 ? void 0 : _sewerageresult$addit12.ifscCode) || "",
-      accountNumber: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit13 = sewerageresult.additionalDetails) === null || _sewerageresult$addit13 === void 0 ? void 0 : _sewerageresult$addit13.bankAccountNumber) || (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit14 = sewerageresult.additionalDetails) === null || _sewerageresult$addit14 === void 0 ? void 0 : _sewerageresult$addit14.accountNumber) || "",
-      confirmAccountNumber: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit15 = sewerageresult.additionalDetails) === null || _sewerageresult$addit15 === void 0 ? void 0 : _sewerageresult$addit15.confirmAccountNumber) || (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit16 = sewerageresult.additionalDetails) === null || _sewerageresult$addit16 === void 0 ? void 0 : _sewerageresult$addit16.bankAccountNumber) || (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit17 = sewerageresult.additionalDetails) === null || _sewerageresult$addit17 === void 0 ? void 0 : _sewerageresult$addit17.accountNumber) || "",
-      accountHolderName: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit18 = sewerageresult.additionalDetails) === null || _sewerageresult$addit18 === void 0 ? void 0 : _sewerageresult$addit18.accountHolderName) || (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit19 = sewerageresult.additionalDetails) === null || _sewerageresult$addit19 === void 0 ? void 0 : _sewerageresult$addit19.ownerName) || ""
+      bankName: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit0 = sewerageresult.additionalDetails) === null || _sewerageresult$addit0 === void 0 ? void 0 : _sewerageresult$addit0.bankName) || "",
+      bankBranchName: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit1 = sewerageresult.additionalDetails) === null || _sewerageresult$addit1 === void 0 ? void 0 : _sewerageresult$addit1.bankBranchName) || (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit10 = sewerageresult.additionalDetails) === null || _sewerageresult$addit10 === void 0 ? void 0 : _sewerageresult$addit10.branchName) || "",
+      ifscCode: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit11 = sewerageresult.additionalDetails) === null || _sewerageresult$addit11 === void 0 ? void 0 : _sewerageresult$addit11.ifscCode) || "",
+      accountNumber: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit12 = sewerageresult.additionalDetails) === null || _sewerageresult$addit12 === void 0 ? void 0 : _sewerageresult$addit12.bankAccountNumber) || (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit13 = sewerageresult.additionalDetails) === null || _sewerageresult$addit13 === void 0 ? void 0 : _sewerageresult$addit13.accountNumber) || "",
+      confirmAccountNumber: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit14 = sewerageresult.additionalDetails) === null || _sewerageresult$addit14 === void 0 ? void 0 : _sewerageresult$addit14.confirmAccountNumber) || (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit15 = sewerageresult.additionalDetails) === null || _sewerageresult$addit15 === void 0 ? void 0 : _sewerageresult$addit15.bankAccountNumber) || (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit16 = sewerageresult.additionalDetails) === null || _sewerageresult$addit16 === void 0 ? void 0 : _sewerageresult$addit16.accountNumber) || "",
+      accountHolderName: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit17 = sewerageresult.additionalDetails) === null || _sewerageresult$addit17 === void 0 ? void 0 : _sewerageresult$addit17.accountHolderName) || (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit18 = sewerageresult.additionalDetails) === null || _sewerageresult$addit18 === void 0 ? void 0 : _sewerageresult$addit18.ownerName) || ""
     };
     sewerageresult.djbEmployee = {
-      isDjbEmployee: String(sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit20 = sewerageresult.additionalDetails) === null || _sewerageresult$addit20 === void 0 ? void 0 : _sewerageresult$addit20.isDjbEmployee) === "true",
-      employeeId: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit21 = sewerageresult.additionalDetails) === null || _sewerageresult$addit21 === void 0 ? void 0 : _sewerageresult$addit21.employeeId) || "",
-      designation: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit22 = sewerageresult.additionalDetails) === null || _sewerageresult$addit22 === void 0 ? void 0 : _sewerageresult$addit22.designation) || "",
-      dor: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit23 = sewerageresult.additionalDetails) === null || _sewerageresult$addit23 === void 0 ? void 0 : _sewerageresult$addit23.dor) || (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit24 = sewerageresult.additionalDetails) === null || _sewerageresult$addit24 === void 0 ? void 0 : _sewerageresult$addit24.dorDate) || ""
+      isDjbEmployee: String(sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit19 = sewerageresult.additionalDetails) === null || _sewerageresult$addit19 === void 0 ? void 0 : _sewerageresult$addit19.isDjbEmployee) === "true",
+      employeeId: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit20 = sewerageresult.additionalDetails) === null || _sewerageresult$addit20 === void 0 ? void 0 : _sewerageresult$addit20.employeeId) || "",
+      designation: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit21 = sewerageresult.additionalDetails) === null || _sewerageresult$addit21 === void 0 ? void 0 : _sewerageresult$addit21.designation) || "",
+      dor: (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit22 = sewerageresult.additionalDetails) === null || _sewerageresult$addit22 === void 0 ? void 0 : _sewerageresult$addit22.dor) || (sewerageresult === null || sewerageresult === void 0 ? void 0 : (_sewerageresult$addit23 = sewerageresult.additionalDetails) === null || _sewerageresult$addit23 === void 0 ? void 0 : _sewerageresult$addit23.dorDate) || ""
     };
   }
   if (waterResult) return _extends({}, waterResult);else return _extends({}, sewerageresult);
 };
 const EditApplication = _ref => {
-  var _newConfig, _Digit, _Digit$ComponentRegis, _Digit2, _Digit2$ComponentRegi;
+  var _newConfig, _Digit, _Digit$ComponentRegis;
   const queryClient = useQueryClient();
   let match = useRouteMatch();
   const _useTranslation = useTranslation(),
@@ -30382,17 +30784,22 @@ const EditApplication = _ref => {
   let _useParams = useParams(),
     tenantId = _useParams.tenantId;
   const _useLocation = useLocation(),
-    pathname = _useLocation.pathname,
     state = _useLocation.state;
   const history = useHistory();
   let applicationNumber = (state === null || state === void 0 ? void 0 : state.id) || sessionStorage.getItem("ApplicationNoState");
   let config = [];
   let waterapplication = {};
   let sewerageapplication = {};
-  const _Digit$Hooks$useSessi = Digit.Hooks.useSessionStorage("WS_EDIT_APPLICATION_V3", {}),
+  const _Digit$Hooks$useSessi = Digit.Hooks.useSessionStorage("WS_EDIT_APPLICATION_V5", {}),
     params = _Digit$Hooks$useSessi[0],
     setParams = _Digit$Hooks$useSessi[1],
     clearParams = _Digit$Hooks$useSessi[2];
+  let initialConfig = [];
+  newConfig === null || newConfig === void 0 ? void 0 : newConfig.forEach(obj => {
+    if (!obj.hideInCitizen) {
+      initialConfig = initialConfig.concat(obj.body.filter(a => !a.hideInCitizen));
+    }
+  });
   const stateId = Digit.ULBService.getStateId();
   let _Digit$Hooks$ws$useWS = Digit.Hooks.ws.useWSConfigMDMS.getFormConfig(stateId, {}),
     newConfig$1 = _Digit$Hooks$ws$useWS.data,
@@ -30455,35 +30862,17 @@ const EditApplication = _ref => {
       setParams(_extends({}, params, EditDetails));
     }
   }, [Waterresult, Sewarageresult]);
-  const goNext = skipStep => {
-    var _params$cptId, _params$cpt, _params$cpt$details, _params$cpt2, _params$cpt2$details;
-    const currentPath = pathname.split("/").pop();
-    let _config$find = config.find(routeObj => routeObj.route === currentPath),
-      nextStep = _config$find.nextStep;
-    let routeObject = config.find(routeObj => routeObj.route === currentPath && routeObj);
-    if (typeof nextStep == "object" && nextStep != null) {
-      if (nextStep[sessionStorage.getItem("KnowProperty")] && (nextStep[sessionStorage.getItem("KnowProperty")] === "search-property" || nextStep[sessionStorage.getItem("KnowProperty")] === "create-property")) {
-        nextStep = "" + nextStep[sessionStorage.getItem("KnowProperty")];
-      }
-    }
-    if (routeObject[sessionStorage.getItem("serviceName")]) nextStep = routeObject[sessionStorage.getItem("serviceName")];
-    if ((params !== null && params !== void 0 && (_params$cptId = params.cptId) !== null && _params$cptId !== void 0 && _params$cptId.id || params !== null && params !== void 0 && (_params$cpt = params.cpt) !== null && _params$cpt !== void 0 && (_params$cpt$details = _params$cpt.details) !== null && _params$cpt$details !== void 0 && _params$cpt$details.propertyId || isModifyEdit && params !== null && params !== void 0 && (_params$cpt2 = params.cpt) !== null && _params$cpt2 !== void 0 && (_params$cpt2$details = _params$cpt2.details) !== null && _params$cpt2$details !== void 0 && _params$cpt2$details.propertyId) && nextStep === "know-your-property") {
-      nextStep = "property-details";
-    }
-    if (nextStep === "docsrequired" && sessionStorage.getItem("changePropertySelected") === "yes") {
-      nextStep = "property-details";
-    }
-    let redirectWithHistory = history.push;
-    if (nextStep === null) {
-      return redirectWithHistory(getPath$3(match.path, match.params) + "/check");
-    }
-    redirectWithHistory(getPath$3(match.path, match.params) + "/" + nextStep);
-  };
   const onSuccess = () => {
     queryClient.invalidateQueries("WS_CREATE");
   };
   const createApplication = function () {
     try {
+      var _params$DocumentsRequ;
+      if (params !== null && params !== void 0 && (_params$DocumentsRequ = params.DocumentsRequired) !== null && _params$DocumentsRequ !== void 0 && _params$DocumentsRequ.documents) {
+        params.documents = {
+          documents: params.DocumentsRequired.documents
+        };
+      }
       history.push(getPath$3(match.path, match.params) + "/acknowledgement");
       return Promise.resolve();
     } catch (e) {
@@ -30494,7 +30883,6 @@ const EditApplication = _ref => {
     if (isFromCreateApi) setParams(data);else if (key === "") setParams(_extends({}, data));else setParams(_extends({}, params, {
       [key]: _extends({}, params[key], data)
     }));
-    goNext();
   };
   const handleSkip = () => {};
   newConfig$1 = newConfig;
@@ -30503,21 +30891,62 @@ const EditApplication = _ref => {
       config = config.concat(obj.body.filter(a => !a.hideInCitizen));
     }
   });
-  config.indexRoute = "property-details";
-  if ((Waterresult && Object.keys(Waterresult).length > 0 || !Sewarageresult) && Waterresult !== null && Waterresult !== void 0 && Waterresult.isLoading || Sewarageresult !== null && Sewarageresult !== void 0 && Sewarageresult.isLoading || configLoading) {
+  const startIndex = config.findIndex(c => c.route === "connection-details");
+  if (startIndex !== -1) {
+    config = config.slice(startIndex);
+  }
+  config = config.filter(c => c.route !== "docsrequired" && c.route !== "check");
+  config.forEach(c => {
+    if (c.component === "WSDocumentDetails") {
+      c.component = "WSDocumentsEmployee";
+      c.key = "DocumentsRequired";
+    }
+  });
+  config = config.map((routeObj, index) => {
+    var _routeObj$texts;
+    return _extends({}, routeObj, {
+      timeLine: [{
+        currentStep: index + 1,
+        actions: ((_routeObj$texts = routeObj.texts) === null || _routeObj$texts === void 0 ? void 0 : _routeObj$texts.header) || routeObj.route
+      }]
+    });
+  });
+  if ((Waterresult && Object.keys(Waterresult).length > 0 || !Sewarageresult) && Waterresult !== null && Waterresult !== void 0 && Waterresult.isLoading || Sewarageresult !== null && Sewarageresult !== void 0 && Sewarageresult.isLoading || configLoading || Object.keys(params).length === 0) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
-  const CheckPage = (_Digit = Digit) === null || _Digit === void 0 ? void 0 : (_Digit$ComponentRegis = _Digit.ComponentRegistryService) === null || _Digit$ComponentRegis === void 0 ? void 0 : _Digit$ComponentRegis.getComponent("WSCheckPage");
-  const Acknowledgement = (_Digit2 = Digit) === null || _Digit2 === void 0 ? void 0 : (_Digit2$ComponentRegi = _Digit2.ComponentRegistryService) === null || _Digit2$ComponentRegi === void 0 ? void 0 : _Digit2$ComponentRegi.getComponent("WSAcknowledgement");
-  return /*#__PURE__*/React.createElement(Switch, null, config.map((routeObj, index) => {
+  const Acknowledgement = (_Digit = Digit) === null || _Digit === void 0 ? void 0 : (_Digit$ComponentRegis = _Digit.ComponentRegistryService) === null || _Digit$ComponentRegis === void 0 ? void 0 : _Digit$ComponentRegis.getComponent("WSAcknowledgement");
+  return /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(Route, {
+    path: getPath$3(match.path, match.params) + "/acknowledgement"
+  }, /*#__PURE__*/React.createElement(Acknowledgement, {
+    data: params,
+    onSuccess: onSuccess,
+    clearParams: clearParams
+  })), /*#__PURE__*/React.createElement(Route, null, /*#__PURE__*/React.createElement("div", {
+    className: "citizen-single-screen-edit"
+  }, /*#__PURE__*/React.createElement("style", null, "\n            .citizen-single-screen-edit .timeline-container { display: none !important; }\n            .citizen-single-screen-edit .form-step-footer { display: none !important; }\n          "), /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      flexDirection: "row",
+      gap: "24px",
+      alignItems: "flex-start",
+      marginBottom: "2rem"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: "1",
+      display: "flex",
+      flexDirection: "column",
+      gap: "24px"
+    }
+  }, config.map((routeObj, index) => {
     const component = routeObj.component,
       texts = routeObj.texts,
       inputs = routeObj.inputs,
       key = routeObj.key,
       isSkipEnabled = routeObj.isSkipEnabled;
     const Component = typeof component === "string" ? Digit.ComponentRegistryService.getComponent(component) : component;
-    return /*#__PURE__*/React.createElement(Route, {
-      path: getPath$3(match.path, match.params) + "/" + routeObj.route,
+    return /*#__PURE__*/React.createElement("div", {
+      id: "step-" + index,
       key: index
     }, /*#__PURE__*/React.createElement(Component, {
       config: {
@@ -30530,22 +30959,16 @@ const EditApplication = _ref => {
       onSkip: handleSkip,
       t: t,
       formData: params,
-      userType: "citizen"
+      userType: "employee"
     }));
-  }), /*#__PURE__*/React.createElement(Route, {
-    path: getPath$3(match.path, match.params) + "/check"
-  }, /*#__PURE__*/React.createElement(CheckPage, {
-    onSubmit: createApplication,
-    value: params
-  })), /*#__PURE__*/React.createElement(Route, {
-    path: getPath$3(match.path, match.params) + "/acknowledgement"
-  }, /*#__PURE__*/React.createElement(Acknowledgement, {
-    data: params,
-    onSuccess: onSuccess,
-    clearParams: clearParams
-  })), /*#__PURE__*/React.createElement(Route, null, /*#__PURE__*/React.createElement(Redirect, {
-    to: getPath$3(match.path, match.params) + "/" + config.indexRoute
-  })));
+  }), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: "24px"
+    }
+  }, /*#__PURE__*/React.createElement(SubmitBar, {
+    label: t("SUBMIT"),
+    onSubmit: createApplication
+  })))))));
 };
 
 const getPath$4 = (path, params) => {
@@ -32450,7 +32873,7 @@ const WSPropertyLocationDetails = props => {
     onSelect(config.key, data);
   };
   const onSkip = () => onSelect();
-  const PropertyLocationDetails = Digit.ComponentRegistryService.setComponent("PropertyLocationDetails");
+  const PropertyLocationDetails = Digit.ComponentRegistryService.getComponent("PropertyLocationDetails");
   if (userType === "citizen") {
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Timeline, {
       currentStep: 2
@@ -38580,12 +39003,12 @@ const ActionModal$5 = _ref => {
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat7 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat7 !== void 0 && _parsedAdhocRebateDat7.adhocRebate) applicationData.additionalDetails.adhocRebate = parseInt(parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat8 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat8 === void 0 ? void 0 : _parsedAdhocRebateDat8.adhocRebate) || "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat9 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat9 !== void 0 && _parsedAdhocRebateDat9.adhocRebateComment) applicationData.additionalDetails.adhocRebateComment = (parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat0 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat0 === void 0 ? void 0 : _parsedAdhocRebateDat0.adhocRebateComment) || "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat1 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat1 !== void 0 && _parsedAdhocRebateDat1.adhocRebateReason) applicationData.additionalDetails.adhocRebateReason = (parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat10 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat10 === void 0 ? void 0 : _parsedAdhocRebateDat10.adhocRebateReason) || "";
-      const dueVerificationData = sessionStorage.getItem("Digit.DUE_VERIFICATION_DATA");
-      if (dueVerificationData) {
+      const inspectionInformationData = sessionStorage.getItem("Digit.INSPECTION_INFORMATION_DATA");
+      if (inspectionInformationData) {
         try {
-          applicationData.dueVerification = JSON.parse(dueVerificationData);
+          applicationData.inspectionInformation = JSON.parse(inspectionInformationData);
         } catch (e) {
-          console.error("Error parsing due verification data", e);
+          console.error("Error parsing inspection information data", e);
         }
       }
       ((_applicationData12 = applicationData) === null || _applicationData12 === void 0 ? void 0 : _applicationData12.serviceType) == "WATER" ? submitAction({
@@ -41509,7 +41932,7 @@ const SubOccupancyTable = _ref => {
   })));
 };
 
-const Reason$1 = _ref => {
+const Reason = _ref => {
   let headComment = _ref.headComment,
     otherComment = _ref.otherComment;
   return /*#__PURE__*/React.createElement("div", {
@@ -41534,7 +41957,7 @@ const TLCaption = _ref => {
   }, /*#__PURE__*/React.createElement(TelePhone, {
     mobile: data.mobileNumber,
     privacy: privacy
-  }), /*#__PURE__*/React.createElement("p", null, "\xA0\xA0\xA0\xA0")), data.source && /*#__PURE__*/React.createElement("p", null, t("ES_APPLICATION_DETAILS_APPLICATION_CHANNEL_" + data.source.toUpperCase())), data.comment && /*#__PURE__*/React.createElement(Reason$1, {
+  }), /*#__PURE__*/React.createElement("p", null, "\xA0\xA0\xA0\xA0")), data.source && /*#__PURE__*/React.createElement("p", null, t("ES_APPLICATION_DETAILS_APPLICATION_CHANNEL_" + data.source.toUpperCase())), data.comment && /*#__PURE__*/React.createElement(Reason, {
     otherComment: data === null || data === void 0 ? void 0 : data.otherComment,
     headComment: data === null || data === void 0 ? void 0 : data.comment
   }), data !== null && data !== void 0 && data.wfComment ? /*#__PURE__*/React.createElement("div", null, data === null || data === void 0 ? void 0 : (_data$wfComment = data.wfComment) === null || _data$wfComment === void 0 ? void 0 : _data$wfComment.map((e, index) => /*#__PURE__*/React.createElement("div", {
@@ -41804,19 +42227,23 @@ 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;
-      const values = [{
+      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))
+      })) : [{
         title: "WS_APPLICATION_FEE_HEADER",
-        value: /*#__PURE__*/React.createElement("span", null, "\u20B9", 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.fee)
+        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)
       }, {
         title: "WS_SERVICE_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.charge)
+        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)
       }, {
         title: "WS_TAX_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.taxAmount)
+        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)
       }];
       setValues(values);
-      setBillDetails(sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill8 = sessionFormData.billDetails) === null || _sessionFormData$bill8 === void 0 ? void 0 : _sessionFormData$bill8[0]);
+      setBillDetails(sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill0 = sessionFormData.billDetails) === null || _sessionFormData$bill0 === void 0 ? void 0 : _sessionFormData$bill0[0]);
     } else {
       setSessionFormData(data);
       setFields(data);
@@ -41880,24 +42307,28 @@ const WSFeeEstimation = _ref => {
         };
         let businessService = (wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$16 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$16 === void 0 ? void 0 : (_wsAdditionalDetails$17 = _wsAdditionalDetails$16.appDetails) === null || _wsAdditionalDetails$17 === void 0 ? void 0 : _wsAdditionalDetails$17.service) == "WATER" ? "WS" : "SW";
         Digit.WSService.wsCalculationEstimate(data, businessService).then((result, err) => {
-          var _result$Calculation, _result$Calculation$, _result$Calculation$$, _result$Calculation3, _result$Calculation3$, _result$Calculation4, _result$Calculation4$, _result$Calculation5, _result$Calculation5$, _result$Calculation6, _result$Calculation6$, _result$Calculation7;
+          var _result$Calculation, _result$Calculation$, _result$Calculation$$, _result$Calculation3, _result$Calculation3$, _result$Calculation4, _result$Calculation4$, _result$Calculation5, _result$Calculation5$, _result$Calculation6, _result$Calculation6$, _result$Calculation7, _result$Calculation7$, _result$Calculation8;
           if ((result === null || result === void 0 ? void 0 : (_result$Calculation = result.Calculation) === null || _result$Calculation === void 0 ? void 0 : (_result$Calculation$ = _result$Calculation[0]) === null || _result$Calculation$ === void 0 ? void 0 : (_result$Calculation$$ = _result$Calculation$.taxHeadEstimates) === null || _result$Calculation$$ === void 0 ? void 0 : _result$Calculation$$.length) > 0) {
             var _result$Calculation2, _result$Calculation2$, _result$Calculation2$2;
             result === null || result === void 0 ? void 0 : (_result$Calculation2 = result.Calculation) === null || _result$Calculation2 === void 0 ? void 0 : (_result$Calculation2$ = _result$Calculation2[0]) === null || _result$Calculation2$ === void 0 ? void 0 : (_result$Calculation2$2 = _result$Calculation2$.taxHeadEstimates) === null || _result$Calculation2$2 === void 0 ? void 0 : _result$Calculation2$2.forEach(data => data.amount = data.estimateAmount);
           }
           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 values = [{
+          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))
+          })) : [{
             title: "WS_APPLICATION_FEE_HEADER",
-            value: (_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$.fee
+            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
           }, {
             title: "WS_SERVICE_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$.charge
+            value: (_result$Calculation6 = result.Calculation) === null || _result$Calculation6 === void 0 ? void 0 : (_result$Calculation6$ = _result$Calculation6[0]) === null || _result$Calculation6$ === void 0 ? void 0 : _result$Calculation6$.charge
           }, {
             title: "WS_TAX_HEADER",
-            value: (_result$Calculation6 = result.Calculation) === null || _result$Calculation6 === void 0 ? void 0 : (_result$Calculation6$ = _result$Calculation6[0]) === null || _result$Calculation6$ === void 0 ? void 0 : _result$Calculation6$.taxAmount
+            value: (_result$Calculation7 = result.Calculation) === null || _result$Calculation7 === void 0 ? void 0 : (_result$Calculation7$ = _result$Calculation7[0]) === null || _result$Calculation7$ === void 0 ? void 0 : _result$Calculation7$.taxAmount
           }];
           setSessionBillFormData(cloneDeep_1(result.Calculation[0]));
-          setBillDetails(result === null || result === void 0 ? void 0 : (_result$Calculation7 = result.Calculation) === null || _result$Calculation7 === void 0 ? void 0 : _result$Calculation7[0]);
+          setBillDetails(result === null || result === void 0 ? void 0 : (_result$Calculation8 = result.Calculation) === null || _result$Calculation8 === void 0 ? void 0 : _result$Calculation8[0]);
           setValues(values);
           fields.billDetails = result === null || result === void 0 ? void 0 : result.Calculation;
           setSessionFormData(fields);
@@ -41967,7 +42398,7 @@ const WSFeeEstimation = _ref => {
     className: "border-none",
     key: "WS_COMMON_TOTAL_AMT",
     label: "" + t("WS_COMMON_TOTAL_AMT"),
-    text: /*#__PURE__*/React.createElement("span", null, "\u20B9", (billDetails === null || billDetails === void 0 ? void 0 : billDetails.totalAmount) || 0),
+    text: /*#__PURE__*/React.createElement("span", null, "\u20B9", billDetails !== null && billDetails !== void 0 && billDetails.totalAmount ? Number(billDetails === null || billDetails === void 0 ? void 0 : billDetails.totalAmount).toFixed(2) : "0.00"),
     textStyle: {
       fontSize: "24px",
       fontWeight: "700"
@@ -42657,36 +43088,65 @@ const DueVerification = _ref => {
   const _useState = useState(""),
     kno = _useState[0],
     setKno = _useState[1];
-  const _useState2 = useState([]),
-    tableData = _useState2[0],
-    setTableData = _useState2[1];
-  const columns = useMemo(() => [{
-    Header: t("K No."),
-    accessor: "kno"
-  }, {
-    Header: t("Full Name"),
-    accessor: "fullName"
-  }, {
-    Header: t("Full Address"),
-    accessor: "fullAddress"
-  }, {
-    Header: t("Due Amount"),
-    accessor: "dueAmount"
-  }, {
-    Header: t("Total Amount"),
-    accessor: "totalAmount"
-  }], [t]);
+  const _useState2 = useState(""),
+    remarks = _useState2[0],
+    setRemarks = _useState2[1];
+  const _useState3 = useState([]),
+    tableData = _useState3[0],
+    setTableData = _useState3[1];
+  const handleRemarkChange = React.useCallback((index, value) => {
+    setTableData(prevData => {
+      const newData = [...prevData];
+      newData[index] = _extends({}, newData[index], {
+        remarks: value
+      });
+      if (applicationData) {
+        applicationData.dueVerification = newData;
+      }
+      return newData;
+    });
+  }, [applicationData]);
+  const isPendingApproval = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_APPROVAL_FOR_CONNECTION";
+  const columns = useMemo(() => {
+    const baseColumns = [{
+      Header: t("K No."),
+      accessor: "kno"
+    }, {
+      Header: t("Full Name"),
+      accessor: "fullName"
+    }, {
+      Header: t("Full Address"),
+      accessor: "fullAddress"
+    }, {
+      Header: t("Due Amount"),
+      accessor: "dueAmount"
+    }, {
+      Header: t("Total Amount"),
+      accessor: "totalAmount"
+    }];
+    if (isPendingApproval) {
+      baseColumns.push({
+        Header: t("Remarks"),
+        accessor: "remarks",
+        Cell: _ref2 => {
+          let row = _ref2.row,
+            value = _ref2.value;
+          return /*#__PURE__*/React.createElement(TextInput, {
+            style: {
+              marginBottom: "0px",
+              minWidth: "150px"
+            },
+            value: value || "",
+            onChange: e => handleRemarkChange(row.index, e.target.value)
+          });
+        }
+      });
+    }
+    return baseColumns;
+  }, [t, handleRemarkChange, isPendingApproval]);
   useEffect(() => {
-    const savedData = sessionStorage.getItem("Digit.DUE_VERIFICATION_DATA");
-    if (savedData) {
-      try {
-        setTableData(JSON.parse(savedData));
-      } catch (e) {
-        console.error("Error parsing due verification data", e);
-      }
-    } else if (applicationData !== null && applicationData !== void 0 && applicationData.dueVerification && Array.isArray(applicationData.dueVerification)) {
+    if (applicationData !== null && applicationData !== void 0 && applicationData.dueVerification && Array.isArray(applicationData.dueVerification)) {
       setTableData(applicationData.dueVerification);
-      sessionStorage.setItem("Digit.DUE_VERIFICATION_DATA", JSON.stringify(applicationData.dueVerification));
     }
   }, [applicationData]);
   const handleAdd = () => {
@@ -42696,12 +43156,16 @@ const DueVerification = _ref => {
         fullName: "John Doe",
         fullAddress: "123 Main St, New Delhi, Delhi 110001",
         dueAmount: "1500",
-        totalAmount: "1500"
+        totalAmount: "1500",
+        remarks: remarks
       };
       const newTableData = [...tableData, mockData];
       setTableData(newTableData);
-      sessionStorage.setItem("Digit.DUE_VERIFICATION_DATA", JSON.stringify(newTableData));
+      if (applicationData) {
+        applicationData.dueVerification = newTableData;
+      }
       setKno("");
+      setRemarks("");
     }
   };
   return /*#__PURE__*/React.createElement("div", {
@@ -42783,7 +43247,8 @@ const DueVerification = _ref => {
   })));
 };
 
-const InspectionInformation = () => {
+const InspectionInformation = _ref => {
+  let applicationData = _ref.applicationData;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const _useState = useState(null),
@@ -42795,9 +43260,37 @@ const InspectionInformation = () => {
   const _useState3 = useState(""),
     inspectorName = _useState3[0],
     setInspectorName = _useState3[1];
+  useEffect(() => {
+    const savedData = sessionStorage.getItem("Digit.INSPECTION_INFORMATION_DATA");
+    if (savedData) {
+      try {
+        const parsed = JSON.parse(savedData);
+        setInspectionType(parsed.inspectionType || null);
+        setInspectionDate(parsed.inspectionDate || "");
+        setInspectorName(parsed.inspectorName || "");
+      } catch (e) {
+        console.error("Error parsing inspection information data", e);
+      }
+    } else if (applicationData !== null && applicationData !== void 0 && applicationData.inspectionInformation) {
+      setInspectionType(applicationData.inspectionInformation.inspectionType || null);
+      setInspectionDate(applicationData.inspectionInformation.inspectionDate || "");
+      setInspectorName(applicationData.inspectionInformation.inspectorName || "");
+      sessionStorage.setItem("Digit.INSPECTION_INFORMATION_DATA", JSON.stringify(applicationData.inspectionInformation));
+    }
+  }, [applicationData]);
+  useEffect(() => {
+    sessionStorage.setItem("Digit.INSPECTION_INFORMATION_DATA", JSON.stringify({
+      inspectionType,
+      inspectionDate,
+      inspectorName
+    }));
+  }, [inspectionType, inspectionDate, inspectorName]);
   const inspectionTypeOptions = [{
-    name: "Select",
+    i18nKey: "ES_COMMON_SELECT",
     code: ""
+  }, {
+    i18nKey: "New Connection Visit",
+    code: "new_connection_visit"
   }];
   return /*#__PURE__*/React.createElement("div", {
     style: {
@@ -42833,7 +43326,7 @@ const InspectionInformation = () => {
     }
   }, "*")), /*#__PURE__*/React.createElement(Dropdown, {
     option: inspectionTypeOptions,
-    optionKey: "name",
+    optionKey: "i18nKey",
     id: "inspectionType",
     selected: inspectionType,
     select: setInspectionType,
@@ -43808,6 +44301,14 @@ const ApplicationDetails = props => {
   function onActionSelect(action) {
     sessionStorage.setItem("SELECTED_ACTION", action === null || action === void 0 ? void 0 : action.action);
     if (action) {
+      if ((action === null || action === void 0 ? void 0 : action.action) === "PAY" && !(action !== null && action !== void 0 && action.redirectionUrl) && !(action !== null && action !== void 0 && action.redirectionUrll)) {
+        if (window.location.href.includes("/employee")) {
+          history.push("/digit-ui/employee/payment/collect/" + businessService + "/" + applicationNumber + "?tenantId=" + tenantId);
+        } else {
+          history.push("/digit-ui/citizen/payment/my-bills/" + businessService + "/" + applicationNumber + "?tenantId=" + tenantId);
+        }
+        return;
+      }
       if (action !== null && action !== void 0 && action.isToast) {
         setShowToast({
           key: "error",
@@ -45141,11 +45642,7 @@ const ActivateConnection = () => {
   if (isEnableLoader || isLoading || isappdetailsLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    style: {
-      marginLeft: "15px"
-    }
-  }, /*#__PURE__*/React.createElement(Header, null, t(config.head))), /*#__PURE__*/React.createElement(FormComposer, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormComposer, {
     config: config.body,
     userType: "employee",
     defaultValues: defaultValues,
@@ -48363,7 +48860,7 @@ const BulkBillGeneration = _ref => {
   }));
 };
 
-const ActionButton = _ref => {
+const ActionButton$1 = _ref => {
   let onClick = _ref.onClick;
   return /*#__PURE__*/React.createElement(LinkButton, {
     label: /*#__PURE__*/React.createElement(EditIcon, {
@@ -48482,7 +48979,7 @@ const CheckPage$4 = _ref2 => {
   }, /*#__PURE__*/React.createElement(Row, {
     label: t("WS_PROPERTY_ID_LABEL"),
     text: "" + t(checkForNA(cpt === null || cpt === void 0 ? void 0 : cpt.propertyId)),
-    actionButton: /*#__PURE__*/React.createElement(ActionButton, {
+    actionButton: /*#__PURE__*/React.createElement(ActionButton$1, {
       onClick: onEdit
     })
   })), /*#__PURE__*/React.createElement(CardSubHeader, null, t("WS_COMMON_CONNECTION_DETAIL")), /*#__PURE__*/React.createElement(StatusTable, {
@@ -48493,7 +48990,7 @@ const CheckPage$4 = _ref2 => {
   }, /*#__PURE__*/React.createElement(Row, {
     label: t("WS_SERVICE_TYPE"),
     text: "" + t(checkForNA(((_connectionDetails = connectionDetails) === null || _connectionDetails === void 0 ? void 0 : (_connectionDetails$se = _connectionDetails.serviceType) === null || _connectionDetails$se === void 0 ? void 0 : _connectionDetails$se.i18nKey) || ((_connectionDetails2 = connectionDetails) === null || _connectionDetails2 === void 0 ? void 0 : (_connectionDetails2$s = _connectionDetails2.serviceType) === null || _connectionDetails2$s === void 0 ? void 0 : _connectionDetails2$s.code) || ((_connectionDetails3 = connectionDetails) === null || _connectionDetails3 === void 0 ? void 0 : _connectionDetails3.serviceType))),
-    actionButton: /*#__PURE__*/React.createElement(ActionButton, {
+    actionButton: /*#__PURE__*/React.createElement(ActionButton$1, {
       onClick: onEdit
     })
   }), /*#__PURE__*/React.createElement(Row, {
@@ -48540,7 +49037,7 @@ const CheckPage$4 = _ref2 => {
   }, /*#__PURE__*/React.createElement(Row, {
     label: t("WS_OWN_DETAIL_NAME"),
     text: "" + t(checkForNA((_holderDetails = holderDetails) === null || _holderDetails === void 0 ? void 0 : _holderDetails.name)),
-    actionButton: /*#__PURE__*/React.createElement(ActionButton, {
+    actionButton: /*#__PURE__*/React.createElement(ActionButton$1, {
       onClick: onEdit
     })
   }), /*#__PURE__*/React.createElement(Row, {
@@ -48575,7 +49072,7 @@ const CheckPage$4 = _ref2 => {
   }, /*#__PURE__*/React.createElement(Row, {
     label: t("WS_ZRO_LOCATION"),
     text: "" + t(checkForNA(((_propertyAddress = propertyAddress) === null || _propertyAddress === void 0 ? void 0 : (_propertyAddress$zro = _propertyAddress.zro) === null || _propertyAddress$zro === void 0 ? void 0 : _propertyAddress$zro.name) || ((_propertyAddress2 = propertyAddress) === null || _propertyAddress2 === void 0 ? void 0 : _propertyAddress2.zro) || ((_propertyAddress3 = propertyAddress) === null || _propertyAddress3 === void 0 ? void 0 : _propertyAddress3.zroLocation) || (additionalDetails === null || additionalDetails === void 0 ? void 0 : additionalDetails.zroLocation) || ((_propertyAddress4 = propertyAddress) === null || _propertyAddress4 === void 0 ? void 0 : (_propertyAddress4$add = _propertyAddress4.additionalDetails) === null || _propertyAddress4$add === void 0 ? void 0 : _propertyAddress4$add.zroLocation))),
-    actionButton: /*#__PURE__*/React.createElement(ActionButton, {
+    actionButton: /*#__PURE__*/React.createElement(ActionButton$1, {
       onClick: onEdit
     })
   }), /*#__PURE__*/React.createElement(Row, {
@@ -48640,7 +49137,7 @@ const CheckPage$4 = _ref2 => {
   }, /*#__PURE__*/React.createElement(Row, {
     label: t("WS_CATEGORY_TYPE"),
     text: "" + t(checkForNA((useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$categoryT = useDetails.categoryType) === null || _useDetails$categoryT === void 0 ? void 0 : _useDetails$categoryT.i18nKey) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$categoryT2 = useDetails.categoryType) === null || _useDetails$categoryT2 === void 0 ? void 0 : _useDetails$categoryT2.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.categoryType))),
-    actionButton: /*#__PURE__*/React.createElement(ActionButton, {
+    actionButton: /*#__PURE__*/React.createElement(ActionButton$1, {
       onClick: onEdit
     })
   }), /*#__PURE__*/React.createElement(Row, {
@@ -48675,7 +49172,7 @@ const CheckPage$4 = _ref2 => {
   }, /*#__PURE__*/React.createElement(Row, {
     label: t("WS_DJB_EMPLOYEE"),
     text: "" + (djbEmployee !== null && djbEmployee !== void 0 && djbEmployee.isDjbEmployee ? t("CORE_COMMON_YES") : t("CORE_COMMON_NO")),
-    actionButton: /*#__PURE__*/React.createElement(ActionButton, {
+    actionButton: /*#__PURE__*/React.createElement(ActionButton$1, {
       onClick: onEdit
     })
   }), (djbEmployee === null || djbEmployee === void 0 ? void 0 : djbEmployee.isDjbEmployee) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
@@ -48695,7 +49192,7 @@ const CheckPage$4 = _ref2 => {
   }, /*#__PURE__*/React.createElement(Row, {
     label: t("WS_NAME_OF_BANK"),
     text: "" + t(checkForNA(bankDetails === null || bankDetails === void 0 ? void 0 : bankDetails.bankName)),
-    actionButton: /*#__PURE__*/React.createElement(ActionButton, {
+    actionButton: /*#__PURE__*/React.createElement(ActionButton$1, {
       onClick: onEdit
     })
   }), /*#__PURE__*/React.createElement(Row, {
@@ -48719,7 +49216,7 @@ const CheckPage$4 = _ref2 => {
     }, /*#__PURE__*/React.createElement(Row, {
       label: t("" + (doc === null || doc === void 0 ? void 0 : (_doc$documentType = doc.documentType) === null || _doc$documentType === void 0 ? void 0 : _doc$documentType.replaceAll(".", "_"))),
       text: checkForNA(doc === null || doc === void 0 ? void 0 : doc.documentUid),
-      actionButton: index === 0 ? /*#__PURE__*/React.createElement(ActionButton, {
+      actionButton: index === 0 ? /*#__PURE__*/React.createElement(ActionButton$1, {
         onClick: onEdit
       }) : null
     }), /*#__PURE__*/React.createElement(Row, {
@@ -48742,7 +49239,7 @@ const CheckPage$4 = _ref2 => {
   }, /*#__PURE__*/React.createElement(Row, {
     label: t("WS_SUBMITTED_BY"),
     text: "" + t((declaration === null || declaration === void 0 ? void 0 : (_declaration$submitte = declaration.submittedBy) === null || _declaration$submitte === void 0 ? void 0 : _declaration$submitte.name) || (declaration === null || declaration === void 0 ? void 0 : (_declaration$submitte2 = declaration.submittedBy) === null || _declaration$submitte2 === void 0 ? void 0 : _declaration$submitte2.code) || (declaration === null || declaration === void 0 ? void 0 : declaration.submittedBy)),
-    actionButton: /*#__PURE__*/React.createElement(ActionButton, {
+    actionButton: /*#__PURE__*/React.createElement(ActionButton$1, {
       onClick: onEdit
     })
   }), ((declaration === null || declaration === void 0 ? void 0 : declaration.signatureFileStoreId) || (declaration === null || declaration === void 0 ? void 0 : declaration.signatureFile)) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {