@djb25/digit-ui-module-commonpt 1.0.1 → 1.0.3

package/dist/index.modern.js

@@ -1,4 +1,4 @@
-import { Loader, Header, FormComposer, Toast, Card, CardText, StatusTable, Row, SubmitBar, Banner, RadioButtons, Dropdown, InfoBannerIcon, Localities, ResponseComposer, Modal, KeyNote, OTPInput, CardLabelError, FormStep, UploadFile, DatePicker, CardSubHeader, PDFSvg, LabelFieldPair, CardLabel, MultiUploadWrapper, CardHeader, CardSectionHeader, CheckBox, TextInput, LinkButton, Close as Close$e, BreakLine, Table, TelePhone, DisplayPhotos, EditIcon, ViewsIcon, CheckPoint, ConnectingCheckPoints, ActionBar, Menu, ButtonSelector, AppContainer, BackButton, PrivateRoute, BreadCrumb, DeleteIcon, MobileNumber, TextArea, RadioOrSelect, SearchForm, SearchField, DetailsCard, TickMark, PropertyHouse, EmployeeModuleCard, CitizenHomeCard, PTIcon } from '@djb25/digit-ui-react-components';
+import { Loader, Header, FormComposer, Toast, Card, CardText, StatusTable, Row, SubmitBar, Banner, RadioButtons, Dropdown, InfoBannerIcon, Localities, ResponseComposer, Modal, KeyNote, OTPInput, CardLabelError, FormStep, UploadFile, DatePicker, CardSubHeader, PDFSvg, LabelFieldPair, CardLabel, MultiUploadWrapper, CardHeader, CardSectionHeader, CheckBox, TextInput, LinkButton, Close as Close$e, BreakLine, Table, TelePhone, DisplayPhotos, EditIcon, ViewsIcon, CheckPoint, ConnectingCheckPoints, ActionBar, Menu, ButtonSelector, AppContainer, BackButton, PrivateRoute, BreadCrumb, DeleteIcon, MobileNumber, TextArea, RadioOrSelect, SearchForm, SearchField, DetailsCard, TickMark, Label, PropertyHouse, EmployeeModuleCard, CitizenHomeCard, PTIcon } from '@djb25/digit-ui-react-components';
 import React, { useState, useEffect, useLayoutEffect, useMemo, useRef, Fragment as Fragment$1, memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useLocation, useHistory, useRouteMatch, Switch, Route, Link, useParams } from 'react-router-dom';
@@ -6054,7 +6054,7 @@ const setAddressDetailsLW = data => {
   return data;
 };
 const setOwnerDetailsLW = data => {
-  var _data$owners, _data$owners$;
+  var _data$owners, _data$owners$, _data$ownershipCatego3;
   const {
     locationDet,
     owners
@@ -6063,7 +6063,8 @@ const setOwnerDetailsLW = data => {
     owner = [],
     document = [];
   data.ownershipCategory = data === null || data === void 0 ? void 0 : (_data$owners = data.owners) === null || _data$owners === void 0 ? void 0 : (_data$owners$ = _data$owners[0]) === null || _data$owners$ === void 0 ? void 0 : _data$owners$.ownershipCategory;
-  if (data.ownershipCategory.includes("INSTITUTIONALPRIVATE") || data.ownershipCategory.includes("INSTITUTIONALGOVERNMENT")) {
+  const ownershipCategoryCode = typeof data.ownershipCategory === "string" ? data.ownershipCategory : (_data$ownershipCatego3 = data.ownershipCategory) === null || _data$ownershipCatego3 === void 0 ? void 0 : _data$ownershipCatego3.code;
+  if (ownershipCategoryCode !== null && ownershipCategoryCode !== void 0 && ownershipCategoryCode.includes("INSTITUTIONALPRIVATE") || ownershipCategoryCode !== null && ownershipCategoryCode !== void 0 && ownershipCategoryCode.includes("INSTITUTIONALGOVERNMENT")) {
     var _owners$14, _owners$15, _owners$16, _owners$16$institutio, _owners$16$institutio2, _owners$16$institutio3, _owners$17, _locationDet$cityCode2, _owners$18, _owners$19, _owners$20, _owners$21, _owners$22, _owners$23, _owners$24;
     institution.designation = owners === null || owners === void 0 ? void 0 : (_owners$14 = owners[0]) === null || _owners$14 === void 0 ? void 0 : _owners$14.designation;
     institution.name = owners === null || owners === void 0 ? void 0 : (_owners$15 = owners[0]) === null || _owners$15 === void 0 ? void 0 : _owners$15.institutionName;
@@ -6142,7 +6143,7 @@ const convertToPropertyLightWeight = (data = {}) => {
       address: data.address,
       propertyType: propertyType,
       ...data.propertyDetails,
-      ownershipCategory: ownershipCategory,
+      ownershipCategory: typeof ownershipCategory === "string" ? ownershipCategory : ownershipCategory === null || ownershipCategory === void 0 ? void 0 : ownershipCategory.code,
       usageCategory: (_data2 = data) === null || _data2 === void 0 ? void 0 : (_data2$assemblyDet = _data2.assemblyDet) === null || _data2$assemblyDet === void 0 ? void 0 : (_data2$assemblyDet$us = _data2$assemblyDet.usageCategoryMajor) === null || _data2$assemblyDet$us === void 0 ? void 0 : _data2$assemblyDet$us.code,
       owners: [...data.owners.map((owner, index) => {
         var _owner$gender, _owner$ownerType, _owner$relationship, _owner$inistitutetype;
@@ -6205,14 +6206,15 @@ const convertToPropertyLightWeight = (data = {}) => {
       channel: "SYSTEM"
     }
   };
-  if (ownershipCategory.includes("INSTITUTIONALPRIVATE") || ownershipCategory.includes("INSTITUTIONALGOVERNMENT")) {
+  const ownershipCategoryCode = typeof ownershipCategory === "string" ? ownershipCategory : ownershipCategory === null || ownershipCategory === void 0 ? void 0 : ownershipCategory.code;
+  if (ownershipCategoryCode !== null && ownershipCategoryCode !== void 0 && ownershipCategoryCode.includes("INSTITUTIONALPRIVATE") || ownershipCategoryCode !== null && ownershipCategoryCode !== void 0 && ownershipCategoryCode.includes("INSTITUTIONALGOVERNMENT")) {
     var _data3;
     formdata.Property.institution = (_data3 = data) === null || _data3 === void 0 ? void 0 : _data3.institution;
   }
   return formdata;
 };
 const convertToUpdatePropertyLightWeight = (data = {}) => {
-  var _data4, _formdata$Property, _data5, _formdata$Property3;
+  var _data4, _data5, _data6, _data6$ownershipCateg, _formdata$Property, _data7, _formdata$Property3;
   let propertyType = data.PropertyType;
   let noOfFloors = 1;
   data = setOwnerDetailsLW(data);
@@ -6228,7 +6230,7 @@ const convertToUpdatePropertyLightWeight = (data = {}) => {
       tenantId: data.tenantId,
       address: data.address,
       propertyType: propertyType,
-      ownershipCategory: (_data4 = data) === null || _data4 === void 0 ? void 0 : _data4.ownershipCategory,
+      ownershipCategory: typeof ((_data4 = data) === null || _data4 === void 0 ? void 0 : _data4.ownershipCategory) === "string" ? (_data5 = data) === null || _data5 === void 0 ? void 0 : _data5.ownershipCategory : (_data6 = data) === null || _data6 === void 0 ? void 0 : (_data6$ownershipCateg = _data6.ownershipCategory) === null || _data6$ownershipCateg === void 0 ? void 0 : _data6$ownershipCateg.code,
       owners: [...data.owners.map((owner, index) => {
         var _owner$gender3, _owner$ownerType3, _owner$relationship3, _owner$inistitutetype3;
         return {
@@ -6293,7 +6295,7 @@ const convertToUpdatePropertyLightWeight = (data = {}) => {
     }
   };
   let propertyInitialObject = JSON.parse(sessionStorage.getItem("propertyInitialObject"));
-  if (checkArrayLength(propertyInitialObject === null || propertyInitialObject === void 0 ? void 0 : propertyInitialObject.units) && checkIsAnArray((_formdata$Property = formdata.Property) === null || _formdata$Property === void 0 ? void 0 : _formdata$Property.units) && (_data5 = data) !== null && _data5 !== void 0 && _data5.isEditProperty) {
+  if (checkArrayLength(propertyInitialObject === null || propertyInitialObject === void 0 ? void 0 : propertyInitialObject.units) && checkIsAnArray((_formdata$Property = formdata.Property) === null || _formdata$Property === void 0 ? void 0 : _formdata$Property.units) && (_data7 = data) !== null && _data7 !== void 0 && _data7.isEditProperty) {
     var _formdata$Property2;
     propertyInitialObject.units = propertyInitialObject.units.filter(unit => unit.active);
     let oldUnits = propertyInitialObject.units.map(unit => {
@@ -7653,7 +7655,7 @@ const SearchProperty = ({
   } = Digit.Hooks.pt.usePropertySearchWithDue({
     tenantId: searchData === null || searchData === void 0 ? void 0 : searchData.city,
     filters: searchData === null || searchData === void 0 ? void 0 : searchData.filters,
-    auth: true,
+    auth: false,
     configs: {
       enabled: Object.keys(searchData).length > 0,
       retry: false,
@@ -8293,7 +8295,7 @@ const PropertySearchResults = ({
   redirectToUrl,
   searchQuery
 }) => {
-  var _result$data, _result$data$Properti, _paymentDetails$data, _paymentDetails$data$, _result$data3, _result$data3$Propert, _modalData$total_due;
+  var _result$data, _result$data2, _properties$map, _paymentDetails$data, _paymentDetails$data$, _ref, _modalData$total_due;
   const {
     t
   } = useTranslation();
@@ -8304,6 +8306,7 @@ const PropertySearchResults = ({
     oldPropertyIds,
     locality,
     city,
+    tenantId: tId,
     doorNo,
     name,
     PToffset
@@ -8335,17 +8338,21 @@ const PropertySearchResults = ({
     setShowModal(false);
   };
   Digit.Hooks.useClickOutside(modalRef, closeModal, modalData);
-  if (mobileNumber || searchQuery && searchQuery.mobileNumber) filters.mobileNumber = mobileNumber ? mobileNumber : searchQuery === null || searchQuery === void 0 ? void 0 : searchQuery.mobileNumber;
-  if (propertyIds || searchQuery && searchQuery.propertyIds) filters.propertyIds = propertyIds ? propertyIds : searchQuery === null || searchQuery === void 0 ? void 0 : searchQuery.propertyIds;
-  if (oldPropertyIds || searchQuery && searchQuery.oldPropertyIds) filters.oldPropertyIds = oldPropertyIds ? oldPropertyIds : searchQuery === null || searchQuery === void 0 ? void 0 : searchQuery.oldPropertyIds;
+  const sbm = (searchQuery === null || searchQuery === void 0 ? void 0 : searchQuery.mobileNumber) || (searchQuery === null || searchQuery === void 0 ? void 0 : searchQuery.mobileNo);
+  const spi = (searchQuery === null || searchQuery === void 0 ? void 0 : searchQuery.propertyIds) || (searchQuery === null || searchQuery === void 0 ? void 0 : searchQuery.propertyId);
+  const sop = (searchQuery === null || searchQuery === void 0 ? void 0 : searchQuery.oldPropertyIds) || (searchQuery === null || searchQuery === void 0 ? void 0 : searchQuery.oldPropertyId);
+  if (mobileNumber || sbm) filters.mobileNumber = mobileNumber ? mobileNumber : sbm;
+  if (propertyIds || spi) filters.propertyIds = propertyIds ? propertyIds : spi;
+  if (oldPropertyIds || sop) filters.oldPropertyIds = oldPropertyIds ? oldPropertyIds : sop;
   if (locality || searchQuery && searchQuery.locality) filters.locality = locality ? locality : searchQuery === null || searchQuery === void 0 ? void 0 : searchQuery.locality;
   if (doorNo || searchQuery && searchQuery.doorNo) filters.doorNo = doorNo ? doorNo : searchQuery === null || searchQuery === void 0 ? void 0 : searchQuery.doorNo;
   if (name || searchQuery && searchQuery.name) filters.name = name ? name : searchQuery === null || searchQuery === void 0 ? void 0 : searchQuery.name;
-  if (locality || searchQuery && searchQuery.locality) {
-    filters.limit = filter1.limit;
-    filters.sortOrder = filter1.sortOrder;
-    filters.sortBy = filter1.sortBy;
-    filters.offset = filter1.offset;
+  filters.limit = filter1.limit;
+  filters.sortOrder = filter1.sortOrder;
+  filters.sortBy = filter1.sortBy;
+  filters.offset = filter1.offset;
+  if (!filters.status) {
+    filters.status = "ACTIVE,INWORKFLOW";
   }
   const [owners, setOwners, clearOwners] = Digit.Hooks.useSessionStorage("PT_MUTATE_MULTIPLE_OWNERS", null);
   const [lastPath, setLastPath, clearLastPath] = Digit.Hooks.useSessionStorage("PT_MUTATE_MULTIPLE_OWNERS_LAST_PATH", null);
@@ -8359,9 +8366,9 @@ const PropertySearchResults = ({
     _clearParams();
     setLastPath("");
   }, []);
-  const auth = true;
+  const auth = false;
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const scity = city ? city : searchQuery === null || searchQuery === void 0 ? void 0 : searchQuery.city;
+  const scity = city || tId || (searchQuery === null || searchQuery === void 0 ? void 0 : searchQuery.city) || tenantId;
   const searchArgs = scity ? {
     tenantId: scity,
     filters,
@@ -8373,8 +8380,11 @@ const PropertySearchResults = ({
   const result = Digit.Hooks.pt.usePropertySearch(searchArgs, {
     privacy: Digit.Utils.getPrivacyObject()
   });
-  const consumerCode = result === null || result === void 0 ? void 0 : (_result$data = result.data) === null || _result$data === void 0 ? void 0 : (_result$data$Properti = _result$data.Properties) === null || _result$data$Properti === void 0 ? void 0 : _result$data$Properti.map(a => a.propertyId).join(",");
-  console.log("result", result);
+  const properties = (result === null || result === void 0 ? void 0 : (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.Properties) || (result === null || result === void 0 ? void 0 : (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.properties) || (Array.isArray(result === null || result === void 0 ? void 0 : result.data) ? result === null || result === void 0 ? void 0 : result.data : []);
+  const consumerCode = properties === null || properties === void 0 ? void 0 : (_properties$map = properties.map) === null || _properties$map === void 0 ? void 0 : _properties$map.call(properties, a => a.propertyId || a.id).filter(id => id).join(",");
+  if (result.isSuccess && (!properties || properties.length === 0)) {
+    console.warn("Property Search: No properties found in result.data", result.data);
+  }
   const fetchBillParams = mobileNumber ? {
     mobileNumber,
     consumerCode
@@ -8386,7 +8396,7 @@ const PropertySearchResults = ({
     ...fetchBillParams,
     tenantId: scity
   }, {
-    enabled: consumerCode ? true : false,
+    enabled: !!(consumerCode && scity),
     retry: false
   });
   const history = useHistory();
@@ -8398,7 +8408,7 @@ const PropertySearchResults = ({
   if (paymentDetails.isLoading || result.isLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
-  if (result.error || !consumerCode) {
+  if (result.error || result.isSuccess && (!properties || properties.length === 0)) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
         height: "150px"
@@ -8421,18 +8431,16 @@ const PropertySearchResults = ({
       };
     }
   });
-  const arr = result === null || result === void 0 ? void 0 : (_result$data3 = result.data) === null || _result$data3 === void 0 ? void 0 : (_result$data3$Propert = _result$data3.Properties) === null || _result$data3$Propert === void 0 ? void 0 : _result$data3$Propert.filter(e => e.status === "ACTIVE");
-  console.log("arrarr", arr);
-  const searchResults = arr === null || arr === void 0 ? void 0 : arr.map(property => {
-    var _sort, _sort$, _addr$locality, _payment$property$pro, _payment$property$pro2, _2, _property$owners, _property$owners$;
+  const searchResults = (_ref = properties || []) === null || _ref === void 0 ? void 0 : _ref.map(property => {
+    var _sort, _sort$, _addr$locality, _addr$locality2, _addr$locality3, _addr$locality4, _payment$property$pro, _payment$property$pro2, _2, _property$owners, _property$owners$;
     let addr = (property === null || property === void 0 ? void 0 : property.address) || {};
     return {
       property_id: property === null || property === void 0 ? void 0 : property.propertyId,
       owner_name: (_sort = ((property === null || property === void 0 ? void 0 : property.owners) || []).sort((a, b) => {
         var _a$additionalDetails, _b$additionalDetails;
-        return (a === null || a === void 0 ? void 0 : (_a$additionalDetails = a.additionalDetails) === null || _a$additionalDetails === void 0 ? void 0 : _a$additionalDetails.ownerSequence) - (b === null || b === void 0 ? void 0 : (_b$additionalDetails = b.additionalDetails) === null || _b$additionalDetails === void 0 ? void 0 : _b$additionalDetails.ownerSequence);
+        return ((a === null || a === void 0 ? void 0 : (_a$additionalDetails = a.additionalDetails) === null || _a$additionalDetails === void 0 ? void 0 : _a$additionalDetails.ownerSequence) || 0) - ((b === null || b === void 0 ? void 0 : (_b$additionalDetails = b.additionalDetails) === null || _b$additionalDetails === void 0 ? void 0 : _b$additionalDetails.ownerSequence) || 0);
       })) === null || _sort === void 0 ? void 0 : (_sort$ = _sort[0]) === null || _sort$ === void 0 ? void 0 : _sort$.name,
-      property_address: [addr.doorNo || "", addr.buildingName || "", addr.street || "", t(`TENANTS_MOHALLA_${(_addr$locality = addr.locality) === null || _addr$locality === void 0 ? void 0 : _addr$locality.code}`) || "", t(addr.tenantId) || ""].filter(a => a).join(", "),
+      property_address: [addr.doorNo || "", addr.buildingName || "", addr.street || "", t(`TENANTS_MOHALLA_${(_addr$locality = addr.locality) === null || _addr$locality === void 0 ? void 0 : _addr$locality.code}`) !== `TENANTS_MOHALLA_${(_addr$locality2 = addr.locality) === null || _addr$locality2 === void 0 ? void 0 : _addr$locality2.code}` ? t(`TENANTS_MOHALLA_${(_addr$locality3 = addr.locality) === null || _addr$locality3 === void 0 ? void 0 : _addr$locality3.code}`) : ((_addr$locality4 = addr.locality) === null || _addr$locality4 === void 0 ? void 0 : _addr$locality4.name) || "", t(addr.tenantId) || ""].filter(a => a).join(", "),
       total_due: ((_payment$property$pro = payment[property === null || property === void 0 ? void 0 : property.propertyId]) === null || _payment$property$pro === void 0 ? void 0 : _payment$property$pro.total_due) || 0,
       bil_due__date: ((_payment$property$pro2 = payment[property === null || property === void 0 ? void 0 : property.propertyId]) === null || _payment$property$pro2 === void 0 ? void 0 : _payment$property$pro2.bil_due__date) || t("N/A"),
       status: t(property.status),
@@ -8525,7 +8533,7 @@ const PropertySearchResults = ({
     style: {
       marginLeft: "8px"
     }
-  }, t(header), " (", searchResults === null || searchResults === void 0 ? void 0 : searchResults.length, ")"), /*#__PURE__*/React.createElement(PrivacyInfoLabel, {
+  }, t(header), " (", searchResults === null || searchResults === void 0 ? void 0 : searchResults.length, ")"), PrivacyInfoLabel && /*#__PURE__*/React.createElement(PrivacyInfoLabel, {
     t: t
   }), /*#__PURE__*/React.createElement(ResponseComposer, {
     data: searchResults,
@@ -8558,7 +8566,7 @@ const PropertySearchResults = ({
       width: "100%"
     },
     label: t("PT_PROCEED_PAYMENT")
-  }))) : null, !(searchResults !== null && searchResults !== void 0 && searchResults.length) > 0 && /*#__PURE__*/React.createElement("p", {
+  }))) : null, (searchResults === null || searchResults === void 0 ? void 0 : searchResults.length) === 0 && /*#__PURE__*/React.createElement("p", {
     style: {
       marginLeft: "16px",
       marginTop: "16px"
@@ -11772,7 +11780,11 @@ const ActionModal$5 = ({
   actionData,
   applicationData,
   businessService,
-  moduleCode
+  moduleCode,
+  cardClassName,
+  cardFormWrapperClassName,
+  cardFormClassName,
+  formClassName
 }) => {
   var _action$assigneeRoles, _action$assigneeRoles2;
   const {
@@ -12020,7 +12032,11 @@ const ActionModal$5 = ({
     childrenAtTheBottom: true,
     onSubmit: submit,
     defaultValues: defaultValues,
-    formId: "modal-action"
+    formId: "modal-action",
+    cardFormClassName: cardFormClassName,
+    cardFormWrapperClassName: cardFormWrapperClassName,
+    cardClassName: cardClassName,
+    formClassName: formClassName
   })) : /*#__PURE__*/React.createElement(Loader, null);
 };
 
@@ -12204,7 +12220,11 @@ const ActionModal$7 = ({
   actionData,
   applicationData,
   businessService,
-  moduleCode
+  moduleCode,
+  cardClassName,
+  cardFormWrapperClassName,
+  cardFormClassName,
+  formClassName
 }) => {
   var _action$roles, _action$roles$, _action$roles$$map;
   const {
@@ -12284,7 +12304,11 @@ const ActionModal$7 = ({
     childrenAtTheBottom: true,
     onSubmit: submit,
     defaultValues: defaultValues,
-    formId: "modal-action"
+    formId: "modal-action",
+    cardFormClassName: cardFormClassName,
+    cardFormWrapperClassName: cardFormWrapperClassName,
+    cardClassName: cardClassName,
+    formClassName: formClassName
   })) : /*#__PURE__*/React.createElement(Loader, null);
 };
 
@@ -12770,7 +12794,7 @@ const configWTApproverApplication = ({
             required: true
           }
         }
-      }, (action === null || action === void 0 ? void 0 : action.state) === "PENDING_FOR_VEHICLE_DRIVER_ASSIGN" ? {
+      }, (action === null || action === void 0 ? void 0 : action.state) === "PENDING_FOR_VEHICLE_DRIVER_ASSIGN" && (action === null || action === void 0 ? void 0 : action.action) !== "ASSIGN_VEHICLE_DRIVER" ? {
         label: t("RS_ASSIGN"),
         type: "dropdown",
         populators: /*#__PURE__*/React.createElement(Dropdown, {
@@ -12780,7 +12804,7 @@ const configWTApproverApplication = ({
           select: setSelectedVendor,
           selected: selectedVendor
         })
-      } : "null", (action === null || action === void 0 ? void 0 : action.state) === "DELIVERY_PENDING" ? {
+      } : "null", (action === null || action === void 0 ? void 0 : action.state) === "DELIVERY_PENDING" || (action === null || action === void 0 ? void 0 : action.action) === "ASSIGN_VEHICLE_DRIVER" ? {
         label: t("RS_REGISTRATION_NUMBER"),
         type: "dropdown",
         populators: /*#__PURE__*/React.createElement(Dropdown, {
@@ -12837,9 +12861,13 @@ const ActionModal$b = ({
   actionData,
   applicationData,
   businessService,
-  moduleCode
+  moduleCode,
+  cardClassName,
+  cardFormWrapperClassName,
+  cardFormClassName,
+  formClassName
 }) => {
-  var _action$assigneeRoles, _action$assigneeRoles2, _dsoData$vendor, _vehicleData$vehicle;
+  var _action$assigneeRoles, _action$assigneeRoles2, _dsoData$vendor, _vehicleData$vehicle, _vehicleData$vehicle$;
   const {
     data: approverData,
     isLoading: PTALoading
@@ -12860,17 +12888,19 @@ const ActionModal$b = ({
   } = Digit.Hooks.fsm.useVendorSearch({
     tenantId,
     config: {
-      enabled: (action === null || action === void 0 ? void 0 : action.state) === "PENDING_FOR_VEHICLE_DRIVER_ASSIGN"
+      enabled: (action === null || action === void 0 ? void 0 : action.state) === "PENDING_FOR_VEHICLE_DRIVER_ASSIGN" || (action === null || action === void 0 ? void 0 : action.action) === "ASSIGN_VEHICLE_DRIVER"
     }
   });
   let vendorDescription = [];
-  dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$vendor = dsoData.vendor) === null || _dsoData$vendor === void 0 ? void 0 : _dsoData$vendor.map(item => {
-    var _item$additionalDetai;
-    if ((item === null || item === void 0 ? void 0 : (_item$additionalDetai = item.additionalDetails) === null || _item$additionalDetai === void 0 ? void 0 : _item$additionalDetai.description) === "WT") {
+  dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$vendor = dsoData.vendor) === null || _dsoData$vendor === void 0 ? void 0 : _dsoData$vendor.forEach(item => {
+    var _item$additionalDetai, _item$additionalDetai2;
+    if ((item === null || item === void 0 ? void 0 : (_item$additionalDetai = item.additionalDetails) === null || _item$additionalDetai === void 0 ? void 0 : _item$additionalDetai.description) === "WT" || (item === null || item === void 0 ? void 0 : (_item$additionalDetai2 = item.additionalDetails) === null || _item$additionalDetai2 === void 0 ? void 0 : _item$additionalDetai2.serviceType) === "WT") {
+      var _item$owner;
+      const displayLabel = `${item === null || item === void 0 ? void 0 : item.name} (${item === null || item === void 0 ? void 0 : (_item$owner = item.owner) === null || _item$owner === void 0 ? void 0 : _item$owner.mobileNumber})`;
       vendorDescription.push({
         code: item === null || item === void 0 ? void 0 : item.name,
-        name: item === null || item === void 0 ? void 0 : item.name,
-        i18nKey: item === null || item === void 0 ? void 0 : item.name,
+        name: displayLabel,
+        i18nKey: displayLabel,
         vendorId: item === null || item === void 0 ? void 0 : item.id
       });
     }
@@ -12881,17 +12911,22 @@ const ActionModal$b = ({
   } = Digit.Hooks.fsm.useVehiclesSearch({
     tenantId,
     config: {
-      enabled: (action === null || action === void 0 ? void 0 : action.state) === "DELIVERY_PENDING"
+      enabled: (action === null || action === void 0 ? void 0 : action.state) === "DELIVERY_PENDING" || (action === null || action === void 0 ? void 0 : action.action) === "ASSIGN_VEHICLE_DRIVER"
     }
   });
   let vehicleDescription = [];
-  vehicleData === null || vehicleData === void 0 ? void 0 : (_vehicleData$vehicle = vehicleData.vehicle) === null || _vehicleData$vehicle === void 0 ? void 0 : _vehicleData$vehicle.map(item => {
+  vehicleData === null || vehicleData === void 0 ? void 0 : (_vehicleData$vehicle = vehicleData.vehicle) === null || _vehicleData$vehicle === void 0 ? void 0 : (_vehicleData$vehicle$ = _vehicleData$vehicle.filter(item => {
+    var _item$driverData, _item$driver;
+    return (item === null || item === void 0 ? void 0 : (_item$driverData = item.driverData) === null || _item$driverData === void 0 ? void 0 : _item$driverData.id) || (item === null || item === void 0 ? void 0 : (_item$driver = item.driver) === null || _item$driver === void 0 ? void 0 : _item$driver.id);
+  })) === null || _vehicleData$vehicle$ === void 0 ? void 0 : _vehicleData$vehicle$.map(item => {
+    var _item$driverData2, _item$driver2;
     vehicleDescription.push({
       code: item === null || item === void 0 ? void 0 : item.registrationNumber,
       name: item === null || item === void 0 ? void 0 : item.registrationNumber,
       i18nKey: item === null || item === void 0 ? void 0 : item.registrationNumber,
       tankerCapacity: item === null || item === void 0 ? void 0 : item.tankCapacity,
-      vehicleId: item === null || item === void 0 ? void 0 : item.id
+      vehicleId: item === null || item === void 0 ? void 0 : item.id,
+      driverId: (item === null || item === void 0 ? void 0 : (_item$driverData2 = item.driverData) === null || _item$driverData2 === void 0 ? void 0 : _item$driverData2.ownerId) || (item === null || item === void 0 ? void 0 : (_item$driver2 = item.driver) === null || _item$driver2 === void 0 ? void 0 : _item$driver2.ownerId)
     });
   });
   const [config, setConfig] = useState({});
@@ -12956,6 +12991,10 @@ const ActionModal$b = ({
     if ((action === null || action === void 0 ? void 0 : action.state) === "DELIVERY_PENDING") {
       applicationData.vehicleId = selectVehicle === null || selectVehicle === void 0 ? void 0 : selectVehicle.vehicleId;
     }
+    if ((action === null || action === void 0 ? void 0 : action.action) === "ASSIGN_VEHICLE_DRIVER") {
+      applicationData.vehicleId = selectVehicle === null || selectVehicle === void 0 ? void 0 : selectVehicle.vehicleId;
+      applicationData.driverId = selectVehicle === null || selectVehicle === void 0 ? void 0 : selectVehicle.driverId;
+    }
     let requestPayload = businessService === "watertanker" ? {
       waterTankerBookingDetail: {
         ...applicationData,
@@ -12980,7 +13019,7 @@ const ActionModal$b = ({
         selectedVendor,
         setSelectedVendor,
         vendorDescription: dsoData ? vendorDescription : undefined,
-        vehicleDescription: vehicleData ? vehicleDescription : undefined,
+        vehicleDescription: vehicleData || (action === null || action === void 0 ? void 0 : action.action) === "ASSIGN_VEHICLE_DRIVER" ? vehicleDescription : undefined,
         selectVehicle,
         setSelectVehicle
       }));
@@ -13005,7 +13044,11 @@ const ActionModal$b = ({
     childrenAtTheBottom: true,
     onSubmit: submit,
     defaultValues: defaultValues,
-    formId: "modal-action"
+    formId: "modal-action",
+    cardFormClassName: cardFormClassName,
+    cardFormWrapperClassName: cardFormWrapperClassName,
+    cardClassName: cardClassName,
+    formClassName: formClassName
   })) : /*#__PURE__*/React.createElement(Loader, null);
 };
 
@@ -13705,7 +13748,7 @@ const NOCDocuments = ({
     }
   }, [nocDocs, commonDocMaping]);
   useEffect(() => {
-    if (bpaApplicationStatus === 'NOC_VERIFICATION_INPROGRESS' && (actions === null || actions === void 0 ? void 0 : actions.length) > 0) setCheckEnablingDocs(true);else setCheckEnablingDocs(false);
+    if (bpaApplicationStatus === "NOC_VERIFICATION_INPROGRESS" && (actions === null || actions === void 0 ? void 0 : actions.length) > 0) setCheckEnablingDocs(true);else setCheckEnablingDocs(false);
   }, [applicationData, bpaActionsDetails]);
   return /*#__PURE__*/React.createElement("div", {
     style: {
@@ -13730,9 +13773,9 @@ const NOCDocuments = ({
           label: isEmployee ? `${t(noc === null || noc === void 0 ? void 0 : noc.title)}` : t(noc === null || noc === void 0 ? void 0 : noc.title),
           text: noc !== null && noc !== void 0 && noc.value ? t(noc === null || noc === void 0 ? void 0 : noc.value) : t("CS_NA"),
           textStyle: (noc === null || noc === void 0 ? void 0 : noc.value) == "APPROVED" || (noc === null || noc === void 0 ? void 0 : noc.value) == "AUTO_APPROVED" ? {
-            color: "#00703C"
+            color: "#2E9E8F"
           } : {
-            color: "#D4351C"
+            color: "#D83A2F"
           }
         });
       } else {
@@ -14284,7 +14327,7 @@ const ScruntinyDetails = ({
   const getTextValues = data => {
     if (data !== null && data !== void 0 && data.value && data !== null && data !== void 0 && data.isTransLate) return /*#__PURE__*/React.createElement("span", {
       style: {
-        color: "#00703C"
+        color: "#2E9E8F"
       }
     }, t(data === null || data === void 0 ? void 0 : data.value));else if (data !== null && data !== void 0 && data.value && data !== null && data !== void 0 && data.isTransLate) return t(data === null || data === void 0 ? void 0 : data.value);else if (data !== null && data !== void 0 && data.value) return data === null || data === void 0 ? void 0 : data.value;else t("NA");
   };
@@ -14554,8 +14597,9 @@ const TLCaption = ({
   }), /*#__PURE__*/React.createElement("p", null, "\xA0\xA0\xA0\xA0")), data.source && /*#__PURE__*/React.createElement("p", null, t("ES_APPLICATION_DETAILS_APPLICATION_CHANNEL_" + data.source.toUpperCase())), data.comment && /*#__PURE__*/React.createElement(Reason, {
     otherComment: data === null || data === void 0 ? void 0 : data.otherComment,
     headComment: data === null || data === void 0 ? void 0 : data.comment
-  }), data !== null && data !== void 0 && data.wfComment ? /*#__PURE__*/React.createElement("div", null, data === null || data === void 0 ? void 0 : (_data$wfComment = data.wfComment) === null || _data$wfComment === void 0 ? void 0 : _data$wfComment.map(e => /*#__PURE__*/React.createElement("div", {
-    className: "TLComments"
+  }), data !== null && data !== void 0 && data.wfComment ? /*#__PURE__*/React.createElement("div", null, data === null || data === void 0 ? void 0 : (_data$wfComment = data.wfComment) === null || _data$wfComment === void 0 ? void 0 : _data$wfComment.map((e, index) => /*#__PURE__*/React.createElement("div", {
+    className: "TLComments",
+    key: index
   }, /*#__PURE__*/React.createElement("h3", null, t("WF_COMMON_COMMENTS")), /*#__PURE__*/React.createElement("p", {
     style: {
       overflowX: "scroll"
@@ -14760,7 +14804,7 @@ const WSAdditonalDetails = ({
     connectionDetails: [],
     plumberDetails: []
   };
-  return /*#__PURE__*/React.createElement(Fragment$1, null, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     style: {
       lineHeight: "19px",
       maxWidth: "950px",
@@ -14771,7 +14815,9 @@ const WSAdditonalDetails = ({
   }, t("WS_COMMON_CONNECTION_DETAIL")), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: "connection-details-new-value-wrapper"
   }, connectionDetails === null || connectionDetails === void 0 ? void 0 : connectionDetails.map((value, index) => {
-    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Row, {
+    return /*#__PURE__*/React.createElement("div", {
+      key: index
+    }, /*#__PURE__*/React.createElement(Row, {
       className: "border-none",
       key: `${value.title}`,
       label: `${t(`${value.title}`)}`,
@@ -14793,9 +14839,10 @@ const WSAdditonalDetails = ({
     style: cardSubHeaderStyles()
   }, t("WS_ROAD_CUTTING_DETAILS")), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: "plumber-details-new-value-wrapper"
-  }, roadCuttingDetails === null || roadCuttingDetails === void 0 ? void 0 : roadCuttingDetails.map(value => {
+  }, roadCuttingDetails === null || roadCuttingDetails === void 0 ? void 0 : roadCuttingDetails.map((value, index) => {
     var _value$values;
     return /*#__PURE__*/React.createElement("div", {
+      key: index,
       style: (roadCuttingDetails === null || roadCuttingDetails === void 0 ? void 0 : roadCuttingDetails.length) > 1 ? {
         border: "1px solid #D6D5D4",
         background: "#FAFAFA",
@@ -14960,7 +15007,7 @@ const WSFeeEstimation = ({
             var _result$Calculation2, _result$Calculation2$, _result$Calculation2$2;
             result === null || result === void 0 ? void 0 : (_result$Calculation2 = result.Calculation) === null || _result$Calculation2 === void 0 ? void 0 : (_result$Calculation2$ = _result$Calculation2[0]) === null || _result$Calculation2$ === void 0 ? void 0 : (_result$Calculation2$2 = _result$Calculation2$.taxHeadEstimates) === null || _result$Calculation2$2 === void 0 ? void 0 : _result$Calculation2$2.forEach(data => data.amount = data.estimateAmount);
           }
-          result.Calculation[0].billSlabData = _.groupBy(result === null || result === void 0 ? void 0 : (_result$Calculation3 = result.Calculation) === null || _result$Calculation3 === void 0 ? void 0 : (_result$Calculation3$ = _result$Calculation3[0]) === null || _result$Calculation3$ === void 0 ? void 0 : _result$Calculation3$.taxHeadEstimates, 'category');
+          result.Calculation[0].billSlabData = _.groupBy(result === null || result === void 0 ? void 0 : (_result$Calculation3 = result.Calculation) === null || _result$Calculation3 === void 0 ? void 0 : (_result$Calculation3$ = _result$Calculation3[0]) === null || _result$Calculation3$ === void 0 ? void 0 : _result$Calculation3$.taxHeadEstimates, "category");
           const values = [{
             title: "WS_APPLICATION_FEE_HEADER",
             value: (_result$Calculation4 = result.Calculation) === null || _result$Calculation4 === void 0 ? void 0 : (_result$Calculation4$ = _result$Calculation4[0]) === null || _result$Calculation4$ === void 0 ? void 0 : _result$Calculation4$.fee
@@ -15006,7 +15053,7 @@ const WSFeeEstimation = ({
       if (targetValueSign == 1) {
         values[value] = e.target.value;
       } else {
-        values[value] = '';
+        values[value] = "";
       }
     } else if (isDropDownValue) {
       values[`${value}_data`] = e;
@@ -15021,7 +15068,7 @@ const WSFeeEstimation = ({
   return /*#__PURE__*/React.createElement(Fragment$1, null, /*#__PURE__*/React.createElement("div", {
     style: {
       lineHeight: "19px",
-      maxWidth: "950px",
+      maxWidth: "100%",
       minWidth: "280px"
     }
   }, values && /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement("div", null, values === null || values === void 0 ? void 0 : values.map((value, index) => {
@@ -15052,15 +15099,16 @@ const WSFeeEstimation = ({
     label: `${t(`CS_INBOX_STATUS_FILTER`)}`,
     text: isPaid ? t("WS_COMMON_PAID_LABEL") : t("WS_COMMON_NOT_PAID"),
     textStyle: !isPaid ? {
-      color: "#D4351C"
+      color: "#D83A2F"
     } : {
-      color: "#00703C"
+      color: "#2E9E8F"
     }
   }))), wsAdditionalDetails !== null && wsAdditionalDetails !== void 0 && (_wsAdditionalDetails$18 = wsAdditionalDetails.additionalDetails) !== null && _wsAdditionalDetails$18 !== void 0 && _wsAdditionalDetails$18.isAdhocRebate ? /*#__PURE__*/React.createElement("div", {
     onClick: e => {
       showPopUp(true);
     }
   }, /*#__PURE__*/React.createElement("span", {
+    className: "add-details-link hover-button",
     style: {
       cursor: "pointer",
       color: "#a82227"
@@ -15084,14 +15132,16 @@ const WSFeeEstimation = ({
     actionSaveOnSubmit: e => addAdhocRebatePenality(),
     hideSubmit: false,
     popupStyles: {
-      overflowY: "auto"
+      overflowY: "auto",
+      background: "#f0f3f7"
     }
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Card, {
+  }, /*#__PURE__*/React.createElement("div", {
     style: {
-      padding: "10px 10px 1px 10px",
-      margin: "0px 0px 15px 0px"
+      display: "flex",
+      flexDirection: "column",
+      gap: "16px"
     }
-  }, /*#__PURE__*/React.createElement(CardSectionHeader, {
+  }, /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSectionHeader, {
     style: {
       fontSize: "16px",
       fontWeight: "700",
@@ -15099,7 +15149,7 @@ const WSFeeEstimation = ({
       padding: "0px",
       margin: "0px 0px 10px 0px"
     }
-  }, t("PT_AD_PENALTY")), /*#__PURE__*/React.createElement(CardLabel, null, t("PT_TX_HEADS")), /*#__PURE__*/React.createElement("div", {
+  }, t("PT_AD_PENALTY")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("PT_TX_HEADS")), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Dropdown, {
     isMandatory: true,
@@ -15110,9 +15160,7 @@ const WSFeeEstimation = ({
     isPropertyAssess: true,
     name: "adhocPenaltyReason_data",
     t: t
-  })), (fields === null || fields === void 0 ? void 0 : (_fields$adhocPenaltyR = fields.adhocPenaltyReason_data) === null || _fields$adhocPenaltyR === void 0 ? void 0 : _fields$adhocPenaltyR.title) === "PT_OTHERS" && /*#__PURE__*/React.createElement("div", {
-    className: "field"
-  }, /*#__PURE__*/React.createElement(CardLabel, null, t("PT_REASON")), /*#__PURE__*/React.createElement("div", {
+  }))), (fields === null || fields === void 0 ? void 0 : (_fields$adhocPenaltyR = fields.adhocPenaltyReason_data) === null || _fields$adhocPenaltyR === void 0 ? void 0 : _fields$adhocPenaltyR.title) === "PT_OTHERS" && /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("PT_REASON")), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(TextInput, Object.assign({
     style: {
@@ -15129,7 +15177,7 @@ const WSFeeEstimation = ({
     pattern: "^[a-zA-Z ]*$",
     type: "text",
     title: t("TL_NAME_ERROR_MESSAGE")
-  })))), /*#__PURE__*/React.createElement(CardLabel, null, t("PT_HEAD_AMT")), /*#__PURE__*/React.createElement("div", {
+  })))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("PT_HEAD_AMT")), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(TextInput, Object.assign({
     style: {
@@ -15145,12 +15193,7 @@ const WSFeeEstimation = ({
     isRequired: true,
     pattern: "^[1-9]+[0-9]*$",
     title: t("ERR_DEFAULT_INPUT_FIELD_MSG")
-  })))), /*#__PURE__*/React.createElement(Card, {
-    style: {
-      padding: "10px 10px 1px 10px",
-      margin: "0px 0px 15px 0px"
-    }
-  }, /*#__PURE__*/React.createElement(CardSectionHeader, {
+  }))))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSectionHeader, {
     style: {
       fontSize: "16px",
       fontWeight: "700",
@@ -15158,7 +15201,7 @@ const WSFeeEstimation = ({
       padding: "0px",
       margin: "0px 0px 10px 0px"
     }
-  }, t("PT_AD_REBATE")), /*#__PURE__*/React.createElement(CardLabel, null, t("PT_TX_HEADS")), /*#__PURE__*/React.createElement("div", {
+  }, t("PT_AD_REBATE")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("PT_TX_HEADS")), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Dropdown, {
     isMandatory: true,
@@ -15169,9 +15212,7 @@ const WSFeeEstimation = ({
     name: "adhocRebateReason_data",
     isPropertyAssess: true,
     t: t
-  })), (fields === null || fields === void 0 ? void 0 : (_fields$adhocRebateRe = fields.adhocRebateReason_data) === null || _fields$adhocRebateRe === void 0 ? void 0 : _fields$adhocRebateRe.title) === "PT_OTHERS" && /*#__PURE__*/React.createElement("div", {
-    className: "field"
-  }, /*#__PURE__*/React.createElement(CardLabel, null, t("PT_REASON")), /*#__PURE__*/React.createElement(TextInput, Object.assign({
+  }))), (fields === null || fields === void 0 ? void 0 : (_fields$adhocRebateRe = fields.adhocRebateReason_data) === null || _fields$adhocRebateRe === void 0 ? void 0 : _fields$adhocRebateRe.title) === "PT_OTHERS" && /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("PT_REASON")), /*#__PURE__*/React.createElement(TextInput, Object.assign({
     style: {
       background: "#FAFAFA"
     },
@@ -15186,7 +15227,7 @@ const WSFeeEstimation = ({
     pattern: "^[a-zA-Z ]*$",
     type: "text",
     title: t("TL_NAME_ERROR_MESSAGE")
-  }))), /*#__PURE__*/React.createElement(CardLabel, null, t("PT_HEAD_AMT")), /*#__PURE__*/React.createElement("div", {
+  }))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("PT_HEAD_AMT")), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(TextInput, Object.assign({
     style: {
@@ -15202,7 +15243,7 @@ const WSFeeEstimation = ({
     isRequired: true,
     pattern: "^[1-9]+[0-9]*$",
     title: t("ERR_DEFAULT_INPUT_FIELD_MSG")
-  }))))), " "), showToast && /*#__PURE__*/React.createElement(Toast, {
+  }))))))), showToast && /*#__PURE__*/React.createElement(Toast, {
     style: {
       zIndex: "10000"
     },
@@ -15316,10 +15357,7 @@ const ViewBreakup = ({
       marginTop: "12px"
     }
   }, /*#__PURE__*/React.createElement("span", {
-    style: {
-      cursor: "pointer",
-      color: "#a82227"
-    }
+    className: "add-details-link hover-button"
   }, t("WS_PAYMENT_VIEW_BREAKUP"))) : null, popup && /*#__PURE__*/React.createElement(Modal, {
     headerBarMain: /*#__PURE__*/React.createElement(Heading, {
       label: t("WS_CALCULATION_BREAKUP")
@@ -15761,20 +15799,14 @@ function ApplicationDetailsContent({
   oldValue,
   isInfoLabel = false
 }) {
-  var _applicationDetails$a, _applicationDetails$a2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data19, _workflowDetails$data20;
+  var _applicationDetails$a, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data19, _workflowDetails$data20;
   const {
     t
   } = useTranslation();
-  const history = useHistory();
-  const location = useLocation();
   const [showPopup, setShowPopup] = useState(false);
-  const [selectedData, setSelectedData] = useState(null);
-  const searchParams = new URLSearchParams(location.search);
   let {
     id: applicationNo
   } = useParams();
-  const ownersSequences = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a = applicationDetails.applicationData) === null || _applicationDetails$a === void 0 ? void 0 : _applicationDetails$a.owners;
-  console.log("ownersSequences:- ", ownersSequences);
   function OpenImage(imageSource, index, thumbnailsToShow) {
     var _thumbnailsToShow$ful;
     window.open(thumbnailsToShow === null || thumbnailsToShow === void 0 ? void 0 : (_thumbnailsToShow$ful = thumbnailsToShow.fullImage) === null || _thumbnailsToShow$ful === void 0 ? void 0 : _thumbnailsToShow$ful[0], "_blank");
@@ -15807,7 +15839,7 @@ function ApplicationDetailsContent({
     loaded: false,
     canLoad: false
   });
-  if ((applicationData === null || applicationData === void 0 ? void 0 : applicationData.status) == "ACTIVE" && !billData.loading && !billData.loaded && !billData.canLoad) {
+  if ((applicationData === null || applicationData === void 0 ? void 0 : applicationData.status) === "ACTIVE" && !billData.loading && !billData.loaded && !billData.canLoad) {
     updateCanFetchBillData({
       loading: false,
       loaded: false,
@@ -15823,7 +15855,7 @@ function ApplicationDetailsContent({
     setBillData((applicationData === null || applicationData === void 0 ? void 0 : applicationData.tenantId) || tenantId, applicationData === null || applicationData === void 0 ? void 0 : applicationData.propertyId, updatefetchBillData, updateCanFetchBillData);
   }
   const convertEpochToDateDMY = dateEpoch => {
-    if (dateEpoch == null || dateEpoch == undefined || dateEpoch == "") {
+    if (dateEpoch == null || dateEpoch === undefined || dateEpoch === "") {
       return "NA";
     }
     const dateFromApi = new Date(dateEpoch);
@@ -15907,7 +15939,6 @@ function ApplicationDetailsContent({
   const checkLocation = window.location.href.includes("employee/tl") || window.location.href.includes("employee/obps") || window.location.href.includes("employee/noc");
   const isNocLocation = window.location.href.includes("employee/noc");
   const isBPALocation = window.location.href.includes("employee/obps");
-  const isWS = window.location.href.includes("employee/ws");
   const getRowStyles = () => {
     if (window.location.href.includes("employee/obps") || window.location.href.includes("employee/noc")) {
       return {
@@ -15946,13 +15977,13 @@ function ApplicationDetailsContent({
     if (window.location.href.includes("employee/obps") || window.location.href.includes("employee/noc") || window.location.href.includes("employee/ws")) {
       return {
         lineHeight: "19px",
-        maxWidth: "950px",
+        maxWidth: "100%",
         minWidth: "280px"
       };
     } else if (checkLocation) {
       return {
         lineHeight: "19px",
-        maxWidth: "600px",
+        maxWidth: "100%",
         minWidth: "280px"
       };
     } else {
@@ -15983,7 +16014,6 @@ function ApplicationDetailsContent({
   const openFilePDF = fileId => {
     Digit.UploadServices.Filefetch([fileId], Digit.ULBService.getStateId()).then(res => {
       var _res$data, _res$data$fileStoreId, _res$data$fileStoreId2;
-      console.log("Response of file:", res);
       const concatenatedUrls = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$fileStoreId = _res$data.fileStoreIds) === null || _res$data$fileStoreId === void 0 ? void 0 : (_res$data$fileStoreId2 = _res$data$fileStoreId[0]) === null || _res$data$fileStoreId2 === void 0 ? void 0 : _res$data$fileStoreId2.url;
       if (concatenatedUrls) {
         const urlArray = concatenatedUrls.split(",");
@@ -16001,7 +16031,6 @@ function ApplicationDetailsContent({
     });
   };
   const handleViewClick = data => {
-    setSelectedData(data);
     setShowPopup(true);
   };
   return /*#__PURE__*/React.createElement(Card, {
@@ -16016,19 +16045,19 @@ function ApplicationDetailsContent({
     infoClickLable: "WS_CLICK_ON_LABEL",
     infoClickInfoLabel: getClickInfoDetails(),
     infoClickInfoLabel1: getClickInfoDetails1()
-  }) : null, applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a2 = applicationDetails.applicationDetails) === null || _applicationDetails$a2 === void 0 ? void 0 : _applicationDetails$a2.map((detail, index) => {
-    var _detail$values, _detail$additionalDet, _applicationDetails$a3, _applicationDetails$a4, _applicationDetails$a5, _detail$additionalDet2, _applicationDetails$a6, _applicationDetails$a7, _detail$additionalDet3, _detail$additionalDet4, _detail$additionalDet5, _detail$additionalDet6, _detail$additionalDet7, _detail$additionalDet8, _detail$additionalDet9, _detail$additionalDet0, _detail$additionalDet1, _workflowDetails$data, _workflowDetails$data2, _detail$additionalDet10, _detail$additionalDet11, _detail$additionalDet12, _detail$additionalDet13, _detail$additionalDet14, _detail$additionalDet15, _detail$additionalDet16, _detail$additionalDet17, _detail$additionalDet18, _detail$additionalDet19, _detail$additionalDet20, _detail$additionalDet21, _detail$additionalDet22, _detail$additionalDet23, _detail$additionalDet24, _detail$additionalDet25, _detail$additionalDet26, _detail$additionalDet27, _detail$additionalDet28, _detail$additionalDet29;
+  }) : null, applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a = applicationDetails.applicationDetails) === null || _applicationDetails$a === void 0 ? void 0 : _applicationDetails$a.map((detail, index) => {
+    var _detail$title, _detail$values, _detail$additionalDet, _applicationDetails$a2, _applicationDetails$a3, _applicationDetails$a4, _detail$additionalDet2, _applicationDetails$a5, _applicationDetails$a6, _detail$additionalDet3, _detail$additionalDet4, _detail$additionalDet5, _detail$additionalDet6, _detail$additionalDet7, _detail$additionalDet8, _detail$additionalDet9, _detail$additionalDet0, _detail$additionalDet1, _workflowDetails$data, _workflowDetails$data2, _detail$additionalDet10, _detail$additionalDet11, _detail$additionalDet12, _detail$additionalDet13, _detail$additionalDet14, _detail$additionalDet15, _detail$additionalDet16, _detail$additionalDet17, _detail$additionalDet18, _detail$additionalDet19, _detail$additionalDet20, _detail$additionalDet21, _detail$additionalDet22, _detail$additionalDet23, _detail$additionalDet24, _detail$additionalDet25, _detail$additionalDet26, _detail$additionalDet27, _detail$additionalDet28, _detail$additionalDet29;
     return /*#__PURE__*/React.createElement(React.Fragment, {
       key: index
     }, /*#__PURE__*/React.createElement("div", {
       style: getMainDivStyles()
-    }, index === 0 && !detail.asSectionHeader ? /*#__PURE__*/React.createElement(CardSubHeader, {
+    }, (detail === null || detail === void 0 ? void 0 : (_detail$title = detail.title) === null || _detail$title === void 0 ? void 0 : _detail$title.trim()) && (index === 0 && !detail.asSectionHeader ? /*#__PURE__*/React.createElement(CardSubHeader, {
       style: {
         marginBottom: "16px",
         fontSize: "24px"
       }
-    }, t(detail.title)) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardSectionHeader, {
-      style: index == 0 && checkLocation ? {
+    }, t(detail.title)) : /*#__PURE__*/React.createElement(CardSectionHeader, {
+      style: index === 0 && checkLocation ? {
         marginBottom: "16px",
         fontSize: "24px"
       } : {
@@ -16036,26 +16065,28 @@ function ApplicationDetailsContent({
         marginTop: "32px",
         fontSize: "24px"
       }
-    }, isNocLocation ? `${t(detail.title)}` : t(detail.title), detail !== null && detail !== void 0 && detail.Component ? /*#__PURE__*/React.createElement(detail.Component, null) : null)), (detail === null || detail === void 0 ? void 0 : detail.isTable) && /*#__PURE__*/React.createElement("table", {
+    }, t(detail.title), detail !== null && detail !== void 0 && detail.Component ? /*#__PURE__*/React.createElement(detail.Component, null) : null)), (detail === null || detail === void 0 ? void 0 : detail.isTable) && /*#__PURE__*/React.createElement("table", {
       style: {
         tableLayout: "fixed",
         width: "100%",
         borderCollapse: "collapse",
-        borderCollapse: "collapse",
         border: "1px solid black"
       }
     }, /*#__PURE__*/React.createElement("tr", {
       style: {
         textAlign: "left"
       }
-    }, detail === null || detail === void 0 ? void 0 : detail.headers.map(header => /*#__PURE__*/React.createElement("th", {
+    }, detail === null || detail === void 0 ? void 0 : detail.headers.map((header, index) => /*#__PURE__*/React.createElement("th", {
       style: {
         padding: "10px",
         paddingLeft: "5px",
         border: "1px solid black"
-      }
+      },
+      key: index
     }, t(header)))), detail === null || detail === void 0 ? void 0 : detail.tableRows.map((row, index) => {
-      return /*#__PURE__*/React.createElement("tr", null, row.map((element, idx) => Array.isArray(element) && element.length > 1 && detail.isMaintenance === true ? /*#__PURE__*/React.createElement("td", {
+      return /*#__PURE__*/React.createElement("tr", {
+        key: index
+      }, row.map((element, idx) => Array.isArray(element) && element.length > 1 && detail.isMaintenance === true ? /*#__PURE__*/React.createElement("td", {
         style: {
           paddingTop: "20px",
           textAlign: "left",
@@ -16069,7 +16100,9 @@ function ApplicationDetailsContent({
           flexWrap: "nowrap",
           gap: "5px"
         }
-      }, element.map((file, fileIndex) => /*#__PURE__*/React.createElement("a", {
+      }, element.map((file, fileIndex) =>
+      /*#__PURE__*/
+      React.createElement("a", {
         key: fileIndex,
         onClick: () => openFilePDF(file.fileStoreId),
         rel: "noopener noreferrer",
@@ -16091,7 +16124,7 @@ function ApplicationDetailsContent({
           border: "1px solid black",
           verticalAlign: "middle"
         }
-      }, console.log("Comming Maintainaince data row:- ", element.data), element && element.editButton === true ? /*#__PURE__*/React.createElement("span", {
+      }, element && element.editButton === true ? /*#__PURE__*/React.createElement("span", {
         style: {
           display: "inline-flex",
           gap: "10px",
@@ -16106,7 +16139,7 @@ function ApplicationDetailsContent({
         }
       }, /*#__PURE__*/React.createElement("button", null, " ", /*#__PURE__*/React.createElement(EditIcon, null), " ")), /*#__PURE__*/React.createElement("div", {
         key: index,
-        onClick: () => handleViewClick(element.data),
+        onClick: () => handleViewClick(),
         style: {
           cursor: "pointer"
         }
@@ -16132,7 +16165,7 @@ function ApplicationDetailsContent({
           })
         });
       }
-      if ((value === null || value === void 0 ? void 0 : value.isLink) == true) {
+      if ((value === null || value === void 0 ? void 0 : value.isLink) === true) {
         var _detail$values2;
         return /*#__PURE__*/React.createElement(Row, {
           key: t(value.title),
@@ -16168,7 +16201,9 @@ function ApplicationDetailsContent({
           }
         });
       }
-      return /*#__PURE__*/React.createElement("div", null, window.location.href.includes("modify") ? /*#__PURE__*/React.createElement(Row, {
+      return /*#__PURE__*/React.createElement("div", {
+        key: index
+      }, window.location.href.includes("modify") ? /*#__PURE__*/React.createElement(Row, {
         className: "border-none",
         key: `${value.title}`,
         label: `${t(`${value.title}`)}`,
@@ -16205,8 +16240,8 @@ function ApplicationDetailsContent({
     })))), (detail === null || detail === void 0 ? void 0 : detail.belowComponent) && /*#__PURE__*/React.createElement(detail.belowComponent, null), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet = detail.additionalDetails) === null || _detail$additionalDet === void 0 ? void 0 : _detail$additionalDet.inspectionReport) && /*#__PURE__*/React.createElement(ScruntinyDetails, {
       scrutinyDetails: detail === null || detail === void 0 ? void 0 : detail.additionalDetails,
       paymentsList: paymentsList
-    }), (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a3 = applicationDetails.applicationData) === null || _applicationDetails$a3 === void 0 ? void 0 : (_applicationDetails$a4 = _applicationDetails$a3.additionalDetails) === null || _applicationDetails$a4 === void 0 ? void 0 : (_applicationDetails$a5 = _applicationDetails$a4.fieldinspection_pending) === null || _applicationDetails$a5 === void 0 ? void 0 : _applicationDetails$a5.length) > 0 && (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet2 = detail.additionalDetails) === null || _detail$additionalDet2 === void 0 ? void 0 : _detail$additionalDet2.fiReport) && /*#__PURE__*/React.createElement(InspectionReport, {
-      fiReport: applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a6 = applicationDetails.applicationData) === null || _applicationDetails$a6 === void 0 ? void 0 : (_applicationDetails$a7 = _applicationDetails$a6.additionalDetails) === null || _applicationDetails$a7 === void 0 ? void 0 : _applicationDetails$a7.fieldinspection_pending
+    }), (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a2 = applicationDetails.applicationData) === null || _applicationDetails$a2 === void 0 ? void 0 : (_applicationDetails$a3 = _applicationDetails$a2.additionalDetails) === null || _applicationDetails$a3 === void 0 ? void 0 : (_applicationDetails$a4 = _applicationDetails$a3.fieldinspection_pending) === null || _applicationDetails$a4 === void 0 ? void 0 : _applicationDetails$a4.length) > 0 && (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet2 = detail.additionalDetails) === null || _detail$additionalDet2 === void 0 ? void 0 : _detail$additionalDet2.fiReport) && /*#__PURE__*/React.createElement(InspectionReport, {
+      fiReport: applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a5 = applicationDetails.applicationData) === null || _applicationDetails$a5 === void 0 ? void 0 : (_applicationDetails$a6 = _applicationDetails$a5.additionalDetails) === null || _applicationDetails$a6 === void 0 ? void 0 : _applicationDetails$a6.fieldinspection_pending
     }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet3 = detail.additionalDetails) === null || _detail$additionalDet3 === void 0 ? void 0 : _detail$additionalDet3.floors) && /*#__PURE__*/React.createElement(PropertyFloors, {
       floors: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet4 = detail.additionalDetails) === null || _detail$additionalDet4 === void 0 ? void 0 : _detail$additionalDet4.floors
     }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet5 = detail.additionalDetails) === null || _detail$additionalDet5 === void 0 ? void 0 : _detail$additionalDet5.owners) && /*#__PURE__*/React.createElement(PropertyOwners, {
@@ -16248,21 +16283,11 @@ function ApplicationDetailsContent({
     }), (detail === null || detail === void 0 ? void 0 : detail.isWaterConnectionDetails) && /*#__PURE__*/React.createElement(WSAdditonalDetails, {
       wsAdditionalDetails: detail,
       oldValue: oldValue
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet23 = detail.additionalDetails) === null || _detail$additionalDet23 === void 0 ? void 0 : _detail$additionalDet23.redirectUrl) && /*#__PURE__*/React.createElement("div", {
-      style: {
-        fontSize: "16px",
-        lineHeight: "24px",
-        fontWeight: "400",
-        padding: "10px 0px"
-      }
-    }, /*#__PURE__*/React.createElement(Link, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet23 = detail.additionalDetails) === null || _detail$additionalDet23 === void 0 ? void 0 : _detail$additionalDet23.redirectUrl) && /*#__PURE__*/React.createElement(Link, {
       to: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet24 = detail.additionalDetails) === null || _detail$additionalDet24 === void 0 ? void 0 : (_detail$additionalDet25 = _detail$additionalDet24.redirectUrl) === null || _detail$additionalDet25 === void 0 ? void 0 : _detail$additionalDet25.url
     }, /*#__PURE__*/React.createElement("span", {
-      className: "link",
-      style: {
-        color: "#a82227"
-      }
-    }, detail === null || detail === void 0 ? void 0 : (_detail$additionalDet26 = detail.additionalDetails) === null || _detail$additionalDet26 === void 0 ? void 0 : (_detail$additionalDet27 = _detail$additionalDet26.redirectUrl) === null || _detail$additionalDet27 === void 0 ? void 0 : _detail$additionalDet27.title))), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet28 = detail.additionalDetails) === null || _detail$additionalDet28 === void 0 ? void 0 : _detail$additionalDet28.estimationDetails) && /*#__PURE__*/React.createElement(WSFeeEstimation, {
+      className: "add-details-link hover-button"
+    }, detail === null || detail === void 0 ? void 0 : (_detail$additionalDet26 = detail.additionalDetails) === null || _detail$additionalDet26 === void 0 ? void 0 : (_detail$additionalDet27 = _detail$additionalDet26.redirectUrl) === null || _detail$additionalDet27 === void 0 ? void 0 : _detail$additionalDet27.title)), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet28 = detail.additionalDetails) === null || _detail$additionalDet28 === void 0 ? void 0 : _detail$additionalDet28.estimationDetails) && /*#__PURE__*/React.createElement(WSFeeEstimation, {
       wsAdditionalDetails: detail,
       workflowDetails: workflowDetails
     }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet29 = detail.additionalDetails) === null || _detail$additionalDet29 === void 0 ? void 0 : _detail$additionalDet29.estimationDetails) && /*#__PURE__*/React.createElement(ViewBreakup, {
@@ -16285,7 +16310,7 @@ function ApplicationDetailsContent({
     let timelineStatusPostfix = "";
     if (window.location.href.includes("/obps/")) {
       var _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _workflowDetails$data15, _workflowDetails$data16, _workflowDetails$data17;
-      if (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data12 = workflowDetails.data) !== null && _workflowDetails$data12 !== void 0 && (_workflowDetails$data13 = _workflowDetails$data12.timeline[index - 1]) !== null && _workflowDetails$data13 !== void 0 && (_workflowDetails$data14 = _workflowDetails$data13.state) !== null && _workflowDetails$data14 !== void 0 && _workflowDetails$data14.includes("BACK_FROM") || workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data15 = workflowDetails.data) !== null && _workflowDetails$data15 !== void 0 && (_workflowDetails$data16 = _workflowDetails$data15.timeline[index - 1]) !== null && _workflowDetails$data16 !== void 0 && (_workflowDetails$data17 = _workflowDetails$data16.state) !== null && _workflowDetails$data17 !== void 0 && _workflowDetails$data17.includes("SEND_TO_CITIZEN")) timelineStatusPostfix = `_NOT_DONE`;else if ((checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.performedAction) === "SEND_TO_ARCHITECT") timelineStatusPostfix = `_BY_ARCHITECT_DONE`;else timelineStatusPostfix = index == 0 ? "" : `_DONE`;
+      if (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data12 = workflowDetails.data) !== null && _workflowDetails$data12 !== void 0 && (_workflowDetails$data13 = _workflowDetails$data12.timeline[index - 1]) !== null && _workflowDetails$data13 !== void 0 && (_workflowDetails$data14 = _workflowDetails$data13.state) !== null && _workflowDetails$data14 !== void 0 && _workflowDetails$data14.includes("BACK_FROM") || workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data15 = workflowDetails.data) !== null && _workflowDetails$data15 !== void 0 && (_workflowDetails$data16 = _workflowDetails$data15.timeline[index - 1]) !== null && _workflowDetails$data16 !== void 0 && (_workflowDetails$data17 = _workflowDetails$data16.state) !== null && _workflowDetails$data17 !== void 0 && _workflowDetails$data17.includes("SEND_TO_CITIZEN")) timelineStatusPostfix = `_NOT_DONE`;else if ((checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.performedAction) === "SEND_TO_ARCHITECT") timelineStatusPostfix = `_BY_ARCHITECT_DONE`;else timelineStatusPostfix = index === 0 ? "" : `_DONE`;
     }
     return /*#__PURE__*/React.createElement(React.Fragment, {
       key: index
@@ -16815,7 +16840,8 @@ const ApplicationDetails = props => {
     actionData: workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : _workflowDetails$data.timeline,
     businessService: businessService,
     workflowDetails: workflowDetails,
-    moduleCode: moduleCode
+    moduleCode: moduleCode,
+    cardFormWrapperClassName: "modal-form"
   }) : null, isWarningPop ? /*#__PURE__*/React.createElement(ApplicationDetailsWarningPopup, {
     action: selectedAction,
     workflowDetails: workflowDetails,
@@ -17240,33 +17266,35 @@ const PropertyAssemblyDetails = ({
   setError,
   clearErrors
 }) => {
-  var _formData$usageCatego, _formData$usageCatego2, _Menu$PropertyTax, _Menu1$PropertyTax, _errors$BuildingType, _errors$floorarea, _errors$constructionA, _errors$usageCategory;
+  var _formData$usageCatego, _formData$usageCatego2, _Menu$PropertyTax, _Menu1$PropertyTax, _errors$BuildingType, _errors$BuildingType2, _errors$floorarea, _errors$floorarea2, _errors$constructionA, _errors$constructionA2, _errors$usageCategory, _errors$usageCategory2;
   const [assemblyDetails, setAssemblyDetails] = React.useState({
     ...formData.assemblyDet,
-    'BuildingType': formData === null || formData === void 0 ? void 0 : formData.PropertyType,
-    'floorarea': formData === null || formData === void 0 ? void 0 : formData.landArea,
-    'constructionArea': formData === null || formData === void 0 ? void 0 : formData.constructionArea,
-    'usageCategoryMajor': formData !== null && formData !== void 0 && formData.usageCategoryMajor && (formData === null || formData === void 0 ? void 0 : (_formData$usageCatego = formData.usageCategoryMajor) === null || _formData$usageCatego === void 0 ? void 0 : _formData$usageCatego.code) === "NONRESIDENTIAL.OTHERS" ? {
+    BuildingType: formData === null || formData === void 0 ? void 0 : formData.PropertyType,
+    floorarea: formData === null || formData === void 0 ? void 0 : formData.landArea,
+    constructionArea: formData === null || formData === void 0 ? void 0 : formData.constructionArea,
+    usageCategoryMajor: formData !== null && formData !== void 0 && formData.usageCategoryMajor && (formData === null || formData === void 0 ? void 0 : (_formData$usageCatego = formData.usageCategoryMajor) === null || _formData$usageCatego === void 0 ? void 0 : _formData$usageCatego.code) === "NONRESIDENTIAL.OTHERS" ? {
       code: `${formData === null || formData === void 0 ? void 0 : (_formData$usageCatego2 = formData.usageCategoryMajor) === null || _formData$usageCatego2 === void 0 ? void 0 : _formData$usageCatego2.code}`,
       i18nKey: `PROPERTYTAX_BILLING_SLAB_OTHERS`
     } : formData === null || formData === void 0 ? void 0 : formData.usageCategoryMajor
   });
   const [focusField, setFocusField] = React.useState("");
-  const stateId = Digit.ULBService.getStateId();
+  let tenantId = "dl.djb";
   const [isErrors, setIsErrors] = useState(false);
   const isMobile = window.Digit.Utils.browser.isMobile();
   let proptype = [];
+  console.log("Calling usePropertyMDMS with tenantId:", tenantId);
   const {
-    data: Menu = {},
+    data: Menu = [],
     isLoading
-  } = Digit.Hooks.pt.usePropertyMDMS(stateId, "PropertyTax", "PTPropertyType") || {};
-  proptype = Menu === null || Menu === void 0 ? void 0 : (_Menu$PropertyTax = Menu.PropertyTax) === null || _Menu$PropertyTax === void 0 ? void 0 : _Menu$PropertyTax.PropertyType;
+  } = Digit.Hooks.pt.usePropertyMDMS(tenantId, "PropertyTax", "PTPropertyType") || {};
+  console.log("PropertyType Menu Data (transformed):", Menu);
+  proptype = (Menu === null || Menu === void 0 ? void 0 : (_Menu$PropertyTax = Menu.PropertyTax) === null || _Menu$PropertyTax === void 0 ? void 0 : _Menu$PropertyTax.PropertyType) || (Array.isArray(Menu) ? Menu : []);
   const {
-    data: Menu1 = {},
+    data: Menu1 = [],
     isLoading: menuLoading
-  } = Digit.Hooks.pt.usePropertyMDMS(stateId, "PropertyTax", "UsageCategory") || {};
-  let usagecat = [];
-  usagecat = (Menu1 === null || Menu1 === void 0 ? void 0 : (_Menu1$PropertyTax = Menu1.PropertyTax) === null || _Menu1$PropertyTax === void 0 ? void 0 : _Menu1$PropertyTax.UsageCategory) || [];
+  } = Digit.Hooks.pt.usePropertyMDMS(tenantId, "PropertyTax", "UsageCategory") || {};
+  console.log("UsageCategory Menu Data (transformed):", Menu1);
+  let usagecat = (Menu1 === null || Menu1 === void 0 ? void 0 : (_Menu1$PropertyTax = Menu1.PropertyTax) === null || _Menu1$PropertyTax === void 0 ? void 0 : _Menu1$PropertyTax.UsageCategory) || (Array.isArray(Menu1) ? Menu1 : []);
   function getPropertyTypeMenu(proptype) {
     if (userType === "employee") {
       var _proptype$filter, _proptype$filter$map;
@@ -17275,9 +17303,10 @@ const PropertyAssemblyDetails = ({
         code: item === null || item === void 0 ? void 0 : item.code
       }))) === null || _proptype$filter$map === void 0 ? void 0 : _proptype$filter$map.sort((a, b) => a.i18nKey.split("_").pop().localeCompare(b.i18nKey.split("_").pop()));
     } else {
+      let menu = [];
       if (Array.isArray(proptype) && proptype.length > 0) {
-        for (i = 0; i < proptype.length; i++) {
-          if (i != 1 && i != 4 && Array.isArray(proptype) && proptype.length > 0) menu.push({
+        for (let i = 0; i < proptype.length; i++) {
+          if (i != 1 && i != 4) menu.push({
             i18nKey: "COMMON_PROPTYPE_" + stringReplaceAll(proptype[i].code, ".", "_"),
             code: proptype[i].code
           });
@@ -17302,8 +17331,10 @@ const PropertyAssemblyDetails = ({
       });
       return catMenu;
     } else {
-      for (i = 0; i < 10; i++) {
-        if (Array.isArray(usagecat) && usagecat.length > 0 && usagecat[i].code.split(".")[0] == "NONRESIDENTIAL" && usagecat[i].code.split(".").length == 2) {
+      let menu = [];
+      for (let i = 0; i < usagecat.length; i++) {
+        var _usagecat$i, _usagecat$i$code, _usagecat$i$code$spli, _usagecat$i2, _usagecat$i2$code, _usagecat$i2$code$spl;
+        if (Array.isArray(usagecat) && usagecat.length > 0 && ((_usagecat$i = usagecat[i]) === null || _usagecat$i === void 0 ? void 0 : (_usagecat$i$code = _usagecat$i.code) === null || _usagecat$i$code === void 0 ? void 0 : (_usagecat$i$code$spli = _usagecat$i$code.split) === null || _usagecat$i$code$spli === void 0 ? void 0 : _usagecat$i$code$spli.call(_usagecat$i$code, ".")[0]) == "NONRESIDENTIAL" && ((_usagecat$i2 = usagecat[i]) === null || _usagecat$i2 === void 0 ? void 0 : (_usagecat$i2$code = _usagecat$i2.code) === null || _usagecat$i2$code === void 0 ? void 0 : (_usagecat$i2$code$spl = _usagecat$i2$code.split) === null || _usagecat$i2$code$spl === void 0 ? void 0 : _usagecat$i2$code$spl.call(_usagecat$i2$code, ".").length) == 2) {
           menu.push({
             i18nKey: "PROPERTYTAX_BILLING_SLAB_" + usagecat[i].code.split(".")[1],
             code: usagecat[i].code
@@ -17370,8 +17401,8 @@ const PropertyAssemblyDetails = ({
       clearErrors(config.key);
     }
   }, [errors]);
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t('PT_PROP_TYPE')}*`), /*#__PURE__*/React.createElement("div", {
-    class: "form-field"
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_PROP_TYPE")}*`), /*#__PURE__*/React.createElement("div", {
+    className: "form-field"
   }, /*#__PURE__*/React.createElement(Controller, {
     name: "BuildingType",
     control: control,
@@ -17391,7 +17422,7 @@ const PropertyAssemblyDetails = ({
           props.onChange(value);
           setAssemblyDetails({
             ...assemblyDetails,
-            ['BuildingType']: value
+            ["BuildingType"]: value
           });
           setFocusField("BuildingType");
         },
@@ -17400,9 +17431,9 @@ const PropertyAssemblyDetails = ({
         t: t
       });
     }
-  }))), /*#__PURE__*/React.createElement(CardLabelError, {
+  }))), (touched === null || touched === void 0 ? void 0 : touched.BuildingType) && (errors === null || errors === void 0 ? void 0 : (_errors$BuildingType = errors.BuildingType) === null || _errors$BuildingType === void 0 ? void 0 : _errors$BuildingType.message) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, touched !== null && touched !== void 0 && touched.BuildingType ? errors === null || errors === void 0 ? void 0 : (_errors$BuildingType = errors.BuildingType) === null || _errors$BuildingType === void 0 ? void 0 : _errors$BuildingType.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_TOT_LAND_AREA")}*`), /*#__PURE__*/React.createElement("div", {
+  }, errors === null || errors === void 0 ? void 0 : (_errors$BuildingType2 = errors.BuildingType) === null || _errors$BuildingType2 === void 0 ? void 0 : _errors$BuildingType2.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_TOT_LAND_AREA")}*`), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
   }, /*#__PURE__*/React.createElement(Controller, {
     name: "floorarea",
@@ -17425,15 +17456,15 @@ const PropertyAssemblyDetails = ({
         props === null || props === void 0 ? void 0 : props.onChange(ev.target.value);
         setAssemblyDetails({
           ...assemblyDetails,
-          ['floorarea']: ev.target.value
+          ["floorarea"]: ev.target.value
         });
         setFocusField("floorarea");
       },
       onBlur: props === null || props === void 0 ? void 0 : props.onBlur
     })
-  }))), /*#__PURE__*/React.createElement(CardLabelError, {
+  }))), (touched === null || touched === void 0 ? void 0 : touched.floorarea) && (errors === null || errors === void 0 ? void 0 : (_errors$floorarea = errors.floorarea) === null || _errors$floorarea === void 0 ? void 0 : _errors$floorarea.message) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, touched !== null && touched !== void 0 && touched.floorarea ? errors === null || errors === void 0 ? void 0 : (_errors$floorarea = errors.floorarea) === null || _errors$floorarea === void 0 ? void 0 : _errors$floorarea.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_TOT_CONSTRUCTION_AREA")}*`), /*#__PURE__*/React.createElement("div", {
+  }, errors === null || errors === void 0 ? void 0 : (_errors$floorarea2 = errors.floorarea) === null || _errors$floorarea2 === void 0 ? void 0 : _errors$floorarea2.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_TOT_CONSTRUCTION_AREA")}*`), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
   }, /*#__PURE__*/React.createElement(Controller, {
     name: "constructionArea",
@@ -17457,19 +17488,19 @@ const PropertyAssemblyDetails = ({
         setFocusField("constructionArea");
         setAssemblyDetails({
           ...assemblyDetails,
-          ['constructionArea']: ev.target.value
+          ["constructionArea"]: ev.target.value
         });
       },
       onBlur: props === null || props === void 0 ? void 0 : props.onBlur
     })
-  }))), /*#__PURE__*/React.createElement(CardLabelError, {
+  }))), (touched === null || touched === void 0 ? void 0 : touched.constructionArea) && (errors === null || errors === void 0 ? void 0 : (_errors$constructionA = errors.constructionArea) === null || _errors$constructionA === void 0 ? void 0 : _errors$constructionA.message) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: isMobile ? {
       ...errorStyle,
       marginLeft: "0px"
     } : {
       ...errorStyle
     }
-  }, touched !== null && touched !== void 0 && touched.constructionArea ? errors === null || errors === void 0 ? void 0 : (_errors$constructionA = errors.constructionArea) === null || _errors$constructionA === void 0 ? void 0 : _errors$constructionA.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_ASSESMENT_INFO_USAGE_TYPE")}*`), /*#__PURE__*/React.createElement("div", {
+  }, errors === null || errors === void 0 ? void 0 : (_errors$constructionA2 = errors.constructionArea) === null || _errors$constructionA2 === void 0 ? void 0 : _errors$constructionA2.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_ASSESMENT_INFO_USAGE_TYPE")}*`), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
   }, /*#__PURE__*/React.createElement(Controller, {
     name: "usageCategoryMajor",
@@ -17491,7 +17522,7 @@ const PropertyAssemblyDetails = ({
           setFocusField("usageCategoryMajor");
           setAssemblyDetails({
             ...assemblyDetails,
-            ['usageCategoryMajor']: value
+            ["usageCategoryMajor"]: value
           });
         },
         optionKey: "i18nKey",
@@ -17499,9 +17530,9 @@ const PropertyAssemblyDetails = ({
         t: t
       });
     }
-  }))), /*#__PURE__*/React.createElement(CardLabelError, {
+  }))), (touched === null || touched === void 0 ? void 0 : touched.usageCategoryMajor) && (errors === null || errors === void 0 ? void 0 : (_errors$usageCategory = errors.usageCategoryMajor) === null || _errors$usageCategory === void 0 ? void 0 : _errors$usageCategory.message) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, touched !== null && touched !== void 0 && touched.usageCategoryMajor ? errors === null || errors === void 0 ? void 0 : (_errors$usageCategory = errors.usageCategoryMajor) === null || _errors$usageCategory === void 0 ? void 0 : _errors$usageCategory.message : ""));
+  }, errors === null || errors === void 0 ? void 0 : (_errors$usageCategory2 = errors.usageCategoryMajor) === null || _errors$usageCategory2 === void 0 ? void 0 : _errors$usageCategory2.message));
 };
 
 const PropertyLocationDetails = ({
@@ -17515,7 +17546,7 @@ const PropertyLocationDetails = ({
   setError,
   clearErrors
 }) => {
-  var _Digit$UserService$ge, _errors$cityCode, _errors$locality, _errors$houseDoorNo, _errors$buildingColon, _errors$landmarkName;
+  var _Digit$UserService$ge, _errors$cityCode, _errors$cityCode2, _errors$locality, _errors$locality2, _errors$houseDoorNo, _errors$houseDoorNo2, _errors$buildingColon, _errors$buildingColon2, _errors$landmarkName, _errors$landmarkName2;
   let validation = {};
   let allCities = Digit.Hooks.pt.useTenants() ? Digit.Hooks.pt.useTenants() : Digit.Hooks.tl.useTenants();
   if (window.location.href.includes("obps")) {
@@ -17527,13 +17558,12 @@ const PropertyLocationDetails = ({
   }
   const userInfo = (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.info;
   userType = (userInfo === null || userInfo === void 0 ? void 0 : userInfo.type) == "EMPLOYEE" ? "employee" : "citizen";
-  const cityId = userInfo === null || userInfo === void 0 ? void 0 : userInfo.tenantId;
   const cityName = 'TENANT_TENANTS_' + (userInfo === null || userInfo === void 0 ? void 0 : userInfo.tenantId.replace('.', '_').toUpperCase());
-  const cityObj = userType === 'employee' ? {
-    code: cityId,
-    name: t(cityName),
-    i18nKey: cityName
-  } : null;
+  const cityObj = (allCities || []).find(city => city.code === ((userInfo === null || userInfo === void 0 ? void 0 : userInfo.tenantId) || "dl.djb")) || {
+    code: "dl.djb",
+    name: t("TENANT_TENANTS_DL_DJB"),
+    i18nKey: "TENANT_TENANTS_DL_DJB"
+  };
   const [locationDetails, setLocationDetails] = React.useState({
     ...(formData === null || formData === void 0 ? void 0 : formData.locationDet),
     cityCode: cityObj,
@@ -17600,8 +17630,10 @@ const PropertyLocationDetails = ({
     fontSize: "12px",
     marginTop: "-21px"
   };
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t('PT_PROP_CITY')}*`), /*#__PURE__*/React.createElement(Controller, {
-    name: "",
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t('PT_PROP_CITY')}*`), /*#__PURE__*/React.createElement("div", {
+    className: "form-field"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    name: "cityCode",
     defaultValue: locationDetails === null || locationDetails === void 0 ? void 0 : locationDetails.cityCode,
     control: control,
     rules: {
@@ -17612,10 +17644,9 @@ const PropertyLocationDetails = ({
       onBlur,
       onChange
     }) => /*#__PURE__*/React.createElement(Dropdown, {
-      className: "form-field",
       selected: value,
-      disable: userType === "employee",
-      option: allCities.sort((a, b) => a.name > b.name ? 1 : b.name > a.name ? -1 : 0),
+      disable: true,
+      option: (allCities || []).sort((a, b) => a.name > b.name ? 1 : b.name > a.name ? -1 : 0),
       select: value => {
         onChange(value);
         setLocationDetails({
@@ -17627,9 +17658,9 @@ const PropertyLocationDetails = ({
       onBlur: onBlur,
       t: t
     })
-  })), /*#__PURE__*/React.createElement(CardLabelError, {
+  }))), (touched === null || touched === void 0 ? void 0 : touched.cityCode) && (errors === null || errors === void 0 ? void 0 : (_errors$cityCode = errors.cityCode) === null || _errors$cityCode === void 0 ? void 0 : _errors$cityCode.message) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, touched !== null && touched !== void 0 && touched.cityCode ? errors === null || errors === void 0 ? void 0 : (_errors$cityCode = errors.cityCode) === null || _errors$cityCode === void 0 ? void 0 : _errors$cityCode.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_PROP_LOCALITY")}*`), /*#__PURE__*/React.createElement("div", {
+  }, errors === null || errors === void 0 ? void 0 : (_errors$cityCode2 = errors.cityCode) === null || _errors$cityCode2 === void 0 ? void 0 : _errors$cityCode2.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_PROP_LOCALITY")}*`), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
   }, /*#__PURE__*/React.createElement(Controller, {
     name: "locality",
@@ -17666,9 +17697,9 @@ const PropertyLocationDetails = ({
         onBlur: onBlur
       });
     }
-  }))), /*#__PURE__*/React.createElement(CardLabelError, {
+  }))), (touched === null || touched === void 0 ? void 0 : touched.locality) && (errors === null || errors === void 0 ? void 0 : (_errors$locality = errors.locality) === null || _errors$locality === void 0 ? void 0 : _errors$locality.message) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, touched !== null && touched !== void 0 && touched.locality ? errors === null || errors === void 0 ? void 0 : (_errors$locality = errors.locality) === null || _errors$locality === void 0 ? void 0 : _errors$locality.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_HOUSE_DOOR_NO")}*`), /*#__PURE__*/React.createElement("div", {
+  }, errors === null || errors === void 0 ? void 0 : (_errors$locality2 = errors.locality) === null || _errors$locality2 === void 0 ? void 0 : _errors$locality2.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_HOUSE_DOOR_NO")}*`), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
   }, /*#__PURE__*/React.createElement(Controller, {
     name: "houseDoorNo",
@@ -17701,9 +17732,9 @@ const PropertyLocationDetails = ({
       pattern: "^([a-zA-Z0-9 !@#$%^&*()_+\-={};':\\\\|,.<>/?]){1,64}$",
       title: t("PT_HOUSE_DOOR_NO_ERROR_MESSAGE")
     }))
-  }))), /*#__PURE__*/React.createElement(CardLabelError, {
+  }))), (touched === null || touched === void 0 ? void 0 : touched.houseDoorNo) && (errors === null || errors === void 0 ? void 0 : (_errors$houseDoorNo = errors.houseDoorNo) === null || _errors$houseDoorNo === void 0 ? void 0 : _errors$houseDoorNo.message) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, touched !== null && touched !== void 0 && touched.houseDoorNo ? errors === null || errors === void 0 ? void 0 : (_errors$houseDoorNo = errors.houseDoorNo) === null || _errors$houseDoorNo === void 0 ? void 0 : _errors$houseDoorNo.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_PROPERTY_ADDRESS_STREET_NAME")}*`), /*#__PURE__*/React.createElement("div", {
+  }, errors === null || errors === void 0 ? void 0 : (_errors$houseDoorNo2 = errors.houseDoorNo) === null || _errors$houseDoorNo2 === void 0 ? void 0 : _errors$houseDoorNo2.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_PROPERTY_ADDRESS_STREET_NAME")}*`), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
   }, /*#__PURE__*/React.createElement(Controller, {
     name: "buildingColonyName",
@@ -17732,9 +17763,9 @@ const PropertyLocationDetails = ({
       },
       onBlur: onBlur
     })
-  }))), /*#__PURE__*/React.createElement(CardLabelError, {
+  }))), (touched === null || touched === void 0 ? void 0 : touched.buildingColonyName) && (errors === null || errors === void 0 ? void 0 : (_errors$buildingColon = errors.buildingColonyName) === null || _errors$buildingColon === void 0 ? void 0 : _errors$buildingColon.message) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, touched !== null && touched !== void 0 && touched.buildingColonyName ? errors === null || errors === void 0 ? void 0 : (_errors$buildingColon = errors.buildingColonyName) === null || _errors$buildingColon === void 0 ? void 0 : _errors$buildingColon.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_LANDMARK_NAME")}`), /*#__PURE__*/React.createElement("div", {
+  }, errors === null || errors === void 0 ? void 0 : (_errors$buildingColon2 = errors.buildingColonyName) === null || _errors$buildingColon2 === void 0 ? void 0 : _errors$buildingColon2.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_LANDMARK_NAME")}`), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
   }, /*#__PURE__*/React.createElement(Controller, {
     name: "landmarkName",
@@ -17761,9 +17792,9 @@ const PropertyLocationDetails = ({
       },
       onBlur: onBlur
     })
-  }))), /*#__PURE__*/React.createElement(CardLabelError, {
+  }))), (touched === null || touched === void 0 ? void 0 : touched.landmarkName) && (errors === null || errors === void 0 ? void 0 : (_errors$landmarkName = errors.landmarkName) === null || _errors$landmarkName === void 0 ? void 0 : _errors$landmarkName.message) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, touched !== null && touched !== void 0 && touched.landmarkName ? errors === null || errors === void 0 ? void 0 : (_errors$landmarkName = errors.landmarkName) === null || _errors$landmarkName === void 0 ? void 0 : _errors$landmarkName.message : ""));
+  }, errors === null || errors === void 0 ? void 0 : (_errors$landmarkName2 = errors.landmarkName) === null || _errors$landmarkName2 === void 0 ? void 0 : _errors$landmarkName2.message));
 };
 
 const getAddress = (address, t) => {
@@ -17780,7 +17811,7 @@ const PropertyOwnerDetails = ({
   setError,
   clearErrors
 }) => {
-  var _formData$owners, _formData$owners2, _formData$owners3, _formData$owners4, _formData$owners5, _formData$owners$inde, _formData$owners6, _formData$owners7, _formData$owners8, _formData$owners9, _ownershipCategory$co, _ownershipCategory$co2, _formState$errors, _formState$errors$mul;
+  var _formData$owners, _formData$owners2, _formData$owners3, _formData$owners4, _formData$owners5, _formData$owners$inde, _formData$owners6, _formData$owners7, _formData$owners8, _rawMenu1$PropertyTax, _formData$owners9, _ownershipCategory$co, _ownershipCategory$co2, _formState$errors, _formState$errors$mul;
   const {
     pathname: url
   } = useLocation();
@@ -17807,6 +17838,7 @@ const PropertyOwnerDetails = ({
   const isUpdateProperty = (formData === null || formData === void 0 ? void 0 : formData.isUpdateProperty) || false;
   let isEditProperty = (formData === null || formData === void 0 ? void 0 : formData.isEditProperty) || false;
   const stateId = Digit.ULBService.getStateId();
+  const tenantId = Digit.ULBService.getCurrentTenantId();
   const {
     data: Menu
   } = Digit.Hooks.pt.useGenderMDMS(stateId, "common-masters", "GenderType");
@@ -17819,18 +17851,14 @@ const PropertyOwnerDetails = ({
     });
   });
   const {
-    data: dropdownData
-  } = Digit.Hooks.tl.useTradeLicenseMDMS(stateId, "common-masters", "TLOwnerTypeWithSubtypes", {
-    userType
-  });
-  const {
-    data: Menu1,
+    data: rawMenu1,
     isLoading
-  } = Digit.Hooks.pt.usePropertyMDMS(stateId, "PropertyTax", "OwnerType");
+  } = Digit.Hooks.pt.usePropertyMDMS(tenantId, "PropertyTax", "OwnerType");
+  const Menu1 = (rawMenu1 === null || rawMenu1 === void 0 ? void 0 : (_rawMenu1$PropertyTax = rawMenu1.PropertyTax) === null || _rawMenu1$PropertyTax === void 0 ? void 0 : _rawMenu1$PropertyTax.OwnerType) || (Array.isArray(rawMenu1) ? rawMenu1 : []);
   const {
     data: mdmsData,
     isLoading: isMdmsDataLoading
-  } = Digit.Hooks.pt.usePropertyMDMS(stateId, "PropertyTax", ["OwnerShipCategory"]);
+  } = Digit.Hooks.pt.usePropertyMDMS(tenantId, "PropertyTax", ["OwnerShipCategory"]);
   const [isCorrespondenceAddress, setIsCorrespondenceAddress] = useState(formData === null || formData === void 0 ? void 0 : (_formData$owners9 = formData.owners) === null || _formData$owners9 === void 0 ? void 0 : _formData$owners9.isCorrespondenceAddress);
   function setCorrespondenceAddress(e, ind) {
     let address = "";
@@ -17894,7 +17922,7 @@ const PropertyOwnerDetails = ({
     setIsErrors(hasErrors);
     onSelect(config === null || config === void 0 ? void 0 : config.key, ownerDetails.map(own => ({
       ...own,
-      ownershipCategory: ownershipCategory === null || ownershipCategory === void 0 ? void 0 : ownershipCategory.value
+      ownershipCategory: ownershipCategory
     })));
   }, [ownerDetails]);
   useEffect(() => {
@@ -17917,10 +17945,17 @@ const PropertyOwnerDetails = ({
       };
     }));
   };
+  const ownershipCategoryMenu = useMemo(() => {
+    var _mdmsData$PropertyTax, _mdmsData$PropertyTax2, _mdmsData$PropertyTax3;
+    return mdmsData === null || mdmsData === void 0 ? void 0 : (_mdmsData$PropertyTax = mdmsData.PropertyTax) === null || _mdmsData$PropertyTax === void 0 ? void 0 : (_mdmsData$PropertyTax2 = _mdmsData$PropertyTax.OwnerShipCategory) === null || _mdmsData$PropertyTax2 === void 0 ? void 0 : (_mdmsData$PropertyTax3 = _mdmsData$PropertyTax2.filter(e => e.code === "INDIVIDUAL.SINGLEOWNER" || e.code === "INDIVIDUAL.MULTIPLEOWNERS" || e.code.split(".").length === 1 && e.code.includes("INSTITUTIONAL"))) === null || _mdmsData$PropertyTax3 === void 0 ? void 0 : _mdmsData$PropertyTax3.map(item => ({
+      ...item,
+      i18nKey: `PT_OWNERSHIP_CATEGORY_${item.code.replaceAll(".", "_")}`
+    }));
+  }, [mdmsData]);
   const institutionTypeMenu = useMemo(() => {
-    var _mdmsData$PropertyTax, _mdmsData$PropertyTax2;
+    var _mdmsData$PropertyTax4, _mdmsData$PropertyTax5;
     const code = ownershipCategory === null || ownershipCategory === void 0 ? void 0 : ownershipCategory.code;
-    const arr = mdmsData === null || mdmsData === void 0 ? void 0 : (_mdmsData$PropertyTax = mdmsData.PropertyTax) === null || _mdmsData$PropertyTax === void 0 ? void 0 : (_mdmsData$PropertyTax2 = _mdmsData$PropertyTax.OwnerShipCategory) === null || _mdmsData$PropertyTax2 === void 0 ? void 0 : _mdmsData$PropertyTax2.filter(e => {
+    const arr = mdmsData === null || mdmsData === void 0 ? void 0 : (_mdmsData$PropertyTax4 = mdmsData.PropertyTax) === null || _mdmsData$PropertyTax4 === void 0 ? void 0 : (_mdmsData$PropertyTax5 = _mdmsData$PropertyTax4.OwnerShipCategory) === null || _mdmsData$PropertyTax5 === void 0 ? void 0 : _mdmsData$PropertyTax5.filter(e => {
       var _e$code;
       return (e === null || e === void 0 ? void 0 : (_e$code = e.code) === null || _e$code === void 0 ? void 0 : _e$code.split(".")[0]) == (code === null || code === void 0 ? void 0 : code.split(".")[0]);
     });
@@ -17929,10 +17964,10 @@ const PropertyOwnerDetails = ({
       return data === null || data === void 0 ? void 0 : (_data$code = data.code) === null || _data$code === void 0 ? void 0 : (_data$code$split = _data$code.split(".")) === null || _data$code$split === void 0 ? void 0 : _data$code$split[1];
     });
     return arraData === null || arraData === void 0 ? void 0 : arraData.map(e => {
-      var _e$code2, _e$code2$split, _e$code3, _e$code3$split, _e$code3$split$;
+      var _e$code2, _e$code2$split, _e$code3;
       return ((_e$code2 = e.code) === null || _e$code2 === void 0 ? void 0 : (_e$code2$split = _e$code2.split(".")) === null || _e$code2$split === void 0 ? void 0 : _e$code2$split[1]) && {
         ...e,
-        i18nKey: `COMMON_MASTERS_OWNERSHIPCATEGORY_${(_e$code3 = e.code) === null || _e$code3 === void 0 ? void 0 : (_e$code3$split = _e$code3.split(".")) === null || _e$code3$split === void 0 ? void 0 : (_e$code3$split$ = _e$code3$split[1]) === null || _e$code3$split$ === void 0 ? void 0 : _e$code3$split$.replaceAll(".", "_")}`
+        i18nKey: `PT_OWNERSHIP_CATEGORY_${(_e$code3 = e.code) === null || _e$code3 === void 0 ? void 0 : _e$code3.replaceAll(".", "_")}`
       };
     });
   }, [mdmsData, ownershipCategory === null || ownershipCategory === void 0 ? void 0 : ownershipCategory.code]);
@@ -17960,7 +17995,7 @@ const PropertyOwnerDetails = ({
     }) => /*#__PURE__*/React.createElement(Dropdown, {
       className: "form-field",
       selected: value,
-      option: dropdownData,
+      option: ownershipCategoryMenu,
       select: value => {
         var _value$code;
         if (!(value !== null && value !== void 0 && (_value$code = value.code) !== null && _value$code !== void 0 && _value$code.includes("MULTIPLEOWNERS")) && (ownerDetails === null || ownerDetails === void 0 ? void 0 : ownerDetails.length) > 1) {
@@ -17974,7 +18009,7 @@ const PropertyOwnerDetails = ({
       t: t
     })
   })), ownerDetails === null || ownerDetails === void 0 ? void 0 : ownerDetails.map((owner, index) => {
-    var _errors, _errors2, _errors3, _errors4, _errors5, _errors6, _ownerDetails$index, _ownerDetails$index3, _ownerDetails$index4, _ownerDetails$index5, _errors7, _errors8, _errors9, _errors0, _errors1, _errors10, _ownerDetails$index6, _ownerDetails$index8, _ownerDetails$index9, _ownerDetails$index0;
+    var _errors, _errors2, _errors3, _errors4, _errors5, _errors6, _errors7, _errors8, _errors9, _errors0, _errors1, _errors10, _ownerDetails$index, _ownerDetails$index3, _ownerDetails$index4, _ownerDetails$index5, _errors11, _errors12, _errors13, _errors14, _errors15, _errors16, _errors17, _errors18, _errors19, _errors20, _errors21, _errors22, _ownerDetails$index6, _ownerDetails$index8, _ownerDetails$index9, _ownerDetails$index0;
     return /*#__PURE__*/React.createElement("div", {
       style: {
         border: "1px solid #D6D5D4",
@@ -18033,9 +18068,9 @@ const PropertyOwnerDetails = ({
         disable: isUpdateProperty || isEditProperty,
         onBlur: onBlur
       })
-    }))), /*#__PURE__*/React.createElement(CardLabelError, {
+    }))), (touched === null || touched === void 0 ? void 0 : touched["institutionName" + index]) && (errors === null || errors === void 0 ? void 0 : (_errors = errors["institutionName" + index]) === null || _errors === void 0 ? void 0 : _errors.message) && /*#__PURE__*/React.createElement(CardLabelError, {
       style: errorStyle
-    }, touched !== null && touched !== void 0 && touched["institutionName" + index] ? errors === null || errors === void 0 ? void 0 : (_errors = errors["institutionName" + index]) === null || _errors === void 0 ? void 0 : _errors.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+    }, errors === null || errors === void 0 ? void 0 : (_errors2 = errors["institutionName" + index]) === null || _errors2 === void 0 ? void 0 : _errors2.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
       className: ""
     }, `${t("PT_INSTITUTION_TYPE")}*`), /*#__PURE__*/React.createElement("div", {
       className: "form-field"
@@ -18052,7 +18087,7 @@ const PropertyOwnerDetails = ({
         onChange,
         onBlur
       }) => /*#__PURE__*/React.createElement(Dropdown, {
-        selected: (institutionTypeMenu === null || institutionTypeMenu === void 0 ? void 0 : institutionTypeMenu.length) === 1 ? Menu1[0] : value,
+        selected: (institutionTypeMenu === null || institutionTypeMenu === void 0 ? void 0 : institutionTypeMenu.length) === 1 ? institutionTypeMenu[0] : value,
         disable: (institutionTypeMenu === null || institutionTypeMenu === void 0 ? void 0 : institutionTypeMenu.length) === 1 || editScreen,
         option: institutionTypeMenu ? institutionTypeMenu.sort((a, b) => a.name.localeCompare(b.name)) : [],
         select: value => {
@@ -18063,9 +18098,9 @@ const PropertyOwnerDetails = ({
         t: t,
         onBlur: onBlur
       })
-    }))), /*#__PURE__*/React.createElement(CardLabelError, {
+    }))), (touched === null || touched === void 0 ? void 0 : touched["institutionType" + index]) && (errors === null || errors === void 0 ? void 0 : (_errors3 = errors["institutionType" + index]) === null || _errors3 === void 0 ? void 0 : _errors3.message) && /*#__PURE__*/React.createElement(CardLabelError, {
       style: errorStyle
-    }, touched !== null && touched !== void 0 && touched["institutionType" + index] ? errors === null || errors === void 0 ? void 0 : (_errors2 = errors["institutionType" + index]) === null || _errors2 === void 0 ? void 0 : _errors2.message : ""), /*#__PURE__*/React.createElement(CardSectionHeader, null, t("TL_AUTHORIZED_PERSON_DETAILS")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_OWNER_NAME")}*`), /*#__PURE__*/React.createElement("div", {
+    }, errors === null || errors === void 0 ? void 0 : (_errors4 = errors["institutionType" + index]) === null || _errors4 === void 0 ? void 0 : _errors4.message), /*#__PURE__*/React.createElement(CardSectionHeader, null, t("TL_AUTHORIZED_PERSON_DETAILS")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_OWNER_NAME")}*`), /*#__PURE__*/React.createElement("div", {
       className: "form-field"
     }, /*#__PURE__*/React.createElement(Controller, {
       key: "name" + index,
@@ -18096,9 +18131,9 @@ const PropertyOwnerDetails = ({
         disable: isUpdateProperty || isEditProperty,
         onBlur: onBlur
       })
-    }))), /*#__PURE__*/React.createElement(CardLabelError, {
+    }))), (touched === null || touched === void 0 ? void 0 : touched["name" + index]) && (errors === null || errors === void 0 ? void 0 : (_errors5 = errors["name" + index]) === null || _errors5 === void 0 ? void 0 : _errors5.message) && /*#__PURE__*/React.createElement(CardLabelError, {
       style: errorStyle
-    }, touched !== null && touched !== void 0 && touched["name" + index] ? errors === null || errors === void 0 ? void 0 : (_errors3 = errors["name" + index]) === null || _errors3 === void 0 ? void 0 : _errors3.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_LANDLINE_NUMBER_FLOATING_LABEL")}*`), /*#__PURE__*/React.createElement("div", {
+    }, errors === null || errors === void 0 ? void 0 : (_errors6 = errors["name" + index]) === null || _errors6 === void 0 ? void 0 : _errors6.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_LANDLINE_NUMBER_FLOATING_LABEL")}*`), /*#__PURE__*/React.createElement("div", {
       className: "form-field"
     }, /*#__PURE__*/React.createElement(Controller, {
       key: "altContactNumber" + index,
@@ -18130,9 +18165,9 @@ const PropertyOwnerDetails = ({
         },
         onBlur: onBlur
       })
-    }))), /*#__PURE__*/React.createElement(CardLabelError, {
+    }))), (touched === null || touched === void 0 ? void 0 : touched["altContactNumber" + index]) && (errors === null || errors === void 0 ? void 0 : (_errors7 = errors["altContactNumber" + index]) === null || _errors7 === void 0 ? void 0 : _errors7.message) && /*#__PURE__*/React.createElement(CardLabelError, {
       style: errorStyle
-    }, touched !== null && touched !== void 0 && touched["altContactNumber" + index] ? errors === null || errors === void 0 ? void 0 : (_errors4 = errors["altContactNumber" + index]) === null || _errors4 === void 0 ? void 0 : _errors4.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_FORM3_MOBILE_NUMBER")}*`), /*#__PURE__*/React.createElement("div", {
+    }, errors === null || errors === void 0 ? void 0 : (_errors8 = errors["altContactNumber" + index]) === null || _errors8 === void 0 ? void 0 : _errors8.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_FORM3_MOBILE_NUMBER")}*`), /*#__PURE__*/React.createElement("div", {
       className: "form-field"
     }, /*#__PURE__*/React.createElement(Controller, {
       key: "mobileNumber" + index,
@@ -18181,9 +18216,9 @@ const PropertyOwnerDetails = ({
       onClick: e => {
         setOwnerDetails([...ownerDetails.filter((own, ind) => ind != index)]);
       }
-    }))), /*#__PURE__*/React.createElement(CardLabelError, {
+    }))), (touched === null || touched === void 0 ? void 0 : touched["mobileNumber" + index]) && (errors === null || errors === void 0 ? void 0 : (_errors9 = errors["mobileNumber" + index]) === null || _errors9 === void 0 ? void 0 : _errors9.message) && /*#__PURE__*/React.createElement(CardLabelError, {
       style: errorStyle
-    }, touched !== null && touched !== void 0 && touched["mobileNumber" + index] ? errors === null || errors === void 0 ? void 0 : (_errors5 = errors["mobileNumber" + index]) === null || _errors5 === void 0 ? void 0 : _errors5.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("TL_NEW_DESIG_OWNER_LABEL")}*`), /*#__PURE__*/React.createElement("div", {
+    }, errors === null || errors === void 0 ? void 0 : (_errors0 = errors["mobileNumber" + index]) === null || _errors0 === void 0 ? void 0 : _errors0.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("TL_NEW_DESIG_OWNER_LABEL")}*`), /*#__PURE__*/React.createElement("div", {
       className: "form-field"
     }, /*#__PURE__*/React.createElement(Controller, {
       key: "designation" + index,
@@ -18214,9 +18249,9 @@ const PropertyOwnerDetails = ({
         disable: isUpdateProperty || isEditProperty,
         onBlur: onBlur
       })
-    }))), /*#__PURE__*/React.createElement(CardLabelError, {
+    }))), (touched === null || touched === void 0 ? void 0 : touched["designation" + index]) && (errors === null || errors === void 0 ? void 0 : (_errors1 = errors["designation" + index]) === null || _errors1 === void 0 ? void 0 : _errors1.message) && /*#__PURE__*/React.createElement(CardLabelError, {
       style: errorStyle
-    }, touched !== null && touched !== void 0 && touched["designation" + index] ? errors === null || errors === void 0 ? void 0 : (_errors6 = errors["designation" + index]) === null || _errors6 === void 0 ? void 0 : _errors6.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("PT_CORRESPONDANCE_ADDRESS")), /*#__PURE__*/React.createElement("div", {
+    }, errors === null || errors === void 0 ? void 0 : (_errors10 = errors["designation" + index]) === null || _errors10 === void 0 ? void 0 : _errors10.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("PT_CORRESPONDANCE_ADDRESS")), /*#__PURE__*/React.createElement("div", {
       className: "form-field"
     }, /*#__PURE__*/React.createElement(TextArea, {
       isMandatory: false,
@@ -18289,9 +18324,9 @@ const PropertyOwnerDetails = ({
       onClick: e => {
         setOwnerDetails([...ownerDetails.filter((own, ind) => ind != index)]);
       }
-    }))), /*#__PURE__*/React.createElement(CardLabelError, {
+    }))), (touched === null || touched === void 0 ? void 0 : touched["mobileNumber" + index]) && (errors === null || errors === void 0 ? void 0 : (_errors11 = errors["mobileNumber" + index]) === null || _errors11 === void 0 ? void 0 : _errors11.message) && /*#__PURE__*/React.createElement(CardLabelError, {
       style: errorStyle
-    }, touched !== null && touched !== void 0 && touched["mobileNumber" + index] ? errors === null || errors === void 0 ? void 0 : (_errors7 = errors["mobileNumber" + index]) === null || _errors7 === void 0 ? void 0 : _errors7.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_OWNER_NAME")}*`), /*#__PURE__*/React.createElement("div", {
+    }, errors === null || errors === void 0 ? void 0 : (_errors12 = errors["mobileNumber" + index]) === null || _errors12 === void 0 ? void 0 : _errors12.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_OWNER_NAME")}*`), /*#__PURE__*/React.createElement("div", {
       className: "form-field"
     }, /*#__PURE__*/React.createElement(Controller, {
       key: "name" + index,
@@ -18322,9 +18357,9 @@ const PropertyOwnerDetails = ({
         disable: isUpdateProperty || isEditProperty,
         onBlur: onBlur
       })
-    }))), /*#__PURE__*/React.createElement(CardLabelError, {
+    }))), (touched === null || touched === void 0 ? void 0 : touched["name" + index]) && (errors === null || errors === void 0 ? void 0 : (_errors13 = errors["name" + index]) === null || _errors13 === void 0 ? void 0 : _errors13.message) && /*#__PURE__*/React.createElement(CardLabelError, {
       style: errorStyle
-    }, touched !== null && touched !== void 0 && touched["name" + index] ? errors === null || errors === void 0 ? void 0 : (_errors8 = errors["name" + index]) === null || _errors8 === void 0 ? void 0 : _errors8.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_FORM3_GENDER")}*`), /*#__PURE__*/React.createElement("div", {
+    }, errors === null || errors === void 0 ? void 0 : (_errors14 = errors["name" + index]) === null || _errors14 === void 0 ? void 0 : _errors14.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_FORM3_GENDER")}*`), /*#__PURE__*/React.createElement("div", {
       className: "form-field"
     }, /*#__PURE__*/React.createElement(Controller, {
       key: "gender" + index,
@@ -18352,9 +18387,9 @@ const PropertyOwnerDetails = ({
         isDropDown: window.location.href.includes("/employee") ? true : false,
         onBlur: onBlur
       })
-    }))), /*#__PURE__*/React.createElement(CardLabelError, {
+    }))), (touched === null || touched === void 0 ? void 0 : touched["gender" + index]) && (errors === null || errors === void 0 ? void 0 : (_errors15 = errors["gender" + index]) === null || _errors15 === void 0 ? void 0 : _errors15.message) && /*#__PURE__*/React.createElement(CardLabelError, {
       style: errorStyle
-    }, touched !== null && touched !== void 0 && touched["gender" + index] ? errors === null || errors === void 0 ? void 0 : (_errors9 = errors["gender" + index]) === null || _errors9 === void 0 ? void 0 : _errors9.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_FORM3_GUARDIAN_NAME")}*`), /*#__PURE__*/React.createElement("div", {
+    }, errors === null || errors === void 0 ? void 0 : (_errors16 = errors["gender" + index]) === null || _errors16 === void 0 ? void 0 : _errors16.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_FORM3_GUARDIAN_NAME")}*`), /*#__PURE__*/React.createElement("div", {
       className: "form-field"
     }, /*#__PURE__*/React.createElement(Controller, {
       key: "fatherOrHusbandName" + index,
@@ -18383,9 +18418,9 @@ const PropertyOwnerDetails = ({
         disable: isUpdateProperty || isEditProperty,
         onBlur: onBlur
       })
-    }))), /*#__PURE__*/React.createElement(CardLabelError, {
+    }))), (touched === null || touched === void 0 ? void 0 : touched["fatherOrHusbandName" + index]) && (errors === null || errors === void 0 ? void 0 : (_errors17 = errors["fatherOrHusbandName" + index]) === null || _errors17 === void 0 ? void 0 : _errors17.message) && /*#__PURE__*/React.createElement(CardLabelError, {
       style: errorStyle
-    }, touched !== null && touched !== void 0 && touched["fatherOrHusbandName" + index] ? errors === null || errors === void 0 ? void 0 : (_errors0 = errors["fatherOrHusbandName" + index]) === null || _errors0 === void 0 ? void 0 : _errors0.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_FORM3_RELATIONSHIP")}*`), /*#__PURE__*/React.createElement("div", {
+    }, errors === null || errors === void 0 ? void 0 : (_errors18 = errors["fatherOrHusbandName" + index]) === null || _errors18 === void 0 ? void 0 : _errors18.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_FORM3_RELATIONSHIP")}*`), /*#__PURE__*/React.createElement("div", {
       className: "form-field"
     }, /*#__PURE__*/React.createElement(Controller, {
       key: "relationship" + index,
@@ -18413,9 +18448,9 @@ const PropertyOwnerDetails = ({
         isDropDown: window.location.href.includes("/employee") ? true : false,
         onBlur: onBlur
       })
-    }))), /*#__PURE__*/React.createElement(CardLabelError, {
+    }))), (touched === null || touched === void 0 ? void 0 : touched["relationship" + index]) && (errors === null || errors === void 0 ? void 0 : (_errors19 = errors["relationship" + index]) === null || _errors19 === void 0 ? void 0 : _errors19.message) && /*#__PURE__*/React.createElement(CardLabelError, {
       style: errorStyle
-    }, touched !== null && touched !== void 0 && touched["relationship" + index] ? errors === null || errors === void 0 ? void 0 : (_errors1 = errors["relationship" + index]) === null || _errors1 === void 0 ? void 0 : _errors1.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+    }, errors === null || errors === void 0 ? void 0 : (_errors20 = errors["relationship" + index]) === null || _errors20 === void 0 ? void 0 : _errors20.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
       className: ""
     }, `${t("PT_SPECIAL_APPLICANT_CATEGORY")}*`), /*#__PURE__*/React.createElement("div", {
       className: "form-field"
@@ -18443,9 +18478,9 @@ const PropertyOwnerDetails = ({
         t: t,
         onBlur: onBlur
       })
-    }))), /*#__PURE__*/React.createElement(CardLabelError, {
+    }))), (touched === null || touched === void 0 ? void 0 : touched["ownerType" + index]) && (errors === null || errors === void 0 ? void 0 : (_errors21 = errors["ownerType" + index]) === null || _errors21 === void 0 ? void 0 : _errors21.message) && /*#__PURE__*/React.createElement(CardLabelError, {
       style: errorStyle
-    }, touched !== null && touched !== void 0 && touched["ownerType" + index] ? errors === null || errors === void 0 ? void 0 : (_errors10 = errors["ownerType" + index]) === null || _errors10 === void 0 ? void 0 : _errors10.message : ""), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("PT_CORRESPONDANCE_ADDRESS")), /*#__PURE__*/React.createElement("div", {
+    }, errors === null || errors === void 0 ? void 0 : (_errors22 = errors["ownerType" + index]) === null || _errors22 === void 0 ? void 0 : _errors22.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("PT_CORRESPONDANCE_ADDRESS")), /*#__PURE__*/React.createElement("div", {
       className: "form-field"
     }, /*#__PURE__*/React.createElement(TextArea, {
       isMandatory: false,
@@ -19139,14 +19174,14 @@ const PropertySearchNSummary = ({
     return getOwnersList ? getOwnersList : t("NA");
   };
   if (window.location.href.includes("/ws/")) ;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, (window.location.href.includes("/tl/") ? !((formData === null || formData === void 0 ? void 0 : (_formData$tradedetils = formData.tradedetils) === null || _formData$tradedetils === void 0 ? void 0 : (_formData$tradedetils2 = _formData$tradedetils[0]) === null || _formData$tradedetils2 === void 0 ? void 0 : (_formData$tradedetils3 = _formData$tradedetils2.structureType) === null || _formData$tradedetils3 === void 0 ? void 0 : _formData$tradedetils3.code) === "MOVABLE") && (isEmpNewApplication || isEmpRenewLicense) : true) && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller",
+  return /*#__PURE__*/React.createElement(Card, {
+    className: "no-shadow"
+  }, (window.location.href.includes("/tl/") ? !((formData === null || formData === void 0 ? void 0 : (_formData$tradedetils = formData.tradedetils) === null || _formData$tradedetils === void 0 ? void 0 : (_formData$tradedetils2 = _formData$tradedetils[0]) === null || _formData$tradedetils2 === void 0 ? void 0 : (_formData$tradedetils3 = _formData$tradedetils2.structureType) === null || _formData$tradedetils3 === void 0 ? void 0 : _formData$tradedetils3.code) === "MOVABLE") && (isEmpNewApplication || isEmpRenewLicense) : true) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(Label, {
     style: getInputStyles()
   }, `${t(`PROPERTY_ID`)}`), /*#__PURE__*/React.createElement("div", {
-    className: "field",
     style: {
-      marginTop: "20px",
-      display: "flex"
+      display: "flex",
+      gap: "12px"
     }
   }, /*#__PURE__*/React.createElement(TextInput, {
     key: config.key,
@@ -19159,8 +19194,7 @@ const PropertySearchNSummary = ({
     },
     style: {
       width: "80%",
-      float: "left",
-      marginRight: "20px"
+      float: "left"
     }
   }), /*#__PURE__*/React.createElement("button", {
     className: "submit-bar",
@@ -19196,9 +19230,8 @@ const PropertySearchNSummary = ({
       marginTop: "20px"
     }
   }, t("PT_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement("div", {
-    style: isMobile ? {} : {
-      maxWidth: "60%"
-    }
+    className: "formcomposer-section-grid",
+    style: isMobile ? {} : {}
   }, /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     labelStyle: isMobile ? {