@djb25/digit-ui-module-ws 1.0.7 → 1.0.9

package/dist/index.modern.js

@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useRef, useMemo, Fragment as Fragment$2, useReducer, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link, useLocation, Switch, Route, useHistory, useRouteMatch, Redirect, useParams } from 'react-router-dom';
-import { Loader as Loader$1, Card, KeyNote, SubmitBar, InfoBannerIcon, Header, BackButton, PrivateRoute, Banner, CardText, ActionBar, HomeIcon, PrintBtnCommon, MultiLink, LinkButton, Toast, BreadcrumbHeader, ArrowLeft, TickMark, FormStep, CardLabel, RadioOrSelect, TextInput, CardHeader, CitizenInfoLabel, CardSubHeader, Dropdown, UploadFile, CheckBox, RadioButtons, MobileNumber, LabelFieldPair, DatePicker, CardLabelError, DeleteIcon, WrapUnMaskComponent, StatusTable, Row, CardSectionHeader, InfoIcon, TextArea, SearchField, FilterFormField, RemoveableTag, MultiSelectDropdown, InboxComposer, DropIcon, WSICon, EmployeeModuleCard, SearchAction, PopUp, DetailsCard, SearchForm, CloseSvg, Table, Localities, Modal, DownloadBtnCommon, CollectionIcon, ResponseComposer, TelePhone, DisplayPhotos, CheckPoint, ConnectingCheckPoints, ActionLinks, PDFSvg, EditIcon, CardSectionSubText, DownloadIcon, CardLabelDesc, FormComposer, MultiUploadWrapper, Close as Close$e, BreakLine, ViewsIcon, Menu, ButtonSelector, CitizenHomeCard } from '@djb25/digit-ui-react-components';
+import { Loader as Loader$1, Card, KeyNote, SubmitBar, InfoBannerIcon, Header, BackButton, PrivateRoute, Banner, CardText, ActionBar, HomeIcon, PrintBtnCommon, MultiLink, LinkButton, Toast, BreadcrumbHeader, ArrowLeft, TickMark, FormStep, CardLabel, RadioOrSelect, TextInput, CardHeader, CitizenInfoLabel, CardSubHeader, Dropdown, UploadFile, CheckBox, RadioButtons, MobileNumber, LabelFieldPair, DatePicker, CardLabelError, DeleteIcon, WrapUnMaskComponent, StatusTable, Row, CardSectionHeader, InfoIcon, TextArea, SearchField, FilterFormField, RemoveableTag, MultiSelectDropdown, InboxComposer, DropIcon, WSICon, EmployeeModuleCard, SearchAction, PopUp, DetailsCard, SearchForm, CloseSvg, CollapsibleCardPage, Table, Localities, Modal, DownloadBtnCommon, CollectionIcon, ResponseComposer, TelePhone, DisplayPhotos, CheckPoint, ConnectingCheckPoints, ActionLinks, PDFSvg, EditIcon, CardSectionSubText, DownloadIcon, CardLabelDesc, FormComposer, MultiUploadWrapper, Close as Close$e, BreakLine, ViewsIcon, 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';
@@ -9252,7 +9252,7 @@ const BILLSBreadCrumbs = ({
         maxWidth: "100% !important"
       }
     }, dowloadOptions && dowloadOptions.length > 0 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(MultiLink, {
-      className: "abcd",
+      className: "",
       onHeadClick: () => setShowOptions(!showOptions),
       displayOptions: showOptions,
       options: dowloadOptions,
@@ -9414,11 +9414,17 @@ const App$1 = ({
   const WSBulkBillGeneration = (_Digit25 = Digit) === null || _Digit25 === void 0 ? void 0 : (_Digit25$ComponentReg = _Digit25.ComponentRegistryService) === null || _Digit25$ComponentReg === void 0 ? void 0 : _Digit25$ComponentReg.getComponent("WSBulkBillGeneration");
   const locationCheck = window.location.href.includes("/employee/ws/new-application") || window.location.href.includes("/employee/ws/modify-application") || window.location.href.includes("/employee/ws/edit-application") || window.location.href.includes("/employee/ws/activate-connection") || window.location.href.includes("/employee/ws/application-details") || window.location.href.includes("/employee/ws/modify-details") || window.location.href.includes("/employee/ws/ws-response") || window.location.href.includes("/employee/ws/new-disconnection/application-form") || window.location.href.includes("/employee/ws/ws-disconnection-response") || window.location.href.includes("/employee/ws/consumption-details") || window.location.href.includes("/employee/ws/edit-disconnection-application") || window.location.href.includes("/employee/ws/config-by-disconnection-application") || window.location.href.includes("/employee/ws/resubmit-disconnection-application") || window.location.href.includes("/employee/ws/water/bulk-bill");
   const locationCheckReqDocs = window.location.href.includes("/employee/ws/create-application") || window.location.href.includes("/employee/ws/new-disconnection/docsrequired");
-  return /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "form-container"
+  return /*#__PURE__*/React.createElement("div", {
+    className: "app-container"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "ground-container employee-app-container form-container"
   }, /*#__PURE__*/React.createElement(BILLSBreadCrumbs, {
     location: location
-  }), /*#__PURE__*/React.createElement(PrivateRoute, {
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "employee-form"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "employee-form-content"
+  }, /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/create-application`,
     component: WSDocsRequired
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
@@ -9571,7 +9577,7 @@ const App$1 = ({
     component: props => /*#__PURE__*/React.createElement(WSBulkBillGeneration, Object.assign({}, props, {
       parentRoute: path
     }))
-  }))));
+  }))))));
 };
 
 let actions = [];
@@ -10990,7 +10996,7 @@ const WSConnectionDetails = ({
   }, commonProps))));
 };
 const ConnectionDetails = _props => {
-  var _formData$DocumentsRe, _errors$proposedTaps2, _errors$proposedPipeS2, _errors$proposedWater2, _errors$proposedToile2;
+  var _formData$DocumentsRe, _errors$proposedTaps2, _errors$proposedTaps3, _errors$proposedPipeS2, _errors$proposedPipeS3, _errors$proposedWater2, _errors$proposedToile2;
   const {
     connectionDetail,
     focusIndex,
@@ -11094,11 +11100,12 @@ const ConnectionDetails = _props => {
   };
   const isMobile = window.Digit.Utils.browser.isMobile();
   const isEmployee = window.location.href.includes("/employee");
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: "16px"
-    }
-  }, /*#__PURE__*/React.createElement(CardLabel, {
+    },
+    className: "formcomposer-section-grid"
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, {
     style: {
       fontWeight: "700"
     }
@@ -11166,12 +11173,11 @@ const ConnectionDetails = _props => {
         onBlur: props.onBlur
       });
     }
-  })), (connectionDetail === null || connectionDetail === void 0 ? void 0 : connectionDetail.water) && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }))), (connectionDetail === null || connectionDetail === void 0 ? void 0 : connectionDetail.water) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     style: isMobile && isEmployee ? {
       fontWeight: "700",
       width: "100%"
     } : {
-      marginTop: "-5px",
       fontWeight: "700"
     },
     className: "card-label-smaller"
@@ -11207,15 +11213,14 @@ const ConnectionDetails = _props => {
         onBlur: props.onBlur
       });
     }
-  }))), /*#__PURE__*/React.createElement(CardLabelError, {
+  }))), localFormState.touched.proposedTaps && errors !== null && errors !== void 0 && (_errors$proposedTaps2 = errors.proposedTaps) !== null && _errors$proposedTaps2 !== void 0 && _errors$proposedTaps2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, localFormState.touched.proposedTaps ? errors === null || errors === void 0 ? void 0 : (_errors$proposedTaps2 = errors.proposedTaps) === null || _errors$proposedTaps2 === void 0 ? void 0 : _errors$proposedTaps2.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }, localFormState.touched.proposedTaps ? errors === null || errors === void 0 ? void 0 : (_errors$proposedTaps3 = errors.proposedTaps) === null || _errors$proposedTaps3 === void 0 ? void 0 : _errors$proposedTaps3.message : "") : null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     style: isMobile && isEmployee ? {
       fontWeight: "700",
       width: "100%",
       paddingTop: "10px"
     } : {
-      marginTop: "-5px",
       fontWeight: "700"
     },
     className: "card-label-smaller"
@@ -11243,14 +11248,13 @@ const ConnectionDetails = _props => {
         t: t
       });
     }
-  })), /*#__PURE__*/React.createElement(CardLabelError, {
+  })), localFormState.touched.proposedPipeSize && errors !== null && errors !== void 0 && (_errors$proposedPipeS2 = errors.proposedPipeSize) !== null && _errors$proposedPipeS2 !== void 0 && _errors$proposedPipeS2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, localFormState.touched.proposedPipeSize ? errors === null || errors === void 0 ? void 0 : (_errors$proposedPipeS2 = errors.proposedPipeSize) === null || _errors$proposedPipeS2 === void 0 ? void 0 : _errors$proposedPipeS2.message : "")), (connectionDetail === null || connectionDetail === void 0 ? void 0 : connectionDetail.sewerage) && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }, localFormState.touched.proposedPipeSize ? errors === null || errors === void 0 ? void 0 : (_errors$proposedPipeS3 = errors.proposedPipeSize) === null || _errors$proposedPipeS3 === void 0 ? void 0 : _errors$proposedPipeS3.message : "") : null), (connectionDetail === null || connectionDetail === void 0 ? void 0 : connectionDetail.sewerage) && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     style: isMobile && isEmployee ? {
       fontWeight: "700",
       width: "100%"
     } : {
-      marginTop: "-5px",
       fontWeight: "700"
     },
     className: "card-label-smaller"
@@ -11293,7 +11297,6 @@ const ConnectionDetails = _props => {
       fontWeight: "700",
       width: "100%"
     } : {
-      marginTop: "-5px",
       fontWeight: "700"
     },
     className: "card-label-smaller"
@@ -11331,7 +11334,7 @@ const ConnectionDetails = _props => {
     }
   }))), /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, localFormState.touched.proposedToilets ? errors === null || errors === void 0 ? void 0 : (_errors$proposedToile2 = errors.proposedToilets) === null || _errors$proposedToile2 === void 0 ? void 0 : _errors$proposedToile2.message : ""))));
+  }, localFormState.touched.proposedToilets ? errors === null || errors === void 0 ? void 0 : (_errors$proposedToile2 = errors.proposedToilets) === null || _errors$proposedToile2 === void 0 ? void 0 : _errors$proposedToile2.message : "")));
 };
 
 const WSDocumentsRequired = () => {
@@ -15288,7 +15291,6 @@ const WSDocumentsEmployee = ({
   formState
 }) => {
   var _formData$DocumentsRe, _applicationDetailsDa, _applicationDetailsDa2, _wsDocs$wsDocsData2;
-  const tenantId = Digit.ULBService.getCurrentTenantId();
   const stateId = Digit.ULBService.getStateId();
   const [documents, setDocuments] = useState((formData === null || formData === void 0 ? void 0 : (_formData$DocumentsRe = formData.DocumentsRequired) === null || _formData$DocumentsRe === void 0 ? void 0 : _formData$DocumentsRe.documents) || []);
   const [error, setError] = useState(null);
@@ -15336,7 +15338,9 @@ const WSDocumentsEmployee = ({
       });
     });
   }
-  return /*#__PURE__*/React.createElement("div", null, wsDocs === null || wsDocs === void 0 ? void 0 : (_wsDocs$wsDocsData2 = wsDocs[wsDocsData]) === null || _wsDocs$wsDocsData2 === void 0 ? void 0 : _wsDocs$wsDocsData2.map((document, index) => {
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+    className: "formcomposer-section-grid ws-doc-upload"
+  }, wsDocs === null || wsDocs === void 0 ? void 0 : (_wsDocs$wsDocsData2 = wsDocs[wsDocsData]) === null || _wsDocs$wsDocsData2 === void 0 ? void 0 : _wsDocs$wsDocsData2.map((document, index) => {
     return /*#__PURE__*/React.createElement(SelectDocument$1, {
       key: index,
       document: document,
@@ -15353,7 +15357,7 @@ const WSDocumentsEmployee = ({
       config: config,
       formState: formState
     });
-  }), error && /*#__PURE__*/React.createElement(Toast, {
+  })), error && /*#__PURE__*/React.createElement(Toast, {
     label: error,
     onClose: () => setError(null),
     error: true
@@ -15376,11 +15380,11 @@ function SelectDocument$1({
   id
 }) {
   var _doc$dropdownData, _formData$ConnectionD;
+  const fileRef = useRef();
   const filteredDocument = documents === null || documents === void 0 ? void 0 : documents.filter(item => {
     var _item$documentType;
     return item === null || item === void 0 ? void 0 : (_item$documentType = item.documentType) === null || _item$documentType === void 0 ? void 0 : _item$documentType.includes(doc === null || doc === void 0 ? void 0 : doc.code);
   })[0];
-  const tenantId = Digit.ULBService.getCurrentTenantId();
   const [selectedDocument, setSelectedDocument] = useState(filteredDocument ? {
     ...filteredDocument,
     code: filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.documentType
@@ -15487,11 +15491,7 @@ function SelectDocument$1({
   useEffect(() => {
     if (isHidden) setUploadedFile(null);
   }, [isHidden]);
-  return /*#__PURE__*/React.createElement("div", {
-    style: {
-      marginBottom: "24px"
-    }
-  }, doc !== null && doc !== void 0 && doc.hasDropdown ? /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, doc !== null && doc !== void 0 && doc.hasDropdown ? /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     style: {
       fontWeight: "700"
     }
@@ -15510,9 +15510,7 @@ function SelectDocument$1({
     select: handleSelectDocument,
     optionKey: "i18nKey",
     t: t
-  })) : null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller"
-  }), /*#__PURE__*/React.createElement("div", {
+  })) : null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(UploadFile, {
     onUpload: selectfile,
@@ -15524,9 +15522,6 @@ function SelectDocument$1({
     textStyles: {
       width: "100%"
     },
-    inputStyles: {
-      width: "280px"
-    },
     buttonType: "button",
     error: !uploadedFile,
     accept: "image/*, .pdf, .png, .jpeg, .jpg"
@@ -15631,7 +15626,7 @@ const WSEditConnectionDetails = ({
     applicationNumber
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, connectionDetails.map((connectionDetail, index) => /*#__PURE__*/React.createElement(ConnectionDetails$4, Object.assign({
-    key: connectionDetail.key,
+    key: connectionDetail.key || index,
     index: index,
     connectionDetail: connectionDetail
   }, commonProps))));
@@ -15752,6 +15747,7 @@ const ConnectionDetails$4 = _props => {
     label: `${t(`WS_SERVICE_NAME_LABEL`)}`,
     text: connectionDetail === null || connectionDetail === void 0 ? void 0 : connectionDetail.serviceName
   }))) : /*#__PURE__*/React.createElement("div", {
+    className: "formcomposer-section-grid",
     style: {
       marginBottom: "16px"
     }
@@ -15829,7 +15825,7 @@ const ConnectionDetails$4 = _props => {
         disable: true
       });
     }
-  }))), (connectionDetail === null || connectionDetail === void 0 ? void 0 : connectionDetail.serviceName) == "WATER" && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }))), (connectionDetail === null || connectionDetail === void 0 ? void 0 : connectionDetail.serviceName) == "WATER" && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     style: isMobile && isEmployee ? {
       fontWeight: "700",
       width: "100%"
@@ -15872,7 +15868,7 @@ const ConnectionDetails$4 = _props => {
     }
   }))), /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, localFormState.touched.proposedTaps ? errors === null || errors === void 0 ? void 0 : (_errors$proposedTaps2 = errors.proposedTaps) === null || _errors$proposedTaps2 === void 0 ? void 0 : _errors$proposedTaps2.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }, localFormState.touched.proposedTaps ? errors === null || errors === void 0 ? void 0 : (_errors$proposedTaps2 = errors.proposedTaps) === null || _errors$proposedTaps2 === void 0 ? void 0 : _errors$proposedTaps2.message : "")), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     style: isMobile && isEmployee ? {
       fontWeight: "700",
       width: "100%"
@@ -15907,7 +15903,7 @@ const ConnectionDetails$4 = _props => {
     }
   })), /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, localFormState.touched.proposedPipeSize ? errors === null || errors === void 0 ? void 0 : (_errors$proposedPipeS2 = errors.proposedPipeSize) === null || _errors$proposedPipeS2 === void 0 ? void 0 : _errors$proposedPipeS2.message : "")), (connectionDetail === null || connectionDetail === void 0 ? void 0 : connectionDetail.serviceName) !== "WATER" && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }, localFormState.touched.proposedPipeSize ? errors === null || errors === void 0 ? void 0 : (_errors$proposedPipeS2 = errors.proposedPipeSize) === null || _errors$proposedPipeS2 === void 0 ? void 0 : _errors$proposedPipeS2.message : ""))), (connectionDetail === null || connectionDetail === void 0 ? void 0 : connectionDetail.serviceName) !== "WATER" && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     style: isMobile && isEmployee ? {
       fontWeight: "700",
       width: "100%"
@@ -15950,7 +15946,7 @@ const ConnectionDetails$4 = _props => {
     }
   }))), /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, localFormState.touched.proposedWaterClosets ? errors === null || errors === void 0 ? void 0 : (_errors$proposedWater2 = errors.proposedWaterClosets) === null || _errors$proposedWater2 === void 0 ? void 0 : _errors$proposedWater2.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }, localFormState.touched.proposedWaterClosets ? errors === null || errors === void 0 ? void 0 : (_errors$proposedWater2 = errors.proposedWaterClosets) === null || _errors$proposedWater2 === void 0 ? void 0 : _errors$proposedWater2.message : "")), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     style: isMobile && isEmployee ? {
       fontWeight: "700",
       width: "100%"
@@ -15993,7 +15989,7 @@ const ConnectionDetails$4 = _props => {
     }
   }))), /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, localFormState.touched.proposedToilets ? errors === null || errors === void 0 ? void 0 : (_errors$proposedToile2 = errors.proposedToilets) === null || _errors$proposedToile2 === void 0 ? void 0 : _errors$proposedToile2.message : ""))));
+  }, localFormState.touched.proposedToilets ? errors === null || errors === void 0 ? void 0 : (_errors$proposedToile2 = errors.proposedToilets) === null || _errors$proposedToile2 === void 0 ? void 0 : _errors$proposedToile2.message : "")))));
 };
 
 const WSDisconnectionDocsRequired = ({
@@ -19979,10 +19975,15 @@ const WSInbox = ({
       ...formState
     }
   });
+  let links = [{
+    text: t("WS_APPLY_NEW_CONNECTION_HOME_CARD_LABEL"),
+    link: `/digit-ui/employee/ws/create-application`,
+    roles: ["WS_CEMP", "SW_CEMP"]
+  }];
+  links = links.filter(link => link.roles ? checkForEmployee(link.roles) : true);
   const PropsForInboxLinks = {
     logoIcon: /*#__PURE__*/React.createElement(DropIcon, null),
-    headerText: checkPathName ? "MODULE_WATER" : "MODULE_SW",
-    links: []
+    headerText: checkPathName ? "MODULE_WATER" : "MODULE_SW"
   };
   const SearchFormFields = useCallback(({
     registerRef,
@@ -20079,7 +20080,9 @@ const WSInbox = ({
     sortFormDefaultValues: formState === null || formState === void 0 ? void 0 : formState.tableForm,
     onSortFormReset
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(InboxComposer, _extends({
+  return /*#__PURE__*/React.createElement("div", {
+    className: "app-container"
+  }, /*#__PURE__*/React.createElement(InboxComposer, _extends({
     isInboxLoading,
     PropsForInboxLinks
   }, propsForSearchForm, propsForFilterForm, propsForMobileSortForm, {
@@ -20185,7 +20188,8 @@ const SearchFields = ({
   reset,
   tenantId,
   t,
-  businessService
+  businessService,
+  hideSubmitButton: _hideSubmitButton = false
 }) => {
   var _statusData$otherRole, _statusData$userRoleS;
   const {
@@ -20249,12 +20253,12 @@ const SearchFields = ({
     componentInFront: "+91"
   };
   let validation = {};
-  return /*#__PURE__*/React.createElement(Fragment$2, null, /*#__PURE__*/React.createElement(SearchField, null, /*#__PURE__*/React.createElement("label", null, t("WS_ACK_COMMON_APP_NO_LABEL")), /*#__PURE__*/React.createElement(TextInput, Object.assign({
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SearchField, null, /*#__PURE__*/React.createElement("label", null, t("WS_ACK_COMMON_APP_NO_LABEL")), /*#__PURE__*/React.createElement(TextInput, Object.assign({
     name: "applicationNumber",
     inputRef: register()
   }, validation = {
     isRequired: false,
-    pattern: "^[a-zA-Z0-9-_\/]*$",
+    pattern: "^[a-zA-Z0-9-_/]*$",
     type: "text",
     title: t("ERR_INVALID_APPLICATION_NO")
   }))), /*#__PURE__*/React.createElement(SearchField, null, /*#__PURE__*/React.createElement("label", null, t("WS_MYCONNECTIONS_CONSUMER_NO")), /*#__PURE__*/React.createElement(TextInput, Object.assign({
@@ -20262,7 +20266,7 @@ const SearchFields = ({
     inputRef: register()
   }, validation = {
     isRequired: false,
-    pattern: "^[a-zA-Z0-9\/-]*$",
+    pattern: "^[a-zA-Z0-9/-]*$",
     type: "text",
     title: t("ERR_INVALID_CONSUMER_NO")
   }))), /*#__PURE__*/React.createElement(SearchField, null, /*#__PURE__*/React.createElement("label", null, t("CONSUMER_MOBILE_NUMBER")), /*#__PURE__*/React.createElement(MobileNumber, Object.assign({
@@ -20305,7 +20309,7 @@ const SearchFields = ({
     }),
     name: "toDate",
     control: control
-  })), /*#__PURE__*/React.createElement(SearchField, {
+  })), !_hideSubmitButton && /*#__PURE__*/React.createElement(SearchField, {
     className: "submit"
   }, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("ES_COMMON_SEARCH"),
@@ -20649,17 +20653,80 @@ const SearchApplication = ({
     disableSortBy: true,
     accessor: row => GetCell((row === null || row === void 0 ? void 0 : row.address) || "-")
   }], []);
-  return /*#__PURE__*/React.createElement(Fragment$2, null, /*#__PURE__*/React.createElement(SearchForm, {
+  return /*#__PURE__*/React.createElement("div", {
+    className: "employee-wrapper"
+  }, /*#__PURE__*/React.createElement(CollapsibleCardPage, {
+    title: t("WS_SEARCH_FILTERS_LABEL") || "Search Filters",
+    defaultOpen: true,
+    tabs: [t("WT_SMART_SEARCH"), t("WT_ADVANCED_SEARCH")],
+    defaultTab: t("WT_SMART_SEARCH")
+  }, activeTab => /*#__PURE__*/React.createElement("form", {
+    className: "ws-search-form",
+    onSubmit: handleSubmit(onSubmit)
+  }, activeTab === t("WT_SMART_SEARCH") && /*#__PURE__*/React.createElement("div", {
+    className: "wt-search-grid",
+    style: {
+      display: "grid",
+      gridTemplateColumns: "1fr 1fr",
+      gap: "24px"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "search-field-wrapper"
+  }, /*#__PURE__*/React.createElement("label", null, t("WT_MOBILE_NUMBER")), /*#__PURE__*/React.createElement(MobileNumber, {
+    name: "mobileNumber",
+    inputRef: register({
+      minLength: {
+        value: 10,
+        message: t("CORE_COMMON_MOBILE_ERROR")
+      },
+      maxLength: {
+        value: 10,
+        message: t("CORE_COMMON_MOBILE_ERROR")
+      },
+      pattern: {
+        value: /[6789][0-9]{9}/,
+        message: t("CORE_COMMON_MOBILE_ERROR")
+      }
+    }),
+    type: "number",
+    maxlength: 10
+  }))), activeTab === t("WT_ADVANCED_SEARCH") && /*#__PURE__*/React.createElement(SearchForm, {
+    className: "ws-search-form-wrapper formcomposer-section-grid",
     onSubmit: onSubmit,
     handleSubmit: handleSubmit
-  }, /*#__PURE__*/React.createElement(SearchFields, {
+  }, /*#__PURE__*/React.createElement(SearchFields, Object.assign({}, {
     register,
     control,
     reset,
     tenantId,
     t,
     businessService
-  })), isLoading ? /*#__PURE__*/React.createElement(Loader$1, null) : null, data !== null && data !== void 0 && data.display && !resultOk ? /*#__PURE__*/React.createElement(Card, {
+  }, {
+    hideSubmitButton: true
+  }))), /*#__PURE__*/React.createElement(SearchField, {
+    className: "ws-submit"
+  }, /*#__PURE__*/React.createElement(SubmitBar, {
+    label: t("ES_COMMON_SEARCH"),
+    className: "submit-bar generic-button",
+    submit: true
+  }), /*#__PURE__*/React.createElement("button", {
+    className: "clear-search generic-button",
+    onClick: () => {
+      reset({
+        applicationType: "",
+        fromDate: "",
+        toDate: "",
+        connectionNumber: "",
+        applicationStatus: "",
+        applicationNumber: "",
+        tradeName: "",
+        offset: 0,
+        limit: 10,
+        sortBy: "commencementDate",
+        sortOrder: "DESC"
+      });
+    }
+  }, t(`CS_COMMON_CLEAR_SEARCH`))))), isLoading ? /*#__PURE__*/React.createElement(Loader$1, null) : null, data !== null && data !== void 0 && data.display && !resultOk ? /*#__PURE__*/React.createElement(Card, {
     style: {
       marginTop: 20
     }
@@ -20701,7 +20768,8 @@ const SearchFields$1 = ({
   control,
   reset,
   tenantId,
-  t
+  t,
+  hideSubmitButton: _hideSubmitButton = false
 }) => {
   const propsForMobileNumber = {
     maxlength: 10,
@@ -20710,7 +20778,7 @@ const SearchFields$1 = ({
     componentInFront: "+91"
   };
   const propsForOldConnectionNumberNpropertyId = {
-    pattern: "[A-Za-z]{2}\-[A-Za-z]{2}\-[0-9]{4}\-[0-9]{4}\-[0-9]{2}\-[0-9]{2}\-[0-9]{6}|[A-Za-z]{2}\-[A-Za-z]{2}\-[0-9]{4}\-[0-9]{2}\-[0-9]{2}\-[0-9]{6}",
+    pattern: "[A-Za-z]{2}-[A-Za-z]{2}-[0-9]{4}-[0-9]{4}-[0-9]{2}-[0-9]{2}-[0-9]{6}|[A-Za-z]{2}-[A-Za-z]{2}-[0-9]{4}-[0-9]{2}-[0-9]{2}-[0-9]{6}",
     title: t("ERR_DEFAULT_INPUT_FIELD_MSG")
   };
   let validation = {};
@@ -20719,7 +20787,7 @@ const SearchFields$1 = ({
     inputRef: register({})
   }, validation = {
     isRequired: false,
-    pattern: "^[a-zA-Z0-9\/-]*$",
+    pattern: "^[a-zA-Z0-9/-]*$",
     type: "text",
     title: t("ERR_INVALID_CONSUMER_NO")
   }))), /*#__PURE__*/React.createElement(SearchField, null, /*#__PURE__*/React.createElement("label", null, t("WS_SEARCH_CONNNECTION_OLD_CONSUMER_LABEL")), /*#__PURE__*/React.createElement(TextInput, Object.assign({
@@ -20731,7 +20799,7 @@ const SearchFields$1 = ({
   }, propsForOldConnectionNumberNpropertyId))), /*#__PURE__*/React.createElement(SearchField, null, /*#__PURE__*/React.createElement("label", null, t("WS_HOME_SEARCH_RESULTS_OWN_MOB_LABEL")), /*#__PURE__*/React.createElement(MobileNumber, Object.assign({
     name: "mobileNumber",
     inputRef: register({})
-  }, propsForMobileNumber))), /*#__PURE__*/React.createElement(SearchField, {
+  }, propsForMobileNumber))), !_hideSubmitButton && /*#__PURE__*/React.createElement(SearchField, {
     className: "submit"
   }, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("WS_SEARCH_CONNECTION_SEARCH_BUTTON"),
@@ -20927,7 +20995,7 @@ const SearchWaterConnection = ({
   const [result, setResult] = useState([]);
   const [showToast, setShowToast] = useState(null);
   const convertEpochToDate = dateEpoch => {
-    if (dateEpoch == null || dateEpoch == undefined || dateEpoch == "") {
+    if (dateEpoch == null || dateEpoch === undefined || dateEpoch === "") {
       return "NA";
     }
     const dateFromApi = new Date(dateEpoch);
@@ -20938,14 +21006,16 @@ const SearchWaterConnection = ({
     day = (day > 9 ? "" : "0") + day;
     return `${day}/${month}/${year}`;
   };
-  useEffect(async () => {
-    const payload = {
-      BulkBillCriteria: {
-        tenantId: Digit.ULBService.getCurrentTenantId()
-      }
-    };
-    let data = await Digit.WSService.WSSewsearchDemand(payload, window.location.href.includes("ws/sewerage/search-demand") ? "sw" : "ws");
-    setResult(data.connection);
+  useEffect(() => {
+    (async () => {
+      const payload = {
+        BulkBillCriteria: {
+          tenantId: Digit.ULBService.getCurrentTenantId()
+        }
+      };
+      let data = await Digit.WSService.WSSewsearchDemand(payload, window.location.href.includes("ws/sewerage/search-demand") ? "sw" : "ws");
+      setResult(data.connection);
+    })();
   }, []);
   const {
     t
@@ -21093,7 +21163,7 @@ const SearchWaterConnection = ({
     }) => {
       var _row$original14;
       const amount = (_row$original14 = row.original) === null || _row$original14 === void 0 ? void 0 : _row$original14.due;
-      if (amount || amount == 0) {
+      if (amount || amount === 0) {
         var _row$original15;
         return GetCell(getActionItem((_row$original15 = row.original) === null || _row$original15 === void 0 ? void 0 : _row$original15.status, row));
       } else {
@@ -21185,17 +21255,77 @@ const SearchWaterConnection = ({
         }, t(`${"WS_COMMON_COLLECT_LABEL"}`), " ")));
     }
   };
-  return /*#__PURE__*/React.createElement(Fragment$2, null, window.location.href.includes("search-demand") ? "" : /*#__PURE__*/React.createElement(SearchForm, {
-    className: "ws-custom-wrapper",
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "employee-wrapper"
+  }, window.location.href.includes("search-demand") ? "" : /*#__PURE__*/React.createElement(CollapsibleCardPage, {
+    title: t("WS_SEARCH_FILTERS_LABEL") || "Search Filters",
+    defaultOpen: true,
+    tabs: [t("WT_SMART_SEARCH"), t("WT_ADVANCED_SEARCH")],
+    defaultTab: t("WT_SMART_SEARCH")
+  }, activeTab => /*#__PURE__*/React.createElement("form", {
+    className: "ws-search-form",
+    onSubmit: handleSubmit(onSubmit)
+  }, activeTab === t("WT_SMART_SEARCH") && /*#__PURE__*/React.createElement("div", {
+    className: "wt-search-grid",
+    style: {
+      display: "grid",
+      gridTemplateColumns: "1fr 1fr",
+      gap: "24px"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "search-field-wrapper"
+  }, /*#__PURE__*/React.createElement("label", null, t("WS_MOBILE_NUMBER")), /*#__PURE__*/React.createElement(MobileNumber, {
+    name: "mobileNumber",
+    inputRef: register({
+      minLength: {
+        value: 10,
+        message: t("CORE_COMMON_MOBILE_ERROR")
+      },
+      maxLength: {
+        value: 10,
+        message: t("CORE_COMMON_MOBILE_ERROR")
+      },
+      pattern: {
+        value: /[6789][0-9]{9}/,
+        message: t("CORE_COMMON_MOBILE_ERROR")
+      }
+    }),
+    type: "number",
+    maxlength: 10
+  }))), activeTab === t("WT_ADVANCED_SEARCH") && /*#__PURE__*/React.createElement(SearchForm, {
+    className: "ws-search-form-wrapper formcomposer-section-grid",
     onSubmit: onSubmit,
     handleSubmit: handleSubmit
-  }, /*#__PURE__*/React.createElement(SearchFields$1, {
+  }, /*#__PURE__*/React.createElement(SearchFields$1, Object.assign({}, {
     register,
     control,
     reset,
     tenantId,
     t
-  })), isLoading ? /*#__PURE__*/React.createElement(Loader$1, null) : null, data !== null && data !== void 0 && data.display && !resultOk ? /*#__PURE__*/React.createElement(Card, {
+  }, {
+    hideSubmitButton: true
+  }))), /*#__PURE__*/React.createElement(SearchField, {
+    className: "ws-submit"
+  }, /*#__PURE__*/React.createElement(SubmitBar, {
+    label: t("WS_SEARCH_CONNECTION_SEARCH_BUTTON"),
+    className: "submit-bar generic-button",
+    submit: true
+  }), /*#__PURE__*/React.createElement("button", {
+    className: "clear-search generic-button",
+    onClick: () => {
+      reset({
+        searchType: "CONNECTION",
+        mobileNumber: "",
+        offset: 0,
+        limit: 10,
+        sortBy: "commencementDate",
+        sortOrder: "DESC",
+        propertyId: "",
+        connectionNumber: "",
+        oldConnectionNumber: ""
+      });
+    }
+  }, t("WS_SEARCH_CONNECTION_RESET_BUTTON"))))), isLoading ? /*#__PURE__*/React.createElement(Loader$1, null) : null, data !== null && data !== void 0 && data.display && !resultOk ? /*#__PURE__*/React.createElement(Card, {
     style: {
       marginTop: 20
     }
@@ -21267,7 +21397,7 @@ const SearchWaterConnection = ({
     onClose: w => {
       setShowToast(x => null);
     }
-  }));
+  })));
 };
 
 const BulkBillSearchFields = ({
@@ -31355,7 +31485,8 @@ const NewApplication = () => {
     onFormValueChange: onFormValueChange,
     label: t("CS_COMMON_SUBMIT"),
     onSubmit: onSubmit,
-    defaultValues: sessionFormData
+    defaultValues: sessionFormData,
+    cardFormWrapperClassName: "new-application-card"
   }), showToast && /*#__PURE__*/React.createElement(Toast, {
     isDleteBtn: true,
     error: (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error" ? true : false,
@@ -33155,7 +33286,11 @@ const ActionModal$5 = ({
   actionData,
   applicationData,
   businessService,
-  moduleCode
+  moduleCode,
+  cardClassName,
+  cardFormWrapperClassName,
+  cardFormClassName,
+  formClassName
 }) => {
   var _action$assigneeRoles, _action$assigneeRoles2;
   const {
@@ -33403,7 +33538,11 @@ const ActionModal$5 = ({
     childrenAtTheBottom: true,
     onSubmit: submit,
     defaultValues: defaultValues,
-    formId: "modal-action"
+    formId: "modal-action",
+    cardFormClassName: cardFormClassName,
+    cardFormWrapperClassName: cardFormWrapperClassName,
+    cardClassName: cardClassName,
+    formClassName: formClassName
   })) : /*#__PURE__*/React.createElement(Loader$1, null);
 };
 
@@ -33587,7 +33726,11 @@ const ActionModal$7 = ({
   actionData,
   applicationData,
   businessService,
-  moduleCode
+  moduleCode,
+  cardClassName,
+  cardFormWrapperClassName,
+  cardFormClassName,
+  formClassName
 }) => {
   var _action$roles, _action$roles$, _action$roles$$map;
   const {
@@ -33667,7 +33810,11 @@ const ActionModal$7 = ({
     childrenAtTheBottom: true,
     onSubmit: submit,
     defaultValues: defaultValues,
-    formId: "modal-action"
+    formId: "modal-action",
+    cardFormClassName: cardFormClassName,
+    cardFormWrapperClassName: cardFormWrapperClassName,
+    cardClassName: cardClassName,
+    formClassName: formClassName
   })) : /*#__PURE__*/React.createElement(Loader$1, null);
 };
 
@@ -34220,7 +34367,11 @@ const ActionModal$b = ({
   actionData,
   applicationData,
   businessService,
-  moduleCode
+  moduleCode,
+  cardClassName,
+  cardFormWrapperClassName,
+  cardFormClassName,
+  formClassName
 }) => {
   var _action$assigneeRoles, _action$assigneeRoles2, _dsoData$vendor, _vehicleData$vehicle;
   const {
@@ -34390,7 +34541,11 @@ const ActionModal$b = ({
     childrenAtTheBottom: true,
     onSubmit: submit,
     defaultValues: defaultValues,
-    formId: "modal-action"
+    formId: "modal-action",
+    cardFormClassName: cardFormClassName,
+    cardFormWrapperClassName: cardFormWrapperClassName,
+    cardClassName: cardClassName,
+    formClassName: formClassName
   })) : /*#__PURE__*/React.createElement(Loader$1, null);
 };
 
@@ -35939,8 +36094,9 @@ const TLCaption = ({
   }), /*#__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, {
     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"
+  }), 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", {
+    className: "TLComments",
+    key: index
   }, /*#__PURE__*/React.createElement("h3", null, t("WF_COMMON_COMMENTS")), /*#__PURE__*/React.createElement("p", {
     style: {
       overflowX: "scroll"
@@ -37141,7 +37297,7 @@ function ApplicationDetailsContent({
   oldValue,
   isInfoLabel = false
 }) {
-  var _applicationDetails$a, _applicationDetails$a2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data19, _workflowDetails$data20;
+  var _applicationDetails$a2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data19, _workflowDetails$data20;
   const {
     t
   } = useTranslation();
@@ -37153,8 +37309,6 @@ function ApplicationDetailsContent({
   let {
     id: applicationNo
   } = useParams();
-  const ownersSequences = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a = applicationDetails.applicationData) === null || _applicationDetails$a === void 0 ? void 0 : _applicationDetails$a.owners;
-  console.log("ownersSequences:- ", ownersSequences);
   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");
@@ -37363,7 +37517,6 @@ function ApplicationDetailsContent({
   const openFilePDF = fileId => {
     Digit.UploadServices.Filefetch([fileId], Digit.ULBService.getStateId()).then(res => {
       var _res$data, _res$data$fileStoreId, _res$data$fileStoreId2;
-      console.log("Response of file:", res);
       const concatenatedUrls = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$fileStoreId = _res$data.fileStoreIds) === null || _res$data$fileStoreId === void 0 ? void 0 : (_res$data$fileStoreId2 = _res$data$fileStoreId[0]) === null || _res$data$fileStoreId2 === void 0 ? void 0 : _res$data$fileStoreId2.url;
       if (concatenatedUrls) {
         const urlArray = concatenatedUrls.split(",");
@@ -37421,7 +37574,6 @@ function ApplicationDetailsContent({
         tableLayout: "fixed",
         width: "100%",
         borderCollapse: "collapse",
-        borderCollapse: "collapse",
         border: "1px solid black"
       }
     }, /*#__PURE__*/React.createElement("tr", {
@@ -37452,7 +37604,9 @@ function ApplicationDetailsContent({
           flexWrap: "nowrap",
           gap: "5px"
         }
-      }, element.map((file, fileIndex) => /*#__PURE__*/React.createElement("a", {
+      }, element.map((file, fileIndex) =>
+      /*#__PURE__*/
+      React.createElement("a", {
         key: fileIndex,
         onClick: () => openFilePDF(file.fileStoreId),
         rel: "noopener noreferrer",
@@ -37474,7 +37628,7 @@ function ApplicationDetailsContent({
           border: "1px solid black",
           verticalAlign: "middle"
         }
-      }, console.log("Comming Maintainaince data row:- ", element.data), element && element.editButton === true ? /*#__PURE__*/React.createElement("span", {
+      }, element && element.editButton === true ? /*#__PURE__*/React.createElement("span", {
         style: {
           display: "inline-flex",
           gap: "10px",
@@ -37515,7 +37669,7 @@ function ApplicationDetailsContent({
           })
         });
       }
-      if ((value === null || value === void 0 ? void 0 : value.isLink) == true) {
+      if ((value === null || value === void 0 ? void 0 : value.isLink) === true) {
         var _detail$values2;
         return /*#__PURE__*/React.createElement(Row, {
           key: t(value.title),
@@ -37670,7 +37824,7 @@ function ApplicationDetailsContent({
     let timelineStatusPostfix = "";
     if (window.location.href.includes("/obps/")) {
       var _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _workflowDetails$data15, _workflowDetails$data16, _workflowDetails$data17;
-      if (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data12 = workflowDetails.data) !== null && _workflowDetails$data12 !== void 0 && (_workflowDetails$data13 = _workflowDetails$data12.timeline[index - 1]) !== null && _workflowDetails$data13 !== void 0 && (_workflowDetails$data14 = _workflowDetails$data13.state) !== null && _workflowDetails$data14 !== void 0 && _workflowDetails$data14.includes("BACK_FROM") || workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data15 = workflowDetails.data) !== null && _workflowDetails$data15 !== void 0 && (_workflowDetails$data16 = _workflowDetails$data15.timeline[index - 1]) !== null && _workflowDetails$data16 !== void 0 && (_workflowDetails$data17 = _workflowDetails$data16.state) !== null && _workflowDetails$data17 !== void 0 && _workflowDetails$data17.includes("SEND_TO_CITIZEN")) timelineStatusPostfix = `_NOT_DONE`;else if ((checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.performedAction) === "SEND_TO_ARCHITECT") timelineStatusPostfix = `_BY_ARCHITECT_DONE`;else timelineStatusPostfix = index == 0 ? "" : `_DONE`;
+      if (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data12 = workflowDetails.data) !== null && _workflowDetails$data12 !== void 0 && (_workflowDetails$data13 = _workflowDetails$data12.timeline[index - 1]) !== null && _workflowDetails$data13 !== void 0 && (_workflowDetails$data14 = _workflowDetails$data13.state) !== null && _workflowDetails$data14 !== void 0 && _workflowDetails$data14.includes("BACK_FROM") || workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data15 = workflowDetails.data) !== null && _workflowDetails$data15 !== void 0 && (_workflowDetails$data16 = _workflowDetails$data15.timeline[index - 1]) !== null && _workflowDetails$data16 !== void 0 && (_workflowDetails$data17 = _workflowDetails$data16.state) !== null && _workflowDetails$data17 !== void 0 && _workflowDetails$data17.includes("SEND_TO_CITIZEN")) timelineStatusPostfix = `_NOT_DONE`;else if ((checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.performedAction) === "SEND_TO_ARCHITECT") timelineStatusPostfix = `_BY_ARCHITECT_DONE`;else timelineStatusPostfix = index === 0 ? "" : `_DONE`;
     }
     return /*#__PURE__*/React.createElement(React.Fragment, {
       key: index
@@ -38200,7 +38354,8 @@ const ApplicationDetails = props => {
     actionData: workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : _workflowDetails$data.timeline,
     businessService: businessService,
     workflowDetails: workflowDetails,
-    moduleCode: moduleCode
+    moduleCode: moduleCode,
+    cardFormWrapperClassName: "modal-form"
   }) : null, isWarningPop ? /*#__PURE__*/React.createElement(ApplicationDetailsWarningPopup, {
     action: selectedAction,
     workflowDetails: workflowDetails,
@@ -38463,7 +38618,6 @@ const ApplicationDetails$1 = () => {
     }
   });
   workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data37 = workflowDetails.data) === null || _workflowDetails$data37 === void 0 ? void 0 : (_workflowDetails$data38 = _workflowDetails$data37.actionState) === null || _workflowDetails$data38 === void 0 ? void 0 : (_workflowDetails$data39 = _workflowDetails$data38.nextActions) === null || _workflowDetails$data39 === void 0 ? void 0 : _workflowDetails$data39.forEach(action => {
-    console.log("workflowDetails", workflowDetails);
     if ((action === null || action === void 0 ? void 0 : action.action) === "PAY") {
       var _workflowDetails$data40, _workflowDetails$data41, _workflowDetails$data42, _workflowDetails$data43, _workflowDetails$data44, _workflowDetails$data45;
       if ((workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data40 = workflowDetails.data) === null || _workflowDetails$data40 === void 0 ? void 0 : (_workflowDetails$data41 = _workflowDetails$data40.processInstances) === null || _workflowDetails$data41 === void 0 ? void 0 : (_workflowDetails$data42 = _workflowDetails$data41[0]) === null || _workflowDetails$data42 === void 0 ? void 0 : _workflowDetails$data42.businessService) == "WSReconnection") {
@@ -39604,7 +39758,6 @@ const EditApplication$1 = () => {
     state
   } = useLocation();
   state = state ? typeof state === "string" ? JSON.parse(state) : state : {};
-  const history = useHistory();
   let filters = getQueryStringParams(location.search);
   const [canSubmit, setSubmitValve] = useState(false);
   const [showToast, setShowToast] = useState(null);
@@ -39777,24 +39930,24 @@ const EditApplication$1 = () => {
   if (enabledLoader || isConfigLoading) {
     return /*#__PURE__*/React.createElement(Loader$1, null);
   }
+  console.log(config.body);
   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, {
+    className: "employee-form-content"
+  }, /*#__PURE__*/React.createElement(FormComposer, {
     config: config.body,
     userType: "employee",
     onFormValueChange: onFormValueChange,
     label: t("CS_COMMON_SUBMIT"),
     onSubmit: onSubmit,
     defaultValues: sessionFormData,
-    appData: appData
+    appData: appData,
+    cardFormWrapperClassName: "new-application-card"
   }), showToast && /*#__PURE__*/React.createElement(Toast, {
     error: showToast.key,
     label: t(showToast === null || showToast === void 0 ? void 0 : showToast.message),
     warning: showToast === null || showToast === void 0 ? void 0 : showToast.warning,
     onClose: closeToast
-  }));
+  })));
 };
 
 const ConsumptionDetails = ({