@mseva/upyog-ui-module-ads 1.1.8 → 1.1.9

package/dist/index.modern.js

@@ -1,4 +1,4 @@
-import { Modal, Card as Card$1, CheckBox, Header, SearchForm, SearchField, TextInput, Dropdown, MobileNumber, CardLabelError as CardLabelError$1, DatePicker, SubmitBar, Table, Loader as Loader$1, Toast, AppContainer, BackButton, PrivateRoute, CloseSvg, RadioButtons, Banner, CardText as CardText$1, ActionBar, KeyNote, DeleteIcon, CardSubHeader, FormStep, CardHeader as CardHeader$1, CardLabel, TelePhone, DisplayPhotos, LocationSearchCard as LocationSearchCard$1, CardSectionHeader, CheckPoint, ConnectingCheckPoints, TickMark, CardLabelDesc, TextArea, LabelFieldPair, UploadFile, StatusTable, Row, LinkButton, EmployeeModuleCard, PropertyHouse, Label, LinkLabel, Localities, DetailsCard, SearchAction, FilterAction, PopUp, ShippingTruck, FormComposer, MultiLink, Menu, CitizenHomeCard } from '@mseva/digit-ui-react-components';
+import { Modal, Card as Card$1, CheckBox, Header, SearchForm, SearchField, TextInput, Dropdown, MobileNumber, CardLabelError as CardLabelError$1, DatePicker, SubmitBar, Table, Loader as Loader$1, Toast, AppContainer, BackButton, PrivateRoute, CloseSvg, RadioButtons, Banner, CardText as CardText$1, ActionBar, KeyNote, DeleteIcon, CardSubHeader, FormStep, CardHeader as CardHeader$1, CardLabel, TelePhone, DisplayPhotos, LocationSearchCard as LocationSearchCard$1, CardSectionHeader, CheckPoint, ConnectingCheckPoints, TickMark, CardLabelDesc, TextArea, LabelFieldPair, UploadFile, StatusTable, Row, LinkButton, EmployeeModuleCard, PropertyHouse, Label, LinkLabel, Localities, DetailsCard, SearchAction, FilterAction, PopUp, ShippingTruck, MultiLink, FormComposer, Menu, CitizenHomeCard } from '@mseva/digit-ui-react-components';
 import React, { useState, useEffect, useMemo, useCallback, useRef, Fragment as Fragment$1 } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useHistory, Link, useParams, useRouteMatch, Switch, useLocation, Route, Redirect } from 'react-router-dom';
@@ -238,6 +238,27 @@ const transformBookingResponseToBookingData = (apiResponse = {}) => {
     bookingData
   };
 };
+const areCartSlotsEqual = (a = [], b = []) => {
+  if ((a === null || a === void 0 ? void 0 : a.length) !== (b === null || b === void 0 ? void 0 : b.length)) return false;
+  const sortByAd = arr => {
+    var _ref;
+    return (_ref = [...arr]) === null || _ref === void 0 ? void 0 : _ref.sort((x, y) => {
+      var _x$ad, _y$ad;
+      return String(x === null || x === void 0 ? void 0 : (_x$ad = x.ad) === null || _x$ad === void 0 ? void 0 : _x$ad.id).localeCompare(String(y === null || y === void 0 ? void 0 : (_y$ad = y.ad) === null || _y$ad === void 0 ? void 0 : _y$ad.id));
+    });
+  };
+  const sortedA = sortByAd(a);
+  const sortedB = sortByAd(b);
+  return sortedA.every((item, idx) => {
+    var _item$ad, _other$ad, _item$slots, _item$slots$map, _other$slots, _other$slots$map;
+    const other = sortedB[idx];
+    if (String(item === null || item === void 0 ? void 0 : (_item$ad = item.ad) === null || _item$ad === void 0 ? void 0 : _item$ad.id) !== String(other === null || other === void 0 ? void 0 : (_other$ad = other.ad) === null || _other$ad === void 0 ? void 0 : _other$ad.id)) return false;
+    const slotsA = item === null || item === void 0 ? void 0 : (_item$slots = item.slots) === null || _item$slots === void 0 ? void 0 : (_item$slots$map = _item$slots.map(s => s === null || s === void 0 ? void 0 : s.bookingDate)) === null || _item$slots$map === void 0 ? void 0 : _item$slots$map.sort();
+    const slotsB = other === null || other === void 0 ? void 0 : (_other$slots = other.slots) === null || _other$slots === void 0 ? void 0 : (_other$slots$map = _other$slots.map(s => s === null || s === void 0 ? void 0 : s.bookingDate)) === null || _other$slots$map === void 0 ? void 0 : _other$slots$map.sort();
+    if ((slotsA === null || slotsA === void 0 ? void 0 : slotsA.length) !== (slotsB === null || slotsB === void 0 ? void 0 : slotsB.length)) return false;
+    return slotsA === null || slotsA === void 0 ? void 0 : slotsA.every((date, i) => date === slotsB[i]);
+  });
+};
 const areSlotsEqual = (a = [], b = []) => {
   if ((a === null || a === void 0 ? void 0 : a.length) !== (b === null || b === void 0 ? void 0 : b.length)) return false;
   const key = s => s === null || s === void 0 ? void 0 : s.bookingDate;
@@ -6911,12 +6932,12 @@ const TableConfig = t => ({
       Cell: ({
         row
       }) => {
-        var _row$original5, _row$original5$workfl, _row$original5$workfl2;
-        return GetCell(t(`${row === null || row === void 0 ? void 0 : (_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : (_row$original5$workfl = _row$original5.workflowData) === null || _row$original5$workfl === void 0 ? void 0 : (_row$original5$workfl2 = _row$original5$workfl.state) === null || _row$original5$workfl2 === void 0 ? void 0 : _row$original5$workfl2["applicationStatus"]}`));
+        var _row$original4, _row$original4$search, _row$original5, _row$original5$workfl, _row$original5$workfl2;
+        return GetCell(t(`${row === null || row === void 0 ? void 0 : (_row$original4 = row.original) === null || _row$original4 === void 0 ? void 0 : (_row$original4$search = _row$original4.searchData) === null || _row$original4$search === void 0 ? void 0 : _row$original4$search["bookingStatus"]}` || `${row === null || row === void 0 ? void 0 : (_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : (_row$original5$workfl = _row$original5.workflowData) === null || _row$original5$workfl === void 0 ? void 0 : (_row$original5$workfl2 = _row$original5$workfl.state) === null || _row$original5$workfl2 === void 0 ? void 0 : _row$original5$workfl2["applicationStatus"]}`));
       },
       mobileCell: original => {
-        var _original$workflowDat, _original$workflowDat2;
-        return GetMobCell(t(`ES_ADS_COMMON_STATUS_${original === null || original === void 0 ? void 0 : (_original$workflowDat = original.workflowData) === null || _original$workflowDat === void 0 ? void 0 : (_original$workflowDat2 = _original$workflowDat.state) === null || _original$workflowDat2 === void 0 ? void 0 : _original$workflowDat2["applicationStatus"]}`));
+        var _original$searchData7, _original$workflowDat, _original$workflowDat2;
+        return GetMobCell(t(`ES_ADS_COMMON_STATUS_${(original === null || original === void 0 ? void 0 : (_original$searchData7 = original.searchData) === null || _original$searchData7 === void 0 ? void 0 : _original$searchData7["bookingStatus"]) || (original === null || original === void 0 ? void 0 : (_original$workflowDat = original.workflowData) === null || _original$workflowDat === void 0 ? void 0 : (_original$workflowDat2 = _original$workflowDat.state) === null || _original$workflowDat2 === void 0 ? void 0 : _original$workflowDat2["applicationStatus"])}`));
       }
     }, {
       Header: t("ADS_DATE"),
@@ -6929,8 +6950,8 @@ const TableConfig = t => ({
         return GetCell(dateStr);
       },
       mobileCell: original => {
-        var _original$searchData7;
-        const createdTime = original === null || original === void 0 ? void 0 : (_original$searchData7 = original.searchData) === null || _original$searchData7 === void 0 ? void 0 : _original$searchData7["applicationDate"];
+        var _original$searchData8;
+        const createdTime = original === null || original === void 0 ? void 0 : (_original$searchData8 = original.searchData) === null || _original$searchData8 === void 0 ? void 0 : _original$searchData8["applicationDate"];
         const dateStr = createdTime ? new Date(createdTime).toLocaleDateString("en-GB") : "";
         return GetMobCell(dateStr);
       }
@@ -19711,307 +19732,55 @@ const ADSMyApplications = () => {
   }, t("ADS_NEW_BOOKING") + " +"))));
 };
 
-const ModalConfig = ({
-  t,
-  action,
-  approvers,
-  selectedApprover,
-  setSelectedApprover,
-  selectFile,
-  uploadedFile,
-  setUploadedFile,
-  assigneeLabel,
-  businessService
-}) => {
-  let checkCondtions = true;
-  if ((action === null || action === void 0 ? void 0 : action.action) == "SENDBACKTOCITIZEN" || (action === null || action === void 0 ? void 0 : action.action) == "APPROVE" || (action === null || action === void 0 ? void 0 : action.action) == "REJECT" || (action === null || action === void 0 ? void 0 : action.action) == "SENDBACK") checkCondtions = false;
-  if (action.isTerminateState) checkCondtions = false;
-  return {
-    label: {
-      heading: `WF_${action === null || action === void 0 ? void 0 : action.action}_APPLICATION`,
-      submit: `${action === null || action === void 0 ? void 0 : action.action}`,
-      cancel: "WF_EMPLOYEE_NEWTL_CANCEL"
-    },
-    form: [{
-      body: [{
-        label: !checkCondtions ? null : t("WF_ASSIGNEE_NAME_LABEL"),
-        placeholder: !checkCondtions ? null : t("WF_ASSIGNEE_NAME_PLACEHOLDER"),
-        type: "dropdown",
-        populators: !checkCondtions ? null : /*#__PURE__*/React.createElement(Dropdown, {
-          option: approvers,
-          autoComplete: "off",
-          optionKey: "name",
-          id: "fieldInspector",
-          select: setSelectedApprover,
-          selected: selectedApprover
-        })
-      }, {
-        label: t("WF_COMMON_COMMENTS"),
-        type: "textarea",
-        populators: {
-          name: "comments"
-        }
-      }, {
-        label: t("TL_APPROVAL_CHECKLIST_BUTTON_UP_FILE"),
-        populators: /*#__PURE__*/React.createElement(UploadFile, {
-          id: "workflow-doc",
-          onUpload: selectFile,
-          onDelete: () => {
-            setUploadedFile(null);
-          },
-          message: uploadedFile ? `1 ${t(`ES_PT_ACTION_FILEUPLOADED`)}` : t(`CS_ACTION_NO_FILEUPLOADED`)
-        })
-      }]
-    }]
-  };
-};
+var isArray = Array.isArray;
+var isArray_1 = isArray;
 
-const Heading$1 = props => {
-  return /*#__PURE__*/React.createElement("h1", {
-    className: "heading-m"
-  }, props.label);
-};
-const Close$4 = () => /*#__PURE__*/React.createElement("svg", {
-  xmlns: "http://www.w3.org/2000/svg",
-  viewBox: "0 0 24 24",
-  fill: "#FFFFFF"
-}, /*#__PURE__*/React.createElement("path", {
-  d: "M0 0h24v24H0V0z",
-  fill: "none"
-}), /*#__PURE__*/React.createElement("path", {
-  d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
-}));
-const CloseBtn$4 = props => {
-  return /*#__PURE__*/React.createElement("div", {
-    className: "icon-bg-secondary",
-    onClick: props.onClick
-  }, /*#__PURE__*/React.createElement(Close$4, null));
-};
-const ADSModal = ({
-  t,
-  action,
-  tenantId,
-  state,
-  bookingNo,
-  closeModal,
-  submitAction,
-  actionData,
-  applicationDetails,
-  applicationData,
-  businessService,
-  moduleCode,
-  workflowConfig,
-  workflowDetails,
-  workflowActions,
-  showToast,
-  closeToast,
-  errors
-}) => {
-  var _action$_rawStateObj, _action$assigneeRoles, _action$assigneeRoles2;
-  const [config, setConfig] = useState({});
-  const [defaultValues, setDefaultValues] = useState({});
-  const [approvers, setApprovers] = useState([]);
-  const [selectedApprover, setSelectedApprover] = useState({});
-  const [file, setFile] = useState(null);
-  const [uploadedFile, setUploadedFile] = useState(null);
-  const [error, setError] = useState(null);
-  const [financialYears, setFinancialYears] = useState([]);
-  const [selectedFinancialYear, setSelectedFinancialYear] = useState(null);
-  const preferToStateFor = new Set(["SUBMIT", "INITIATE", "PAY"]);
-  const fromState = (action === null || action === void 0 ? void 0 : action.fromStateCode) || (action === null || action === void 0 ? void 0 : (_action$_rawStateObj = action._rawStateObj) === null || _action$_rawStateObj === void 0 ? void 0 : _action$_rawStateObj.state) || null;
-  const toState = (action === null || action === void 0 ? void 0 : action.toStateCode) || null;
-  const statusToSend = (action === null || action === void 0 ? void 0 : action.status) || (preferToStateFor.has(action === null || action === void 0 ? void 0 : action.action) ? toState || fromState || (action === null || action === void 0 ? void 0 : action.nextState) : fromState || toState || (action === null || action === void 0 ? void 0 : action.nextState));
-  const {
-    data: approverData,
-    isLoading: PTALoading
-  } = Digit.Hooks.useEmployeeSearch(tenantId, {
-    roles: action === null || action === void 0 ? void 0 : (_action$assigneeRoles = action.assigneeRoles) === null || _action$assigneeRoles === void 0 ? void 0 : (_action$assigneeRoles2 = _action$assigneeRoles.map) === null || _action$assigneeRoles2 === void 0 ? void 0 : _action$assigneeRoles2.call(_action$assigneeRoles, e => ({
-      code: e
-    })),
-    isActive: true
-  }, {
-    enabled: !(action !== null && action !== void 0 && action.isTerminateState)
-  });
-  const {
-    isLoading: financialYearsLoading,
-    data: financialYearsData
-  } = Digit.Hooks.pt.useMDMS(tenantId, businessService, "FINANCIAL_YEARLS", {}, {
-    details: {
-      tenantId: Digit.ULBService.getStateId(),
-      moduleDetails: [{
-        moduleName: "egf-master",
-        masterDetails: [{
-          name: "FinancialYear",
-          filter: "[?(@.module == 'ADV')]"
-        }]
-      }]
-    }
-  });
-  useEffect(() => {
-    if (financialYearsData && financialYearsData["egf-master"]) {
-      var _financialYearsData$e;
-      setFinancialYears((_financialYearsData$e = financialYearsData["egf-master"]) === null || _financialYearsData$e === void 0 ? void 0 : _financialYearsData$e["FinancialYear"]);
-    }
-  }, [financialYearsData]);
-  const {
-    data: EmployeeStatusData
-  } = Digit.Hooks.useCustomMDMS(tenantId, "common-masters", [{
-    name: "Department"
-  }]);
-  useEffect(() => {
-    if (approverData && EmployeeStatusData) {
-      var _approverData$Employe;
-      const departments = EmployeeStatusData["common-masters"].Department;
-      setApprovers(approverData === null || approverData === void 0 ? void 0 : (_approverData$Employe = approverData.Employees) === null || _approverData$Employe === void 0 ? void 0 : _approverData$Employe.map(employee => {
-        var _employee$assignments, _employee$assignments2, _employee$user;
-        const deptCode = employee === null || employee === void 0 ? void 0 : (_employee$assignments = employee.assignments) === null || _employee$assignments === void 0 ? void 0 : (_employee$assignments2 = _employee$assignments[0]) === null || _employee$assignments2 === void 0 ? void 0 : _employee$assignments2.department;
-        const matchedDept = departments === null || departments === void 0 ? void 0 : departments.find(d => (d === null || d === void 0 ? void 0 : d.code) === deptCode);
-        return {
-          uuid: employee === null || employee === void 0 ? void 0 : employee.uuid,
-          name: `${employee === null || employee === void 0 ? void 0 : (_employee$user = employee.user) === null || _employee$user === void 0 ? void 0 : _employee$user.name} - ${matchedDept === null || matchedDept === void 0 ? void 0 : matchedDept.name}`
-        };
-      }));
+var freeGlobal = typeof commonjsGlobal == 'object' && commonjsGlobal && commonjsGlobal.Object === Object && commonjsGlobal;
+var _freeGlobal = freeGlobal;
+
+var freeSelf = typeof self == 'object' && self && self.Object === Object && self;
+var root = _freeGlobal || freeSelf || Function('return this')();
+var _root = root;
+
+var Symbol$1 = _root.Symbol;
+var _Symbol = Symbol$1;
+
+var objectProto = Object.prototype;
+var hasOwnProperty$1 = objectProto.hasOwnProperty;
+var nativeObjectToString = objectProto.toString;
+var symToStringTag = _Symbol ? _Symbol.toStringTag : undefined;
+function getRawTag(value) {
+  var isOwn = hasOwnProperty$1.call(value, symToStringTag),
+    tag = value[symToStringTag];
+  try {
+    value[symToStringTag] = undefined;
+    var unmasked = true;
+  } catch (e) {}
+  var result = nativeObjectToString.call(value);
+  if (unmasked) {
+    if (isOwn) {
+      value[symToStringTag] = tag;
+    } else {
+      delete value[symToStringTag];
     }
-  }, [approverData]);
-  function selectFile(e) {
-    setFile(e.target.files[0]);
   }
-  useEffect(() => {
-    (async () => {
-      setError(null);
-      if (file) {
-        if (file.size >= 5242880) {
-          setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
-        } else {
-          try {
-            var _response$data, _response$data$files;
-            const response = await Digit.UploadServices.Filestorage("PT", file, Digit.ULBService.getStateId());
-            if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
-              var _response$data2, _response$data2$files;
-              setUploadedFile(response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$files = _response$data2.files[0]) === null || _response$data2$files === void 0 ? void 0 : _response$data2$files.fileStoreId);
-            } else {
-              setError(t("CS_FILE_UPLOAD_ERROR"));
-            }
-          } catch (err) {
-            setError(t("CS_FILE_UPLOAD_ERROR"));
-          }
-        }
-      }
-    })();
-  }, [file]);
-  function submit(data) {
-    applicationData = {
-      ...applicationData,
-      action: action === null || action === void 0 ? void 0 : action.action,
-      comment: data === null || data === void 0 ? void 0 : data.comments,
-      assignee: !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? null : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
-      status: statusToSend,
-      wfDocuments: uploadedFile ? [{
-        documentType: (action === null || action === void 0 ? void 0 : action.action) + " DOC",
-        fileName: file === null || file === void 0 ? void 0 : file.name,
-        fileStoreId: uploadedFile
-      }] : null
-    };
-    submitAction({
-      Licenses: [applicationData]
-    });
-  }
-  useEffect(() => {
-    if (workflowActions && workflowActions.length > 0) {
-      const meta = workflowActions.find(w => w.action === (action === null || action === void 0 ? void 0 : action.action));
-    }
-  }, [workflowActions, action]);
-  useEffect(() => {
-    if (action) {
-      setConfig(ModalConfig({
-        t,
-        action,
-        approvers,
-        selectedApprover,
-        setSelectedApprover,
-        selectFile,
-        uploadedFile,
-        setUploadedFile,
-        businessService
-      }));
-    }
-  }, [action, approvers, financialYears, selectedFinancialYear, uploadedFile]);
-  return action && config.form ? /*#__PURE__*/React.createElement(Modal, {
-    headerBarMain: /*#__PURE__*/React.createElement(Heading$1, {
-      label: t(config.label.heading)
-    }),
-    headerBarEnd: /*#__PURE__*/React.createElement(CloseBtn$4, {
-      onClick: closeModal
-    }),
-    actionCancelLabel: t(config.label.cancel),
-    actionCancelOnSubmit: closeModal,
-    actionSaveLabel: t(config.label.submit),
-    actionSaveOnSubmit: () => {},
-    formId: "modal-action"
-  }, /*#__PURE__*/React.createElement(FormComposer, {
-    config: config.form,
-    noBoxShadow: true,
-    inline: true,
-    childrenAtTheBottom: true,
-    onSubmit: submit,
-    defaultValues: defaultValues,
-    formId: "modal-action"
-  }), showToast && /*#__PURE__*/React.createElement(Toast, {
-    error: showToast.key === "error" ? true : false,
-    label: errors,
-    onClose: closeToast
-  })) : /*#__PURE__*/React.createElement(Loader$1, null);
-};
-
-var isArray = Array.isArray;
-var isArray_1 = isArray;
-
-var freeGlobal = typeof commonjsGlobal == 'object' && commonjsGlobal && commonjsGlobal.Object === Object && commonjsGlobal;
-var _freeGlobal = freeGlobal;
-
-var freeSelf = typeof self == 'object' && self && self.Object === Object && self;
-var root = _freeGlobal || freeSelf || Function('return this')();
-var _root = root;
-
-var Symbol$1 = _root.Symbol;
-var _Symbol = Symbol$1;
-
-var objectProto = Object.prototype;
-var hasOwnProperty$1 = objectProto.hasOwnProperty;
-var nativeObjectToString = objectProto.toString;
-var symToStringTag = _Symbol ? _Symbol.toStringTag : undefined;
-function getRawTag(value) {
-  var isOwn = hasOwnProperty$1.call(value, symToStringTag),
-    tag = value[symToStringTag];
-  try {
-    value[symToStringTag] = undefined;
-    var unmasked = true;
-  } catch (e) {}
-  var result = nativeObjectToString.call(value);
-  if (unmasked) {
-    if (isOwn) {
-      value[symToStringTag] = tag;
-    } else {
-      delete value[symToStringTag];
-    }
-  }
-  return result;
-}
-var _getRawTag = getRawTag;
-
-var objectProto$1 = Object.prototype;
-var nativeObjectToString$1 = objectProto$1.toString;
-function objectToString(value) {
-  return nativeObjectToString$1.call(value);
-}
-var _objectToString = objectToString;
-
-var nullTag = '[object Null]',
-  undefinedTag = '[object Undefined]';
-var symToStringTag$1 = _Symbol ? _Symbol.toStringTag : undefined;
-function baseGetTag(value) {
-  if (value == null) {
-    return value === undefined ? undefinedTag : nullTag;
+  return result;
+}
+var _getRawTag = getRawTag;
+
+var objectProto$1 = Object.prototype;
+var nativeObjectToString$1 = objectProto$1.toString;
+function objectToString(value) {
+  return nativeObjectToString$1.call(value);
+}
+var _objectToString = objectToString;
+
+var nullTag = '[object Null]',
+  undefinedTag = '[object Undefined]';
+var symToStringTag$1 = _Symbol ? _Symbol.toStringTag : undefined;
+function baseGetTag(value) {
+  if (value == null) {
+    return value === undefined ? undefinedTag : nullTag;
   }
   return symToStringTag$1 && symToStringTag$1 in Object(value) ? _getRawTag(value) : _objectToString(value);
 }
@@ -22186,12 +21955,10 @@ const ADSCartDetails$1 = ({
   cartDetails,
   t
 }) => {
-  const [expanded, setExpanded] = useState(() => cartDetails === null || cartDetails === void 0 ? void 0 : cartDetails.map(item => {
-    var _item$ad;
-    return item === null || item === void 0 ? void 0 : (_item$ad = item.ad) === null || _item$ad === void 0 ? void 0 : _item$ad.id;
-  }));
-  const toggleExpand = adId => {
-    setExpanded(prev => prev !== null && prev !== void 0 && prev.includes(adId) ? prev === null || prev === void 0 ? void 0 : prev.filter(id => id !== adId) : [...prev, adId]);
+  const getKey = ad => `${ad === null || ad === void 0 ? void 0 : ad.id}_${ad === null || ad === void 0 ? void 0 : ad.bookingStartDate}_${ad === null || ad === void 0 ? void 0 : ad.bookingEndDate}`;
+  const [expanded, setExpanded] = useState(() => cartDetails === null || cartDetails === void 0 ? void 0 : cartDetails.map(item => getKey(item === null || item === void 0 ? void 0 : item.ad)));
+  const toggleExpand = key => {
+    setExpanded(prev => prev !== null && prev !== void 0 && prev.includes(key) ? prev === null || prev === void 0 ? void 0 : prev.filter(id => id !== key) : [...prev, key]);
   };
   const makeColumns = () => [{
     Header: t("ADS_DATE"),
@@ -22225,8 +21992,9 @@ const ADSCartDetails$1 = ({
       color: "#666"
     }
   }, t("ADS_NO_ADVERTISMENT_DETAILS")) : cartDetails === null || cartDetails === void 0 ? void 0 : cartDetails.map((item, idx) => {
-    var _item$ad2, _item$ad4, _item$ad5, _item$ad6, _item$ad7, _item$slots;
-    const isOpen = expanded === null || expanded === void 0 ? void 0 : expanded.includes(item === null || item === void 0 ? void 0 : (_item$ad2 = item.ad) === null || _item$ad2 === void 0 ? void 0 : _item$ad2.id);
+    var _item$ad, _item$ad2, _item$ad3, _item$ad4, _item$slots;
+    const key = getKey(item === null || item === void 0 ? void 0 : item.ad);
+    const isOpen = expanded === null || expanded === void 0 ? void 0 : expanded.includes(key);
     return /*#__PURE__*/React.createElement("div", {
       key: idx,
       style: {
@@ -22236,10 +22004,7 @@ const ADSCartDetails$1 = ({
         overflow: "hidden"
       }
     }, /*#__PURE__*/React.createElement("div", {
-      onClick: () => {
-        var _item$ad3;
-        return toggleExpand(item === null || item === void 0 ? void 0 : (_item$ad3 = item.ad) === null || _item$ad3 === void 0 ? void 0 : _item$ad3.id);
-      },
+      onClick: () => toggleExpand(key),
       style: {
         background: "#f9f9f9",
         padding: "10px 14px",
@@ -22251,7 +22016,7 @@ const ADSCartDetails$1 = ({
         justifyContent: "space-between",
         alignItems: "center"
       }
-    }, /*#__PURE__*/React.createElement("span", null, t((item === null || item === void 0 ? void 0 : (_item$ad4 = item.ad) === null || _item$ad4 === void 0 ? void 0 : _item$ad4.name) ?? (item === null || item === void 0 ? void 0 : (_item$ad5 = item.ad) === null || _item$ad5 === void 0 ? void 0 : _item$ad5.location)), item !== null && item !== void 0 && (_item$ad6 = item.ad) !== null && _item$ad6 !== void 0 && _item$ad6.amount ? ` — ₹${((item === null || item === void 0 ? void 0 : (_item$ad7 = item.ad) === null || _item$ad7 === void 0 ? void 0 : _item$ad7.amount) * 1.18 * (item === null || item === void 0 ? void 0 : (_item$slots = item.slots) === null || _item$slots === void 0 ? void 0 : _item$slots.length)).toFixed(2)}` : ""), /*#__PURE__*/React.createElement("span", {
+    }, /*#__PURE__*/React.createElement("span", null, t((item === null || item === void 0 ? void 0 : (_item$ad = item.ad) === null || _item$ad === void 0 ? void 0 : _item$ad.name) ?? (item === null || item === void 0 ? void 0 : (_item$ad2 = item.ad) === null || _item$ad2 === void 0 ? void 0 : _item$ad2.location)), item !== null && item !== void 0 && (_item$ad3 = item.ad) !== null && _item$ad3 !== void 0 && _item$ad3.amount ? ` — ₹${((item === null || item === void 0 ? void 0 : (_item$ad4 = item.ad) === null || _item$ad4 === void 0 ? void 0 : _item$ad4.amount) * 1.18 * (item === null || item === void 0 ? void 0 : (_item$slots = item.slots) === null || _item$slots === void 0 ? void 0 : _item$slots.length)).toFixed(2)}` : ""), /*#__PURE__*/React.createElement("span", {
       style: {
         fontSize: "18px"
       }
@@ -22279,7 +22044,7 @@ const ADSCartDetails$1 = ({
 };
 
 const ADSApplicationDetails = () => {
-  var _workflowDetails$data, _workflowDetails$data2, _ads_details$addition, _ads_details$cartDeta, _ads_details$applican, _ads_details$applican2, _ads_details$applican3, _ads_details$address, _ads_details$address2, _docs;
+  var _workflowDetails$data, _workflowDetails$data2, _ads_details$addition, _ads_details$applican, _ads_details$applican2, _ads_details$applican3, _ads_details$address, _ads_details$address2, _docs;
   const [wfActionsState, setWfActionsState] = useState([]);
   const {
     t
@@ -22439,32 +22204,6 @@ const ADSApplicationDetails = () => {
     label: t("PTR_PET_DOWNLOAD_ACK_FORM"),
     onClick: () => downloadAcknowledgement(application)
   });
-  const columns = [{
-    Header: `${t("ADS_TYPE")}`,
-    accessor: "addType"
-  }, {
-    Header: t("ADS_FACE_AREA"),
-    accessor: "faceArea",
-    Cell: ({
-      value
-    }) => t((value === null || value === void 0 ? void 0 : value.replaceAll("_", " ")) || "N/A")
-  }, {
-    Header: `${t("ADS_NIGHT_LIGHT")}`,
-    accessor: "nightLight"
-  }, {
-    Header: `${t("CHB_BOOKING_DATE")}`,
-    accessor: "bookingDate"
-  }, {
-    Header: `${t("PT_COMMON_TABLE_COL_STATUS_LABEL")}`,
-    accessor: "bookingStatus"
-  }];
-  const adslistRows = (ads_details === null || ads_details === void 0 ? void 0 : (_ads_details$cartDeta = ads_details.cartDetails) === null || _ads_details$cartDeta === void 0 ? void 0 : _ads_details$cartDeta.map(slot => ({
-    addType: `${t(slot.addType)}`,
-    faceArea: `${t(slot.faceArea)}`,
-    nightLight: `${t(slot.nightLight ? "Yes" : "No")}`,
-    bookingDate: `${t(slot.bookingDate)}`,
-    bookingStatus: `${t(slot.status)}`
-  }))) || [];
   if (reciept_data && (reciept_data === null || reciept_data === void 0 ? void 0 : reciept_data.Payments.length) > 0 && !recieptDataLoading) {
     dowloadOptions.push({
       label: t("CHB_FEE_RECEIPT"),
@@ -22533,7 +22272,7 @@ const ADSApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("BOOKING_STATUS"),
-    text: ads_details === null || ads_details === void 0 ? void 0 : ads_details.bookingStatus
+    text: t(ads_details === null || ads_details === void 0 ? void 0 : ads_details.bookingStatus)
   }), (ads_details === null || ads_details === void 0 ? void 0 : ads_details.receiptNo) && /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("CITIZEN_SUCCESS_ADVT_HOARDINGS_PAYMENT_RECEIPT_NO"),
@@ -22577,6 +22316,258 @@ const ADSApplicationDetails = () => {
   })));
 };
 
+const ModalConfig = ({
+  t,
+  action,
+  approvers,
+  selectedApprover,
+  setSelectedApprover,
+  selectFile,
+  uploadedFile,
+  setUploadedFile,
+  assigneeLabel,
+  businessService
+}) => {
+  let checkCondtions = true;
+  if ((action === null || action === void 0 ? void 0 : action.action) == "SENDBACKTOCITIZEN" || (action === null || action === void 0 ? void 0 : action.action) == "APPROVE" || (action === null || action === void 0 ? void 0 : action.action) == "REJECT" || (action === null || action === void 0 ? void 0 : action.action) == "SENDBACK") checkCondtions = false;
+  if (action.isTerminateState) checkCondtions = false;
+  return {
+    label: {
+      heading: `WF_${action === null || action === void 0 ? void 0 : action.action}_APPLICATION`,
+      submit: `${action === null || action === void 0 ? void 0 : action.action}`,
+      cancel: "WF_EMPLOYEE_NEWTL_CANCEL"
+    },
+    form: [{
+      body: [{
+        label: !checkCondtions ? null : t("WF_ASSIGNEE_NAME_LABEL"),
+        placeholder: !checkCondtions ? null : t("WF_ASSIGNEE_NAME_PLACEHOLDER"),
+        type: "dropdown",
+        populators: !checkCondtions ? null : /*#__PURE__*/React.createElement(Dropdown, {
+          option: approvers,
+          autoComplete: "off",
+          optionKey: "name",
+          id: "fieldInspector",
+          select: setSelectedApprover,
+          selected: selectedApprover
+        })
+      }, {
+        label: t("WF_COMMON_COMMENTS"),
+        type: "textarea",
+        populators: {
+          name: "comments"
+        }
+      }, {
+        label: t("TL_APPROVAL_CHECKLIST_BUTTON_UP_FILE"),
+        populators: /*#__PURE__*/React.createElement(UploadFile, {
+          id: "workflow-doc",
+          onUpload: selectFile,
+          onDelete: () => {
+            setUploadedFile(null);
+          },
+          message: uploadedFile ? `1 ${t(`ES_PT_ACTION_FILEUPLOADED`)}` : t(`CS_ACTION_NO_FILEUPLOADED`)
+        })
+      }]
+    }]
+  };
+};
+
+const Heading$1 = props => {
+  return /*#__PURE__*/React.createElement("h1", {
+    className: "heading-m"
+  }, props.label);
+};
+const Close$4 = () => /*#__PURE__*/React.createElement("svg", {
+  xmlns: "http://www.w3.org/2000/svg",
+  viewBox: "0 0 24 24",
+  fill: "#FFFFFF"
+}, /*#__PURE__*/React.createElement("path", {
+  d: "M0 0h24v24H0V0z",
+  fill: "none"
+}), /*#__PURE__*/React.createElement("path", {
+  d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
+}));
+const CloseBtn$4 = props => {
+  return /*#__PURE__*/React.createElement("div", {
+    className: "icon-bg-secondary",
+    onClick: props.onClick
+  }, /*#__PURE__*/React.createElement(Close$4, null));
+};
+const ADSModal = ({
+  t,
+  action,
+  tenantId,
+  state,
+  bookingNo,
+  closeModal,
+  submitAction,
+  actionData,
+  applicationDetails,
+  applicationData,
+  businessService,
+  moduleCode,
+  workflowConfig,
+  workflowDetails,
+  workflowActions,
+  showToast,
+  closeToast,
+  errors
+}) => {
+  var _action$_rawStateObj, _action$assigneeRoles, _action$assigneeRoles2;
+  const [config, setConfig] = useState({});
+  const [defaultValues, setDefaultValues] = useState({});
+  const [approvers, setApprovers] = useState([]);
+  const [selectedApprover, setSelectedApprover] = useState({});
+  const [file, setFile] = useState(null);
+  const [uploadedFile, setUploadedFile] = useState(null);
+  const [error, setError] = useState(null);
+  const [financialYears, setFinancialYears] = useState([]);
+  const [selectedFinancialYear, setSelectedFinancialYear] = useState(null);
+  const preferToStateFor = new Set(["SUBMIT", "INITIATE", "PAY"]);
+  const fromState = (action === null || action === void 0 ? void 0 : action.fromStateCode) || (action === null || action === void 0 ? void 0 : (_action$_rawStateObj = action._rawStateObj) === null || _action$_rawStateObj === void 0 ? void 0 : _action$_rawStateObj.state) || null;
+  const toState = (action === null || action === void 0 ? void 0 : action.toStateCode) || null;
+  const statusToSend = (action === null || action === void 0 ? void 0 : action.status) || (preferToStateFor.has(action === null || action === void 0 ? void 0 : action.action) ? toState || fromState || (action === null || action === void 0 ? void 0 : action.nextState) : fromState || toState || (action === null || action === void 0 ? void 0 : action.nextState));
+  const {
+    data: approverData,
+    isLoading: PTALoading
+  } = Digit.Hooks.useEmployeeSearch(tenantId, {
+    roles: action === null || action === void 0 ? void 0 : (_action$assigneeRoles = action.assigneeRoles) === null || _action$assigneeRoles === void 0 ? void 0 : (_action$assigneeRoles2 = _action$assigneeRoles.map) === null || _action$assigneeRoles2 === void 0 ? void 0 : _action$assigneeRoles2.call(_action$assigneeRoles, e => ({
+      code: e
+    })),
+    isActive: true
+  }, {
+    enabled: !(action !== null && action !== void 0 && action.isTerminateState)
+  });
+  const {
+    isLoading: financialYearsLoading,
+    data: financialYearsData
+  } = Digit.Hooks.pt.useMDMS(tenantId, businessService, "FINANCIAL_YEARLS", {}, {
+    details: {
+      tenantId: Digit.ULBService.getStateId(),
+      moduleDetails: [{
+        moduleName: "egf-master",
+        masterDetails: [{
+          name: "FinancialYear",
+          filter: "[?(@.module == 'ADV')]"
+        }]
+      }]
+    }
+  });
+  useEffect(() => {
+    if (financialYearsData && financialYearsData["egf-master"]) {
+      var _financialYearsData$e;
+      setFinancialYears((_financialYearsData$e = financialYearsData["egf-master"]) === null || _financialYearsData$e === void 0 ? void 0 : _financialYearsData$e["FinancialYear"]);
+    }
+  }, [financialYearsData]);
+  const {
+    data: EmployeeStatusData
+  } = Digit.Hooks.useCustomMDMS(tenantId, "common-masters", [{
+    name: "Department"
+  }]);
+  useEffect(() => {
+    if (approverData && EmployeeStatusData) {
+      var _approverData$Employe;
+      const departments = EmployeeStatusData["common-masters"].Department;
+      setApprovers(approverData === null || approverData === void 0 ? void 0 : (_approverData$Employe = approverData.Employees) === null || _approverData$Employe === void 0 ? void 0 : _approverData$Employe.map(employee => {
+        var _employee$assignments, _employee$assignments2, _employee$user;
+        const deptCode = employee === null || employee === void 0 ? void 0 : (_employee$assignments = employee.assignments) === null || _employee$assignments === void 0 ? void 0 : (_employee$assignments2 = _employee$assignments[0]) === null || _employee$assignments2 === void 0 ? void 0 : _employee$assignments2.department;
+        const matchedDept = departments === null || departments === void 0 ? void 0 : departments.find(d => (d === null || d === void 0 ? void 0 : d.code) === deptCode);
+        return {
+          uuid: employee === null || employee === void 0 ? void 0 : employee.uuid,
+          name: `${employee === null || employee === void 0 ? void 0 : (_employee$user = employee.user) === null || _employee$user === void 0 ? void 0 : _employee$user.name} - ${matchedDept === null || matchedDept === void 0 ? void 0 : matchedDept.name}`
+        };
+      }));
+    }
+  }, [approverData]);
+  function selectFile(e) {
+    setFile(e.target.files[0]);
+  }
+  useEffect(() => {
+    (async () => {
+      setError(null);
+      if (file) {
+        if (file.size >= 5242880) {
+          setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
+        } else {
+          try {
+            var _response$data, _response$data$files;
+            const response = await Digit.UploadServices.Filestorage("PT", file, Digit.ULBService.getStateId());
+            if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
+              var _response$data2, _response$data2$files;
+              setUploadedFile(response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$files = _response$data2.files[0]) === null || _response$data2$files === void 0 ? void 0 : _response$data2$files.fileStoreId);
+            } else {
+              setError(t("CS_FILE_UPLOAD_ERROR"));
+            }
+          } catch (err) {
+            setError(t("CS_FILE_UPLOAD_ERROR"));
+          }
+        }
+      }
+    })();
+  }, [file]);
+  function submit(data) {
+    applicationData = {
+      ...applicationData,
+      action: action === null || action === void 0 ? void 0 : action.action,
+      comment: data === null || data === void 0 ? void 0 : data.comments,
+      assignee: !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? null : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
+      status: statusToSend,
+      wfDocuments: uploadedFile ? [{
+        documentType: (action === null || action === void 0 ? void 0 : action.action) + " DOC",
+        fileName: file === null || file === void 0 ? void 0 : file.name,
+        fileStoreId: uploadedFile
+      }] : null
+    };
+    submitAction({
+      Licenses: [applicationData]
+    });
+  }
+  useEffect(() => {
+    if (workflowActions && workflowActions.length > 0) {
+      const meta = workflowActions.find(w => w.action === (action === null || action === void 0 ? void 0 : action.action));
+    }
+  }, [workflowActions, action]);
+  useEffect(() => {
+    if (action) {
+      setConfig(ModalConfig({
+        t,
+        action,
+        approvers,
+        selectedApprover,
+        setSelectedApprover,
+        selectFile,
+        uploadedFile,
+        setUploadedFile,
+        businessService
+      }));
+    }
+  }, [action, approvers, financialYears, selectedFinancialYear, uploadedFile]);
+  return action && config.form ? /*#__PURE__*/React.createElement(Modal, {
+    headerBarMain: /*#__PURE__*/React.createElement(Heading$1, {
+      label: t(config.label.heading)
+    }),
+    headerBarEnd: /*#__PURE__*/React.createElement(CloseBtn$4, {
+      onClick: closeModal
+    }),
+    actionCancelLabel: t(config.label.cancel),
+    actionCancelOnSubmit: closeModal,
+    actionSaveLabel: t(config.label.submit),
+    actionSaveOnSubmit: () => {},
+    formId: "modal-action"
+  }, /*#__PURE__*/React.createElement(FormComposer, {
+    config: config.form,
+    noBoxShadow: true,
+    inline: true,
+    childrenAtTheBottom: true,
+    onSubmit: submit,
+    defaultValues: defaultValues,
+    formId: "modal-action"
+  }), showToast && /*#__PURE__*/React.createElement(Toast, {
+    error: showToast.key === "error" ? true : false,
+    label: errors,
+    onClose: closeToast
+  })) : /*#__PURE__*/React.createElement(Loader$1, null);
+};
+
 var defineProperty = function () {
   try {
     var func = _getNative(Object, 'defineProperty');
@@ -23666,10 +23657,8 @@ const ADSCitizenDetailsNew = ({
   onGoBack,
   onChange: _onChange = () => {}
 }) => {
-  var _window$location, _window$location$path, _errors$name, _errors$address, _errors$pincode;
+  var _errors$name, _errors$address, _errors$pincode;
   const dispatch = useDispatch();
-  const isEmployee = typeof window !== "undefined" && ((_window$location = window.location) === null || _window$location === void 0 ? void 0 : (_window$location$path = _window$location.pathname) === null || _window$location$path === void 0 ? void 0 : _window$location$path.includes("/employee"));
-  const formStorageKey = `ads_form_${isEmployee ? "employee" : "citizen"}`;
   const userInfo = Digit.UserService.getUser();
   const isCitizen = window.location.href.includes("citizen");
   const tenantId = isCitizen ? window.localStorage.getItem("CITIZEN.CITY") : window.localStorage.getItem("Employee.tenant-id");
@@ -23683,7 +23672,6 @@ const ADSCitizenDetailsNew = ({
     control,
     handleSubmit,
     setValue,
-    reset,
     formState: {
       errors
     },
@@ -23691,14 +23679,13 @@ const ADSCitizenDetailsNew = ({
   } = useForm({
     mode: "onChange",
     defaultValues: {
-      name: name || "",
+      name: isCitizen ? name || "" : "",
       emailId: isCitizen ? emailId || "" : "",
       mobileNumber: isCitizen ? mobileNumber || "" : "",
       address: "",
       pincode: ""
     }
   });
-  if (typeof window !== "undefined") window.__ADS_FORM_DRAFT = window.__ADS_FORM_DRAFT || {};
   useEffect(() => {
     if (currentStepData !== null && currentStepData !== void 0 && currentStepData.CreatedResponse) {
       const created = currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.CreatedResponse;
@@ -23713,19 +23700,6 @@ const ADSCitizenDetailsNew = ({
       }
     }
   }, [currentStepData, setValue]);
-  useEffect(() => {
-    try {
-      var _window$__ADS_FORM_DR;
-      const mem = (_window$__ADS_FORM_DR = window.__ADS_FORM_DRAFT) === null || _window$__ADS_FORM_DR === void 0 ? void 0 : _window$__ADS_FORM_DR[formStorageKey];
-      if (mem && typeof mem === "object") {
-        reset(mem);
-        console.info("[ADS] rehydrated form from in-memory draft");
-        return;
-      }
-    } catch (e) {
-      console.warn("[ADS] failed to rehydrate from in-memory", e);
-    }
-  }, []);
   const onSubmit = async data => {
     var _currentStepData$ads, _currentStepData$Crea;
     const applicationDate = Date.now();
@@ -24087,8 +24061,8 @@ const AvailabilityModal = ({
   });
   const slots = (slotResults === null || slotResults === void 0 ? void 0 : slotResults.advertisementSlotAvailabiltityDetails) || [];
   const existingForAd = (cartSlots === null || cartSlots === void 0 ? void 0 : (_cartSlots$find = cartSlots.find(item => {
-    var _item$ad;
-    return (item === null || item === void 0 ? void 0 : (_item$ad = item.ad) === null || _item$ad === void 0 ? void 0 : _item$ad.id) === (ad === null || ad === void 0 ? void 0 : ad.id);
+    var _item$ad, _item$ad2, _item$ad3;
+    return (item === null || item === void 0 ? void 0 : (_item$ad = item.ad) === null || _item$ad === void 0 ? void 0 : _item$ad.id) === (ad === null || ad === void 0 ? void 0 : ad.id) && (item === null || item === void 0 ? void 0 : (_item$ad2 = item.ad) === null || _item$ad2 === void 0 ? void 0 : _item$ad2.bookingStartDate) === (dateRange === null || dateRange === void 0 ? void 0 : dateRange.startDate) && (item === null || item === void 0 ? void 0 : (_item$ad3 = item.ad) === null || _item$ad3 === void 0 ? void 0 : _item$ad3.bookingEndDate) === (dateRange === null || dateRange === void 0 ? void 0 : dateRange.endDate);
   })) === null || _cartSlots$find === void 0 ? void 0 : _cartSlots$find.slots) || [];
   const allBooked = (slots === null || slots === void 0 ? void 0 : slots.length) > 0 && (slots === null || slots === void 0 ? void 0 : slots.every(s => (s === null || s === void 0 ? void 0 : s.slotStaus) !== "AVAILABLE"));
   const allAvailableSlots = slots === null || slots === void 0 ? void 0 : slots.filter(s => (s === null || s === void 0 ? void 0 : s.slotStaus) === "AVAILABLE");
@@ -24114,9 +24088,9 @@ const AvailabilityModal = ({
         nightLight: (ad === null || ad === void 0 ? void 0 : ad.light) === "With Light",
         bookingStartDate: dateRange === null || dateRange === void 0 ? void 0 : dateRange.startDate,
         bookingEndDate: dateRange === null || dateRange === void 0 ? void 0 : dateRange.endDate
-      });
+      }, dateRange);
     } else if ((existingForAd === null || existingForAd === void 0 ? void 0 : existingForAd.length) > 0) {
-      onRemoveSlot(ad);
+      onRemoveSlot(ad, dateRange);
     }
     setSelectedSlots([]);
     setSelectAll(false);
@@ -24136,7 +24110,7 @@ const AvailabilityModal = ({
       setSelectAll(false);
       setSelectedSlots([]);
     }
-  }, [ad]);
+  }, [ad, dateRange]);
   const columns = [{
     Header: () => /*#__PURE__*/React.createElement("input", {
       type: "checkbox",
@@ -24341,12 +24315,10 @@ const CartModal = ({
   onRemoveSlot,
   t
 }) => {
-  const [expanded, setExpanded] = useState(() => cartSlots === null || cartSlots === void 0 ? void 0 : cartSlots.map(item => {
-    var _item$ad;
-    return item === null || item === void 0 ? void 0 : (_item$ad = item.ad) === null || _item$ad === void 0 ? void 0 : _item$ad.id;
-  }));
-  const toggleExpand = adId => {
-    setExpanded(prev => prev !== null && prev !== void 0 && prev.includes(adId) ? prev === null || prev === void 0 ? void 0 : prev.filter(id => id !== adId) : [...prev, adId]);
+  const getKey = ad => `${ad === null || ad === void 0 ? void 0 : ad.id}_${ad === null || ad === void 0 ? void 0 : ad.bookingStartDate}_${ad === null || ad === void 0 ? void 0 : ad.bookingEndDate}`;
+  const [expanded, setExpanded] = useState(() => cartSlots === null || cartSlots === void 0 ? void 0 : cartSlots.map(item => getKey(item.ad)));
+  const toggleExpand = key => {
+    setExpanded(prev => prev !== null && prev !== void 0 && prev.includes(key) ? prev === null || prev === void 0 ? void 0 : prev.filter(id => id !== key) : [...prev, key]);
   };
   const makeColumns = ad => [{
     Header: t("ADS_DATE"),
@@ -24454,10 +24426,11 @@ const CartModal = ({
       color: "#666"
     }
   }, t("ADS_NO_ITEMS_IN_CART")) : cartSlots === null || cartSlots === void 0 ? void 0 : cartSlots.map((item, idx) => {
-    var _item$ad3, _item$ad4, _item$ad5, _item$slots;
-    const isOpen = expanded === null || expanded === void 0 ? void 0 : expanded.includes(item.ad.id);
+    var _item$ad, _item$ad2, _item$ad3, _item$slots;
+    const key = getKey(item === null || item === void 0 ? void 0 : item.ad);
+    const isOpen = expanded === null || expanded === void 0 ? void 0 : expanded.includes(key);
     return /*#__PURE__*/React.createElement("div", {
-      key: idx,
+      key: key,
       style: {
         marginBottom: "16px",
         border: "1px solid #ddd",
@@ -24476,21 +24449,24 @@ const CartModal = ({
         alignItems: "center"
       }
     }, /*#__PURE__*/React.createElement("div", {
-      onClick: () => {
-        var _item$ad2;
-        return toggleExpand(item === null || item === void 0 ? void 0 : (_item$ad2 = item.ad) === null || _item$ad2 === void 0 ? void 0 : _item$ad2.id);
-      },
+      onClick: () => toggleExpand(key),
       style: {
         cursor: "pointer",
         flex: 1
       }
-    }, item === null || item === void 0 ? void 0 : (_item$ad3 = item.ad) === null || _item$ad3 === void 0 ? void 0 : _item$ad3.name, item !== null && item !== void 0 && (_item$ad4 = item.ad) !== null && _item$ad4 !== void 0 && _item$ad4.amount ? ` — ₹${((item === null || item === void 0 ? void 0 : (_item$ad5 = item.ad) === null || _item$ad5 === void 0 ? void 0 : _item$ad5.amount) * 1.18 * (item === null || item === void 0 ? void 0 : (_item$slots = item.slots) === null || _item$slots === void 0 ? void 0 : _item$slots.length)).toFixed(2)}` : "", /*#__PURE__*/React.createElement("span", {
+    }, item === null || item === void 0 ? void 0 : (_item$ad = item.ad) === null || _item$ad === void 0 ? void 0 : _item$ad.name, item !== null && item !== void 0 && (_item$ad2 = item.ad) !== null && _item$ad2 !== void 0 && _item$ad2.amount ? ` — ₹${((item === null || item === void 0 ? void 0 : (_item$ad3 = item.ad) === null || _item$ad3 === void 0 ? void 0 : _item$ad3.amount) * 1.18 * (item === null || item === void 0 ? void 0 : (_item$slots = item.slots) === null || _item$slots === void 0 ? void 0 : _item$slots.length)).toFixed(2)}` : "", /*#__PURE__*/React.createElement("span", {
       style: {
         fontSize: "18px",
         marginLeft: "8px"
       }
     }, isOpen ? "▾" : "▸")), /*#__PURE__*/React.createElement("button", {
-      onClick: () => onRemoveSlot(item === null || item === void 0 ? void 0 : item.ad),
+      onClick: () => {
+        var _item$ad4, _item$ad5;
+        return onRemoveSlot(item === null || item === void 0 ? void 0 : item.ad, {
+          startDate: item === null || item === void 0 ? void 0 : (_item$ad4 = item.ad) === null || _item$ad4 === void 0 ? void 0 : _item$ad4.bookingStartDate,
+          endDate: item === null || item === void 0 ? void 0 : (_item$ad5 = item.ad) === null || _item$ad5 === void 0 ? void 0 : _item$ad5.bookingEndDate
+        });
+      },
       style: {
         padding: "6px 12px",
         borderRadius: "6px",
@@ -24507,7 +24483,7 @@ const CartModal = ({
       }
     }, /*#__PURE__*/React.createElement(Table, {
       t: t,
-      data: item.slots,
+      data: item === null || item === void 0 ? void 0 : item.slots,
       columns: makeColumns(),
       disableSort: true,
       isPaginationRequired: false,
@@ -24913,40 +24889,53 @@ const ADSCitizenSecond = ({
     });
     setShowModal(true);
   };
-  const handleRemoveFromCart = ad => {
-    setCartSlots(prev => prev.filter(item => item.ad.id !== ad.id));
+  const handleRemoveFromCart = (ad, dateRange) => {
+    setCartSlots(prev => prev.filter(item => {
+      var _item$ad, _item$ad2, _item$ad3;
+      return !((item === null || item === void 0 ? void 0 : (_item$ad = item.ad) === null || _item$ad === void 0 ? void 0 : _item$ad.id) === (ad === null || ad === void 0 ? void 0 : ad.id) && (item === null || item === void 0 ? void 0 : (_item$ad2 = item.ad) === null || _item$ad2 === void 0 ? void 0 : _item$ad2.bookingStartDate) === (dateRange === null || dateRange === void 0 ? void 0 : dateRange.startDate) && (item === null || item === void 0 ? void 0 : (_item$ad3 = item.ad) === null || _item$ad3 === void 0 ? void 0 : _item$ad3.bookingEndDate) === (dateRange === null || dateRange === void 0 ? void 0 : dateRange.endDate));
+    }));
     setShowToast({
-      label: `Removed all slots for ${ad.name}`,
+      label: `Removed slots for ${ad === null || ad === void 0 ? void 0 : ad.name} (${dateRange === null || dateRange === void 0 ? void 0 : dateRange.startDate} → ${dateRange === null || dateRange === void 0 ? void 0 : dateRange.endDate})`,
       error: true
     });
   };
-  const handleAddToCart = (slots, ad) => {
+  const handleAddToCart = (slots, ad, dateRange) => {
     setCartSlots(prev => {
-      const enrichedSlots = slots.map(s => ({
+      const enrichedSlots = slots === null || slots === void 0 ? void 0 : slots.map(s => ({
         ...s,
         bookingStartDate: s === null || s === void 0 ? void 0 : s.bookingDate,
         bookingEndDate: dateRange === null || dateRange === void 0 ? void 0 : dateRange.endDate,
         bookingFromTime: dateRange === null || dateRange === void 0 ? void 0 : dateRange.startTime,
         bookingToTime: dateRange === null || dateRange === void 0 ? void 0 : dateRange.endTime
       }));
-      const existing = prev.find(item => item.ad.id === ad.id);
+      const existing = prev.find(item => {
+        var _item$ad4, _item$ad5, _item$ad6;
+        return (item === null || item === void 0 ? void 0 : (_item$ad4 = item.ad) === null || _item$ad4 === void 0 ? void 0 : _item$ad4.id) === (ad === null || ad === void 0 ? void 0 : ad.id) && (item === null || item === void 0 ? void 0 : (_item$ad5 = item.ad) === null || _item$ad5 === void 0 ? void 0 : _item$ad5.bookingStartDate) === (dateRange === null || dateRange === void 0 ? void 0 : dateRange.startDate) && (item === null || item === void 0 ? void 0 : (_item$ad6 = item.ad) === null || _item$ad6 === void 0 ? void 0 : _item$ad6.bookingEndDate) === (dateRange === null || dateRange === void 0 ? void 0 : dateRange.endDate);
+      });
       let updated;
       if (existing) {
-        updated = prev.map(item => item.ad.id === ad.id ? {
-          ...item,
-          slots: enrichedSlots
-        } : item);
+        updated = prev.map(item => {
+          var _item$ad7, _item$ad8, _item$ad9;
+          return (item === null || item === void 0 ? void 0 : (_item$ad7 = item.ad) === null || _item$ad7 === void 0 ? void 0 : _item$ad7.id) === (ad === null || ad === void 0 ? void 0 : ad.id) && (item === null || item === void 0 ? void 0 : (_item$ad8 = item.ad) === null || _item$ad8 === void 0 ? void 0 : _item$ad8.bookingStartDate) === (dateRange === null || dateRange === void 0 ? void 0 : dateRange.startDate) && (item === null || item === void 0 ? void 0 : (_item$ad9 = item.ad) === null || _item$ad9 === void 0 ? void 0 : _item$ad9.bookingEndDate) === (dateRange === null || dateRange === void 0 ? void 0 : dateRange.endDate) ? {
+            ...item,
+            slots: enrichedSlots
+          } : item;
+        });
         setShowToast({
-          label: `Updated ${enrichedSlots.length} slot(s) for ${ad.name}`,
+          label: `Updated ${enrichedSlots.length} slot(s) for ${ad === null || ad === void 0 ? void 0 : ad.name} (${dateRange === null || dateRange === void 0 ? void 0 : dateRange.startDate} → ${dateRange === null || dateRange === void 0 ? void 0 : dateRange.endDate})`,
           error: false
         });
       } else {
         updated = [...prev, {
-          ad,
+          ad: {
+            ...ad,
+            bookingStartDate: dateRange === null || dateRange === void 0 ? void 0 : dateRange.startDate,
+            bookingEndDate: dateRange === null || dateRange === void 0 ? void 0 : dateRange.endDate
+          },
           slots: enrichedSlots
         }];
         setShowToast({
-          label: `Added ${enrichedSlots.length} slot(s) to ${ad.name}`,
+          label: `Added ${enrichedSlots === null || enrichedSlots === void 0 ? void 0 : enrichedSlots.length} slot(s) to ${ad === null || ad === void 0 ? void 0 : ad.name} (${dateRange === null || dateRange === void 0 ? void 0 : dateRange.startDate} → ${dateRange === null || dateRange === void 0 ? void 0 : dateRange.endDate})`,
           error: false
         });
       }
@@ -26950,6 +26939,12 @@ const ADSSelectProofIdentity = ({
     };
     onSelect(config.key, documentStep);
   };
+  useEffect(() => {
+    if (toastError) {
+      const timer = setTimeout(() => setToastError(null), 2000);
+      return () => clearTimeout(timer);
+    }
+  }, [toastError]);
   const onSkip = () => onSelect();
   return /*#__PURE__*/React.createElement("div", null, !isLoading ? /*#__PURE__*/React.createElement(FormStep, {
     t: t,
@@ -26997,6 +26992,7 @@ function ADSSelectDocument$1({
   const [uploadedFile, setUploadedFile] = useState((doc === null || doc === void 0 ? void 0 : doc.fileStoreId) || null);
   const [fieldError, setFieldError] = useState(null);
   const [loading, setLoading] = useState(false);
+  const isCitizen = window.location.href.includes("citizen");
   function selectfile(e) {
     const selected = e.target.files && e.target.files[0];
     if (!selected) return;
@@ -27057,11 +27053,15 @@ function ADSSelectDocument$1({
       marginBottom: "24px"
     }
   }, loading && /*#__PURE__*/React.createElement(Loader$1, null), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller"
+    className: "card-label-smaller",
+    style: {
+      width: "100%"
+    }
   }, t(doc === null || doc === void 0 ? void 0 : doc.code.replaceAll(".", "_")) + (doc !== null && doc !== void 0 && doc.required ? "  *" : ""))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement("div", {
     className: "field",
     style: {
-      width: "100%"
+      width: "100%",
+      maxWidth: !isCitizen && "500px"
     }
   }, /*#__PURE__*/React.createElement(UploadFile, {
     onUpload: selectfile,