@mseva/digit-ui-module-rentandlease 1.0.51-dev.1.2 → 1.0.51-dev.1.4

package/dist/index.modern.js

@@ -1,4 +1,4 @@
-import { CheckBox, Loader as Loader$2, CloseSvg, RefreshSVG, RadioButtons, SubmitBar, PTIcon, EmployeeModuleCard, Header, MultiLink, Card, CardSubHeader, StatusTable, CardSectionHeader, Row, AppContainer, PrivateRoute, BreadCrumb, Table, Label, MobileNumber, TextInput, DatePicker, LinkLabel, ActionBar, DetailsCard, SearchAction, FilterAction, PopUp, ShippingTruck, Dropdown, UploadFile, Modal, FormComposer, Toast, Menu, BackButton, CardHeader, LabelFieldPair, CardLabel, CardLabelError, TextArea, FormStep, Banner, KeyNote, CitizenHomeCard } from '@mseva/digit-ui-react-components';
+import { CheckBox, Loader as Loader$2, CloseSvg, RefreshSVG, RadioButtons, SubmitBar, PTIcon, EmployeeModuleCard, Header, MultiLink, Card, CardSubHeader, StatusTable, CardSectionHeader, Row, AppContainer, PrivateRoute, BreadCrumb, Table, Label, MobileNumber, TextInput, DatePicker, LinkLabel, ActionBar, DetailsCard, SearchAction, FilterAction, PopUp, ShippingTruck, Dropdown, UploadFile, Modal, FormComposer, Toast, Menu, CardHeader, LabelFieldPair, CardLabel, CardLabelError, TextArea, FormStep, Banner, KeyNote, CitizenHomeCard } from '@mseva/digit-ui-react-components';
 import React, { useState, useMemo, useEffect, useCallback, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams, useLocation, useRouteMatch, Switch, Link, useHistory } from 'react-router-dom';
@@ -6103,6 +6103,18 @@ const RentAndLeaseCard = () => {
   return /*#__PURE__*/React.createElement(EmployeeModuleCard, propsForModuleCard);
 };
 
+const convertEpochToDate = dateEpoch => {
+  if (dateEpoch == null || dateEpoch == undefined || dateEpoch == "") {
+    return "NA";
+  }
+  const dateFromApi = new Date(dateEpoch);
+  let month = dateFromApi.getMonth() + 1;
+  let day = dateFromApi.getDate();
+  let year = dateFromApi.getFullYear();
+  month = (month > 9 ? "" : "0") + month;
+  day = (day > 9 ? "" : "0") + day;
+  return `${day}/${month}/${year}`;
+};
 const pdfDownloadLink = (documents = {}, fileStoreId = "", format = "") => {
   let downloadLink = documents[fileStoreId] || "";
   let differentFormats = (downloadLink === null || downloadLink === void 0 ? void 0 : downloadLink.split(",")) || [];
@@ -6117,7 +6129,7 @@ const pdfDownloadLink = (documents = {}, fileStoreId = "", format = "") => {
 const capitalize = text => text.substr(0, 1).toUpperCase() + text.substr(1);
 const ulbCamel = ulb => ulb.toLowerCase().split(" ").map(capitalize).join(" ");
 const getAcknowledgementData = async (application, tenantInfo, t) => {
-  var _application$OwnerInf, _application$addition, _application$addition2, _application$addition3, _application$addition4, _application$addition5, _application$addition6, _application$addition7, _application$addition8, _application$addition9, _application$addition0, _application$Document, _application$addition1, _tenantInfo$city;
+  var _application$OwnerInf, _application$addition, _application$addition2, _application$addition3, _application$addition4, _application$addition5, _application$addition6, _application$addition7, _application$addition8, _application$addition9, _application$addition0, _application$addition1, _application$addition10, _application$addition11, _application$addition12, _application$addition13, _application$addition14, _application$addition15, _application$addition16, _application$addition17, _application$addition18, _application$addition19, _application$addition20, _application$addition21, _application$addition22, _application$addition23, _application$addition24, _application$addition25, _application$addition26, _application$addition27, _application$addition28, _application$addition29, _application$Document, _application$addition36, _tenantInfo$city;
   const details = [];
   application === null || application === void 0 ? void 0 : (_application$OwnerInf = application.OwnerInfo) === null || _application$OwnerInf === void 0 ? void 0 : _application$OwnerInf.forEach((owner, index) => {
     var _owner$permanentAddre, _owner$permanentAddre2, _owner$correspondence, _owner$correspondence2;
@@ -6148,44 +6160,70 @@ const getAcknowledgementData = async (application, tenantInfo, t) => {
       value: t(application === null || application === void 0 ? void 0 : application.status) || "NA"
     }, {
       title: t("PROPERTY_ID"),
-      value: t(application === null || application === void 0 ? void 0 : (_application$addition = application.additionalDetails) === null || _application$addition === void 0 ? void 0 : _application$addition.propertyId) || "NA"
+      value: t(application === null || application === void 0 ? void 0 : (_application$addition = application.additionalDetails) === null || _application$addition === void 0 ? void 0 : (_application$addition2 = _application$addition.propertyDetails) === null || _application$addition2 === void 0 ? void 0 : (_application$addition3 = _application$addition2[0]) === null || _application$addition3 === void 0 ? void 0 : _application$addition3.propertyId) || "NA"
     }, {
       title: t("PT_ACK_LOCALIZATION_PROPERTY_ADDRESS"),
-      value: (application === null || application === void 0 ? void 0 : (_application$addition2 = application.additionalDetails) === null || _application$addition2 === void 0 ? void 0 : _application$addition2.address) || "NA"
+      value: (application === null || application === void 0 ? void 0 : (_application$addition4 = application.additionalDetails) === null || _application$addition4 === void 0 ? void 0 : (_application$addition5 = _application$addition4.propertyDetails) === null || _application$addition5 === void 0 ? void 0 : (_application$addition6 = _application$addition5[0]) === null || _application$addition6 === void 0 ? void 0 : _application$addition6.address) || "NA"
     }, {
       title: t("Allotment Type"),
-      value: (application === null || application === void 0 ? void 0 : (_application$addition3 = application.additionalDetails) === null || _application$addition3 === void 0 ? void 0 : _application$addition3.allotmentType) || "NA"
+      value: (application === null || application === void 0 ? void 0 : (_application$addition7 = application.additionalDetails) === null || _application$addition7 === void 0 ? void 0 : (_application$addition8 = _application$addition7.propertyDetails) === null || _application$addition8 === void 0 ? void 0 : (_application$addition9 = _application$addition8[0]) === null || _application$addition9 === void 0 ? void 0 : _application$addition9.allotmentType) || "NA"
     }, {
       title: t("Property Name"),
-      value: (application === null || application === void 0 ? void 0 : (_application$addition4 = application.additionalDetails) === null || _application$addition4 === void 0 ? void 0 : _application$addition4.propertyName) || "NA"
+      value: (application === null || application === void 0 ? void 0 : (_application$addition0 = application.additionalDetails) === null || _application$addition0 === void 0 ? void 0 : (_application$addition1 = _application$addition0.propertyDetails) === null || _application$addition1 === void 0 ? void 0 : (_application$addition10 = _application$addition1[0]) === null || _application$addition10 === void 0 ? void 0 : _application$addition10.propertyName) || "NA"
     }, {
       title: t("Property Area"),
-      value: `${(application === null || application === void 0 ? void 0 : (_application$addition5 = application.additionalDetails) === null || _application$addition5 === void 0 ? void 0 : _application$addition5.propertySizeOrArea) || "NA"} sq. meters`
+      value: `${(application === null || application === void 0 ? void 0 : (_application$addition11 = application.additionalDetails) === null || _application$addition11 === void 0 ? void 0 : (_application$addition12 = _application$addition11.propertyDetails) === null || _application$addition12 === void 0 ? void 0 : (_application$addition13 = _application$addition12[0]) === null || _application$addition13 === void 0 ? void 0 : _application$addition13.propertySizeOrArea) || "NA"} sq. meters`
     }, {
       title: t("PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TYPE"),
-      value: (application === null || application === void 0 ? void 0 : (_application$addition6 = application.additionalDetails) === null || _application$addition6 === void 0 ? void 0 : _application$addition6.propertyType) || "NA"
+      value: (application === null || application === void 0 ? void 0 : (_application$addition14 = application.additionalDetails) === null || _application$addition14 === void 0 ? void 0 : (_application$addition15 = _application$addition14.propertyDetails) === null || _application$addition15 === void 0 ? void 0 : (_application$addition16 = _application$addition15[0]) === null || _application$addition16 === void 0 ? void 0 : _application$addition16.propertyType) || "NA"
     }, {
       title: t("Location Type"),
-      value: (application === null || application === void 0 ? void 0 : (_application$addition7 = application.additionalDetails) === null || _application$addition7 === void 0 ? void 0 : _application$addition7.locationType) || "NA"
+      value: (application === null || application === void 0 ? void 0 : (_application$addition17 = application.additionalDetails) === null || _application$addition17 === void 0 ? void 0 : (_application$addition18 = _application$addition17.propertyDetails) === null || _application$addition18 === void 0 ? void 0 : (_application$addition19 = _application$addition18[0]) === null || _application$addition19 === void 0 ? void 0 : _application$addition19.locationType) || "NA"
     }, {
       title: t("Security Deposit"),
-      value: `Rs. ${(application === null || application === void 0 ? void 0 : (_application$addition8 = application.additionalDetails) === null || _application$addition8 === void 0 ? void 0 : _application$addition8.securityDeposit) || "NA"}`
+      value: `Rs. ${(application === null || application === void 0 ? void 0 : (_application$addition20 = application.additionalDetails) === null || _application$addition20 === void 0 ? void 0 : (_application$addition21 = _application$addition20.propertyDetails) === null || _application$addition21 === void 0 ? void 0 : (_application$addition22 = _application$addition21[0]) === null || _application$addition22 === void 0 ? void 0 : _application$addition22.securityDeposit) || "NA"}`
     }, {
       title: t("Base Rent"),
-      value: `Rs. ${(application === null || application === void 0 ? void 0 : (_application$addition9 = application.additionalDetails) === null || _application$addition9 === void 0 ? void 0 : _application$addition9.baseRent) || "NA"}`
+      value: `Rs. ${(application === null || application === void 0 ? void 0 : (_application$addition23 = application.additionalDetails) === null || _application$addition23 === void 0 ? void 0 : (_application$addition24 = _application$addition23.propertyDetails) === null || _application$addition24 === void 0 ? void 0 : (_application$addition25 = _application$addition24[0]) === null || _application$addition25 === void 0 ? void 0 : _application$addition25.baseRent) || "NA"}`
     }, ...(application !== null && application !== void 0 && application.amountToBeDeducted ? [{
       title: t("Penalty Amount"),
-      value: `Rs. ${application === null || application === void 0 ? void 0 : application.amountToBeDeducted}`
+      value: `Rs. ${(application === null || application === void 0 ? void 0 : application.amountToBeDeducted) || 0}`
     }, {
       title: t("Penalty Amount (After Security Deposit)"),
-      value: `Rs. ${(application === null || application === void 0 ? void 0 : application.amountToBeDeducted) - ((application === null || application === void 0 ? void 0 : (_application$addition0 = application.additionalDetails) === null || _application$addition0 === void 0 ? void 0 : _application$addition0.securityDeposit) || 0)}`
+      value: `Rs. ${Math.abs(Number(application === null || application === void 0 ? void 0 : (_application$addition26 = application.additionalDetails) === null || _application$addition26 === void 0 ? void 0 : (_application$addition27 = _application$addition26.propertyDetails) === null || _application$addition27 === void 0 ? void 0 : (_application$addition28 = _application$addition27[0]) === null || _application$addition28 === void 0 ? void 0 : _application$addition28.securityDeposit) - (application === null || application === void 0 ? void 0 : application.amountToBeDeducted)) || 0}`
     }] : [])]
   });
-  const docDetails = application === null || application === void 0 ? void 0 : (_application$Document = application.Document) === null || _application$Document === void 0 ? void 0 : _application$Document.map((doc, index) => ({
+  if ((application === null || application === void 0 ? void 0 : (_application$addition29 = application.additionalDetails) === null || _application$addition29 === void 0 ? void 0 : _application$addition29.applicationType) === "Legacy") {
+    var _application$addition30, _application$addition31, _application$addition32, _application$addition33, _application$addition34, _application$addition35;
+    details.push({
+      title: t("RAL_ARREAR_DETAILS"),
+      values: [{
+        title: t("Arrears"),
+        value: (application === null || application === void 0 ? void 0 : (_application$addition30 = application.additionalDetails) === null || _application$addition30 === void 0 ? void 0 : _application$addition30.arrear) || "NA"
+      }, {
+        title: t("RAL_START_DATE"),
+        value: convertEpochToDate(application === null || application === void 0 ? void 0 : (_application$addition31 = application.additionalDetails) === null || _application$addition31 === void 0 ? void 0 : _application$addition31.arrearStartDate) || "NA"
+      }, {
+        title: t("RAL_END_DATE"),
+        value: convertEpochToDate(application === null || application === void 0 ? void 0 : (_application$addition32 = application.additionalDetails) === null || _application$addition32 === void 0 ? void 0 : _application$addition32.arrearEndDate) || "NA"
+      }, {
+        title: t("Reason"),
+        value: (application === null || application === void 0 ? void 0 : (_application$addition33 = application.additionalDetails) === null || _application$addition33 === void 0 ? void 0 : (_application$addition34 = _application$addition33.arrearReason) === null || _application$addition34 === void 0 ? void 0 : _application$addition34.name) || "NA"
+      }, {
+        title: t("Remarks"),
+        value: (application === null || application === void 0 ? void 0 : (_application$addition35 = application.additionalDetails) === null || _application$addition35 === void 0 ? void 0 : _application$addition35.remarks) || "NA"
+      }]
+    });
+  }
+  const standardDocs = (application === null || application === void 0 ? void 0 : (_application$Document = application.Document) === null || _application$Document === void 0 ? void 0 : _application$Document.map((doc, index) => ({
     title: t(`${doc.documentType}`) || "NA",
-    value: " ",
-    link: doc.fileStoreId ? Digit.Utils.getFileUrl(doc.fileStoreId) : ""
-  }));
+    value: " "
+  }))) || [];
+  const arrearDoc = application !== null && application !== void 0 && (_application$addition36 = application.additionalDetails) !== null && _application$addition36 !== void 0 && _application$addition36.arrearDoc ? [{
+    title: t("Arrear Doc"),
+    value: " "
+  }] : [];
+  const docDetails = [...standardDocs, ...arrearDoc];
   details.push({
     title: t("BPA_APPLICATION_DOCUMENTS"),
     values: docDetails !== null && docDetails !== void 0 && docDetails.length ? docDetails : [{
@@ -6193,7 +6231,6 @@ const getAcknowledgementData = async (application, tenantInfo, t) => {
       value: "NA"
     }]
   });
-  const imageURL = application === null || application === void 0 ? void 0 : (_application$addition1 = application.additionalDetails) === null || _application$addition1 === void 0 ? void 0 : _application$addition1.propertyImage;
   return {
     t: t,
     tenantId: tenantInfo === null || tenantInfo === void 0 ? void 0 : tenantInfo.code,
@@ -6202,8 +6239,7 @@ const getAcknowledgementData = async (application, tenantInfo, t) => {
     phoneNumber: tenantInfo === null || tenantInfo === void 0 ? void 0 : tenantInfo.contactNumber,
     heading: t("Allotment letter for Rent and Lease Services"),
     applicationNumber: (application === null || application === void 0 ? void 0 : application.applicationNumber) || "NA",
-    details,
-    imageURL
+    details
   };
 };
 
@@ -6289,7 +6325,7 @@ var b = "function" === typeof Symbol && Symbol.for,
   k = b ? Symbol.for("react.context") : 60110,
   l = b ? Symbol.for("react.async_mode") : 60111,
   m = b ? Symbol.for("react.concurrent_mode") : 60111,
-  n = b ? Symbol.for("react.forward_ref") : 60112,
+  n$1 = b ? Symbol.for("react.forward_ref") : 60112,
   p = b ? Symbol.for("react.suspense") : 60113,
   q = b ? Symbol.for("react.suspense_list") : 60120,
   r = b ? Symbol.for("react.memo") : 60115,
@@ -6314,7 +6350,7 @@ function z(a) {
           default:
             switch (a = a && a.$$typeof, a) {
               case k:
-              case n:
+              case n$1:
               case t:
               case r:
               case h:
@@ -6336,7 +6372,7 @@ var ConcurrentMode = m;
 var ContextConsumer = k;
 var ContextProvider = h;
 var Element = c;
-var ForwardRef = n;
+var ForwardRef = n$1;
 var Fragment = e;
 var Lazy = t;
 var Memo = r;
@@ -6358,7 +6394,7 @@ var isElement = function (a) {
   return "object" === typeof a && null !== a && a.$$typeof === c;
 };
 var isForwardRef = function (a) {
-  return z(a) === n;
+  return z(a) === n$1;
 };
 var isFragment = function (a) {
   return z(a) === e;
@@ -6382,7 +6418,7 @@ var isSuspense = function (a) {
   return z(a) === p;
 };
 var isValidElementType = function (a) {
-  return "string" === typeof a || "function" === typeof a || a === e || a === m || a === g || a === f || a === p || a === q || "object" === typeof a && null !== a && (a.$$typeof === t || a.$$typeof === r || a.$$typeof === h || a.$$typeof === k || a.$$typeof === n || a.$$typeof === w || a.$$typeof === x || a.$$typeof === y || a.$$typeof === v);
+  return "string" === typeof a || "function" === typeof a || a === e || a === m || a === g || a === f || a === p || a === q || "object" === typeof a && null !== a && (a.$$typeof === t || a.$$typeof === r || a.$$typeof === h || a.$$typeof === k || a.$$typeof === n$1 || a.$$typeof === w || a.$$typeof === x || a.$$typeof === y || a.$$typeof === v);
 };
 var typeOf = z;
 var reactIs_production_min = {
@@ -7227,6 +7263,7 @@ const getTimelineAcknowledgementData = (workflowDetails, tenantInfo, pdfFiles =
     const formats = (downloadLink === null || downloadLink === void 0 ? void 0 : (_downloadLink$split = downloadLink.split(",")) === null || _downloadLink$split === void 0 ? void 0 : _downloadLink$split.filter(Boolean)) || [];
     return (formats === null || formats === void 0 ? void 0 : formats.find(link => !(link !== null && link !== void 0 && link.includes("large")) && !(link !== null && link !== void 0 && link.includes("medium")) && !(link !== null && link !== void 0 && link.includes("small")))) || (formats === null || formats === void 0 ? void 0 : formats[0]) || "";
   };
+  const pattern = /\[#\?.*?\*\*\]/;
   const timelineRows = timeline.map((item, index) => {
     var _item$auditDetails, _item$auditDetails2, _item$assigner, _item$assigner2, _item$assigner3, _item$wfComment;
     const createdDate = (item === null || item === void 0 ? void 0 : (_item$auditDetails = item.auditDetails) === null || _item$auditDetails === void 0 ? void 0 : _item$auditDetails.created) || "N/A";
@@ -7236,7 +7273,8 @@ const getTimelineAcknowledgementData = (workflowDetails, tenantInfo, pdfFiles =
     const mobileNumber = (item === null || item === void 0 ? void 0 : (_item$assigner3 = item.assigner) === null || _item$assigner3 === void 0 ? void 0 : _item$assigner3.mobileNumber) || "N/A";
     const action = (item === null || item === void 0 ? void 0 : item.performedAction) || "N/A";
     const status = (item === null || item === void 0 ? void 0 : item.status) || (item === null || item === void 0 ? void 0 : item.state) || "N/A";
-    const comment = (item === null || item === void 0 ? void 0 : (_item$wfComment = item.wfComment) === null || _item$wfComment === void 0 ? void 0 : _item$wfComment[0]) || "-";
+    const rawComment = (item === null || item === void 0 ? void 0 : (_item$wfComment = item.wfComment) === null || _item$wfComment === void 0 ? void 0 : _item$wfComment[0]) || "-";
+    const comment = typeof rawComment === "string" ? rawComment.split(pattern)[0] : rawComment;
     const documents = (item === null || item === void 0 ? void 0 : item.wfDocuments) || [];
     const sla = (item === null || item === void 0 ? void 0 : item.sla) || "N/A";
     const assignedTo = Array.isArray(item === null || item === void 0 ? void 0 : item.assignes) ? item.assignes.map(a => a === null || a === void 0 ? void 0 : a.name).filter(Boolean).join(", ") : "";
@@ -7348,7 +7386,9 @@ function NewApplicationTimeline({
   workflowDetails,
   t,
   tenantId = Digit.ULBService.getCurrentTenantId(),
-  timeObj
+  timeObj,
+  empUserName = null,
+  handleSetEmpDesignation = () => {}
 }) {
   var _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _employeeData$data, _employeeData$data$Em;
   const {
@@ -7423,6 +7463,9 @@ function NewApplicationTimeline({
     const translationKey = `COMMON_MASTERS_DESIGNATION_${assignment === null || assignment === void 0 ? void 0 : assignment.designation}`;
     deptMap[emp === null || emp === void 0 ? void 0 : emp.code] = translationKey;
   });
+  if (employeeData && empUserName) {
+    handleSetEmpDesignation(t(deptMap[empUserName]));
+  }
   if (isLoading) return /*#__PURE__*/React.createElement(Loader$2, null);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "custom-timeline-container"
@@ -7490,13 +7533,13 @@ function NewApplicationTimeline({
       className: "custom-officer-info"
     }, /*#__PURE__*/React.createElement("div", {
       className: "custom-officer-name"
-    }, (item === null || item === void 0 ? void 0 : (_item$assigner2 = item.assigner) === null || _item$assigner2 === void 0 ? void 0 : _item$assigner2.name) || t("CS_COMMON_NA")), (item === null || item === void 0 ? void 0 : (_item$assigner3 = item.assigner) === null || _item$assigner3 === void 0 ? void 0 : _item$assigner3.emailId) && /*#__PURE__*/React.createElement("div", {
+    }, (item === null || item === void 0 ? void 0 : (_item$assigner2 = item.assigner) === null || _item$assigner2 === void 0 ? void 0 : _item$assigner2.name) || t("CS_COMMON_NA"), deptMap[item === null || item === void 0 ? void 0 : (_item$assigner3 = item.assigner) === null || _item$assigner3 === void 0 ? void 0 : _item$assigner3.userName] && /*#__PURE__*/React.createElement("span", {
+      className: "custom-officer-name"
+    }, "- ", t(deptMap[item === null || item === void 0 ? void 0 : (_item$assigner4 = item.assigner) === null || _item$assigner4 === void 0 ? void 0 : _item$assigner4.userName]))), (item === null || item === void 0 ? void 0 : (_item$assigner5 = item.assigner) === null || _item$assigner5 === void 0 ? void 0 : _item$assigner5.emailId) && /*#__PURE__*/React.createElement("div", {
       className: "custom-officer-email"
     }, /*#__PURE__*/React.createElement("span", {
       className: "custom-email-label"
-    }, t("Email")), " ", item === null || item === void 0 ? void 0 : (_item$assigner4 = item.assigner) === null || _item$assigner4 === void 0 ? void 0 : _item$assigner4.emailId), deptMap[item === null || item === void 0 ? void 0 : (_item$assigner5 = item.assigner) === null || _item$assigner5 === void 0 ? void 0 : _item$assigner5.userName] && /*#__PURE__*/React.createElement("div", {
-      className: "custom-officer-name"
-    }, t(deptMap[item === null || item === void 0 ? void 0 : (_item$assigner6 = item.assigner) === null || _item$assigner6 === void 0 ? void 0 : _item$assigner6.userName])))), /*#__PURE__*/React.createElement("div", {
+    }, t("Email")), " ", item === null || item === void 0 ? void 0 : (_item$assigner6 = item.assigner) === null || _item$assigner6 === void 0 ? void 0 : _item$assigner6.emailId))), /*#__PURE__*/React.createElement("div", {
       className: "custom-card-column custom-card-column-mid"
     }, (item === null || item === void 0 ? void 0 : item.sla) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("h3", {
       className: "custom-action-title"
@@ -7518,9 +7561,13 @@ function NewApplicationTimeline({
       className: "custom-comments-title"
     }, t("Officer Comments")), /*#__PURE__*/React.createElement("div", {
       className: "custom-comment-text"
-    }, item === null || item === void 0 ? void 0 : (_item$wfComment3 = item.wfComment) === null || _item$wfComment3 === void 0 ? void 0 : _item$wfComment3.map((comment, idx) => /*#__PURE__*/React.createElement("p", {
-      key: idx
-    }, comment)))), (item === null || item === void 0 ? void 0 : (_item$assignes = item.assignes) === null || _item$assignes === void 0 ? void 0 : _item$assignes.length) > 0 && /*#__PURE__*/React.createElement("div", {
+    }, item === null || item === void 0 ? void 0 : (_item$wfComment3 = item.wfComment) === null || _item$wfComment3 === void 0 ? void 0 : _item$wfComment3.map((comment, idx) => {
+      const pattern = /\[#\?.*?\*\*\]/;
+      const truncatedComment = typeof comment === "string" ? comment === null || comment === void 0 ? void 0 : comment.split(pattern)[0] : comment;
+      return /*#__PURE__*/React.createElement("p", {
+        key: idx
+      }, truncatedComment);
+    }))), (item === null || item === void 0 ? void 0 : (_item$assignes = item.assignes) === null || _item$assignes === void 0 ? void 0 : _item$assignes.length) > 0 && /*#__PURE__*/React.createElement("div", {
       className: "custom-assigned-to-footer"
     }, /*#__PURE__*/React.createElement("h3", {
       className: "custom-comments-title"
@@ -7528,9 +7575,9 @@ function NewApplicationTimeline({
       className: "custom-officer-info"
     }, /*#__PURE__*/React.createElement("div", {
       className: "custom-officer-name"
-    }, (_item$assignes$ = item.assignes[0]) === null || _item$assignes$ === void 0 ? void 0 : _item$assignes$.name), deptMap[(_item$assignes$2 = item.assignes[0]) === null || _item$assignes$2 === void 0 ? void 0 : _item$assignes$2.userName] && /*#__PURE__*/React.createElement("div", {
+    }, (_item$assignes$ = item.assignes[0]) === null || _item$assignes$ === void 0 ? void 0 : _item$assignes$.name, deptMap[(_item$assignes$2 = item.assignes[0]) === null || _item$assignes$2 === void 0 ? void 0 : _item$assignes$2.userName] && /*#__PURE__*/React.createElement("span", {
       className: "custom-officer-email"
-    }, t(deptMap[(_item$assignes$3 = item.assignes[0]) === null || _item$assignes$3 === void 0 ? void 0 : _item$assignes$3.userName]))))), (item === null || item === void 0 ? void 0 : item.wfDocuments) && (item === null || item === void 0 ? void 0 : (_item$wfDocuments = item.wfDocuments) === null || _item$wfDocuments === void 0 ? void 0 : _item$wfDocuments.length) > 0 && /*#__PURE__*/React.createElement("div", {
+    }, "- ", t(deptMap[(_item$assignes$3 = item.assignes[0]) === null || _item$assignes$3 === void 0 ? void 0 : _item$assignes$3.userName])))))), (item === null || item === void 0 ? void 0 : item.wfDocuments) && (item === null || item === void 0 ? void 0 : (_item$wfDocuments = item.wfDocuments) === null || _item$wfDocuments === void 0 ? void 0 : _item$wfDocuments.length) > 0 && /*#__PURE__*/React.createElement("div", {
       className: "custom-comments-section-no-border"
     }, /*#__PURE__*/React.createElement("h4", {
       className: "custom-comments-title"
@@ -7546,7 +7593,7 @@ function NewApplicationTimeline({
 }
 
 const RALApplicationDetails = () => {
-  var _applicationData$Owne, _propertyDetails$fees, _propertyDetails$fees2, _propertyDetails$fees3, _propertyDetails$fees4, _applicationData$Docu;
+  var _applicationData$Owne, _propertyDetails$fees, _propertyDetails$fees2, _propertyDetails$fees3, _propertyDetails$fees4;
   const {
     t
   } = useTranslation();
@@ -7576,6 +7623,7 @@ const RALApplicationDetails = () => {
       setLoader(false);
     }
   };
+  console.log('applicationData', applicationData);
   const {
     data: reciept_data,
     isLoading: recieptDataLoading
@@ -7596,11 +7644,10 @@ const RALApplicationDetails = () => {
         ...applications
       }, tenantInfo, t);
       setTimeout(() => {
-        Digit.Utils.pdf.generateFormatted(acknowldgementDataAPI);
+        Digit.Utils.pdf.generate(acknowldgementDataAPI);
         setLoader(false);
       }, 0);
     } catch (error) {
-      console.error("Error generating acknowledgement:", error);
       setLoader(false);
     }
   };
@@ -7618,17 +7665,12 @@ const RALApplicationDetails = () => {
     try {
       var _response;
       let response = null;
-      if (payments !== null && payments !== void 0 && payments.fileStoreId) {
-        response = {
-          filestoreIds: [payments === null || payments === void 0 ? void 0 : payments.fileStoreId]
-        };
-      } else {
-        response = await Digit.PaymentService.generatePdf(tenantId, {
-          Payments: [{
-            ...payments
-          }]
-        }, "rentandlease-receipt");
-      }
+      response = await Digit.PaymentService.generatePdf(tenantId, {
+        Payments: [{
+          ...(payments || {}),
+          AllotmentDetails: [applicationData]
+        }]
+      }, "rentandlease-receipt");
       const fileStore = await Digit.PaymentService.printReciept(tenantId, {
         fileStoreIds: response.filestoreIds[0]
       });
@@ -7668,8 +7710,21 @@ const RALApplicationDetails = () => {
   const getDate = epoch => {
     return Digit.DateUtils.ConvertEpochToDate(epoch);
   };
+  const tValue = value => {
+    if (value === 0 || value === "0") return "0";
+    if (!value) return t("CS_NA");
+    if (typeof value === "object" && value !== null) {
+      return t((value === null || value === void 0 ? void 0 : value.name) || (value === null || value === void 0 ? void 0 : value.code) || "CS_NA");
+    }
+    return t(value);
+  };
   const rawAdditionalDetails = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.additionalDetails) || {};
-  const propertyDetails = Array.isArray(rawAdditionalDetails) ? rawAdditionalDetails[0] : rawAdditionalDetails;
+  const propertyDetails = Array.isArray(rawAdditionalDetails === null || rawAdditionalDetails === void 0 ? void 0 : rawAdditionalDetails.propertyDetails) ? rawAdditionalDetails === null || rawAdditionalDetails === void 0 ? void 0 : rawAdditionalDetails.propertyDetails[0] : rawAdditionalDetails === null || rawAdditionalDetails === void 0 ? void 0 : rawAdditionalDetails.propertyDetails;
+  const arrearDoc = rawAdditionalDetails !== null && rawAdditionalDetails !== void 0 && rawAdditionalDetails.arrearDoc ? [{
+    documentType: "Arrear Doc",
+    fileStoreId: rawAdditionalDetails.arrearDoc
+  }] : [];
+  const allDocuments = [...((applicationData === null || applicationData === void 0 ? void 0 : applicationData.Document) || []), ...arrearDoc];
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: "cardHeaderWithOptions ral-app-details-header"
   }, /*#__PURE__*/React.createElement(Header, {
@@ -7690,19 +7745,19 @@ const RALApplicationDetails = () => {
       className: "ral-app-details-owner-header"
     }, t("RAL_APPLICANT"), " ", index + 1), /*#__PURE__*/React.createElement(Row, {
       label: t("PT_OWNERSHIP_INFO_NAME"),
-      text: (owner === null || owner === void 0 ? void 0 : owner.name) || t("CS_NA")
+      text: tValue(owner === null || owner === void 0 ? void 0 : owner.name)
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("CORE_COMMON_PROFILE_EMAIL"),
-      text: (owner === null || owner === void 0 ? void 0 : owner.emailId) || t("CS_NA")
+      text: tValue(owner === null || owner === void 0 ? void 0 : owner.emailId)
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("CORE_MOBILE_NUMBER"),
-      text: (owner === null || owner === void 0 ? void 0 : owner.mobileNo) || t("CS_NA")
+      text: tValue(owner === null || owner === void 0 ? void 0 : owner.mobileNo)
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("PT_COMMON_COL_ADDRESS"),
-      text: (owner === null || owner === void 0 ? void 0 : (_owner$correspondence = owner.correspondenceAddress) === null || _owner$correspondence === void 0 ? void 0 : _owner$correspondence.addressId) || (owner === null || owner === void 0 ? void 0 : (_owner$permanentAddre = owner.permanentAddress) === null || _owner$permanentAddre === void 0 ? void 0 : _owner$permanentAddre.addressId) || t("CS_NA")
+      text: tValue((owner === null || owner === void 0 ? void 0 : (_owner$correspondence = owner.correspondenceAddress) === null || _owner$correspondence === void 0 ? void 0 : _owner$correspondence.addressId) || (owner === null || owner === void 0 ? void 0 : (_owner$permanentAddre = owner.permanentAddress) === null || _owner$permanentAddre === void 0 ? void 0 : _owner$permanentAddre.addressId))
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("CORE_COMMON_PINCODE"),
-      text: (owner === null || owner === void 0 ? void 0 : (_owner$correspondence2 = owner.correspondenceAddress) === null || _owner$correspondence2 === void 0 ? void 0 : _owner$correspondence2.pincode) || (owner === null || owner === void 0 ? void 0 : (_owner$permanentAddre2 = owner.permanentAddress) === null || _owner$permanentAddre2 === void 0 ? void 0 : _owner$permanentAddre2.pincode) || t("CS_NA")
+      text: tValue((owner === null || owner === void 0 ? void 0 : (_owner$correspondence2 = owner.correspondenceAddress) === null || _owner$correspondence2 === void 0 ? void 0 : _owner$correspondence2.pincode) || (owner === null || owner === void 0 ? void 0 : (_owner$permanentAddre2 = owner.permanentAddress) === null || _owner$permanentAddre2 === void 0 ? void 0 : _owner$permanentAddre2.pincode))
     }));
   }) : /*#__PURE__*/React.createElement(Row, {
     label: t("OWNER"),
@@ -7711,66 +7766,83 @@ const RALApplicationDetails = () => {
     className: "ral-card-subheader-24"
   }, t("ES_TITILE_PROPERTY_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
     label: t("APPLICATION_NUMBER"),
-    text: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationNumber) || t("CS_NA")
+    text: tValue(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationNumber)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RENT_LEASE_PROPERTY_ID"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.propertyId) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.propertyId)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RENT_LEASE_PROPERTY_NAME"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.propertyName) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.propertyName)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_ALLOTMENT_TYPE"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.allotmentType) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.allotmentType)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RENT_LEASE_PROPERTY_TYPE"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.propertyType) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.propertyType)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("WS_PROPERTY_ADDRESS_LABEL"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.address) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.address)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_PROPERTY_AMOUNT"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.baseRent) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.baseRent)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("PENALTY_TYPE"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.penaltyType) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.penaltyType)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_FEE_CYCLE"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$fees = propertyDetails.feesPeriodCycle) === null || _propertyDetails$fees === void 0 ? void 0 : (_propertyDetails$fees2 = _propertyDetails$fees[0]) === null || _propertyDetails$fees2 === void 0 ? void 0 : _propertyDetails$fees2.toUpperCase()) + (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$fees3 = propertyDetails.feesPeriodCycle) === null || _propertyDetails$fees3 === void 0 ? void 0 : (_propertyDetails$fees4 = _propertyDetails$fees3.slice(1)) === null || _propertyDetails$fees4 === void 0 ? void 0 : _propertyDetails$fees4.toLowerCase()) || t("CS_NA")
+    text: propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.feesPeriodCycle ? tValue((propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$fees = propertyDetails.feesPeriodCycle) === null || _propertyDetails$fees === void 0 ? void 0 : (_propertyDetails$fees2 = _propertyDetails$fees[0]) === null || _propertyDetails$fees2 === void 0 ? void 0 : _propertyDetails$fees2.toUpperCase()) + (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$fees3 = propertyDetails.feesPeriodCycle) === null || _propertyDetails$fees3 === void 0 ? void 0 : (_propertyDetails$fees4 = _propertyDetails$fees3.slice(1)) === null || _propertyDetails$fees4 === void 0 ? void 0 : _propertyDetails$fees4.toLowerCase())) : t("CS_NA")
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("PROPERTY_SIZE"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.propertySizeOrArea) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.propertySizeOrArea)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RENT_LEASE_LOCATION_TYPE"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.locationType) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.locationType)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_START_DATE"),
-    text: getDate(applicationData === null || applicationData === void 0 ? void 0 : applicationData.startDate) || t("CS_NA")
+    text: tValue(getDate(applicationData === null || applicationData === void 0 ? void 0 : applicationData.startDate))
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_END_DATE"),
-    text: getDate(applicationData === null || applicationData === void 0 ? void 0 : applicationData.endDate) || t("CS_NA")
+    text: tValue(getDate(applicationData === null || applicationData === void 0 ? void 0 : applicationData.endDate))
   }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted) > 0 && /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_PROPERTY_PENALTY"),
-    text: applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted
-  }), /*#__PURE__*/React.createElement(Row, {
+    text: tValue(applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted)
+  }), (rawAdditionalDetails === null || rawAdditionalDetails === void 0 ? void 0 : rawAdditionalDetails.applicationType) !== "Legacy" && /*#__PURE__*/React.createElement(Row, {
     label: t("SECURITY_DEPOSIT"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit)
   }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted) - (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit) > 0 && /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_AMOUNT_TO_TAKE_FROM_CITIZEN"),
-    text: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted) - (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit)
+    text: tValue((applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted) - (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit))
   }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeRefund) > 0 && /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_AMOUNT_TO_REFUND"),
-    text: applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeRefund
+    text: tValue(applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeRefund)
   }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.tradeLicenseNumber) && /*#__PURE__*/React.createElement(Row, {
     label: t("RENT_LEASE_TRADE_LICENSE_NUMBER"),
-    text: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.tradeLicenseNumber) || t("CS_NA")
-  })), /*#__PURE__*/React.createElement(CardSubHeader, {
+    text: tValue(applicationData === null || applicationData === void 0 ? void 0 : applicationData.tradeLicenseNumber)
+  })), (rawAdditionalDetails === null || rawAdditionalDetails === void 0 ? void 0 : rawAdditionalDetails.applicationType) === "Legacy" && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardSubHeader, {
+    className: "ral-card-subheader-24"
+  }, t("RAL_ARREAR_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
+    label: t("Arrears"),
+    text: tValue(rawAdditionalDetails === null || rawAdditionalDetails === void 0 ? void 0 : rawAdditionalDetails.arrear)
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_START_DATE"),
+    text: rawAdditionalDetails !== null && rawAdditionalDetails !== void 0 && rawAdditionalDetails.arrearStartDate ? getDate(rawAdditionalDetails.arrearStartDate) : t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_END_DATE"),
+    text: rawAdditionalDetails !== null && rawAdditionalDetails !== void 0 && rawAdditionalDetails.arrearEndDate ? getDate(rawAdditionalDetails.arrearEndDate) : t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("Reason"),
+    text: tValue(rawAdditionalDetails === null || rawAdditionalDetails === void 0 ? void 0 : rawAdditionalDetails.arrearReason)
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("Remarks"),
+    text: tValue(rawAdditionalDetails === null || rawAdditionalDetails === void 0 ? void 0 : rawAdditionalDetails.remarks)
+  }))), /*#__PURE__*/React.createElement(CardSubHeader, {
     className: "ral-card-subheader-24-margin"
   }, t("CS_COMMON_DOCUMENTS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Card, {
     className: "ral-app-details-docs-card"
-  }, (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$Docu = applicationData.Document) === null || _applicationData$Docu === void 0 ? void 0 : _applicationData$Docu.length) > 0 ? applicationData.Document.map((doc, index) => /*#__PURE__*/React.createElement("div", {
+  }, (allDocuments === null || allDocuments === void 0 ? void 0 : allDocuments.length) > 0 ? allDocuments.map((doc, index) => /*#__PURE__*/React.createElement("div", {
     key: index
   }, /*#__PURE__*/React.createElement(RALDocuments, {
-    value: applicationData.Document,
+    value: allDocuments,
     Code: doc === null || doc === void 0 ? void 0 : doc.documentType,
     index: index
   }), t(doc === null || doc === void 0 ? void 0 : doc.documentType))) : /*#__PURE__*/React.createElement("h5", null, t("CS_NO_DOCUMENTS_UPLOADED"))))), /*#__PURE__*/React.createElement(NewApplicationTimeline, {
@@ -8175,8 +8247,8 @@ const DesktopInbox = ({
     Cell: ({
       row
     }) => {
-      var _row$original4, _row$original4$search, _row$original4$search2, _row$original4$search3;
-      return GetCell(`${(_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$search2 = _row$original4$search.additionalDetails) === null || _row$original4$search2 === void 0 ? void 0 : (_row$original4$search3 = _row$original4$search2[0]) === null || _row$original4$search3 === void 0 ? void 0 : _row$original4$search3["propertyName"]}`);
+      var _row$original4, _row$original4$search, _row$original4$search2, _row$original4$search3, _row$original4$search4;
+      return GetCell(`${(_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$search2 = _row$original4$search.additionalDetails) === null || _row$original4$search2 === void 0 ? void 0 : (_row$original4$search3 = _row$original4$search2.propertyDetails) === null || _row$original4$search3 === void 0 ? void 0 : (_row$original4$search4 = _row$original4$search3[0]) === null || _row$original4$search4 === void 0 ? void 0 : _row$original4$search4["propertyName"]}`);
     },
     mobileCell: original => {
       var _original$searchData2, _original$searchData3, _original$searchData4;
@@ -8188,11 +8260,11 @@ const DesktopInbox = ({
       row
     }) => {
       var _row$original5, _row$original5$search, _row$original5$search2, _row$original5$search3;
-      return GetCell(`${(_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : (_row$original5$search = _row$original5.searchData) === null || _row$original5$search === void 0 ? void 0 : (_row$original5$search2 = _row$original5$search.additionalDetails) === null || _row$original5$search2 === void 0 ? void 0 : (_row$original5$search3 = _row$original5$search2[0]) === null || _row$original5$search3 === void 0 ? void 0 : _row$original5$search3["allotmentType"]}`);
+      return GetCell(`${(_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : (_row$original5$search = _row$original5.searchData) === null || _row$original5$search === void 0 ? void 0 : (_row$original5$search2 = _row$original5$search.additionalDetails) === null || _row$original5$search2 === void 0 ? void 0 : (_row$original5$search3 = _row$original5$search2.propertyDetails[0]) === null || _row$original5$search3 === void 0 ? void 0 : _row$original5$search3["allotmentType"]}`);
     },
     mobileCell: original => {
       var _original$searchData5, _original$searchData6, _original$searchData7;
-      return GetMobCell(`${original === null || original === void 0 ? void 0 : (_original$searchData5 = original.searchData) === null || _original$searchData5 === void 0 ? void 0 : (_original$searchData6 = _original$searchData5.additionalDetails) === null || _original$searchData6 === void 0 ? void 0 : (_original$searchData7 = _original$searchData6[0]) === null || _original$searchData7 === void 0 ? void 0 : _original$searchData7["allotmentType"]}`);
+      return GetMobCell(`${original === null || original === void 0 ? void 0 : (_original$searchData5 = original.searchData) === null || _original$searchData5 === void 0 ? void 0 : (_original$searchData6 = _original$searchData5.additionalDetails) === null || _original$searchData6 === void 0 ? void 0 : (_original$searchData7 = _original$searchData6.propertyDetails[0]) === null || _original$searchData7 === void 0 ? void 0 : _original$searchData7["allotmentType"]}`);
     }
   }, {
     Header: t("RENT_AMOUNT "),
@@ -8200,11 +8272,11 @@ const DesktopInbox = ({
       row
     }) => {
       var _row$original6, _row$original6$search, _row$original6$search2, _row$original6$search3;
-      return GetCell(`${(_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : (_row$original6$search = _row$original6.searchData) === null || _row$original6$search === void 0 ? void 0 : (_row$original6$search2 = _row$original6$search.additionalDetails) === null || _row$original6$search2 === void 0 ? void 0 : (_row$original6$search3 = _row$original6$search2[0]) === null || _row$original6$search3 === void 0 ? void 0 : _row$original6$search3["baseRent"]}`);
+      return GetCell(`${(_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : (_row$original6$search = _row$original6.searchData) === null || _row$original6$search === void 0 ? void 0 : (_row$original6$search2 = _row$original6$search.additionalDetails) === null || _row$original6$search2 === void 0 ? void 0 : (_row$original6$search3 = _row$original6$search2.propertyDetails[0]) === null || _row$original6$search3 === void 0 ? void 0 : _row$original6$search3["baseRent"]}`);
     },
     mobileCell: original => {
       var _original$searchData8, _original$searchData9, _original$searchData0;
-      return GetMobCell(original === null || original === void 0 ? void 0 : (_original$searchData8 = original.searchData) === null || _original$searchData8 === void 0 ? void 0 : (_original$searchData9 = _original$searchData8.additionalDetails) === null || _original$searchData9 === void 0 ? void 0 : (_original$searchData0 = _original$searchData9[0]) === null || _original$searchData0 === void 0 ? void 0 : _original$searchData0["baseRent"]) || "-";
+      return GetMobCell(original === null || original === void 0 ? void 0 : (_original$searchData8 = original.searchData) === null || _original$searchData8 === void 0 ? void 0 : (_original$searchData9 = _original$searchData8.additionalDetails) === null || _original$searchData9 === void 0 ? void 0 : (_original$searchData0 = _original$searchData9.propertyDetails[0]) === null || _original$searchData0 === void 0 ? void 0 : _original$searchData0["baseRent"]) || "-";
     }
   }, {
     Header: t("CS_CREATED_DATE"),
@@ -8510,19 +8582,19 @@ const MobileInbox = ({
     Header: t("RENT_LEASE_PROPERTY_NAME"),
     mobileCell: original => {
       var _original$searchData2, _original$searchData3, _original$searchData4;
-      return GetMobCell(original === null || original === void 0 ? void 0 : (_original$searchData2 = original.searchData) === null || _original$searchData2 === void 0 ? void 0 : (_original$searchData3 = _original$searchData2.additionalDetails) === null || _original$searchData3 === void 0 ? void 0 : (_original$searchData4 = _original$searchData3[0]) === null || _original$searchData4 === void 0 ? void 0 : _original$searchData4["propertyName"]);
+      return GetMobCell(original === null || original === void 0 ? void 0 : (_original$searchData2 = original.searchData) === null || _original$searchData2 === void 0 ? void 0 : (_original$searchData3 = _original$searchData2.additionalDetails) === null || _original$searchData3 === void 0 ? void 0 : (_original$searchData4 = _original$searchData3.propertyDetails[0]) === null || _original$searchData4 === void 0 ? void 0 : _original$searchData4["propertyName"]);
     }
   }, {
     Header: t("RAL_ALLOTMENT_TYPE"),
     mobileCell: original => {
       var _original$searchData5, _original$searchData6, _original$searchData7;
-      return GetMobCell(original === null || original === void 0 ? void 0 : (_original$searchData5 = original.searchData) === null || _original$searchData5 === void 0 ? void 0 : (_original$searchData6 = _original$searchData5.additionalDetails) === null || _original$searchData6 === void 0 ? void 0 : (_original$searchData7 = _original$searchData6[0]) === null || _original$searchData7 === void 0 ? void 0 : _original$searchData7["allotmentType"]);
+      return GetMobCell(original === null || original === void 0 ? void 0 : (_original$searchData5 = original.searchData) === null || _original$searchData5 === void 0 ? void 0 : (_original$searchData6 = _original$searchData5.additionalDetails) === null || _original$searchData6 === void 0 ? void 0 : (_original$searchData7 = _original$searchData6.propertyDetails[0]) === null || _original$searchData7 === void 0 ? void 0 : _original$searchData7["allotmentType"]);
     }
   }, {
     Header: t("RENT_AMOUNT "),
     mobileCell: original => {
       var _original$searchData8, _original$searchData9, _original$searchData0;
-      return GetMobCell((original === null || original === void 0 ? void 0 : (_original$searchData8 = original.searchData) === null || _original$searchData8 === void 0 ? void 0 : (_original$searchData9 = _original$searchData8.additionalDetails) === null || _original$searchData9 === void 0 ? void 0 : (_original$searchData0 = _original$searchData9[0]) === null || _original$searchData0 === void 0 ? void 0 : _original$searchData0["baseRent"]) || "-");
+      return GetMobCell((original === null || original === void 0 ? void 0 : (_original$searchData8 = original.searchData) === null || _original$searchData8 === void 0 ? void 0 : (_original$searchData9 = _original$searchData8.additionalDetails) === null || _original$searchData9 === void 0 ? void 0 : (_original$searchData0 = _original$searchData9.propertyDetails[0]) === null || _original$searchData0 === void 0 ? void 0 : _original$searchData0["baseRent"]) || "-");
     }
   }, {
     Header: t("CS_CREATED_DATE"),
@@ -9145,7 +9217,7 @@ const RALModal = ({
 };
 
 const RALApplicationDetails$1 = () => {
-  var _workflowDetails$data, _user$info, _user$info$roles, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _actions, _actions2, _applicationData$Owne, _propertyDetails$fees, _propertyDetails$fees2, _propertyDetails$fees3, _propertyDetails$fees4, _applicationData$Docu2, _actions3, _workflowDetails$data7;
+  var _workflowDetails$data, _user$info, _user$info$roles, _user$info2, _user$info2$roles$fin, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _actions, _actions2, _applicationData$Owne, _propertyDetails$fees, _propertyDetails$fees2, _propertyDetails$fees3, _propertyDetails$fees4, _actions3, _workflowDetails$data7;
   const {
     t
   } = useTranslation();
@@ -9160,6 +9232,13 @@ const RALApplicationDetails$1 = () => {
   const [displayMenu, setDisplayMenu] = useState(false);
   const [selectedAction, setSelectedAction] = useState(null);
   const [showModal, setShowModal] = useState(false);
+  const [showOptions, setShowOptions] = useState(false);
+  const {
+    data: storeData
+  } = Digit.Hooks.useStore.getInitData();
+  const {
+    tenants
+  } = storeData || {};
   const [getEmployees, setEmployees] = useState([]);
   const history = useHistory();
   const [getWorkflowService, setWorkflowService] = useState([]);
@@ -9191,13 +9270,24 @@ const RALApplicationDetails$1 = () => {
       fetchApplications(filters);
     }
   }, []);
+  const {
+    data: reciept_data,
+    isLoading: recieptDataLoading
+  } = Digit.Hooks.useRecieptSearch({
+    tenantId: tenantId,
+    businessService: "rl-services",
+    consumerCodes: acknowledgementIds,
+    isEmployee: false
+  }, {
+    enabled: acknowledgementIds ? true : false
+  });
+  console.log('reciept_data', reciept_data);
   const workflowDetails = Digit.Hooks.useWorkflowDetails({
     tenantId,
     id: acknowledgementIds,
     moduleCode: "RENT_N_LEASE_NEW",
     role: "EMPLOYEE"
   });
-  console.log("workflowDetails", workflowDetails);
   if (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data = workflowDetails.data) !== null && _workflowDetails$data !== void 0 && _workflowDetails$data.actionState && !workflowDetails.isLoading) {
     workflowDetails.data.actionState.nextActions = workflowDetails.data.nextActions;
   }
@@ -9207,10 +9297,77 @@ const RALApplicationDetails$1 = () => {
     }, 2000);
     return () => clearTimeout(timer);
   };
+  console.log('applicationData', applicationData);
   const rawAdditionalDetails = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.additionalDetails) || {};
-  const propertyDetails = Array.isArray(rawAdditionalDetails) ? rawAdditionalDetails[0] : rawAdditionalDetails;
+  const propertyDetails = Array.isArray(rawAdditionalDetails === null || rawAdditionalDetails === void 0 ? void 0 : rawAdditionalDetails.propertyDetails) ? rawAdditionalDetails === null || rawAdditionalDetails === void 0 ? void 0 : rawAdditionalDetails.propertyDetails[0] : rawAdditionalDetails === null || rawAdditionalDetails === void 0 ? void 0 : rawAdditionalDetails.propertyDetails;
+  const arrearDoc = rawAdditionalDetails !== null && rawAdditionalDetails !== void 0 && rawAdditionalDetails.arrearDoc ? [{
+    documentType: "Arrear Doc",
+    fileStoreId: rawAdditionalDetails.arrearDoc
+  }] : [];
+  const allDocuments = [...((applicationData === null || applicationData === void 0 ? void 0 : applicationData.Document) || []), ...arrearDoc];
   let user = Digit.UserService.getUser();
   const userRoles = user === null || user === void 0 ? void 0 : (_user$info = user.info) === null || _user$info === void 0 ? void 0 : (_user$info$roles = _user$info.roles) === null || _user$info$roles === void 0 ? void 0 : _user$info$roles.map(e => e.code);
+  const isCemp = user === null || user === void 0 ? void 0 : (_user$info2 = user.info) === null || _user$info2 === void 0 ? void 0 : (_user$info2$roles$fin = _user$info2.roles.find(role => role.code === "RL_CEMP")) === null || _user$info2$roles$fin === void 0 ? void 0 : _user$info2$roles$fin.code;
+  const getAcknowledgement = async () => {
+    setLoader(true);
+    try {
+      const applications = applicationData;
+      const tenantInfo = tenants.find(tenant => tenant.code === tenantId);
+      const acknowldgementDataAPI = await getAcknowledgementData({
+        ...applications
+      }, tenantInfo, t);
+      setTimeout(() => {
+        Digit.Utils.pdf.generate(acknowldgementDataAPI);
+        setLoader(false);
+      }, 0);
+    } catch (error) {
+      setLoader(false);
+    }
+  };
+  async function getRecieptSearch({
+    tenantId,
+    payments,
+    ...params
+  }) {
+    setLoader(true);
+    try {
+      var _response;
+      let response = null;
+      response = await Digit.PaymentService.generatePdf(tenantId, {
+        Payments: [{
+          ...(payments || {}),
+          AllotmentDetails: [applicationData]
+        }]
+      }, "rentandlease-receipt");
+      const fileStore = await Digit.PaymentService.printReciept(tenantId, {
+        fileStoreIds: response.filestoreIds[0]
+      });
+      window.open(fileStore[(_response = response) === null || _response === void 0 ? void 0 : _response.filestoreIds[0]], "_blank");
+      setLoader(false);
+    } catch (error) {
+      console.error(error);
+      setLoader(false);
+    }
+  }
+  const dowloadOptions = [];
+  if (reciept_data && (reciept_data === null || reciept_data === void 0 ? void 0 : reciept_data.Payments.length) > 0 && !recieptDataLoading) {
+    dowloadOptions.push({
+      label: t("PTR_FEE_RECIEPT"),
+      onClick: () => {
+        var _reciept_data$Payment;
+        return getRecieptSearch({
+          tenantId: reciept_data === null || reciept_data === void 0 ? void 0 : (_reciept_data$Payment = reciept_data.Payments[0]) === null || _reciept_data$Payment === void 0 ? void 0 : _reciept_data$Payment.tenantId,
+          payments: reciept_data === null || reciept_data === void 0 ? void 0 : reciept_data.Payments[0]
+        });
+      }
+    });
+    if ((applicationData === null || applicationData === void 0 ? void 0 : applicationData.status) === "APPROVED" || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.status) === "CLOSED") {
+      dowloadOptions.push({
+        label: t("CHB_DOWNLOAD_ACK_FORM"),
+        onClick: () => getAcknowledgement()
+      });
+    }
+  }
   let actions = (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data2 = workflowDetails.data) === null || _workflowDetails$data2 === void 0 ? void 0 : (_workflowDetails$data3 = _workflowDetails$data2.actionState) === null || _workflowDetails$data3 === void 0 ? void 0 : (_workflowDetails$data4 = _workflowDetails$data3.nextActions) === null || _workflowDetails$data4 === void 0 ? void 0 : _workflowDetails$data4.filter(e => {
     return ((userRoles === null || userRoles === void 0 ? void 0 : userRoles.some(role => {
       var _e$roles;
@@ -9250,6 +9407,14 @@ const RALApplicationDetails$1 = () => {
   const getDate = epoch => {
     return Digit.DateUtils.ConvertEpochToDate(epoch);
   };
+  const tValue = value => {
+    if (value === 0 || value === "0") return "0";
+    if (!value) return t("CS_NA");
+    if (typeof value === "object" && value !== null) {
+      return t((value === null || value === void 0 ? void 0 : value.name) || (value === null || value === void 0 ? void 0 : value.code) || "CS_NA");
+    }
+    return t(value);
+  };
   function onActionSelect(action) {
     var _ref, _action$state, _filterRoles$;
     const payload = {
@@ -9437,7 +9602,12 @@ const RALApplicationDetails$1 = () => {
     className: "cardHeaderWithOptions ral-app-details-header"
   }, /*#__PURE__*/React.createElement(Header, {
     className: "ral-header-32"
-  }, t("RENT_LEASE_APPLICATION_DETAILS"))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, {
+  }, t("RENT_LEASE_APPLICATION_DETAILS")), isCemp && dowloadOptions && dowloadOptions.length > 0 && /*#__PURE__*/React.createElement(MultiLink, {
+    className: "multilinkWrapper",
+    onHeadClick: () => setShowOptions(!showOptions),
+    displayOptions: showOptions,
+    options: dowloadOptions
+  })), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, {
     className: "ral-card-subheader-24"
   }, t("RAL_CITIZEN_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, null, applicationData !== null && applicationData !== void 0 && (_applicationData$Owne = applicationData.OwnerInfo) !== null && _applicationData$Owne !== void 0 && _applicationData$Owne.length ? applicationData.OwnerInfo.map((owner, index) => {
     var _owner$correspondence, _owner$permanentAddre, _owner$correspondence2, _owner$permanentAddre2;
@@ -9448,19 +9618,19 @@ const RALApplicationDetails$1 = () => {
       className: "ral-app-details-owner-header"
     }, t("RAL_APPLICANT"), " ", index + 1), /*#__PURE__*/React.createElement(Row, {
       label: t("PT_OWNERSHIP_INFO_NAME"),
-      text: (owner === null || owner === void 0 ? void 0 : owner.name) || t("CS_NA")
+      text: tValue(owner === null || owner === void 0 ? void 0 : owner.name)
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("CORE_COMMON_PROFILE_EMAIL"),
-      text: (owner === null || owner === void 0 ? void 0 : owner.emailId) || t("CS_NA")
+      text: tValue(owner === null || owner === void 0 ? void 0 : owner.emailId)
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("CORE_MOBILE_NUMBER"),
-      text: (owner === null || owner === void 0 ? void 0 : owner.mobileNo) || t("CS_NA")
+      text: tValue(owner === null || owner === void 0 ? void 0 : owner.mobileNo)
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("PT_COMMON_COL_ADDRESS"),
-      text: (owner === null || owner === void 0 ? void 0 : (_owner$correspondence = owner.correspondenceAddress) === null || _owner$correspondence === void 0 ? void 0 : _owner$correspondence.addressId) || (owner === null || owner === void 0 ? void 0 : (_owner$permanentAddre = owner.permanentAddress) === null || _owner$permanentAddre === void 0 ? void 0 : _owner$permanentAddre.addressId) || t("CS_NA")
+      text: tValue((owner === null || owner === void 0 ? void 0 : (_owner$correspondence = owner.correspondenceAddress) === null || _owner$correspondence === void 0 ? void 0 : _owner$correspondence.addressId) || (owner === null || owner === void 0 ? void 0 : (_owner$permanentAddre = owner.permanentAddress) === null || _owner$permanentAddre === void 0 ? void 0 : _owner$permanentAddre.addressId))
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("CORE_COMMON_PINCODE"),
-      text: (owner === null || owner === void 0 ? void 0 : (_owner$correspondence2 = owner.correspondenceAddress) === null || _owner$correspondence2 === void 0 ? void 0 : _owner$correspondence2.pincode) || (owner === null || owner === void 0 ? void 0 : (_owner$permanentAddre2 = owner.permanentAddress) === null || _owner$permanentAddre2 === void 0 ? void 0 : _owner$permanentAddre2.pincode) || t("CS_NA")
+      text: tValue((owner === null || owner === void 0 ? void 0 : (_owner$correspondence2 = owner.correspondenceAddress) === null || _owner$correspondence2 === void 0 ? void 0 : _owner$correspondence2.pincode) || (owner === null || owner === void 0 ? void 0 : (_owner$permanentAddre2 = owner.permanentAddress) === null || _owner$permanentAddre2 === void 0 ? void 0 : _owner$permanentAddre2.pincode))
     }));
   }) : /*#__PURE__*/React.createElement(Row, {
     label: t("OWNER"),
@@ -9469,69 +9639,86 @@ const RALApplicationDetails$1 = () => {
     className: "ral-card-subheader-24"
   }, t("ES_TITILE_PROPERTY_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, null, (applicationData === null || applicationData === void 0 ? void 0 : applicationData.registrationNumber) && /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_REGISTRATION_NUMBER"),
-    text: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.registrationNumber) || t("CS_NA")
+    text: tValue(applicationData === null || applicationData === void 0 ? void 0 : applicationData.registrationNumber)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("APPLICATION_NUMBER"),
-    text: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationNumber) || t("CS_NA")
+    text: tValue(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationNumber)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RENT_LEASE_PROPERTY_ID"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.propertyId) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.propertyId)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RENT_LEASE_PROPERTY_NAME"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.propertyName) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.propertyName)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_ALLOTMENT_TYPE"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.allotmentType) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.allotmentType)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RENT_LEASE_PROPERTY_TYPE"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.propertyType) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.propertyType)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("WS_PROPERTY_ADDRESS_LABEL"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.address) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.address)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_PROPERTY_AMOUNT"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.baseRent) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.baseRent)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("PENALTY_TYPE"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.penaltyType) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.penaltyType)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_FEE_CYCLE"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$fees = propertyDetails.feesPeriodCycle) === null || _propertyDetails$fees === void 0 ? void 0 : (_propertyDetails$fees2 = _propertyDetails$fees[0]) === null || _propertyDetails$fees2 === void 0 ? void 0 : _propertyDetails$fees2.toUpperCase()) + (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$fees3 = propertyDetails.feesPeriodCycle) === null || _propertyDetails$fees3 === void 0 ? void 0 : (_propertyDetails$fees4 = _propertyDetails$fees3.slice(1)) === null || _propertyDetails$fees4 === void 0 ? void 0 : _propertyDetails$fees4.toLowerCase()) || t("CS_NA")
+    text: propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.feesPeriodCycle ? tValue((propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$fees = propertyDetails.feesPeriodCycle) === null || _propertyDetails$fees === void 0 ? void 0 : (_propertyDetails$fees2 = _propertyDetails$fees[0]) === null || _propertyDetails$fees2 === void 0 ? void 0 : _propertyDetails$fees2.toUpperCase()) + (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$fees3 = propertyDetails.feesPeriodCycle) === null || _propertyDetails$fees3 === void 0 ? void 0 : (_propertyDetails$fees4 = _propertyDetails$fees3.slice(1)) === null || _propertyDetails$fees4 === void 0 ? void 0 : _propertyDetails$fees4.toLowerCase())) : t("CS_NA")
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("PROPERTY_SIZE"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.propertySizeOrArea) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.propertySizeOrArea)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RENT_LEASE_LOCATION_TYPE"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.locationType) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.locationType)
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_START_DATE"),
-    text: getDate(applicationData === null || applicationData === void 0 ? void 0 : applicationData.startDate) || t("CS_NA")
+    text: tValue(getDate(applicationData === null || applicationData === void 0 ? void 0 : applicationData.startDate))
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_END_DATE"),
-    text: getDate(applicationData === null || applicationData === void 0 ? void 0 : applicationData.endDate) || t("CS_NA")
+    text: tValue(getDate(applicationData === null || applicationData === void 0 ? void 0 : applicationData.endDate))
   }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted) > 0 && /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_PROPERTY_PENALTY"),
-    text: applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted
-  }), /*#__PURE__*/React.createElement(Row, {
+    text: tValue(applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted)
+  }), (rawAdditionalDetails === null || rawAdditionalDetails === void 0 ? void 0 : rawAdditionalDetails.applicationType) !== "Legacy" && /*#__PURE__*/React.createElement(Row, {
     label: t("SECURITY_DEPOSIT"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit) || t("CS_NA")
+    text: tValue(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit)
   }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted) - (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit) > 0 && /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_AMOUNT_TO_TAKE_FROM_CITIZEN"),
-    text: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted) - (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit)
+    text: tValue((applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted) - (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit))
   }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeRefund) > 0 && /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_AMOUNT_TO_REFUND"),
-    text: applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeRefund
+    text: tValue(applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeRefund)
   }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.tradeLicenseNumber) && /*#__PURE__*/React.createElement(Row, {
     label: t("RENT_LEASE_TRADE_LICENSE_NUMBER"),
-    text: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.tradeLicenseNumber) || t("CS_NA")
-  })), /*#__PURE__*/React.createElement(CardSubHeader, {
+    text: tValue(applicationData === null || applicationData === void 0 ? void 0 : applicationData.tradeLicenseNumber)
+  })), (rawAdditionalDetails === null || rawAdditionalDetails === void 0 ? void 0 : rawAdditionalDetails.applicationType) === "Legacy" && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardSubHeader, {
+    className: "ral-card-subheader-24"
+  }, t("RAL_ARREAR_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
+    label: t("Arrears"),
+    text: tValue(rawAdditionalDetails === null || rawAdditionalDetails === void 0 ? void 0 : rawAdditionalDetails.arrear)
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_START_DATE"),
+    text: rawAdditionalDetails !== null && rawAdditionalDetails !== void 0 && rawAdditionalDetails.arrearStartDate ? getDate(rawAdditionalDetails.arrearStartDate) : t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_END_DATE"),
+    text: rawAdditionalDetails !== null && rawAdditionalDetails !== void 0 && rawAdditionalDetails.arrearEndDate ? getDate(rawAdditionalDetails.arrearEndDate) : t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("Reason"),
+    text: tValue(rawAdditionalDetails === null || rawAdditionalDetails === void 0 ? void 0 : rawAdditionalDetails.arrearReason)
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("Remarks"),
+    text: tValue(rawAdditionalDetails === null || rawAdditionalDetails === void 0 ? void 0 : rawAdditionalDetails.remarks)
+  }))), /*#__PURE__*/React.createElement(CardSubHeader, {
     className: "ral-card-subheader-24-margin"
   }, t("CS_COMMON_DOCUMENTS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Card, {
     className: "ral-app-details-docs-card"
-  }, (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$Docu2 = applicationData.Document) === null || _applicationData$Docu2 === void 0 ? void 0 : _applicationData$Docu2.length) > 0 ? applicationData.Document.map((doc, index) => /*#__PURE__*/React.createElement("div", {
+  }, (allDocuments === null || allDocuments === void 0 ? void 0 : allDocuments.length) > 0 ? allDocuments.map((doc, index) => /*#__PURE__*/React.createElement("div", {
     key: index
   }, /*#__PURE__*/React.createElement(RALDocuments, {
-    value: applicationData.Document,
+    value: allDocuments,
     Code: doc === null || doc === void 0 ? void 0 : doc.documentType,
     index: index
   }), t(doc === null || doc === void 0 ? void 0 : doc.documentType))) : /*#__PURE__*/React.createElement("h5", null, t("CS_NO_DOCUMENTS_UPLOADED"))))), /*#__PURE__*/React.createElement(NewApplicationTimeline, {
@@ -9587,12 +9774,40 @@ const RALApplicationDetails$1 = () => {
   }));
 };
 
+const RALBreadCrumbs = ({
+  location,
+  t
+}) => {
+  const crumbs = [{
+    path: "/digit-ui/employee",
+    content: t("ES_COMMON_HOME"),
+    show: true
+  }, {
+    path: "/digit-ui/employee/rentandlease/inbox",
+    content: t("CS_COMMON_INBOX"),
+    show: location.pathname.includes("/rentandlease/inbox") || location.pathname.includes("/rentAndLease/inbox") ? true : false
+  }, {
+    path: "/digit-ui/employee/rentandlease/allot-property",
+    content: "Allot Property",
+    show: location.pathname.includes("/rentandlease/allot-property") || location.pathname.includes("/rentAndLease/allot-property") ? true : false
+  }, {
+    path: "/digit-ui/employee/rentandlease/property",
+    content: "Application Overview",
+    show: location.pathname.includes("/rentandlease/property") || location.pathname.includes("/rentAndLease/property") ? true : false
+  }];
+  return /*#__PURE__*/React.createElement(BreadCrumb, {
+    crumbs: crumbs
+  });
+};
 const EmployeeApp = ({
   path,
   url,
   userType
 }) => {
   var _Digit, _Digit$ComponentRegis, _Digit2, _Digit2$ComponentRegi;
+  const {
+    t
+  } = useTranslation();
   const location = useLocation();
   const inboxInitialState = {
     searchParams: {
@@ -9600,23 +9815,22 @@ const EmployeeApp = ({
         code: "ASSIGNED_TO_ALL",
         name: "ES_INBOX_ASSIGNED_TO_ALL"
       },
-      services: ["RENT_N_LEASE_NEW"],
+      services: ["RENT_N_LEASE_NEW", "RENT_AND_LEASE_LG"],
       applicationStatus: [],
       locality: []
     }
   };
   const NewRentAndLeaseStepperForm = (_Digit = Digit) === null || _Digit === void 0 ? void 0 : (_Digit$ComponentRegis = _Digit.ComponentRegistryService) === null || _Digit$ComponentRegis === void 0 ? void 0 : _Digit$ComponentRegis.getComponent("NewRentAndLeaseStepperForm");
   const RALResponse = (_Digit2 = Digit) === null || _Digit2 === void 0 ? void 0 : (_Digit2$ComponentRegi = _Digit2.ComponentRegistryService) === null || _Digit2$ComponentRegi === void 0 ? void 0 : _Digit2$ComponentRegi.getComponent("RALResponse");
-  return /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "ground-container"
   }, /*#__PURE__*/React.createElement("div", {
     style: {
-      marginLeft: "-4px",
-      display: "flex",
-      alignItems: "center"
+      marginLeft: "10px"
     }
-  }, /*#__PURE__*/React.createElement(BackButton, {
-    location: location
+  }, /*#__PURE__*/React.createElement(RALBreadCrumbs, {
+    location: location,
+    t: t
   })), /*#__PURE__*/React.createElement(PrivateRoute, {
     exact: true,
     path: `${path}/`,
@@ -9629,7 +9843,7 @@ const EmployeeApp = ({
     component: () => /*#__PURE__*/React.createElement(Inbox, {
       useNewInboxAPI: true,
       parentRoute: path,
-      businessService: "RENT_N_LEASE_NEW",
+      businessService: "RENT_N_LEASE_NEW,RENT_AND_LEASE_LG",
       moduleCode: "RAL",
       filterComponent: "RAL_INBOX_FILTER",
       initialStates: inboxInitialState,
@@ -9644,7 +9858,7 @@ const EmployeeApp = ({
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/response/:applicationNumber`,
     component: RALResponse
-  }))));
+  })));
 };
 
 const UPDATE_RENTANDLEASE_NEW_APPLICATION_FORMType = "UPDATE_RENTANDLEASE_NEW_APPLICATION_FORM";
@@ -10313,86 +10527,1195 @@ const NewRentAndLeaseStepperForm = ({
   }));
 };
 
-const RentAndLeasePropertyDetails = ({
-  onGoBack,
-  goNext,
-  currentStepData,
-  t,
-  validateStep,
-  config
-}) => {
-  const dispatch = useDispatch();
-  const tenantId = window.localStorage.getItem("Employee.tenant-id");
-  const filters = {
-    tenantId,
-    searchType: "1"
-  };
-  const {
-    data,
-    isLoading,
-    isError
-  } = Digit.Hooks.rentandlease.useRentAndLeaseProperties(filters);
-  const {
-    triggerLoader,
-    triggerToast
-  } = config === null || config === void 0 ? void 0 : config.currStepConfig[0];
-  const propertyTypeOptions = [{
-    name: t("ON_RENT"),
-    code: "rent",
-    i18nKey: "rent"
-  }, {
-    name: t("ON_LEASE"),
-    code: "lease",
-    i18nKey: "lease"
-  }];
-  const propertySpecificOptions = [{
-    name: t("COMMERCIAL"),
-    code: "Commercial",
-    i18nKey: "Commercial"
-  }, {
-    name: t("RESIDENTIAL"),
-    code: "Residential",
-    i18nKey: "Residential"
-  }];
-  const locationTypeOptions = [{
-    name: t("PRIME"),
-    code: "Prime",
-    i18nKey: "Prime"
-  }, {
-    name: t("NON_PRIME"),
-    code: "Non-Prime",
-    i18nKey: "Non-Prime"
-  }];
-  const {
-    control,
-    handleSubmit,
-    setValue,
-    watch,
-    formState: {
-      errors
+var exif = createCommonjsModule(function (module, exports) {
+  (function () {
+    var debug = false;
+    var EXIF = function (obj) {
+      if (obj instanceof EXIF) return obj;
+      if (!(this instanceof EXIF)) return new EXIF(obj);
+      this.EXIFwrapped = obj;
+    };
+    {
+      if ( module.exports) {
+        exports = module.exports = EXIF;
+      }
+      exports.EXIF = EXIF;
+    }
+    var ExifTags = EXIF.Tags = {
+      0x9000: "ExifVersion",
+      0xA000: "FlashpixVersion",
+      0xA001: "ColorSpace",
+      0xA002: "PixelXDimension",
+      0xA003: "PixelYDimension",
+      0x9101: "ComponentsConfiguration",
+      0x9102: "CompressedBitsPerPixel",
+      0x927C: "MakerNote",
+      0x9286: "UserComment",
+      0xA004: "RelatedSoundFile",
+      0x9003: "DateTimeOriginal",
+      0x9004: "DateTimeDigitized",
+      0x9290: "SubsecTime",
+      0x9291: "SubsecTimeOriginal",
+      0x9292: "SubsecTimeDigitized",
+      0x829A: "ExposureTime",
+      0x829D: "FNumber",
+      0x8822: "ExposureProgram",
+      0x8824: "SpectralSensitivity",
+      0x8827: "ISOSpeedRatings",
+      0x8828: "OECF",
+      0x9201: "ShutterSpeedValue",
+      0x9202: "ApertureValue",
+      0x9203: "BrightnessValue",
+      0x9204: "ExposureBias",
+      0x9205: "MaxApertureValue",
+      0x9206: "SubjectDistance",
+      0x9207: "MeteringMode",
+      0x9208: "LightSource",
+      0x9209: "Flash",
+      0x9214: "SubjectArea",
+      0x920A: "FocalLength",
+      0xA20B: "FlashEnergy",
+      0xA20C: "SpatialFrequencyResponse",
+      0xA20E: "FocalPlaneXResolution",
+      0xA20F: "FocalPlaneYResolution",
+      0xA210: "FocalPlaneResolutionUnit",
+      0xA214: "SubjectLocation",
+      0xA215: "ExposureIndex",
+      0xA217: "SensingMethod",
+      0xA300: "FileSource",
+      0xA301: "SceneType",
+      0xA302: "CFAPattern",
+      0xA401: "CustomRendered",
+      0xA402: "ExposureMode",
+      0xA403: "WhiteBalance",
+      0xA404: "DigitalZoomRation",
+      0xA405: "FocalLengthIn35mmFilm",
+      0xA406: "SceneCaptureType",
+      0xA407: "GainControl",
+      0xA408: "Contrast",
+      0xA409: "Saturation",
+      0xA40A: "Sharpness",
+      0xA40B: "DeviceSettingDescription",
+      0xA40C: "SubjectDistanceRange",
+      0xA005: "InteroperabilityIFDPointer",
+      0xA420: "ImageUniqueID"
+    };
+    var TiffTags = EXIF.TiffTags = {
+      0x0100: "ImageWidth",
+      0x0101: "ImageHeight",
+      0x8769: "ExifIFDPointer",
+      0x8825: "GPSInfoIFDPointer",
+      0xA005: "InteroperabilityIFDPointer",
+      0x0102: "BitsPerSample",
+      0x0103: "Compression",
+      0x0106: "PhotometricInterpretation",
+      0x0112: "Orientation",
+      0x0115: "SamplesPerPixel",
+      0x011C: "PlanarConfiguration",
+      0x0212: "YCbCrSubSampling",
+      0x0213: "YCbCrPositioning",
+      0x011A: "XResolution",
+      0x011B: "YResolution",
+      0x0128: "ResolutionUnit",
+      0x0111: "StripOffsets",
+      0x0116: "RowsPerStrip",
+      0x0117: "StripByteCounts",
+      0x0201: "JPEGInterchangeFormat",
+      0x0202: "JPEGInterchangeFormatLength",
+      0x012D: "TransferFunction",
+      0x013E: "WhitePoint",
+      0x013F: "PrimaryChromaticities",
+      0x0211: "YCbCrCoefficients",
+      0x0214: "ReferenceBlackWhite",
+      0x0132: "DateTime",
+      0x010E: "ImageDescription",
+      0x010F: "Make",
+      0x0110: "Model",
+      0x0131: "Software",
+      0x013B: "Artist",
+      0x8298: "Copyright"
+    };
+    var GPSTags = EXIF.GPSTags = {
+      0x0000: "GPSVersionID",
+      0x0001: "GPSLatitudeRef",
+      0x0002: "GPSLatitude",
+      0x0003: "GPSLongitudeRef",
+      0x0004: "GPSLongitude",
+      0x0005: "GPSAltitudeRef",
+      0x0006: "GPSAltitude",
+      0x0007: "GPSTimeStamp",
+      0x0008: "GPSSatellites",
+      0x0009: "GPSStatus",
+      0x000A: "GPSMeasureMode",
+      0x000B: "GPSDOP",
+      0x000C: "GPSSpeedRef",
+      0x000D: "GPSSpeed",
+      0x000E: "GPSTrackRef",
+      0x000F: "GPSTrack",
+      0x0010: "GPSImgDirectionRef",
+      0x0011: "GPSImgDirection",
+      0x0012: "GPSMapDatum",
+      0x0013: "GPSDestLatitudeRef",
+      0x0014: "GPSDestLatitude",
+      0x0015: "GPSDestLongitudeRef",
+      0x0016: "GPSDestLongitude",
+      0x0017: "GPSDestBearingRef",
+      0x0018: "GPSDestBearing",
+      0x0019: "GPSDestDistanceRef",
+      0x001A: "GPSDestDistance",
+      0x001B: "GPSProcessingMethod",
+      0x001C: "GPSAreaInformation",
+      0x001D: "GPSDateStamp",
+      0x001E: "GPSDifferential"
+    };
+    var IFD1Tags = EXIF.IFD1Tags = {
+      0x0100: "ImageWidth",
+      0x0101: "ImageHeight",
+      0x0102: "BitsPerSample",
+      0x0103: "Compression",
+      0x0106: "PhotometricInterpretation",
+      0x0111: "StripOffsets",
+      0x0112: "Orientation",
+      0x0115: "SamplesPerPixel",
+      0x0116: "RowsPerStrip",
+      0x0117: "StripByteCounts",
+      0x011A: "XResolution",
+      0x011B: "YResolution",
+      0x011C: "PlanarConfiguration",
+      0x0128: "ResolutionUnit",
+      0x0201: "JpegIFOffset",
+      0x0202: "JpegIFByteCount",
+      0x0211: "YCbCrCoefficients",
+      0x0212: "YCbCrSubSampling",
+      0x0213: "YCbCrPositioning",
+      0x0214: "ReferenceBlackWhite"
+    };
+    var StringValues = EXIF.StringValues = {
+      ExposureProgram: {
+        0: "Not defined",
+        1: "Manual",
+        2: "Normal program",
+        3: "Aperture priority",
+        4: "Shutter priority",
+        5: "Creative program",
+        6: "Action program",
+        7: "Portrait mode",
+        8: "Landscape mode"
+      },
+      MeteringMode: {
+        0: "Unknown",
+        1: "Average",
+        2: "CenterWeightedAverage",
+        3: "Spot",
+        4: "MultiSpot",
+        5: "Pattern",
+        6: "Partial",
+        255: "Other"
+      },
+      LightSource: {
+        0: "Unknown",
+        1: "Daylight",
+        2: "Fluorescent",
+        3: "Tungsten (incandescent light)",
+        4: "Flash",
+        9: "Fine weather",
+        10: "Cloudy weather",
+        11: "Shade",
+        12: "Daylight fluorescent (D 5700 - 7100K)",
+        13: "Day white fluorescent (N 4600 - 5400K)",
+        14: "Cool white fluorescent (W 3900 - 4500K)",
+        15: "White fluorescent (WW 3200 - 3700K)",
+        17: "Standard light A",
+        18: "Standard light B",
+        19: "Standard light C",
+        20: "D55",
+        21: "D65",
+        22: "D75",
+        23: "D50",
+        24: "ISO studio tungsten",
+        255: "Other"
+      },
+      Flash: {
+        0x0000: "Flash did not fire",
+        0x0001: "Flash fired",
+        0x0005: "Strobe return light not detected",
+        0x0007: "Strobe return light detected",
+        0x0009: "Flash fired, compulsory flash mode",
+        0x000D: "Flash fired, compulsory flash mode, return light not detected",
+        0x000F: "Flash fired, compulsory flash mode, return light detected",
+        0x0010: "Flash did not fire, compulsory flash mode",
+        0x0018: "Flash did not fire, auto mode",
+        0x0019: "Flash fired, auto mode",
+        0x001D: "Flash fired, auto mode, return light not detected",
+        0x001F: "Flash fired, auto mode, return light detected",
+        0x0020: "No flash function",
+        0x0041: "Flash fired, red-eye reduction mode",
+        0x0045: "Flash fired, red-eye reduction mode, return light not detected",
+        0x0047: "Flash fired, red-eye reduction mode, return light detected",
+        0x0049: "Flash fired, compulsory flash mode, red-eye reduction mode",
+        0x004D: "Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected",
+        0x004F: "Flash fired, compulsory flash mode, red-eye reduction mode, return light detected",
+        0x0059: "Flash fired, auto mode, red-eye reduction mode",
+        0x005D: "Flash fired, auto mode, return light not detected, red-eye reduction mode",
+        0x005F: "Flash fired, auto mode, return light detected, red-eye reduction mode"
+      },
+      SensingMethod: {
+        1: "Not defined",
+        2: "One-chip color area sensor",
+        3: "Two-chip color area sensor",
+        4: "Three-chip color area sensor",
+        5: "Color sequential area sensor",
+        7: "Trilinear sensor",
+        8: "Color sequential linear sensor"
+      },
+      SceneCaptureType: {
+        0: "Standard",
+        1: "Landscape",
+        2: "Portrait",
+        3: "Night scene"
+      },
+      SceneType: {
+        1: "Directly photographed"
+      },
+      CustomRendered: {
+        0: "Normal process",
+        1: "Custom process"
+      },
+      WhiteBalance: {
+        0: "Auto white balance",
+        1: "Manual white balance"
+      },
+      GainControl: {
+        0: "None",
+        1: "Low gain up",
+        2: "High gain up",
+        3: "Low gain down",
+        4: "High gain down"
+      },
+      Contrast: {
+        0: "Normal",
+        1: "Soft",
+        2: "Hard"
+      },
+      Saturation: {
+        0: "Normal",
+        1: "Low saturation",
+        2: "High saturation"
+      },
+      Sharpness: {
+        0: "Normal",
+        1: "Soft",
+        2: "Hard"
+      },
+      SubjectDistanceRange: {
+        0: "Unknown",
+        1: "Macro",
+        2: "Close view",
+        3: "Distant view"
+      },
+      FileSource: {
+        3: "DSC"
+      },
+      Components: {
+        0: "",
+        1: "Y",
+        2: "Cb",
+        3: "Cr",
+        4: "R",
+        5: "G",
+        6: "B"
+      }
+    };
+    function imageHasData(img) {
+      return !!img.exifdata;
+    }
+    function base64ToArrayBuffer(base64, contentType) {
+      contentType = contentType || base64.match(/^data\:([^\;]+)\;base64,/mi)[1] || '';
+      base64 = base64.replace(/^data\:([^\;]+)\;base64,/gmi, '');
+      var binary = atob(base64);
+      var len = binary.length;
+      var buffer = new ArrayBuffer(len);
+      var view = new Uint8Array(buffer);
+      for (var i = 0; i < len; i++) {
+        view[i] = binary.charCodeAt(i);
+      }
+      return buffer;
+    }
+    function objectURLToBlob(url, callback) {
+      var http = new XMLHttpRequest();
+      http.open("GET", url, true);
+      http.responseType = "blob";
+      http.onload = function (e) {
+        if (this.status == 200 || this.status === 0) {
+          callback(this.response);
+        }
+      };
+      http.send();
+    }
+    function getImageData(img, callback) {
+      function handleBinaryFile(binFile) {
+        var data = findEXIFinJPEG(binFile);
+        img.exifdata = data || {};
+        var iptcdata = findIPTCinJPEG(binFile);
+        img.iptcdata = iptcdata || {};
+        if (EXIF.isXmpEnabled) {
+          var xmpdata = findXMPinJPEG(binFile);
+          img.xmpdata = xmpdata || {};
+        }
+        if (callback) {
+          callback.call(img);
+        }
+      }
+      if (img.src) {
+        if (/^data\:/i.test(img.src)) {
+          var arrayBuffer = base64ToArrayBuffer(img.src);
+          handleBinaryFile(arrayBuffer);
+        } else if (/^blob\:/i.test(img.src)) {
+          var fileReader = new FileReader();
+          fileReader.onload = function (e) {
+            handleBinaryFile(e.target.result);
+          };
+          objectURLToBlob(img.src, function (blob) {
+            fileReader.readAsArrayBuffer(blob);
+          });
+        } else {
+          var http = new XMLHttpRequest();
+          http.onload = function () {
+            if (this.status == 200 || this.status === 0) {
+              handleBinaryFile(http.response);
+            } else {
+              throw "Could not load image";
+            }
+            http = null;
+          };
+          http.open("GET", img.src, true);
+          http.responseType = "arraybuffer";
+          http.send(null);
+        }
+      } else if (self.FileReader && (img instanceof self.Blob || img instanceof self.File)) {
+        var fileReader = new FileReader();
+        fileReader.onload = function (e) {
+          handleBinaryFile(e.target.result);
+        };
+        fileReader.readAsArrayBuffer(img);
+      }
     }
-  } = useForm({
-    defaultValues: {
-      propertyId: "",
-      propertyName: "",
-      propertyType: "",
-      propertySpecific: "",
-      locationType: "",
-      allotmentType: "",
-      propertySizeOrArea: "",
-      baseRent: "",
-      securityDeposit: "",
-      refundApplicableOnDiscontinuation: null,
-      penaltyType: "",
-      startDate: "",
-      endDate: "",
-      incrementApplicable: "",
-      incrementPercentage: "",
-      incrementCycle: "",
-      selectedProperty: null,
-      duration: ""
+    function findEXIFinJPEG(file) {
+      var dataView = new DataView(file);
+      if (dataView.getUint8(0) != 0xFF || dataView.getUint8(1) != 0xD8) {
+        return false;
+      }
+      var offset = 2,
+        length = file.byteLength,
+        marker;
+      while (offset < length) {
+        if (dataView.getUint8(offset) != 0xFF) {
+          return false;
+        }
+        marker = dataView.getUint8(offset + 1);
+        if (marker == 225) {
+          return readEXIFData(dataView, offset + 4, dataView.getUint16(offset + 2) - 2);
+        } else {
+          offset += 2 + dataView.getUint16(offset + 2);
+        }
+      }
+    }
+    function findIPTCinJPEG(file) {
+      var dataView = new DataView(file);
+      if (dataView.getUint8(0) != 0xFF || dataView.getUint8(1) != 0xD8) {
+        return false;
+      }
+      var offset = 2,
+        length = file.byteLength;
+      var isFieldSegmentStart = function (dataView, offset) {
+        return dataView.getUint8(offset) === 0x38 && dataView.getUint8(offset + 1) === 0x42 && dataView.getUint8(offset + 2) === 0x49 && dataView.getUint8(offset + 3) === 0x4D && dataView.getUint8(offset + 4) === 0x04 && dataView.getUint8(offset + 5) === 0x04;
+      };
+      while (offset < length) {
+        if (isFieldSegmentStart(dataView, offset)) {
+          var nameHeaderLength = dataView.getUint8(offset + 7);
+          if (nameHeaderLength % 2 !== 0) nameHeaderLength += 1;
+          if (nameHeaderLength === 0) {
+            nameHeaderLength = 4;
+          }
+          var startOffset = offset + 8 + nameHeaderLength;
+          var sectionLength = dataView.getUint16(offset + 6 + nameHeaderLength);
+          return readIPTCData(file, startOffset, sectionLength);
+        }
+        offset++;
+      }
+    }
+    var IptcFieldMap = {
+      0x78: 'caption',
+      0x6E: 'credit',
+      0x19: 'keywords',
+      0x37: 'dateCreated',
+      0x50: 'byline',
+      0x55: 'bylineTitle',
+      0x7A: 'captionWriter',
+      0x69: 'headline',
+      0x74: 'copyright',
+      0x0F: 'category'
+    };
+    function readIPTCData(file, startOffset, sectionLength) {
+      var dataView = new DataView(file);
+      var data = {};
+      var fieldValue, fieldName, dataSize, segmentType;
+      var segmentStartPos = startOffset;
+      while (segmentStartPos < startOffset + sectionLength) {
+        if (dataView.getUint8(segmentStartPos) === 0x1C && dataView.getUint8(segmentStartPos + 1) === 0x02) {
+          segmentType = dataView.getUint8(segmentStartPos + 2);
+          if (segmentType in IptcFieldMap) {
+            dataSize = dataView.getInt16(segmentStartPos + 3);
+            fieldName = IptcFieldMap[segmentType];
+            fieldValue = getStringFromDB(dataView, segmentStartPos + 5, dataSize);
+            if (data.hasOwnProperty(fieldName)) {
+              if (data[fieldName] instanceof Array) {
+                data[fieldName].push(fieldValue);
+              } else {
+                data[fieldName] = [data[fieldName], fieldValue];
+              }
+            } else {
+              data[fieldName] = fieldValue;
+            }
+          }
+        }
+        segmentStartPos++;
+      }
+      return data;
+    }
+    function readTags(file, tiffStart, dirStart, strings, bigEnd) {
+      var entries = file.getUint16(dirStart, !bigEnd),
+        tags = {},
+        entryOffset,
+        tag,
+        i;
+      for (i = 0; i < entries; i++) {
+        entryOffset = dirStart + i * 12 + 2;
+        tag = strings[file.getUint16(entryOffset, !bigEnd)];
+        if (!tag && debug) console.log("Unknown tag: " + file.getUint16(entryOffset, !bigEnd));
+        tags[tag] = readTagValue(file, entryOffset, tiffStart, dirStart, bigEnd);
+      }
+      return tags;
+    }
+    function readTagValue(file, entryOffset, tiffStart, dirStart, bigEnd) {
+      var type = file.getUint16(entryOffset + 2, !bigEnd),
+        numValues = file.getUint32(entryOffset + 4, !bigEnd),
+        valueOffset = file.getUint32(entryOffset + 8, !bigEnd) + tiffStart,
+        offset,
+        vals,
+        val,
+        n,
+        numerator,
+        denominator;
+      switch (type) {
+        case 1:
+        case 7:
+          if (numValues == 1) {
+            return file.getUint8(entryOffset + 8, !bigEnd);
+          } else {
+            offset = numValues > 4 ? valueOffset : entryOffset + 8;
+            vals = [];
+            for (n = 0; n < numValues; n++) {
+              vals[n] = file.getUint8(offset + n);
+            }
+            return vals;
+          }
+        case 2:
+          offset = numValues > 4 ? valueOffset : entryOffset + 8;
+          return getStringFromDB(file, offset, numValues - 1);
+        case 3:
+          if (numValues == 1) {
+            return file.getUint16(entryOffset + 8, !bigEnd);
+          } else {
+            offset = numValues > 2 ? valueOffset : entryOffset + 8;
+            vals = [];
+            for (n = 0; n < numValues; n++) {
+              vals[n] = file.getUint16(offset + 2 * n, !bigEnd);
+            }
+            return vals;
+          }
+        case 4:
+          if (numValues == 1) {
+            return file.getUint32(entryOffset + 8, !bigEnd);
+          } else {
+            vals = [];
+            for (n = 0; n < numValues; n++) {
+              vals[n] = file.getUint32(valueOffset + 4 * n, !bigEnd);
+            }
+            return vals;
+          }
+        case 5:
+          if (numValues == 1) {
+            numerator = file.getUint32(valueOffset, !bigEnd);
+            denominator = file.getUint32(valueOffset + 4, !bigEnd);
+            val = new Number(numerator / denominator);
+            val.numerator = numerator;
+            val.denominator = denominator;
+            return val;
+          } else {
+            vals = [];
+            for (n = 0; n < numValues; n++) {
+              numerator = file.getUint32(valueOffset + 8 * n, !bigEnd);
+              denominator = file.getUint32(valueOffset + 4 + 8 * n, !bigEnd);
+              vals[n] = new Number(numerator / denominator);
+              vals[n].numerator = numerator;
+              vals[n].denominator = denominator;
+            }
+            return vals;
+          }
+        case 9:
+          if (numValues == 1) {
+            return file.getInt32(entryOffset + 8, !bigEnd);
+          } else {
+            vals = [];
+            for (n = 0; n < numValues; n++) {
+              vals[n] = file.getInt32(valueOffset + 4 * n, !bigEnd);
+            }
+            return vals;
+          }
+        case 10:
+          if (numValues == 1) {
+            return file.getInt32(valueOffset, !bigEnd) / file.getInt32(valueOffset + 4, !bigEnd);
+          } else {
+            vals = [];
+            for (n = 0; n < numValues; n++) {
+              vals[n] = file.getInt32(valueOffset + 8 * n, !bigEnd) / file.getInt32(valueOffset + 4 + 8 * n, !bigEnd);
+            }
+            return vals;
+          }
+      }
+    }
+    function getNextIFDOffset(dataView, dirStart, bigEnd) {
+      var entries = dataView.getUint16(dirStart, !bigEnd);
+      return dataView.getUint32(dirStart + 2 + entries * 12, !bigEnd);
+    }
+    function readThumbnailImage(dataView, tiffStart, firstIFDOffset, bigEnd) {
+      var IFD1OffsetPointer = getNextIFDOffset(dataView, tiffStart + firstIFDOffset, bigEnd);
+      if (!IFD1OffsetPointer) {
+        return {};
+      } else if (IFD1OffsetPointer > dataView.byteLength) {
+        return {};
+      }
+      var thumbTags = readTags(dataView, tiffStart, tiffStart + IFD1OffsetPointer, IFD1Tags, bigEnd);
+      if (thumbTags['Compression']) {
+        switch (thumbTags['Compression']) {
+          case 6:
+            if (thumbTags.JpegIFOffset && thumbTags.JpegIFByteCount) {
+              var tOffset = tiffStart + thumbTags.JpegIFOffset;
+              var tLength = thumbTags.JpegIFByteCount;
+              thumbTags['blob'] = new Blob([new Uint8Array(dataView.buffer, tOffset, tLength)], {
+                type: 'image/jpeg'
+              });
+            }
+            break;
+          case 1:
+            console.log("Thumbnail image format is TIFF, which is not implemented.");
+            break;
+          default:
+            console.log("Unknown thumbnail image format '%s'", thumbTags['Compression']);
+        }
+      } else if (thumbTags['PhotometricInterpretation'] == 2) {
+        console.log("Thumbnail image format is RGB, which is not implemented.");
+      }
+      return thumbTags;
+    }
+    function getStringFromDB(buffer, start, length) {
+      var outstr = "";
+      for (n = start; n < start + length; n++) {
+        outstr += String.fromCharCode(buffer.getUint8(n));
+      }
+      return outstr;
+    }
+    function readEXIFData(file, start) {
+      if (getStringFromDB(file, start, 4) != "Exif") {
+        return false;
+      }
+      var bigEnd,
+        tags,
+        tag,
+        exifData,
+        gpsData,
+        tiffOffset = start + 6;
+      if (file.getUint16(tiffOffset) == 0x4949) {
+        bigEnd = false;
+      } else if (file.getUint16(tiffOffset) == 0x4D4D) {
+        bigEnd = true;
+      } else {
+        return false;
+      }
+      if (file.getUint16(tiffOffset + 2, !bigEnd) != 0x002A) {
+        return false;
+      }
+      var firstIFDOffset = file.getUint32(tiffOffset + 4, !bigEnd);
+      if (firstIFDOffset < 0x00000008) {
+        return false;
+      }
+      tags = readTags(file, tiffOffset, tiffOffset + firstIFDOffset, TiffTags, bigEnd);
+      if (tags.ExifIFDPointer) {
+        exifData = readTags(file, tiffOffset, tiffOffset + tags.ExifIFDPointer, ExifTags, bigEnd);
+        for (tag in exifData) {
+          switch (tag) {
+            case "LightSource":
+            case "Flash":
+            case "MeteringMode":
+            case "ExposureProgram":
+            case "SensingMethod":
+            case "SceneCaptureType":
+            case "SceneType":
+            case "CustomRendered":
+            case "WhiteBalance":
+            case "GainControl":
+            case "Contrast":
+            case "Saturation":
+            case "Sharpness":
+            case "SubjectDistanceRange":
+            case "FileSource":
+              exifData[tag] = StringValues[tag][exifData[tag]];
+              break;
+            case "ExifVersion":
+            case "FlashpixVersion":
+              exifData[tag] = String.fromCharCode(exifData[tag][0], exifData[tag][1], exifData[tag][2], exifData[tag][3]);
+              break;
+            case "ComponentsConfiguration":
+              exifData[tag] = StringValues.Components[exifData[tag][0]] + StringValues.Components[exifData[tag][1]] + StringValues.Components[exifData[tag][2]] + StringValues.Components[exifData[tag][3]];
+              break;
+          }
+          tags[tag] = exifData[tag];
+        }
+      }
+      if (tags.GPSInfoIFDPointer) {
+        gpsData = readTags(file, tiffOffset, tiffOffset + tags.GPSInfoIFDPointer, GPSTags, bigEnd);
+        for (tag in gpsData) {
+          switch (tag) {
+            case "GPSVersionID":
+              gpsData[tag] = gpsData[tag][0] + "." + gpsData[tag][1] + "." + gpsData[tag][2] + "." + gpsData[tag][3];
+              break;
+          }
+          tags[tag] = gpsData[tag];
+        }
+      }
+      tags['thumbnail'] = readThumbnailImage(file, tiffOffset, firstIFDOffset, bigEnd);
+      return tags;
+    }
+    function findXMPinJPEG(file) {
+      if (!('DOMParser' in self)) {
+        return;
+      }
+      var dataView = new DataView(file);
+      if (dataView.getUint8(0) != 0xFF || dataView.getUint8(1) != 0xD8) {
+        return false;
+      }
+      var offset = 2,
+        length = file.byteLength,
+        dom = new DOMParser();
+      while (offset < length - 4) {
+        if (getStringFromDB(dataView, offset, 4) == "http") {
+          var startOffset = offset - 1;
+          var sectionLength = dataView.getUint16(offset - 2) - 1;
+          var xmpString = getStringFromDB(dataView, startOffset, sectionLength);
+          var xmpEndIndex = xmpString.indexOf('xmpmeta>') + 8;
+          xmpString = xmpString.substring(xmpString.indexOf('<x:xmpmeta'), xmpEndIndex);
+          var indexOfXmp = xmpString.indexOf('x:xmpmeta') + 10;
+          xmpString = xmpString.slice(0, indexOfXmp) + 'xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/" ' + 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ' + 'xmlns:tiff="http://ns.adobe.com/tiff/1.0/" ' + 'xmlns:plus="http://schemas.android.com/apk/lib/com.google.android.gms.plus" ' + 'xmlns:ext="http://www.gettyimages.com/xsltExtension/1.0" ' + 'xmlns:exif="http://ns.adobe.com/exif/1.0/" ' + 'xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#" ' + 'xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#" ' + 'xmlns:crs="http://ns.adobe.com/camera-raw-settings/1.0/" ' + 'xmlns:xapGImg="http://ns.adobe.com/xap/1.0/g/img/" ' + 'xmlns:Iptc4xmpExt="http://iptc.org/std/Iptc4xmpExt/2008-02-29/" ' + xmpString.slice(indexOfXmp);
+          var domDocument = dom.parseFromString(xmpString, 'text/xml');
+          return xml2Object(domDocument);
+        } else {
+          offset++;
+        }
+      }
+    }
+    function xml2json(xml) {
+      var json = {};
+      if (xml.nodeType == 1) {
+        if (xml.attributes.length > 0) {
+          json['@attributes'] = {};
+          for (var j = 0; j < xml.attributes.length; j++) {
+            var attribute = xml.attributes.item(j);
+            json['@attributes'][attribute.nodeName] = attribute.nodeValue;
+          }
+        }
+      } else if (xml.nodeType == 3) {
+        return xml.nodeValue;
+      }
+      if (xml.hasChildNodes()) {
+        for (var i = 0; i < xml.childNodes.length; i++) {
+          var child = xml.childNodes.item(i);
+          var nodeName = child.nodeName;
+          if (json[nodeName] == null) {
+            json[nodeName] = xml2json(child);
+          } else {
+            if (json[nodeName].push == null) {
+              var old = json[nodeName];
+              json[nodeName] = [];
+              json[nodeName].push(old);
+            }
+            json[nodeName].push(xml2json(child));
+          }
+        }
+      }
+      return json;
+    }
+    function xml2Object(xml) {
+      try {
+        var obj = {};
+        if (xml.children.length > 0) {
+          for (var i = 0; i < xml.children.length; i++) {
+            var item = xml.children.item(i);
+            var attributes = item.attributes;
+            for (var idx in attributes) {
+              var itemAtt = attributes[idx];
+              var dataKey = itemAtt.nodeName;
+              var dataValue = itemAtt.nodeValue;
+              if (dataKey !== undefined) {
+                obj[dataKey] = dataValue;
+              }
+            }
+            var nodeName = item.nodeName;
+            if (typeof obj[nodeName] == "undefined") {
+              obj[nodeName] = xml2json(item);
+            } else {
+              if (typeof obj[nodeName].push == "undefined") {
+                var old = obj[nodeName];
+                obj[nodeName] = [];
+                obj[nodeName].push(old);
+              }
+              obj[nodeName].push(xml2json(item));
+            }
+          }
+        } else {
+          obj = xml.textContent;
+        }
+        return obj;
+      } catch (e) {
+        console.log(e.message);
+      }
+    }
+    EXIF.enableXmp = function () {
+      EXIF.isXmpEnabled = true;
+    };
+    EXIF.disableXmp = function () {
+      EXIF.isXmpEnabled = false;
+    };
+    EXIF.getData = function (img, callback) {
+      if ((self.Image && img instanceof self.Image || self.HTMLImageElement && img instanceof self.HTMLImageElement) && !img.complete) return false;
+      if (!imageHasData(img)) {
+        getImageData(img, callback);
+      } else {
+        if (callback) {
+          callback.call(img);
+        }
+      }
+      return true;
+    };
+    EXIF.getTag = function (img, tag) {
+      if (!imageHasData(img)) return;
+      return img.exifdata[tag];
+    };
+    EXIF.getIptcTag = function (img, tag) {
+      if (!imageHasData(img)) return;
+      return img.iptcdata[tag];
+    };
+    EXIF.getAllTags = function (img) {
+      if (!imageHasData(img)) return {};
+      var a,
+        data = img.exifdata,
+        tags = {};
+      for (a in data) {
+        if (data.hasOwnProperty(a)) {
+          tags[a] = data[a];
+        }
+      }
+      return tags;
+    };
+    EXIF.getAllIptcTags = function (img) {
+      if (!imageHasData(img)) return {};
+      var a,
+        data = img.iptcdata,
+        tags = {};
+      for (a in data) {
+        if (data.hasOwnProperty(a)) {
+          tags[a] = data[a];
+        }
+      }
+      return tags;
+    };
+    EXIF.pretty = function (img) {
+      if (!imageHasData(img)) return "";
+      var a,
+        data = img.exifdata,
+        strPretty = "";
+      for (a in data) {
+        if (data.hasOwnProperty(a)) {
+          if (typeof data[a] == "object") {
+            if (data[a] instanceof Number) {
+              strPretty += a + " : " + data[a] + " [" + data[a].numerator + "/" + data[a].denominator + "]\r\n";
+            } else {
+              strPretty += a + " : [" + data[a].length + " values]\r\n";
+            }
+          } else {
+            strPretty += a + " : " + data[a] + "\r\n";
+          }
+        }
+      }
+      return strPretty;
+    };
+    EXIF.readFromBinaryFile = function (file) {
+      return findEXIFinJPEG(file);
+    };
+  }).call(commonjsGlobal);
+});
+
+const ChallanDocuments = ({
+  t,
+  config,
+  onSelect,
+  userType,
+  formData,
+  setError: setFormError,
+  clearErrors: clearFormErrors,
+  formState,
+  data,
+  isLoading,
+  error,
+  setError
+}) => {
+  var _formData$documents, _data$Challan2, _data$Challan2$Docume;
+  const [documents, setDocuments] = useState((formData === null || formData === void 0 ? void 0 : (_formData$documents = formData.documents) === null || _formData$documents === void 0 ? void 0 : _formData$documents.documents) || []);
+  const [enableSubmit, setEnableSubmit] = useState(true);
+  const [checkRequiredFields, setCheckRequiredFields] = useState(false);
+  const tenantId = window.location.href.includes("employee") ? Digit.ULBService.getCurrentPermanentCity() : localStorage.getItem("CITIZEN.CITY");
+  const handleSubmit = () => {
+    let document = formData.documents;
+    let documentStep;
+    documentStep = {
+      ...document,
+      documents: documents
+    };
+    onSelect(config.key, documentStep);
+  };
+  useEffect(() => {
+    if (documents) onSelect(documents);
+  }, [documents]);
+  useEffect(() => {
+    var _formData$documents2;
+    const incomingDocs = (formData === null || formData === void 0 ? void 0 : (_formData$documents2 = formData.documents) === null || _formData$documents2 === void 0 ? void 0 : _formData$documents2.documents) || [];
+    if (Array.isArray(incomingDocs) && incomingDocs.length > 0 && documents.length === 0) {
+      setDocuments(incomingDocs);
+    }
+  }, [formData]);
+  useEffect(() => {
+    var _data$Challan, _data$Challan$Documen;
+    let count = 0;
+    data === null || data === void 0 ? void 0 : (_data$Challan = data.Challan) === null || _data$Challan === void 0 ? void 0 : (_data$Challan$Documen = _data$Challan.Documents) === null || _data$Challan$Documen === void 0 ? void 0 : _data$Challan$Documen.map(doc => {
+      doc.hasDropdown = true;
+      let isRequired = false;
+      documents === null || documents === void 0 ? void 0 : documents.map(data => {
+        if (doc.required && data !== null && data !== void 0 && data.documentType.includes(doc.code)) isRequired = true;
+      });
+      if (!isRequired && doc.required) count = count + 1;
+    });
+    if ((count == "0" || count == 0) && (documents === null || documents === void 0 ? void 0 : documents.length) > 0) setEnableSubmit(false);else setEnableSubmit(true);
+  }, [documents, checkRequiredFields]);
+  return /*#__PURE__*/React.createElement("div", null, !isLoading ? /*#__PURE__*/React.createElement("div", null, data === null || data === void 0 ? void 0 : (_data$Challan2 = data.Challan) === null || _data$Challan2 === void 0 ? void 0 : (_data$Challan2$Docume = _data$Challan2.Documents) === null || _data$Challan2$Docume === void 0 ? void 0 : _data$Challan2$Docume.map((document, index) => {
+    return /*#__PURE__*/React.createElement(PTRSelectDocument, {
+      key: index,
+      document: document,
+      t: t,
+      error: error,
+      setError: setError,
+      setDocuments: setDocuments,
+      documents: documents,
+      setCheckRequiredFields: setCheckRequiredFields,
+      handleSubmit: handleSubmit
+    });
+  }), error && /*#__PURE__*/React.createElement(Toast, {
+    isDleteBtn: true,
+    label: error,
+    onClose: () => setError(null),
+    error: true
+  })) : /*#__PURE__*/React.createElement(Loader$1, null));
+};
+function PTRSelectDocument({
+  t,
+  document: doc,
+  setDocuments,
+  setError,
+  documents,
+  action,
+  formData,
+  handleSubmit,
+  id
+}) {
+  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(() => {
+    var _doc$dropdownData2;
+    if (filteredDocument) {
+      var _doc$dropdownData, _match$code;
+      const match = doc === null || doc === void 0 ? void 0 : (_doc$dropdownData = doc.dropdownData) === null || _doc$dropdownData === void 0 ? void 0 : _doc$dropdownData.find(e => e.code === filteredDocument.documentType);
+      return match ? {
+        ...match,
+        i18nKey: (_match$code = match.code) === null || _match$code === void 0 ? void 0 : _match$code.replaceAll(".", "_")
+      } : {};
+    }
+    if ((doc === null || doc === void 0 ? void 0 : (_doc$dropdownData2 = doc.dropdownData) === null || _doc$dropdownData2 === void 0 ? void 0 : _doc$dropdownData2.length) === 1) {
+      var _onlyOption$code;
+      const onlyOption = doc.dropdownData[0];
+      return {
+        ...onlyOption,
+        i18nKey: (_onlyOption$code = onlyOption.code) === null || _onlyOption$code === void 0 ? void 0 : _onlyOption$code.replaceAll(".", "_")
+      };
+    }
+    return {};
+  });
+  const [file, setFile] = useState(null);
+  const [uploadedFile, setUploadedFile] = useState(() => (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.filestoreId) || (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.fileStoreId) || null);
+  useEffect(() => {
+    const fsId = (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.filestoreId) || (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.fileStoreId);
+    if (fsId && fsId !== uploadedFile) {
+      setUploadedFile(fsId);
+    }
+  }, [filteredDocument]);
+  function selectfile(e) {
+    const file = e.target.files[0];
+    if (!file) return;
+    setFile(file);
+    updateDocument(selectedDocument, {});
+  }
+  function updateDocument(selectedDocument, extraFields = {}) {
+    setDocuments(() => [{
+      documentType: "arrearDoc",
+      filestoreId: extraFields.filestoreId || null,
+      documentUid: extraFields.documentUid || null
+    }]);
+  }
+  const {
+    dropdownData
+  } = doc;
+  var dropDownData = dropdownData;
+  const [isHidden, setHidden] = useState(false);
+  const [getLoading, setLoading] = useState(false);
+  useEffect(() => {
+    if (action === "update") {
+      var _formData$originalDat, _formData$originalDat2;
+      const originalDoc = formData === null || formData === void 0 ? void 0 : (_formData$originalDat = formData.originalData) === null || _formData$originalDat === void 0 ? void 0 : (_formData$originalDat2 = _formData$originalDat.documents) === null || _formData$originalDat2 === void 0 ? void 0 : _formData$originalDat2.filter(e => e.documentType.includes(doc === null || doc === void 0 ? void 0 : doc.code))[0];
+      const docType = dropDownData.filter(e => e.code === (originalDoc === null || originalDoc === void 0 ? void 0 : originalDoc.documentType)).map(e => {
+        var _e$code;
+        return {
+          ...e,
+          i18nKey: e === null || e === void 0 ? void 0 : (_e$code = e.code) === null || _e$code === void 0 ? void 0 : _e$code.replaceAll(".", "_")
+        };
+      })[0];
+      if (!docType) setHidden(true);else {
+        setSelectedDocument(docType);
+        setUploadedFile(originalDoc === null || originalDoc === void 0 ? void 0 : originalDoc.fileStoreId);
+      }
+    }
+  }, []);
+  useEffect(() => {
+    if (!(doc !== null && doc !== void 0 && doc.hasDropdown)) {
+      var _doc$code;
+      setSelectedDocument({
+        code: doc === null || doc === void 0 ? void 0 : doc.code,
+        i18nKey: doc === null || doc === void 0 ? void 0 : (_doc$code = doc.code) === null || _doc$code === void 0 ? void 0 : _doc$code.replaceAll(".", "_")
+      });
+    }
+  }, []);
+  useEffect(() => {
+    (async () => {
+      setError(null);
+      if (file) {
+        setLoading(true);
+        if (file.size >= 5242880) {
+          setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
+        } else {
+          try {
+            var _response$data, _response$data$files;
+            setUploadedFile(null);
+            const response = await Digit.UploadServices.Filestorage("PTR", file, Digit.ULBService.getStateId());
+            setLoading(false);
+            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) {
+              const fsId = response.data.files[0].fileStoreId;
+              setUploadedFile(fsId);
+              updateDocument(selectedDocument, {
+                filestoreId: fsId,
+                documentUid: fsId
+              });
+            } else {
+              setError(t("CS_FILE_UPLOAD_ERROR"));
+            }
+          } catch (err) {
+            setLoading(false);
+            setError(t("CS_FILE_UPLOAD_ERROR"));
+          }
+        }
+      }
+    })();
+  }, [file]);
+  useEffect(() => {
+    if (isHidden) setUploadedFile(null);
+  }, [isHidden]);
+  return /*#__PURE__*/React.createElement("div", {
+    className: "challan-documents"
+  }, /*#__PURE__*/React.createElement(LabelFieldPair, {
+    className: "challan-label-field"
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    className: "challan-card-label"
+  }, t(doc === null || doc === void 0 ? void 0 : doc.code), " ", /*#__PURE__*/React.createElement("span", {
+    className: "requiredField"
+  }, " ", (doc === null || doc === void 0 ? void 0 : doc.required) && " *")), /*#__PURE__*/React.createElement("div", {
+    className: "field",
+    style: {
+      width: "100%"
+    }
+  }, /*#__PURE__*/React.createElement(UploadFile, {
+    onUpload: selectfile,
+    onDelete: () => {
+      setUploadedFile(null);
+    },
+    id: id,
+    message: uploadedFile ? `1 ${t(`CS_ACTION_FILEUPLOADED`)}` : t(`CS_ACTION_NO_FILEUPLOADED`),
+    textStyles: {
+      width: "100%"
+    },
+    inputStyles: {
+      width: "280px"
+    },
+    accept: ".pdf, .jpeg, .jpg, .png",
+    buttonType: "button",
+    error: !uploadedFile
+  }))), getLoading && /*#__PURE__*/React.createElement(Loader$1, {
+    page: true
+  }));
+}
+
+const RentAndLeasePropertyDetails = ({
+  onGoBack,
+  goNext,
+  currentStepData,
+  validateStep,
+  config
+}) => {
+  var _watch, _watch2;
+  const dispatch = useDispatch();
+  const tenantId = window.localStorage.getItem("Employee.tenant-id");
+  const [documentsData, setDocumentsData] = useState([]);
+  const [error, setError] = useState(null);
+  const {
+    t
+  } = useTranslation();
+  const propertyTypeOptions = [{
+    name: t("ON_RENT"),
+    code: "rent",
+    i18nKey: "rent"
+  }, {
+    name: t("ON_LEASE"),
+    code: "lease",
+    i18nKey: "lease"
+  }, {
+    name: t("ON_DEED"),
+    code: "deed",
+    i18nKey: "deed"
+  }];
+  const applicationTypeOptions = [{
+    name: t("Legacy"),
+    code: "Legacy"
+  }, {
+    name: t("New"),
+    code: "new"
+  }];
+  const propertySpecificOptions = [{
+    name: t("COMMERCIAL"),
+    code: "Commercial",
+    i18nKey: "Commercial"
+  }, {
+    name: t("RESIDENTIAL"),
+    code: "Residential",
+    i18nKey: "Residential"
+  }];
+  const locationTypeOptions = [{
+    name: t("PRIME"),
+    code: "Prime",
+    i18nKey: "Prime"
+  }, {
+    name: t("NON_PRIME"),
+    code: "Non-Prime",
+    i18nKey: "Non-Prime"
+  }];
+  const arrearReasonOptions = [{
+    name: t("PREVIOUS DUES"),
+    code: "PREVIOUS DUES"
+  }, {
+    name: t("UNDER DISPUTE"),
+    code: "UNDER DISPUTE"
+  }, {
+    name: t("COURT CASE"),
+    code: "COURT CASE"
+  }];
+  const filters = {
+    tenantId,
+    searchType: "1"
+  };
+  const {
+    data,
+    isLoading,
+    isError
+  } = Digit.Hooks.rentandlease.useRentAndLeaseProperties(filters);
+  const {
+    triggerLoader,
+    triggerToast
+  } = config === null || config === void 0 ? void 0 : config.currStepConfig[0];
+  const {
+    control,
+    handleSubmit,
+    setValue,
+    watch,
+    clearErrors,
+    formState: {
+      errors
+    }
+  } = useForm({
+    defaultValues: {
+      applicationType: {
+        name: t("Legacy"),
+        code: "Legacy"
+      },
+      propertyId: "",
+      propertyName: "",
+      propertyType: "",
+      propertySpecific: "",
+      locationType: "",
+      allotmentType: "",
+      propertySizeOrArea: "",
+      baseRent: "",
+      securityDeposit: "",
+      refundApplicableOnDiscontinuation: null,
+      penaltyType: "",
+      startDate: "",
+      endDate: "",
+      incrementApplicable: "",
+      incrementPercentage: "",
+      incrementCycle: "",
+      selectedProperty: null,
+      duration: ""
     }
   });
+  const docUploadData = {
+    Challan: {
+      Documents: [{
+        code: "arrearDoc",
+        documentType: "ID_PROOF",
+        required: watch("arrear") > 0 ? true : false,
+        active: true,
+        description: "ID proof of offender",
+        maxSizeMB: 2,
+        hasDropdown: true
+      }]
+    }
+  };
   const selectedPropertyType = watch("propertyType");
   const selectedPropertySpecific = watch("propertySpecific");
   const selectedLocationType = watch("locationType");
@@ -10406,6 +11729,16 @@ const RentAndLeasePropertyDetails = ({
       setFilteredProperties(properties);
     }
   }, [data, selectedPropertyType, selectedPropertySpecific, selectedLocationType]);
+  useEffect(() => {
+    const startDate = watch("arrearStartDate");
+    if (startDate) {
+      const end = new Date(startDate);
+      end.setFullYear(end.getFullYear() + 1);
+      setValue("arrearEndDate", end.toISOString().split("T")[0], {
+        shouldValidate: true
+      });
+    }
+  }, [watch("arrearStartDate")]);
   const todayISO = new Date().toISOString().split("T")[0];
   const minStartDate = new Date();
   minStartDate.setMonth(minStartDate.getMonth() - 11);
@@ -10427,6 +11760,18 @@ const RentAndLeasePropertyDetails = ({
     });
   };
   const onSubmit = async data => {
+    var _data$applicationType, _documentsData$;
+    const applicationType = data === null || data === void 0 ? void 0 : (_data$applicationType = data.applicationType) === null || _data$applicationType === void 0 ? void 0 : _data$applicationType.code;
+    if (applicationType === "Legacy" && (data === null || data === void 0 ? void 0 : data.arrear) > 0 && !(documentsData !== null && documentsData !== void 0 && (_documentsData$ = documentsData[0]) !== null && _documentsData$ !== void 0 && _documentsData$.filestoreId)) {
+      alert("Please upload arrear document");
+      return;
+    }
+    if (applicationType === "Legacy") {
+      var _documentsData$2;
+      data["arrearDoc"] = documentsData === null || documentsData === void 0 ? void 0 : (_documentsData$2 = documentsData[0]) === null || _documentsData$2 === void 0 ? void 0 : _documentsData$2.filestoreId;
+    } else {
+      delete data["arrearDoc"];
+    }
     if (validateStep) {
       const validationErrors = validateStep(data);
       if (Object.keys(validationErrors).length > 0) return;
@@ -10449,6 +11794,13 @@ const RentAndLeasePropertyDetails = ({
           shouldValidate: true
         });
       });
+      if (propertyDetails.arrearDoc) {
+        setDocumentsData([{
+          documentType: "arrearDoc",
+          filestoreId: propertyDetails.arrearDoc,
+          documentUid: propertyDetails.arrearDoc
+        }]);
+      }
     }
   }, [currentStepData, setValue]);
   useEffect(() => {
@@ -10493,12 +11845,41 @@ const RentAndLeasePropertyDetails = ({
       triggerToast("ERROR_WHILE_FETCHING_PROPERTIES", true);
     }
   }, [isError, triggerToast]);
+  const handleDocumentsSelect = data => {
+    setDocumentsData(data);
+  };
+  useEffect(() => {
+    if (watch("arrear") <= 0) {
+      clearErrors(["arrearStartDate", "arrearEndDate", "arrearReason", "remarks"]);
+    }
+  }, [watch("arrear")]);
   return /*#__PURE__*/React.createElement("form", {
     onSubmit: handleSubmit(onSubmit)
   }, /*#__PURE__*/React.createElement(CardSectionHeader, {
     className: "card-section-header"
   }, t("ES_TITILE_PROPERTY_DETAILS")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
+  }, t("PT_COMMON_TABLE_COL_APP_TYPE"), " ", /*#__PURE__*/React.createElement("span", {
+    className: "mandatory-asterisk"
+  }, "*")), /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "applicationType",
+    rules: {
+      required: t("RENT_LEASE_APPLICATION_TYPE_REQUIRED")
+    },
+    render: props => /*#__PURE__*/React.createElement(Dropdown, {
+      className: "form-field",
+      select: props.onChange,
+      selected: props.value,
+      option: applicationTypeOptions,
+      defaultValues: true,
+      optionKey: "name",
+      t: t
+    })
+  })), errors.applicationType && /*#__PURE__*/React.createElement(CardLabelError, {
+    className: "ral-error-label"
+  }, getErrorMessage("applicationType")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+    className: "card-label-smaller"
   }, t("RENT_LEASE_PROPERTY_TYPE"), " ", /*#__PURE__*/React.createElement("span", {
     className: "mandatory-asterisk"
   }, "*")), /*#__PURE__*/React.createElement(Controller, {
@@ -10745,7 +12126,7 @@ const RentAndLeasePropertyDetails = ({
       t: t,
       disabled: true
     })
-  }))), errors.penaltyType && /*#__PURE__*/React.createElement(CardLabelError, null, getErrorMessage("penaltyType")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("RAL_SECURITY_AMOUNT"), " ", /*#__PURE__*/React.createElement("span", {
+  }))), errors.penaltyType && /*#__PURE__*/React.createElement(CardLabelError, null, getErrorMessage("penaltyType")), ((_watch = watch("applicationType")) === null || _watch === void 0 ? void 0 : _watch.code) != "Legacy" && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("RAL_SECURITY_AMOUNT"), " ", /*#__PURE__*/React.createElement("span", {
     className: "mandatory-asterisk"
   }, "*")), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
@@ -10766,7 +12147,158 @@ const RentAndLeasePropertyDetails = ({
     })
   }))), errors.securityDeposit && /*#__PURE__*/React.createElement(CardLabelError, {
     className: "ral-error-label"
-  }, getErrorMessage("securityDeposit")), /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar, {
+  }, getErrorMessage("securityDeposit"))), ((_watch2 = watch("applicationType")) === null || _watch2 === void 0 ? void 0 : _watch2.code) == "Legacy" && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("Arrears"), " ", /*#__PURE__*/React.createElement("span", {
+    className: "mandatory-asterisk"
+  }, "*")), /*#__PURE__*/React.createElement("div", {
+    className: "form-field"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "arrear",
+    rules: {
+      required: t("RENT_LEASE_ARREAR_REQUIRED")
+    },
+    render: ({
+      value,
+      onChange
+    }) => /*#__PURE__*/React.createElement(TextInput, {
+      type: "number",
+      value: value || "",
+      onChange: e => onChange(e.target.value)
+    })
+  }))), errors.arrear && /*#__PURE__*/React.createElement(CardLabelError, {
+    className: "ral-error-label"
+  }, getErrorMessage("arrear")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("RAL_START_DATE"), " ", watch("arrear") > 0 && /*#__PURE__*/React.createElement("span", {
+    className: "mandatory-asterisk"
+  }, "*")), /*#__PURE__*/React.createElement("div", {
+    className: "form-field"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "arrearStartDate",
+    rules: {
+      validate: value => {
+        const arrear = watch("arrear");
+        if (arrear > 0 && !value) {
+          return t("RENT_LEASE_RAL_START_DATE_REQUIRED");
+        }
+        return true;
+      }
+    },
+    render: ({
+      value,
+      onChange
+    }) => /*#__PURE__*/React.createElement(TextInput, {
+      type: "date",
+      min: minStartDateISO,
+      value: value || "",
+      onChange: e => {
+        onChange(e);
+      }
+    })
+  }))), errors.arrearStartDate && /*#__PURE__*/React.createElement(CardLabelError, {
+    className: "ral-error-label"
+  }, getErrorMessage("arrearStartDate")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("RAL_END_DATE"), " ", watch("arrear") > 0 && /*#__PURE__*/React.createElement("span", {
+    className: "mandatory-asterisk"
+  }, "*")), /*#__PURE__*/React.createElement("div", {
+    className: "form-field"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "arrearEndDate",
+    rules: {
+      validate: value => {
+        const arrear = watch("arrear");
+        if (arrear > 0 && !value) {
+          return t("RENT_LEASE_RAL_END_DATE_REQUIRED");
+        }
+        return true;
+      }
+    },
+    render: ({
+      value,
+      onChange
+    }) => {
+      return /*#__PURE__*/React.createElement(TextInput, {
+        type: "date",
+        value: value || "",
+        onChange: e => onChange(e.target.value)
+      });
+    }
+  }))), errors.arrearEndDate && /*#__PURE__*/React.createElement(CardLabelError, {
+    className: "ral-error-label"
+  }, getErrorMessage("arrearEndDate")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+    className: "card-label-smaller"
+  }, t("Reason"), " ", watch("arrear") > 0 && /*#__PURE__*/React.createElement("span", {
+    className: "mandatory-asterisk"
+  }, "*")), /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "arrearReason",
+    rules: {
+      validate: value => {
+        const arrear = watch("arrear");
+        if (arrear > 0 && !value) {
+          return t("RENT_LEASE_REASON_REQUIRED");
+        }
+        return true;
+      }
+    },
+    render: props => /*#__PURE__*/React.createElement(Dropdown, {
+      className: "form-field",
+      select: props.onChange,
+      selected: props.value,
+      option: arrearReasonOptions,
+      defaultValues: true,
+      optionKey: "name",
+      t: t
+    })
+  })), errors.arrearReason && /*#__PURE__*/React.createElement(CardLabelError, {
+    className: "ral-error-label"
+  }, getErrorMessage("arrearReason")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+    className: "card-label-smaller"
+  }, t("Remarks"), " ", watch("arrear") > 0 && /*#__PURE__*/React.createElement("span", {
+    className: "mandatory-asterisk"
+  }, "*")), /*#__PURE__*/React.createElement("div", {
+    className: "form-field"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "remarks",
+    rules: {
+      validate: value => {
+        const arrear = watch("arrear");
+        if (arrear > 0 && !(value !== null && value !== void 0 && value.trim())) {
+          return t("RENT_LEASE_REMARKS_REQUIRED");
+        }
+        return true;
+      }
+    },
+    render: ({
+      value,
+      onChange
+    }) => /*#__PURE__*/React.createElement(TextInput, {
+      type: "text",
+      value: value || "",
+      onChange: e => onChange(e.target.value),
+      t: t
+    })
+  }))), errors.remarks && /*#__PURE__*/React.createElement(CardLabelError, {
+    className: "ral-error-label"
+  }, getErrorMessage("remarks")), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(ChallanDocuments, {
+    t: t,
+    config: {
+      key: "documents"
+    },
+    onSelect: handleDocumentsSelect,
+    userType: "CITIZEN",
+    formData: {
+      documents: {
+        documents: documentsData
+      }
+    },
+    setError: setError,
+    error: error,
+    clearErrors: () => {},
+    formState: {},
+    data: docUploadData,
+    isLoading: isLoading
+  }))), /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("Back"),
     className: "ral-back-btn",
     onSubmit: onGoBack
@@ -10857,9 +12389,11 @@ const RentAndLeaseCitizenDetails = ({
   const buildAllotmentPayload = ({
     propertyDetails,
     applicants,
+    additionalDetails,
     tenantId,
     previousApplicationNumber: _previousApplicationNumber = null
   }) => {
+    var _propertyDetails$pena;
     const startDateEpoch = propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.startDate ? new Date(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.startDate).getTime() : null;
     const endDateEpoch = propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.endDate ? new Date(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.endDate).getTime() : null;
     return {
@@ -10868,7 +12402,7 @@ const RentAndLeaseCitizenDetails = ({
       previousApplicationNumber: _previousApplicationNumber,
       startDate: startDateEpoch,
       endDate: endDateEpoch,
-      penaltyType: propertyDetails.penaltyType,
+      penaltyType: typeof propertyDetails.penaltyType === "object" ? (_propertyDetails$pena = propertyDetails.penaltyType) === null || _propertyDetails$pena === void 0 ? void 0 : _propertyDetails$pena.code : propertyDetails.penaltyType,
       workflow: {
         action: "INITIATE",
         comments: "",
@@ -10890,11 +12424,14 @@ const RentAndLeaseCitizenDetails = ({
             addressId: a === null || a === void 0 ? void 0 : a.address
           }
         };
-      })
+      }),
+      ...(additionalDetails ? {
+        additionalDetails: additionalDetails
+      } : {})
     };
   };
   const onSubmit = async data => {
-    var _currentStepData$Crea, _currentStepData$Crea2, _currentStepData$Crea3;
+    var _currentStepData$prop, _currentStepData$prop2, _currentStepData$prop3, _currentStepData$prop4, _currentStepData$prop5, _currentStepData$prop6, _currentStepData$prop7, _currentStepData$prop8, _currentStepData$prop9, _currentStepData$prop0, _currentStepData$prop1, _currentStepData$Crea, _currentStepData$Crea2, _currentStepData$Crea3;
     if (validateStep) {
       var _Object$keys;
       const validationErrors = validateStep(data);
@@ -10906,9 +12443,20 @@ const RentAndLeaseCitizenDetails = ({
       triggerToast(t("RAL_DUPLICATE_MOBILE_ERROR"), true);
       return;
     }
+    const applicationType = currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$prop = currentStepData.propertyDetails) === null || _currentStepData$prop === void 0 ? void 0 : (_currentStepData$prop2 = _currentStepData$prop.applicationType) === null || _currentStepData$prop2 === void 0 ? void 0 : _currentStepData$prop2.code;
+    const additionalDetails = applicationType === "Legacy" ? {
+      arrear: currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$prop3 = currentStepData.propertyDetails) === null || _currentStepData$prop3 === void 0 ? void 0 : _currentStepData$prop3.arrear,
+      arrearDoc: currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$prop4 = currentStepData.propertyDetails) === null || _currentStepData$prop4 === void 0 ? void 0 : _currentStepData$prop4.arrearDoc,
+      arrearEndDate: currentStepData !== null && currentStepData !== void 0 && (_currentStepData$prop5 = currentStepData.propertyDetails) !== null && _currentStepData$prop5 !== void 0 && _currentStepData$prop5.arrearEndDate ? new Date(currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$prop6 = currentStepData.propertyDetails) === null || _currentStepData$prop6 === void 0 ? void 0 : _currentStepData$prop6.arrearEndDate).getTime() : null,
+      arrearStartDate: currentStepData !== null && currentStepData !== void 0 && (_currentStepData$prop7 = currentStepData.propertyDetails) !== null && _currentStepData$prop7 !== void 0 && _currentStepData$prop7.arrearStartDate ? new Date(currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$prop8 = currentStepData.propertyDetails) === null || _currentStepData$prop8 === void 0 ? void 0 : _currentStepData$prop8.arrearStartDate).getTime() : null,
+      arrearReason: currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$prop9 = currentStepData.propertyDetails) === null || _currentStepData$prop9 === void 0 ? void 0 : (_currentStepData$prop0 = _currentStepData$prop9.arrearReason) === null || _currentStepData$prop0 === void 0 ? void 0 : _currentStepData$prop0.code,
+      applicationType: applicationType,
+      remarks: currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$prop1 = currentStepData.propertyDetails) === null || _currentStepData$prop1 === void 0 ? void 0 : _currentStepData$prop1.remarks
+    } : null;
     const payload = buildAllotmentPayload({
       propertyDetails: currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.propertyDetails,
       applicants: data === null || data === void 0 ? void 0 : data.applicants,
+      additionalDetails,
       tenantId
     });
     const existingPropertyAlloted = currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$Crea = currentStepData.CreatedResponse) === null || _currentStepData$Crea === void 0 ? void 0 : (_currentStepData$Crea2 = _currentStepData$Crea.AllotmentDetails) === null || _currentStepData$Crea2 === void 0 ? void 0 : (_currentStepData$Crea3 = _currentStepData$Crea2[0]) === null || _currentStepData$Crea3 === void 0 ? void 0 : _currentStepData$Crea3.applicationNumber;
@@ -11421,7 +12969,7 @@ const NewRentAndLeaseStepFormFour = ({
     } = CreatedResponse || {};
     let formData = {};
     if (id) {
-      var _CreatedResponse$Allo, _CreatedResponse$Allo2, _CreatedResponse$Allo3, _CreatedResponse$Allo4, _updatedPropertyDetai, _updatedPropertyDetai2, _updatedPropertyDetai3, _CreatedResponse$Allo5, _CreatedResponse$Allo6, _CreatedResponse$Allo7, _CreatedResponse$Allo8, _CreatedResponse$Allo9, _CreatedResponse$Allo0, _CreatedResponse$Allo1, _CreatedResponse$Allo10, _CreatedResponse$Allo11, _updatedPropertyDetai4;
+      var _CreatedResponse$Allo, _CreatedResponse$Allo2, _CreatedResponse$Allo3, _CreatedResponse$Allo4, _updatedPropertyDetai, _updatedPropertyDetai2, _updatedPropertyDetai3, _updatedPropertyDetai4, _CreatedResponse$Allo5, _CreatedResponse$Allo6, _CreatedResponse$Allo7, _CreatedResponse$Allo8, _CreatedResponse$Allo9, _CreatedResponse$Allo0, _CreatedResponse$Allo1, _updatedPropertyDetai5, _CreatedResponse$Allo10, _CreatedResponse$Allo11, _updatedPropertyDetai6;
       const originalOwners = (CreatedResponse === null || CreatedResponse === void 0 ? void 0 : (_CreatedResponse$Allo = CreatedResponse.AllotmentDetails) === null || _CreatedResponse$Allo === void 0 ? void 0 : (_CreatedResponse$Allo2 = _CreatedResponse$Allo[0]) === null || _CreatedResponse$Allo2 === void 0 ? void 0 : _CreatedResponse$Allo2.OwnerInfo) || [];
       const updatedApplicants = (updatedApplicantDetails === null || updatedApplicantDetails === void 0 ? void 0 : updatedApplicantDetails.applicants) || [];
       const mergedOwnerInfo = updatedApplicants.map((applicant, index) => {
@@ -11447,22 +12995,33 @@ const NewRentAndLeaseStepFormFour = ({
       });
       const rawAdditionalDetails = (CreatedResponse === null || CreatedResponse === void 0 ? void 0 : (_CreatedResponse$Allo3 = CreatedResponse.AllotmentDetails) === null || _CreatedResponse$Allo3 === void 0 ? void 0 : (_CreatedResponse$Allo4 = _CreatedResponse$Allo3[0]) === null || _CreatedResponse$Allo4 === void 0 ? void 0 : _CreatedResponse$Allo4.additionalDetails) || {};
       const originalAdditionalDetails = Array.isArray(rawAdditionalDetails) ? rawAdditionalDetails[0] : rawAdditionalDetails;
-      const mergedAdditionalDetails = {
+      const applicationType = (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai = updatedPropertyDetails.applicationType) === null || _updatedPropertyDetai === void 0 ? void 0 : _updatedPropertyDetai.code) || (originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.applicationType);
+      const additionalDetails = applicationType === "Legacy" ? {
         ...originalAdditionalDetails,
         ...updatedPropertyDetails,
-        allotmentType: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai = updatedPropertyDetails.propertyType) === null || _updatedPropertyDetai === void 0 ? void 0 : _updatedPropertyDetai.code) || (originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.allotmentType),
-        propertyType: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai2 = updatedPropertyDetails.propertySpecific) === null || _updatedPropertyDetai2 === void 0 ? void 0 : _updatedPropertyDetai2.code) || (originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.propertyType),
-        locationType: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai3 = updatedPropertyDetails.locationType) === null || _updatedPropertyDetai3 === void 0 ? void 0 : _updatedPropertyDetai3.code) || (originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.locationType)
-      };
+        arrearDoc: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.arrearDoc) || (originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.arrearDoc),
+        arrearStartDate: updatedPropertyDetails !== null && updatedPropertyDetails !== void 0 && updatedPropertyDetails.arrearStartDate ? new Date(updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.arrearStartDate).getTime() : originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.arrearStartDate,
+        arrearEndDate: updatedPropertyDetails !== null && updatedPropertyDetails !== void 0 && updatedPropertyDetails.arrearEndDate ? new Date(updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.arrearEndDate).getTime() : originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.arrearEndDate,
+        allotmentType: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai2 = updatedPropertyDetails.propertyType) === null || _updatedPropertyDetai2 === void 0 ? void 0 : _updatedPropertyDetai2.code) || (originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.allotmentType),
+        propertyType: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai3 = updatedPropertyDetails.propertySpecific) === null || _updatedPropertyDetai3 === void 0 ? void 0 : _updatedPropertyDetai3.code) || (originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.propertyType),
+        locationType: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai4 = updatedPropertyDetails.locationType) === null || _updatedPropertyDetai4 === void 0 ? void 0 : _updatedPropertyDetai4.code) || (originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.locationType),
+        applicationType: applicationType,
+        securityDeposit: null
+      } : null;
       const allotmentIdForNewDocs = CreatedResponse === null || CreatedResponse === void 0 ? void 0 : (_CreatedResponse$Allo5 = CreatedResponse.AllotmentDetails) === null || _CreatedResponse$Allo5 === void 0 ? void 0 : (_CreatedResponse$Allo6 = _CreatedResponse$Allo5[0]) === null || _CreatedResponse$Allo6 === void 0 ? void 0 : _CreatedResponse$Allo6.id;
       formData = {
         ...(CreatedResponse === null || CreatedResponse === void 0 ? void 0 : (_CreatedResponse$Allo7 = CreatedResponse.AllotmentDetails) === null || _CreatedResponse$Allo7 === void 0 ? void 0 : _CreatedResponse$Allo7[0]),
         startDate: updatedPropertyDetails !== null && updatedPropertyDetails !== void 0 && updatedPropertyDetails.startDate ? new Date(updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.startDate).getTime() : CreatedResponse === null || CreatedResponse === void 0 ? void 0 : (_CreatedResponse$Allo8 = CreatedResponse.AllotmentDetails) === null || _CreatedResponse$Allo8 === void 0 ? void 0 : (_CreatedResponse$Allo9 = _CreatedResponse$Allo8[0]) === null || _CreatedResponse$Allo9 === void 0 ? void 0 : _CreatedResponse$Allo9.startDate,
         endDate: updatedPropertyDetails !== null && updatedPropertyDetails !== void 0 && updatedPropertyDetails.endDate ? new Date(updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.endDate).getTime() : CreatedResponse === null || CreatedResponse === void 0 ? void 0 : (_CreatedResponse$Allo0 = CreatedResponse.AllotmentDetails) === null || _CreatedResponse$Allo0 === void 0 ? void 0 : (_CreatedResponse$Allo1 = _CreatedResponse$Allo0[0]) === null || _CreatedResponse$Allo1 === void 0 ? void 0 : _CreatedResponse$Allo1.endDate,
-        penaltyType: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.penaltyType) || (CreatedResponse === null || CreatedResponse === void 0 ? void 0 : (_CreatedResponse$Allo10 = CreatedResponse.AllotmentDetails) === null || _CreatedResponse$Allo10 === void 0 ? void 0 : (_CreatedResponse$Allo11 = _CreatedResponse$Allo10[0]) === null || _CreatedResponse$Allo11 === void 0 ? void 0 : _CreatedResponse$Allo11.penaltyType),
+        penaltyType: typeof (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.penaltyType) === "object" ? updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai5 = updatedPropertyDetails.penaltyType) === null || _updatedPropertyDetai5 === void 0 ? void 0 : _updatedPropertyDetai5.code : (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.penaltyType) || (CreatedResponse === null || CreatedResponse === void 0 ? void 0 : (_CreatedResponse$Allo10 = CreatedResponse.AllotmentDetails) === null || _CreatedResponse$Allo10 === void 0 ? void 0 : (_CreatedResponse$Allo11 = _CreatedResponse$Allo10[0]) === null || _CreatedResponse$Allo11 === void 0 ? void 0 : _CreatedResponse$Allo11.penaltyType),
         OwnerInfo: mergedOwnerInfo,
-        additionalDetails: [mergedAdditionalDetails],
-        propertyId: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.propertyId) || (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai4 = updatedPropertyDetails.selectedProperty) === null || _updatedPropertyDetai4 === void 0 ? void 0 : _updatedPropertyDetai4.propertyId),
+        ...(additionalDetails && {
+          additionalDetails: additionalDetails
+        }),
+        propertyId: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.propertyId) || (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai6 = updatedPropertyDetails.selectedProperty) === null || _updatedPropertyDetai6 === void 0 ? void 0 : _updatedPropertyDetai6.propertyId),
+        ...(applicationType === "Legacy" && {
+          securityDeposit: null
+        }),
         Document: updatedDocuments.map(doc => {
           var _ref, _CreatedResponse$Allo12, _CreatedResponse$Allo13;
           const originalDoc = ((_ref = (CreatedResponse === null || CreatedResponse === void 0 ? void 0 : (_CreatedResponse$Allo12 = CreatedResponse.AllotmentDetails) === null || _CreatedResponse$Allo12 === void 0 ? void 0 : (_CreatedResponse$Allo13 = _CreatedResponse$Allo12[0]) === null || _CreatedResponse$Allo13 === void 0 ? void 0 : _CreatedResponse$Allo13.Document) || []) === null || _ref === void 0 ? void 0 : _ref.find(d => d.documentUid === (doc === null || doc === void 0 ? void 0 : doc.documentUid) || d.fileStoreId === (doc === null || doc === void 0 ? void 0 : doc.fileStoreId) || d.documentType === (doc === null || doc === void 0 ? void 0 : doc.documentType))) || {};
@@ -11492,7 +13051,7 @@ const NewRentAndLeaseStepFormFour = ({
         }
       };
     } else {
-      var _CreatedResponse$Allo14, _CreatedResponse$Allo15, _CreatedResponse$Allo16, _CreatedResponse$Allo17, _updatedPropertyDetai5, _updatedPropertyDetai6, _updatedPropertyDetai7, _CreatedResponse$Allo18, _CreatedResponse$Allo19, _CreatedResponse$Allo20, _CreatedResponse$Allo21, _CreatedResponse$Allo22, _CreatedResponse$Allo23, _CreatedResponse$Allo24, _updatedPropertyDetai8;
+      var _CreatedResponse$Allo14, _CreatedResponse$Allo15, _CreatedResponse$Allo16, _CreatedResponse$Allo17, _updatedPropertyDetai7, _updatedPropertyDetai8, _updatedPropertyDetai9, _updatedPropertyDetai0, _CreatedResponse$Allo18, _CreatedResponse$Allo19, _CreatedResponse$Allo20, _CreatedResponse$Allo21, _CreatedResponse$Allo22, _updatedPropertyDetai1, _CreatedResponse$Allo23, _CreatedResponse$Allo24, _updatedPropertyDetai10;
       const originalOwners = (CreatedResponse === null || CreatedResponse === void 0 ? void 0 : (_CreatedResponse$Allo14 = CreatedResponse.AllotmentDetails) === null || _CreatedResponse$Allo14 === void 0 ? void 0 : (_CreatedResponse$Allo15 = _CreatedResponse$Allo14[0]) === null || _CreatedResponse$Allo15 === void 0 ? void 0 : _CreatedResponse$Allo15.OwnerInfo) || [];
       const updatedApplicants = (updatedApplicantDetails === null || updatedApplicantDetails === void 0 ? void 0 : updatedApplicantDetails.applicants) || [];
       const mergedOwnerInfo = updatedApplicants.map((applicant, index) => {
@@ -11518,21 +13077,28 @@ const NewRentAndLeaseStepFormFour = ({
       });
       const rawAdditionalDetails = (CreatedResponse === null || CreatedResponse === void 0 ? void 0 : (_CreatedResponse$Allo16 = CreatedResponse.AllotmentDetails) === null || _CreatedResponse$Allo16 === void 0 ? void 0 : (_CreatedResponse$Allo17 = _CreatedResponse$Allo16[0]) === null || _CreatedResponse$Allo17 === void 0 ? void 0 : _CreatedResponse$Allo17.additionalDetails) || {};
       const originalAdditionalDetails = Array.isArray(rawAdditionalDetails) ? rawAdditionalDetails[0] : rawAdditionalDetails;
-      const mergedAdditionalDetails = {
+      const applicationType = (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai7 = updatedPropertyDetails.applicationType) === null || _updatedPropertyDetai7 === void 0 ? void 0 : _updatedPropertyDetai7.code) || (originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.applicationType);
+      const additionalDetails = applicationType === "Legacy" ? {
         ...originalAdditionalDetails,
         ...updatedPropertyDetails,
-        allotmentType: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai5 = updatedPropertyDetails.propertyType) === null || _updatedPropertyDetai5 === void 0 ? void 0 : _updatedPropertyDetai5.code) || (originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.allotmentType),
-        propertyType: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai6 = updatedPropertyDetails.propertySpecific) === null || _updatedPropertyDetai6 === void 0 ? void 0 : _updatedPropertyDetai6.code) || (originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.propertyType),
-        locationType: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai7 = updatedPropertyDetails.locationType) === null || _updatedPropertyDetai7 === void 0 ? void 0 : _updatedPropertyDetai7.code) || (originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.locationType)
-      };
+        arrearDoc: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.arrearDoc) || (originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.arrearDoc),
+        arrearStartDate: updatedPropertyDetails !== null && updatedPropertyDetails !== void 0 && updatedPropertyDetails.arrearStartDate ? new Date(updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.arrearStartDate).getTime() : originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.arrearStartDate,
+        arrearEndDate: updatedPropertyDetails !== null && updatedPropertyDetails !== void 0 && updatedPropertyDetails.arrearEndDate ? new Date(updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.arrearEndDate).getTime() : originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.arrearEndDate,
+        allotmentType: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai8 = updatedPropertyDetails.propertyType) === null || _updatedPropertyDetai8 === void 0 ? void 0 : _updatedPropertyDetai8.code) || (originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.allotmentType),
+        propertyType: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai9 = updatedPropertyDetails.propertySpecific) === null || _updatedPropertyDetai9 === void 0 ? void 0 : _updatedPropertyDetai9.code) || (originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.propertyType),
+        locationType: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai0 = updatedPropertyDetails.locationType) === null || _updatedPropertyDetai0 === void 0 ? void 0 : _updatedPropertyDetai0.code) || (originalAdditionalDetails === null || originalAdditionalDetails === void 0 ? void 0 : originalAdditionalDetails.locationType),
+        applicationType: applicationType
+      } : null;
       formData = {
         ...(CreatedResponse === null || CreatedResponse === void 0 ? void 0 : (_CreatedResponse$Allo18 = CreatedResponse.AllotmentDetails) === null || _CreatedResponse$Allo18 === void 0 ? void 0 : _CreatedResponse$Allo18[0]),
         startDate: updatedPropertyDetails !== null && updatedPropertyDetails !== void 0 && updatedPropertyDetails.startDate ? new Date(updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.startDate).getTime() : CreatedResponse === null || CreatedResponse === void 0 ? void 0 : (_CreatedResponse$Allo19 = CreatedResponse.AllotmentDetails) === null || _CreatedResponse$Allo19 === void 0 ? void 0 : (_CreatedResponse$Allo20 = _CreatedResponse$Allo19[0]) === null || _CreatedResponse$Allo20 === void 0 ? void 0 : _CreatedResponse$Allo20.startDate,
         endDate: updatedPropertyDetails !== null && updatedPropertyDetails !== void 0 && updatedPropertyDetails.endDate ? new Date(updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.endDate).getTime() : CreatedResponse === null || CreatedResponse === void 0 ? void 0 : (_CreatedResponse$Allo21 = CreatedResponse.AllotmentDetails) === null || _CreatedResponse$Allo21 === void 0 ? void 0 : (_CreatedResponse$Allo22 = _CreatedResponse$Allo21[0]) === null || _CreatedResponse$Allo22 === void 0 ? void 0 : _CreatedResponse$Allo22.endDate,
-        penaltyType: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.penaltyType) || (CreatedResponse === null || CreatedResponse === void 0 ? void 0 : (_CreatedResponse$Allo23 = CreatedResponse.AllotmentDetails) === null || _CreatedResponse$Allo23 === void 0 ? void 0 : (_CreatedResponse$Allo24 = _CreatedResponse$Allo23[0]) === null || _CreatedResponse$Allo24 === void 0 ? void 0 : _CreatedResponse$Allo24.penaltyType),
+        penaltyType: typeof (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.penaltyType) === "object" ? updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai1 = updatedPropertyDetails.penaltyType) === null || _updatedPropertyDetai1 === void 0 ? void 0 : _updatedPropertyDetai1.code : (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.penaltyType) || (CreatedResponse === null || CreatedResponse === void 0 ? void 0 : (_CreatedResponse$Allo23 = CreatedResponse.AllotmentDetails) === null || _CreatedResponse$Allo23 === void 0 ? void 0 : (_CreatedResponse$Allo24 = _CreatedResponse$Allo23[0]) === null || _CreatedResponse$Allo24 === void 0 ? void 0 : _CreatedResponse$Allo24.penaltyType),
         OwnerInfo: mergedOwnerInfo,
-        additionalDetails: [mergedAdditionalDetails],
-        propertyId: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.propertyId) || (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai8 = updatedPropertyDetails.selectedProperty) === null || _updatedPropertyDetai8 === void 0 ? void 0 : _updatedPropertyDetai8.propertyId),
+        ...(additionalDetails && {
+          additionalDetails: additionalDetails
+        }),
+        propertyId: (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : updatedPropertyDetails.propertyId) || (updatedPropertyDetails === null || updatedPropertyDetails === void 0 ? void 0 : (_updatedPropertyDetai10 = updatedPropertyDetails.selectedProperty) === null || _updatedPropertyDetai10 === void 0 ? void 0 : _updatedPropertyDetai10.propertyId),
         Document: updatedDocuments.map(doc => {
           var _ref2, _CreatedResponse$Allo25, _CreatedResponse$Allo26;
           const originalDoc = ((_ref2 = (CreatedResponse === null || CreatedResponse === void 0 ? void 0 : (_CreatedResponse$Allo25 = CreatedResponse.AllotmentDetails) === null || _CreatedResponse$Allo25 === void 0 ? void 0 : (_CreatedResponse$Allo26 = _CreatedResponse$Allo25[0]) === null || _CreatedResponse$Allo26 === void 0 ? void 0 : _CreatedResponse$Allo26.Document) || []) === null || _ref2 === void 0 ? void 0 : _ref2.find(d => d.documentUid === (doc === null || doc === void 0 ? void 0 : doc.documentUid) || d.fileStoreId === (doc === null || doc === void 0 ? void 0 : doc.fileStoreId) || d.documentType === (doc === null || doc === void 0 ? void 0 : doc.documentType))) || {};
@@ -11861,14 +13427,26 @@ function RentAndLeaseSelectDocument({
 function RentAndLeaseSummary({
   t
 }) {
-  var _formData$applicantDe, _formData$applicantDe2, _formData$applicantDe3, _formData$applicantDe4, _formData$documents, _formData$documents$d;
+  var _formData$applicantDe, _formData$applicantDe2, _formData$applicantDe3, _formData$applicantDe4, _formData$documents, _formData$documents$d, _formData$documents2, _property$application2, _property$arrearReaso, _property$arrearReaso2;
   const formData = useSelector(state => {
     var _state$rentAndLease, _state$rentAndLease$R;
     return ((_state$rentAndLease = state.rentAndLease) === null || _state$rentAndLease === void 0 ? void 0 : (_state$rentAndLease$R = _state$rentAndLease.RentAndLeaseNewApplicationFormReducer) === null || _state$rentAndLease$R === void 0 ? void 0 : _state$rentAndLease$R.formData) || {};
   });
   const applicantDetails = Array.isArray(formData === null || formData === void 0 ? void 0 : (_formData$applicantDe = formData.applicantDetails) === null || _formData$applicantDe === void 0 ? void 0 : _formData$applicantDe.applicants) ? (_formData$applicantDe2 = formData.applicantDetails) === null || _formData$applicantDe2 === void 0 ? void 0 : _formData$applicantDe2.applicants : formData !== null && formData !== void 0 && (_formData$applicantDe3 = formData.applicantDetails) !== null && _formData$applicantDe3 !== void 0 && _formData$applicantDe3.applicants ? [(_formData$applicantDe4 = formData.applicantDetails) === null || _formData$applicantDe4 === void 0 ? void 0 : _formData$applicantDe4.applicants] : [];
   const property = (formData === null || formData === void 0 ? void 0 : formData.propertyDetails) || {};
-  const docs = (formData === null || formData === void 0 ? void 0 : (_formData$documents = formData.documents) === null || _formData$documents === void 0 ? void 0 : (_formData$documents$d = _formData$documents.documents) === null || _formData$documents$d === void 0 ? void 0 : _formData$documents$d.documents) || [];
+  const standardDocs = (formData === null || formData === void 0 ? void 0 : (_formData$documents = formData.documents) === null || _formData$documents === void 0 ? void 0 : (_formData$documents$d = _formData$documents.documents) === null || _formData$documents$d === void 0 ? void 0 : _formData$documents$d.documents) || [];
+  const arrearDoc = property.arrearDoc ? [{
+    documentType: "Arrear Doc",
+    fileStoreId: property.arrearDoc
+  }] : [];
+  const docs = [...standardDocs, ...arrearDoc];
+  const mergedDocsObject = {
+    ...(formData === null || formData === void 0 ? void 0 : formData.documents),
+    documents: {
+      ...(formData === null || formData === void 0 ? void 0 : (_formData$documents2 = formData.documents) === null || _formData$documents2 === void 0 ? void 0 : _formData$documents2.documents),
+      documents: docs
+    }
+  };
   const renderRow = (label, value) => /*#__PURE__*/React.createElement("div", {
     className: "ral-summary-row"
   }, /*#__PURE__*/React.createElement("div", {
@@ -11886,7 +13464,9 @@ function RentAndLeaseSummary({
     securityDeposit: t("SECURITY_DEPOSIT"),
     tax_applicable: t("GST_APPLICABLE"),
     refundApplicableOnDiscontinuation: t("REFUND_APPLICABLE"),
-    penaltyType: t("PENALTY_TYPE")
+    penaltyType: t("PENALTY_TYPE"),
+    startDate: t("RAL_START_DATE"),
+    endDate: t("RAL_END_DATE")
   };
   return /*#__PURE__*/React.createElement("div", {
     className: "application-summary"
@@ -11907,7 +13487,10 @@ function RentAndLeaseSummary({
     className: "ral-summary-header-row"
   }, /*#__PURE__*/React.createElement("h3", {
     className: "ral-summary-heading"
-  }, t("Properties Details"))), Object.entries(propertyLabels).map(([key, label]) => {
+  }, t("Properties Details"))), Object.entries(propertyLabels).filter(([key]) => {
+    var _property$application;
+    return (property === null || property === void 0 ? void 0 : (_property$application = property.applicationType) === null || _property$application === void 0 ? void 0 : _property$application.code) !== "Legacy" || key !== "securityDeposit";
+  }).map(([key, label]) => {
     var _property$selectedPro, _value, _value2;
     let value = (property === null || property === void 0 ? void 0 : (_property$selectedPro = property.selectedProperty) === null || _property$selectedPro === void 0 ? void 0 : _property$selectedPro[key]) || (property === null || property === void 0 ? void 0 : property[key]);
     if ((_value = value) !== null && _value !== void 0 && _value.name) value = value.name;else if ((_value2 = value) !== null && _value2 !== void 0 && _value2.code) value = value.code;
@@ -11917,8 +13500,17 @@ function RentAndLeaseSummary({
     if (key === "tax_applicable") {
       value = value === true ? t("YES") : t("NO");
     }
+    if (typeof value === "number" && (key === "startDate" || key === "endDate")) {
+      value = Digit.DateUtils.ConvertEpochToDate(value);
+    }
     return renderRow(label, value || "NA");
-  }))), /*#__PURE__*/React.createElement(Card, {
+  }))), (property === null || property === void 0 ? void 0 : (_property$application2 = property.applicationType) === null || _property$application2 === void 0 ? void 0 : _property$application2.code) === "Legacy" && /*#__PURE__*/React.createElement(Card, {
+    className: "summary-section"
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+    className: "ral-summary-header-row"
+  }, /*#__PURE__*/React.createElement("h3", {
+    className: "ral-summary-heading"
+  }, t("Additional Details"))), renderRow(t("Arrears"), property === null || property === void 0 ? void 0 : property.arrear), (property === null || property === void 0 ? void 0 : property.arrearStartDate) && renderRow(t("RAL_START_DATE"), typeof property.arrearStartDate === "number" ? Digit.DateUtils.ConvertEpochToDate(property.arrearStartDate) : property.arrearStartDate), (property === null || property === void 0 ? void 0 : property.arrearEndDate) && renderRow(t("RAL_END_DATE"), typeof property.arrearEndDate === "number" ? Digit.DateUtils.ConvertEpochToDate(property.arrearEndDate) : property.arrearEndDate), (property === null || property === void 0 ? void 0 : (_property$arrearReaso = property.arrearReason) === null || _property$arrearReaso === void 0 ? void 0 : _property$arrearReaso.name) && renderRow(t("Reason"), property === null || property === void 0 ? void 0 : (_property$arrearReaso2 = property.arrearReason) === null || _property$arrearReaso2 === void 0 ? void 0 : _property$arrearReaso2.name), (property === null || property === void 0 ? void 0 : property.remarks) && renderRow(t("Remarks"), property === null || property === void 0 ? void 0 : property.remarks))), /*#__PURE__*/React.createElement(Card, {
     className: "summary-section"
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: "ral-summary-header-row"
@@ -11930,7 +13522,7 @@ function RentAndLeaseSummary({
     key: index,
     className: "ral-summary-doc-card"
   }, /*#__PURE__*/React.createElement(RALDocuments, {
-    value: formData === null || formData === void 0 ? void 0 : formData.documents,
+    value: mergedDocsObject,
     Code: doc === null || doc === void 0 ? void 0 : doc.documentType,
     index: index
   })))) : /*#__PURE__*/React.createElement("div", null, t("CS_NO_DOCUMENTS_UPLOADED"))))));
@@ -13731,8 +15323,7 @@ const MyProperties = ({
   }, /*#__PURE__*/React.createElement("div", null, header && /*#__PURE__*/React.createElement(Header, {
     className: "ral-my-properties-header"
   }, t(header), " (", totalCount, ")"), getPropertiesData === null || getPropertiesData === void 0 ? void 0 : getPropertiesData.map((property, index) => {
-    var _ref, _ref2;
-    console.log("property", property);
+    var _ref, _property$additionalD, _property$additionalD2, _property$additionalD3, _ref2, _property$additionalD4, _property$additionalD5, _property$additionalD6;
     return /*#__PURE__*/React.createElement(Card, {
       key: index
     }, (property === null || property === void 0 ? void 0 : property.registrationNumber) && /*#__PURE__*/React.createElement(KeyNote, {
@@ -13743,13 +15334,13 @@ const MyProperties = ({
       note: (property === null || property === void 0 ? void 0 : property.applicationNumber) || t("CS_NA")
     }), /*#__PURE__*/React.createElement(KeyNote, {
       keyValue: t("RAL_ALLOTMENT_TYPE"),
-      note: ((_ref = Array.isArray(property === null || property === void 0 ? void 0 : property.additionalDetails) ? property === null || property === void 0 ? void 0 : property.additionalDetails[0] : property === null || property === void 0 ? void 0 : property.additionalDetails) === null || _ref === void 0 ? void 0 : _ref.allotmentType) || t("CS_NA")
+      note: ((_ref = Array.isArray(property === null || property === void 0 ? void 0 : (_property$additionalD = property.additionalDetails) === null || _property$additionalD === void 0 ? void 0 : _property$additionalD.propertyDetails) ? property === null || property === void 0 ? void 0 : (_property$additionalD2 = property.additionalDetails) === null || _property$additionalD2 === void 0 ? void 0 : _property$additionalD2.propertyDetails[0] : property === null || property === void 0 ? void 0 : (_property$additionalD3 = property.additionalDetails) === null || _property$additionalD3 === void 0 ? void 0 : _property$additionalD3.propertyDetails) === null || _ref === void 0 ? void 0 : _ref.allotmentType) || t("CS_NA")
     }), /*#__PURE__*/React.createElement(KeyNote, {
       keyValue: t("STATUS"),
       note: t(property !== null && property !== void 0 && property.expireFlag ? "Renewed" : property.status)
     }), /*#__PURE__*/React.createElement(KeyNote, {
       keyValue: t("RENT_LEASE_PROPERTY_NAME"),
-      note: ((_ref2 = Array.isArray(property === null || property === void 0 ? void 0 : property.additionalDetails) ? property === null || property === void 0 ? void 0 : property.additionalDetails[0] : property === null || property === void 0 ? void 0 : property.additionalDetails) === null || _ref2 === void 0 ? void 0 : _ref2.propertyName) || t("CS_NA")
+      note: ((_ref2 = Array.isArray(property === null || property === void 0 ? void 0 : (_property$additionalD4 = property.additionalDetails) === null || _property$additionalD4 === void 0 ? void 0 : _property$additionalD4.propertyDetails) ? property === null || property === void 0 ? void 0 : (_property$additionalD5 = property.additionalDetails) === null || _property$additionalD5 === void 0 ? void 0 : _property$additionalD5.propertyDetails[0] : property === null || property === void 0 ? void 0 : (_property$additionalD6 = property.additionalDetails) === null || _property$additionalD6 === void 0 ? void 0 : _property$additionalD6.propertyDetails) === null || _ref2 === void 0 ? void 0 : _ref2.propertyName) || t("CS_NA")
     }), /*#__PURE__*/React.createElement("div", {
       className: "ral-my-properties-actions"
     }, /*#__PURE__*/React.createElement(Link, {