npm - @djb25/digit-ui-module-commonpt - Versions diffs - 1.0.2 → 1.0.4 - Mend

@djb25/digit-ui-module-commonpt 1.0.2 → 1.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.js +1 -9
package/dist/index.js.map +1 -1
package/dist/index.modern.js +1126 -1192
package/dist/index.modern.js.map +1 -1
package/package.json +2 -2

package/dist/index.modern.js CHANGED Viewed

@@ -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, Label, PropertyHouse, EmployeeModuleCard, CitizenHomeCard, PTIcon } from '@djb25/digit-ui-react-components';
+import { Loader, VerticalTimeline, FormComposer, Toast, Card, CardText, StatusTable, Row, SubmitBar, Banner, RadioButtons, Dropdown, InfoBannerIcon, Localities, Header, 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, LayoutWrapper, CollapsibleCardPage, AddressDetails, DeleteIcon, MobileNumber, RadioOrSelect, TextArea, 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';
@@ -6,64 +6,61 @@ import { useQueryClient } from 'react-query';
 import { useForm, Controller } from 'react-hook-form';
 const newConfig = [{
-  "head": "PT_ASSEMBLY_DET",
-  "body": [{
-    "type": "component",
-    "route": "property-type",
-    "isMandatory": true,
-    "component": "CPTPropertyAssemblyDetails",
-    "texts": {
-      "headerCaption": "",
-      "header": "PT_ASSEMBLY_DET",
-      "cardText": "",
-      "submitBarLabel": "PT_COMMONS_NEXT"
+  head: "PT_LOCATION_DETAILS",
+  body: [{
+    type: "component",
+    route: "property-type",
+    isMandatory: true,
+    component: "CPTPropertyLocationDetails",
+    texts: {
+      headerCaption: "",
+      header: "PT_LOCATION_DETAILS",
+      cardText: "",
+      submitBarLabel: "PT_COMMONS_NEXT"
     },
-    "nextStep": {
-      "COMMON_PROPTYPE_BUILTUP_INDEPENDENTPROPERTY": "landarea",
-      "COMMON_PROPTYPE_BUILTUP_SHAREDPROPERTY": "PtUnits",
-      "COMMON_PROPTYPE_VACANT": "area"
+    nextStep: {
+      COMMON_PROPTYPE_BUILTUP_INDEPENDENTPROPERTY: "landarea",
+      COMMON_PROPTYPE_BUILTUP_SHAREDPROPERTY: "PtUnits",
+      COMMON_PROPTYPE_VACANT: "area"
     },
-    "key": "assemblyDet",
-    "withoutLabel": true
+    key: "locationDet",
+    withoutLabel: true,
+    colSpan: "span 2"
   }]
 }, {
-  "head": "PT_LOCATION_DETAILS",
-  "body": [{
-    "type": "component",
-    "route": "property-type",
-    "isMandatory": true,
-    "component": "CPTPropertyLocationDetails",
-    "texts": {
-      "headerCaption": "",
-      "header": "PT_LOCATION_DETAILS",
-      "cardText": "",
-      "submitBarLabel": "PT_COMMONS_NEXT"
-    },
-    "nextStep": {
-      "COMMON_PROPTYPE_BUILTUP_INDEPENDENTPROPERTY": "landarea",
-      "COMMON_PROPTYPE_BUILTUP_SHAREDPROPERTY": "PtUnits",
-      "COMMON_PROPTYPE_VACANT": "area"
+  head: "PT_PROPERTY_WATER_CONNECTION",
+  body: [{
+    type: "component",
+    route: "property-type",
+    isMandatory: false,
+    component: "PropertyWaterConnection",
+    texts: {
+      headerCaption: "",
+      header: "PT_PROPERTY_WATER_CONNECTION",
+      cardText: "",
+      submitBarLabel: "PT_COMMONS_NEXT"
     },
-    "key": "locationDet",
-    "withoutLabel": true
+    key: "waterConnection",
+    withoutLabel: true,
+    colSpan: "span 2"
   }]
 }, {
-  "head": "PT_OWNERSHIP_DETAILS",
-  "body": [{
-    "type": "component",
-    "route": "institutional-owner-address",
-    "isMandatory": true,
-    "component": "CPTPropertyOwnerDetails",
-    "texts": {
-      "headerCaption": "PT_OWNERS_DETAILS",
-      "header": "PT_OWNERS_ADDRESS",
-      "cardText": "",
-      "submitBarLabel": "PT_COMMON_NEXT"
+  head: "PT_OWNERSHIP_DETAILS",
+  body: [{
+    type: "component",
+    route: "institutional-owner-address",
+    isMandatory: false,
+    component: "CPTPropertyOwnerDetails",
+    texts: {
+      headerCaption: "PT_OWNERS_DETAILS",
+      header: "PT_OWNERS_ADDRESS",
+      cardText: "",
+      submitBarLabel: "PT_COMMON_NEXT"
     },
-    "key": "owners",
-    "withoutLabel": true,
-    "nextStep": "institutional-proof-of-identity",
-    "hideInEmployee": true
+    key: "owners",
+    withoutLabel: true,
+    nextStep: "institutional-proof-of-identity",
+    colSpan: "span 2"
   }]
 }];
@@ -5900,161 +5897,41 @@ var lodash = createCommonjsModule(function (module, exports) {
   }).call(commonjsGlobal);
 });
-const CreatePropertyForm = ({
-  config,
-  onSelect,
-  value,
-  userType,
-  redirectUrl
-}) => {
-  var _Digit$Hooks$pt$useTe;
-  const [showToast, setShowToast] = useState(null);
-  const tenantId = Digit.ULBService.getCurrentTenantId();
-  const tenants = Digit.Hooks.pt.useTenants();
-  const {
-    t
-  } = useTranslation();
-  const location = useLocation();
-  const [canSubmit, setCanSubmit] = useState(false);
-  const defaultValues = {
-    ...value
-  };
-  const history = useHistory();
-  const match = useRouteMatch();
-  sessionStorage.setItem("VisitedCommonPTSearch", true);
-  sessionStorage.setItem("VisitedLightCreate", true);
-  const isMobile = window.Digit.Utils.browser.isMobile();
-  let allCities = (_Digit$Hooks$pt$useTe = Digit.Hooks.pt.useTenants()) === null || _Digit$Hooks$pt$useTe === void 0 ? void 0 : _Digit$Hooks$pt$useTe.sort((a, b) => {
-    var _a$i18nKey, _a$i18nKey$localeComp;
-    return a === null || a === void 0 ? void 0 : (_a$i18nKey = a.i18nKey) === null || _a$i18nKey === void 0 ? void 0 : (_a$i18nKey$localeComp = _a$i18nKey.localeCompare) === null || _a$i18nKey$localeComp === void 0 ? void 0 : _a$i18nKey$localeComp.call(_a$i18nKey, b === null || b === void 0 ? void 0 : b.i18nKey);
-  });
-  if (window.location.href.includes("obps")) {
-    allCities = Digit.SessionStorage.get("OBPS_TENANTS");
-  }
-  if (window.location.href.includes("fsm")) {
-    allCities = Digit.SessionStorage.get("FSM_TENANTS");
-  }
-  const [formValue, setFormValue] = useState("");
-  const [cityCode, setCityCode] = useState("");
-  let enableSkip = userType == "employee" ? false : (config === null || config === void 0 ? void 0 : config.isSkipEnabled) || sessionStorage.getItem("skipenabled");
-  const [mutationHappened, setMutationHappened, clear] = Digit.Hooks.useSessionStorage("EMPLOYEE_MUTATION_HAPPENED", false);
-  const [successData, setsuccessData, clearSuccessData] = Digit.Hooks.useSessionStorage("EMPLOYEE_MUTATION_SUCCESS_DATA", {});
-  const {
-    data: commonFields,
-    isLoading
-  } = Digit.Hooks.pt.useMDMS(Digit.ULBService.getStateId(), "PropertyTax", "CommonFieldsConfig");
-  useEffect(() => {
-    setMutationHappened(false);
-    clearSuccessData();
-  }, []);
-  if (isLoading) {
-    return /*#__PURE__*/React.createElement(Loader, null);
-  }
-  const onSubmit = async () => {
-    var _formValue$owners, _formValue$owners$own, _formValue$owners2, _formValue$owners2$, _formValue$owners2$$o, _formValue$owners2$$o2, _formValue$owners3;
-    if ((formValue !== null && formValue !== void 0 && (_formValue$owners = formValue.owners) !== null && _formValue$owners !== void 0 && (_formValue$owners$own = _formValue$owners.ownershipCategory) !== null && _formValue$owners$own !== void 0 && _formValue$owners$own.includes("MULTIPLEOWNERS") || formValue !== null && formValue !== void 0 && (_formValue$owners2 = formValue.owners) !== null && _formValue$owners2 !== void 0 && (_formValue$owners2$ = _formValue$owners2[0]) !== null && _formValue$owners2$ !== void 0 && (_formValue$owners2$$o = _formValue$owners2$.ownershipCategory) !== null && _formValue$owners2$$o !== void 0 && (_formValue$owners2$$o2 = _formValue$owners2$$o.code) !== null && _formValue$owners2$$o2 !== void 0 && _formValue$owners2$$o2.includes("MULTIPLEOWNERS")) && (formValue === null || formValue === void 0 ? void 0 : (_formValue$owners3 = formValue.owners) === null || _formValue$owners3 === void 0 ? void 0 : _formValue$owners3.length) == 1) {
-      setShowToast({
-        key: true,
-        label: "PT_COMMON_ONE_MORE_OWNER_INFROMATION_REQUIRED"
-      });
-    } else {
-      if (onSelect) {
-        onSelect('cptNewProperty', {
-          property: formValue
-        });
-      } else {
-        if (userType === 'employee') {
-          history.push(`${match.path}/save-property?redirectToUrl=${redirectUrl}`, {
-            data: formValue,
-            prevState: {
-              ...(location === null || location === void 0 ? void 0 : location.state)
-            }
-          });
-        } else {
-          var _formValue$owners4, _formValue$owners4$;
-          history.replace(`/digit-ui/citizen/commonPt/property/citizen-otp`, {
-            mobileNumber: formValue === null || formValue === void 0 ? void 0 : (_formValue$owners4 = formValue.owners) === null || _formValue$owners4 === void 0 ? void 0 : (_formValue$owners4$ = _formValue$owners4[0]) === null || _formValue$owners4$ === void 0 ? void 0 : _formValue$owners4$.mobileNumber,
-            redirectBackTo: '/digit-ui/citizen/commonPt/property/new-application/save-property',
-            redirectData: formValue
-          });
-        }
-      }
-    }
-  };
-  const onSkip = () => {
-    onSelect("isSkip", true);
-  };
-  const onFormValueChange = (setValue, data, formState) => {
-    if (!lodash.isEqual(data, formValue)) {
-      setFormValue(data);
-    }
-    if (data.assemblyDet && data.locationDet && data.owners && !Object.keys(formState === null || formState === void 0 ? void 0 : formState.errors).length) {
-      setCanSubmit(true);
-    } else {
-      setCanSubmit(false);
-    }
-  };
-  const getHeaderLabel = () => {
-    var _url$split, _url$split$, _url$split$$split;
-    let url = window.location.href;
-    let moduleName = url === null || url === void 0 ? void 0 : (_url$split = url.split("=")) === null || _url$split === void 0 ? void 0 : (_url$split$ = _url$split[1]) === null || _url$split$ === void 0 ? void 0 : (_url$split$$split = _url$split$.split("/")) === null || _url$split$$split === void 0 ? void 0 : _url$split$$split[3];
-    if (moduleName) return t(`ES_COMMON_CREATE_PROPERTY_HEADER_${moduleName === null || moduleName === void 0 ? void 0 : moduleName.toUpperCase()}`);else return t('ES_COMMON_CREATE_PROPERTY_HEADER');
-  };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    style: {
-      marginLeft: "12px"
-    }
-  }, /*#__PURE__*/React.createElement(Header, {
-    styles: window.location.href.includes("citizen") ? {
-      paddingLeft: "0px",
-      marginLeft: "0px"
-    } : {}
-  }, t(getHeaderLabel()))), /*#__PURE__*/React.createElement(FormComposer, {
-    onSkip: onSkip,
-    showSkip: enableSkip,
-    skipStyle: isMobile ? {} : {
-      textAlign: "right",
-      marginRight: "55px"
-    },
-    sectionHeadStyle: {
-      marginBottom: "16px"
-    },
-    onSubmit: onSubmit,
-    noBoxShadow: true,
-    inline: true,
-    config: newConfig,
-    label: t('SUBMIT'),
-    isDisabled: !canSubmit,
-    defaultValues: defaultValues,
-    onFormValueChange: onFormValueChange
-  }), showToast && /*#__PURE__*/React.createElement(Toast, {
-    error: showToast.key,
-    label: t(showToast.label),
-    onClose: () => {
-      setShowToast(null);
-    }
-  }));
-};
 const setAddressDetailsLW = data => {
-  var _locationDet$cityCode, _locationDet$locality;
+  var _address$city, _address$city2, _address$locality, _address$locality2, _address$locality3, _address$locality4, _address$zro, _address$addressType;
   let {
-    locationDet
+    locationDet,
+    propertyAddress
   } = data;
+  let address = (Array.isArray(locationDet) ? locationDet[0] : locationDet) || (Array.isArray(propertyAddress) ? propertyAddress[0] : propertyAddress);
+  console.log(address, "address_debug");
+  if (!address) return data;
   let propAddress = {
-    city: locationDet === null || locationDet === void 0 ? void 0 : (_locationDet$cityCode = locationDet.cityCode) === null || _locationDet$cityCode === void 0 ? void 0 : _locationDet$cityCode.name,
-    doorNo: locationDet === null || locationDet === void 0 ? void 0 : locationDet.houseDoorNo,
-    street: locationDet === null || locationDet === void 0 ? void 0 : locationDet.buildingColonyName,
-    landmark: locationDet === null || locationDet === void 0 ? void 0 : locationDet.landmarkName,
+    city: (address === null || address === void 0 ? void 0 : (_address$city = address.city) === null || _address$city === void 0 ? void 0 : _address$city.code) || (address === null || address === void 0 ? void 0 : (_address$city2 = address.city) === null || _address$city2 === void 0 ? void 0 : _address$city2.name) || (address === null || address === void 0 ? void 0 : address.city),
+    houseNo: (address === null || address === void 0 ? void 0 : address.houseNo) || (address === null || address === void 0 ? void 0 : address.houseDoorNo) || (address === null || address === void 0 ? void 0 : address.doorNo),
+    street: (address === null || address === void 0 ? void 0 : address.street) || (address === null || address === void 0 ? void 0 : address.buildingColonyName) || (address === null || address === void 0 ? void 0 : address.streetName),
+    landmark: (address === null || address === void 0 ? void 0 : address.landmark) || (address === null || address === void 0 ? void 0 : address.landmarkName),
+    pincode: (address === null || address === void 0 ? void 0 : address.pincode) || (address === null || address === void 0 ? void 0 : address.pinCode),
+    latitude: (address === null || address === void 0 ? void 0 : address.latitude) || (address === null || address === void 0 ? void 0 : address.Latitude),
+    longitude: (address === null || address === void 0 ? void 0 : address.longitude) || (address === null || address === void 0 ? void 0 : address.Longitude),
     locality: {
-      code: (locationDet === null || locationDet === void 0 ? void 0 : (_locationDet$locality = locationDet.locality) === null || _locationDet$locality === void 0 ? void 0 : _locationDet$locality.code) || "NA"
-    }
+      code: (address === null || address === void 0 ? void 0 : (_address$locality = address.locality) === null || _address$locality === void 0 ? void 0 : _address$locality.code) || (address === null || address === void 0 ? void 0 : (_address$locality2 = address.locality) === null || _address$locality2 === void 0 ? void 0 : _address$locality2.name) || (address === null || address === void 0 ? void 0 : address.locality),
+      latitude: address === null || address === void 0 ? void 0 : (_address$locality3 = address.locality) === null || _address$locality3 === void 0 ? void 0 : _address$locality3.latitude,
+      longitude: address === null || address === void 0 ? void 0 : (_address$locality4 = address.locality) === null || _address$locality4 === void 0 ? void 0 : _address$locality4.longitude
+    },
+    addressLine1: address === null || address === void 0 ? void 0 : address.addressLine1,
+    addressLine2: address === null || address === void 0 ? void 0 : address.addressLine2,
+    assembly: (address === null || address === void 0 ? void 0 : address.assembly) || (address === null || address === void 0 ? void 0 : address.Assembly),
+    block: address === null || address === void 0 ? void 0 : address.block,
+    zone: address === null || address === void 0 ? void 0 : address.zone,
+    zro: (address === null || address === void 0 ? void 0 : (_address$zro = address.zro) === null || _address$zro === void 0 ? void 0 : _address$zro.code) || (address === null || address === void 0 ? void 0 : address.zro),
+    addressType: (address === null || address === void 0 ? void 0 : (_address$addressType = address.addressType) === null || _address$addressType === void 0 ? void 0 : _address$addressType.code) || (address === null || address === void 0 ? void 0 : address.addressType)
   };
   data.address = propAddress;
   return data;
 };
 const setOwnerDetailsLW = data => {
-  var _data$owners, _data$owners$;
+  var _data$owners, _data$owners$, _data$ownershipCatego3;
   const {
     locationDet,
     owners
@@ -6062,14 +5939,15 @@ const setOwnerDetailsLW = data => {
   let institution = {},
     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")) {
-    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;
+  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) || "INDIVIDUAL.SINGLEOWNER";
+  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$city, _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;
     institution.type = owners === null || owners === void 0 ? void 0 : (_owners$16 = owners[0]) === null || _owners$16 === void 0 ? void 0 : (_owners$16$institutio = _owners$16.institutionType) === null || _owners$16$institutio === void 0 ? void 0 : (_owners$16$institutio2 = _owners$16$institutio.code) === null || _owners$16$institutio2 === void 0 ? void 0 : (_owners$16$institutio3 = _owners$16$institutio2.split(".")) === null || _owners$16$institutio3 === void 0 ? void 0 : _owners$16$institutio3[1];
     institution.landlineNumber = owners === null || owners === void 0 ? void 0 : (_owners$17 = owners[0]) === null || _owners$17 === void 0 ? void 0 : _owners$17.altContactNumber;
-    institution.tenantId = locationDet === null || locationDet === void 0 ? void 0 : (_locationDet$cityCode2 = locationDet.cityCode) === null || _locationDet$cityCode2 === void 0 ? void 0 : _locationDet$cityCode2.code;
+    institution.tenantId = (locationDet === null || locationDet === void 0 ? void 0 : (_locationDet$city = locationDet.city) === null || _locationDet$city === void 0 ? void 0 : _locationDet$city.code) || (locationDet === null || locationDet === void 0 ? void 0 : locationDet.city);
     owner.push({
       altContactNumber: owners === null || owners === void 0 ? void 0 : (_owners$18 = owners[0]) === null || _owners$18 === void 0 ? void 0 : _owners$18.altContactNumber,
       permanentAddress: owners === null || owners === void 0 ? void 0 : (_owners$19 = owners[0]) === null || _owners$19 === void 0 ? void 0 : _owners$19.permanentAddress,
@@ -6083,88 +5961,96 @@ const setOwnerDetailsLW = data => {
     });
     data.institution = institution;
     data.owners = owner;
-  } else {
+  } else if (owners && owners.length > 0) {
     owners.map(own => {
-      var _own$gender, _owners$25, _own$ownerType, _own$relationship;
+      var _own$gender, _own$gender2, _own$ownerType, _own$relationship;
       owner.push({
         emailId: own === null || own === void 0 ? void 0 : own.emailId,
         fatherOrHusbandName: own === null || own === void 0 ? void 0 : own.fatherOrHusbandName,
-        gender: own === null || own === void 0 ? void 0 : (_own$gender = own.gender) === null || _own$gender === void 0 ? void 0 : _own$gender.value,
-        sameAsPropertyAddress: (own === null || own === void 0 ? void 0 : own.isCorrespondenceAddress) || (owners === null || owners === void 0 ? void 0 : (_owners$25 = owners[0]) === null || _owners$25 === void 0 ? void 0 : _owners$25.isCoresAddr),
+        gender: (own === null || own === void 0 ? void 0 : (_own$gender = own.gender) === null || _own$gender === void 0 ? void 0 : _own$gender.code) || (own === null || own === void 0 ? void 0 : (_own$gender2 = own.gender) === null || _own$gender2 === void 0 ? void 0 : _own$gender2.value) || (own === null || own === void 0 ? void 0 : own.gender),
+        sameAsPropertyAddress: (own === null || own === void 0 ? void 0 : own.isCorrespondenceAddress) || (own === null || own === void 0 ? void 0 : own.isCoresAddr),
         mobileNumber: own === null || own === void 0 ? void 0 : own.mobileNumber,
         name: own === null || own === void 0 ? void 0 : own.name,
-        ownerType: (own === null || own === void 0 ? void 0 : (_own$ownerType = own.ownerType) === null || _own$ownerType === void 0 ? void 0 : _own$ownerType.code) || "NONE",
+        ownerType: (own === null || own === void 0 ? void 0 : (_own$ownerType = own.ownerType) === null || _own$ownerType === void 0 ? void 0 : _own$ownerType.code) || (own === null || own === void 0 ? void 0 : own.ownerType) || "NONE",
         permanentAddress: own === null || own === void 0 ? void 0 : own.permanentAddress,
-        relationship: own === null || own === void 0 ? void 0 : (_own$relationship = own.relationship) === null || _own$relationship === void 0 ? void 0 : _own$relationship.code,
-        documents: document
+        relationship: (own === null || own === void 0 ? void 0 : (_own$relationship = own.relationship) === null || _own$relationship === void 0 ? void 0 : _own$relationship.code) || (own === null || own === void 0 ? void 0 : own.relationship),
+        documents: (own === null || own === void 0 ? void 0 : own.documents) || document
       });
     });
     data.owners = owner;
+  } else if (data !== null && data !== void 0 && data.applicant && data !== null && data !== void 0 && data.contact) {
+    var _useDetails$gender;
+    const {
+      applicant,
+      contact,
+      useDetails
+    } = data;
+    owner.push({
+      name: `${applicant.firstName}${applicant.middleName ? ` ${applicant.middleName}` : ""}${applicant.lastName ? ` ${applicant.lastName}` : ""}`,
+      mobileNumber: contact.mobileNumber,
+      gender: (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$gender = useDetails.gender) === null || _useDetails$gender === void 0 ? void 0 : _useDetails$gender.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.gender) || "MALE",
+      fatherOrHusbandName: applicant.ParentorSpouse || "NA",
+      relationship: "FATHER",
+      ownerType: "NONE",
+      status: "ACTIVE"
+    });
+    data.owners = owner;
   }
   return data;
 };
-const getUsageTypeLW = data => {
-  var _data$isResdential;
-  if ((data === null || data === void 0 ? void 0 : (_data$isResdential = data.isResdential) === null || _data$isResdential === void 0 ? void 0 : _data$isResdential.code) == "RESIDENTIAL") {
-    var _data$isResdential2;
-    return data === null || data === void 0 ? void 0 : (_data$isResdential2 = data.isResdential) === null || _data$isResdential2 === void 0 ? void 0 : _data$isResdential2.code;
-  } else {
-    var _data$usageCategory;
-    return data === null || data === void 0 ? void 0 : (_data$usageCategory = data.usageCategory) === null || _data$usageCategory === void 0 ? void 0 : _data$usageCategory.code;
-  }
-};
 const setPropertyDetailsLW = data => {
-  var _assemblyDet$Building;
+  var _useDetails$propertyT, _useDetails$propertyC, _useDetails$noOfFloor, _useDetails$noOfFloor2, _useDetails$noOfFloor3, _useDetails$noOfFloor4, _useDetails$noOfFloor5, _useDetails$noOfFloor6, _useDetails$noOfFloor7;
   let propertyDetails = {};
   const {
-    assemblyDet
+    waterConnection,
+    useDetails: topUseDetails
   } = data;
+  const useDetails = (waterConnection === null || waterConnection === void 0 ? void 0 : waterConnection.useDetails) || topUseDetails;
   propertyDetails = {
-    propertyType: assemblyDet === null || assemblyDet === void 0 ? void 0 : (_assemblyDet$Building = assemblyDet.BuildingType) === null || _assemblyDet$Building === void 0 ? void 0 : _assemblyDet$Building.code,
-    usageCategory: getUsageTypeLW(assemblyDet),
-    landArea: parseInt(assemblyDet === null || assemblyDet === void 0 ? void 0 : assemblyDet.floorarea),
-    superBuiltUpArea: parseInt(assemblyDet === null || assemblyDet === void 0 ? void 0 : assemblyDet.constructionArea)
+    propertyType: (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$propertyT = useDetails.propertyType) === null || _useDetails$propertyT === void 0 ? void 0 : _useDetails$propertyT.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.propertyType),
+    usageCategory: (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$propertyC = useDetails.propertyCategory) === null || _useDetails$propertyC === void 0 ? void 0 : _useDetails$propertyC.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.propertyCategory),
+    landArea: parseFloat(useDetails === null || useDetails === void 0 ? void 0 : useDetails.plotArea),
+    superBuiltUpArea: parseFloat(useDetails === null || useDetails === void 0 ? void 0 : useDetails.builtUpArea),
+    noOfFloors: (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$noOfFloor = useDetails.noOfFloors) === null || _useDetails$noOfFloor === void 0 ? void 0 : _useDetails$noOfFloor.code) === "BASEMENT" ? 0 : parseInt((useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$noOfFloor2 = useDetails.noOfFloors) === null || _useDetails$noOfFloor2 === void 0 ? void 0 : (_useDetails$noOfFloor3 = _useDetails$noOfFloor2.code) === null || _useDetails$noOfFloor3 === void 0 ? void 0 : (_useDetails$noOfFloor4 = _useDetails$noOfFloor3.split("_")) === null || _useDetails$noOfFloor4 === void 0 ? void 0 : _useDetails$noOfFloor4[0]) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$noOfFloor5 = useDetails.noOfFloors) === null || _useDetails$noOfFloor5 === void 0 ? void 0 : (_useDetails$noOfFloor6 = _useDetails$noOfFloor5.split) === null || _useDetails$noOfFloor6 === void 0 ? void 0 : (_useDetails$noOfFloor7 = _useDetails$noOfFloor6.call(_useDetails$noOfFloor5, "_")) === null || _useDetails$noOfFloor7 === void 0 ? void 0 : _useDetails$noOfFloor7[0])) || 1
   };
   data.propertyDetails = propertyDetails;
   return data;
 };
 const convertToPropertyLightWeight = (data = {}) => {
-  var _data, _data$owners2, _data$owners2$, _data2, _data2$assemblyDet, _data2$assemblyDet$us;
-  let propertyType = data.PropertyType;
-  let noOfFloors = 1;
-  let ownershipCategory = (_data = data) === null || _data === void 0 ? void 0 : (_data$owners2 = _data.owners) === null || _data$owners2 === void 0 ? void 0 : (_data$owners2$ = _data$owners2[0]) === null || _data$owners2$ === void 0 ? void 0 : _data$owners2$.ownershipCategory;
+  var _data$propertyDetails, _data$propertyDetails2, _data, _data$owners2, _data$owners2$, _data$propertyDetails3, _data$propertyDetails4, _data$waterConnection, _data$waterConnection2, _data$waterConnection3, _data$waterConnection4, _data$waterConnection5, _data$waterConnection6, _data$waterConnection7, _data$waterConnection8, _data$waterConnection9, _data$waterConnection0, _data$waterConnection1, _data$waterConnection10, _data$waterConnection11, _data$waterConnection12, _data$waterConnection13, _data$waterConnection14, _data$waterConnection15, _data$waterConnection16;
   data = setOwnerDetailsLW(data);
   data = setAddressDetailsLW(data);
   data = setPropertyDetailsLW(data);
+  let propertyType = (_data$propertyDetails = data.propertyDetails) === null || _data$propertyDetails === void 0 ? void 0 : _data$propertyDetails.propertyType;
+  let noOfFloors = ((_data$propertyDetails2 = data.propertyDetails) === null || _data$propertyDetails2 === void 0 ? void 0 : _data$propertyDetails2.noOfFloors) || 1;
+  let ownershipCategory = (_data = data) === null || _data === void 0 ? void 0 : (_data$owners2 = _data.owners) === null || _data$owners2 === void 0 ? void 0 : (_data$owners2$ = _data$owners2[0]) === null || _data$owners2$ === void 0 ? void 0 : _data$owners2$.ownershipCategory;
   const formdata = {
     Property: {
       tenantId: data.tenantId,
       address: data.address,
       propertyType: propertyType,
       ...data.propertyDetails,
-      ownershipCategory: ownershipCategory,
-      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;
+      ownershipCategory: "INDIVIDUAL.SINGLEOWNER",
+      usageCategory: (_data$propertyDetails3 = data.propertyDetails) === null || _data$propertyDetails3 === void 0 ? void 0 : _data$propertyDetails3.usageCategory,
+      owners: [...(data.owners || []).map((owner, index) => {
+        var _owner$gender, _owner$gender2, _owner$ownerType, _owner$relationship, _owner$inistitutetype;
         return {
           ...owner,
           additionalDetails: {
             ownerSequence: index,
             ownerName: owner === null || owner === void 0 ? void 0 : owner.name
           },
-          documents: Object.keys(owner.documents).map(key => {
-            const {
-              documentType,
-              fileStoreId
-            } = owner.documents[key];
+          documents: owner.documents ? Array.isArray(owner.documents) ? owner.documents : Object.keys(owner.documents).map(key => {
+            var _doc$documentType;
+            const doc = owner.documents[key];
             return {
-              documentType: documentType.code,
-              fileStoreId
+              documentType: (doc === null || doc === void 0 ? void 0 : (_doc$documentType = doc.documentType) === null || _doc$documentType === void 0 ? void 0 : _doc$documentType.code) || (doc === null || doc === void 0 ? void 0 : doc.documentType) || "",
+              fileStoreId: (doc === null || doc === void 0 ? void 0 : doc.fileStoreId) || ""
             };
-          }),
-          gender: (_owner$gender = owner.gender) === null || _owner$gender === void 0 ? void 0 : _owner$gender.code,
-          ownerType: ((_owner$ownerType = owner.ownerType) === null || _owner$ownerType === void 0 ? void 0 : _owner$ownerType.code) || "NONE",
-          relationship: (_owner$relationship = owner.relationship) === null || _owner$relationship === void 0 ? void 0 : _owner$relationship.code,
+          }) : [],
+          gender: typeof owner.gender === "string" ? owner.gender : ((_owner$gender = owner.gender) === null || _owner$gender === void 0 ? void 0 : _owner$gender.code) || ((_owner$gender2 = owner.gender) === null || _owner$gender2 === void 0 ? void 0 : _owner$gender2.value),
+          ownerType: ((_owner$ownerType = owner.ownerType) === null || _owner$ownerType === void 0 ? void 0 : _owner$ownerType.code) || owner.ownerType || "NONE",
+          relationship: ((_owner$relationship = owner.relationship) === null || _owner$relationship === void 0 ? void 0 : _owner$relationship.code) || owner.relationship,
           inistitutetype: owner === null || owner === void 0 ? void 0 : (_owner$inistitutetype = owner.inistitutetype) === null || _owner$inistitutetype === void 0 ? void 0 : _owner$inistitutetype.value,
           landlineNumber: owner === null || owner === void 0 ? void 0 : owner.altContactNumber,
           status: "ACTIVE"
@@ -6173,27 +6059,35 @@ const convertToPropertyLightWeight = (data = {}) => {
       noOfFloors: noOfFloors,
       additionalDetails: {
         isRainwaterHarvesting: false,
-        owners: [...data.owners.map((owner, index) => {
-          var _owner$gender2, _owner$ownerType2, _owner$relationship2, _owner$inistitutetype2;
+        propertyType: propertyType,
+        propertyCategory: (_data$propertyDetails4 = data.propertyDetails) === null || _data$propertyDetails4 === void 0 ? void 0 : _data$propertyDetails4.usageCategory,
+        waterConnectionUsageType: (_data$waterConnection = data.waterConnection) === null || _data$waterConnection === void 0 ? void 0 : (_data$waterConnection2 = _data$waterConnection.useDetails) === null || _data$waterConnection2 === void 0 ? void 0 : (_data$waterConnection3 = _data$waterConnection2.WaterConnectionUsageType) === null || _data$waterConnection3 === void 0 ? void 0 : _data$waterConnection3.code,
+        yearOfConstruction: (_data$waterConnection4 = data.waterConnection) === null || _data$waterConnection4 === void 0 ? void 0 : (_data$waterConnection5 = _data$waterConnection4.useDetails) === null || _data$waterConnection5 === void 0 ? void 0 : (_data$waterConnection6 = _data$waterConnection5.SelectYearofConstruction) === null || _data$waterConnection6 === void 0 ? void 0 : _data$waterConnection6.value,
+        numberOfDwellingUnits: (_data$waterConnection7 = data.waterConnection) === null || _data$waterConnection7 === void 0 ? void 0 : (_data$waterConnection8 = _data$waterConnection7.useDetails) === null || _data$waterConnection8 === void 0 ? void 0 : _data$waterConnection8.NumberofDwellingUnits,
+        numberOfRooms: (_data$waterConnection9 = data.waterConnection) === null || _data$waterConnection9 === void 0 ? void 0 : (_data$waterConnection0 = _data$waterConnection9.useDetails) === null || _data$waterConnection0 === void 0 ? void 0 : _data$waterConnection0.NumberofRooms,
+        numberOfFloors: (_data$waterConnection1 = data.waterConnection) === null || _data$waterConnection1 === void 0 ? void 0 : (_data$waterConnection10 = _data$waterConnection1.useDetails) === null || _data$waterConnection10 === void 0 ? void 0 : _data$waterConnection10.NumberofFloors,
+        plotArea: (_data$waterConnection11 = data.waterConnection) === null || _data$waterConnection11 === void 0 ? void 0 : (_data$waterConnection12 = _data$waterConnection11.useDetails) === null || _data$waterConnection12 === void 0 ? void 0 : _data$waterConnection12.plotArea,
+        builtUpArea: (_data$waterConnection13 = data.waterConnection) === null || _data$waterConnection13 === void 0 ? void 0 : (_data$waterConnection14 = _data$waterConnection13.useDetails) === null || _data$waterConnection14 === void 0 ? void 0 : _data$waterConnection14.builtUpArea,
+        numberOfBeds: (_data$waterConnection15 = data.waterConnection) === null || _data$waterConnection15 === void 0 ? void 0 : (_data$waterConnection16 = _data$waterConnection15.useDetails) === null || _data$waterConnection16 === void 0 ? void 0 : _data$waterConnection16.hospitalBeds,
+        owners: [...(data.owners || []).map((owner, index) => {
+          var _owner$gender3, _owner$gender4, _owner$ownerType2, _owner$relationship2, _owner$inistitutetype2;
           return {
             ...owner,
             additionalDetails: {
               ownerSequence: index,
               ownerName: owner === null || owner === void 0 ? void 0 : owner.name
             },
-            documents: Object.keys(owner.documents).map(key => {
-              const {
-                documentType,
-                fileStoreId
-              } = owner.documents[key];
+            documents: owner.documents ? Array.isArray(owner.documents) ? owner.documents : Object.keys(owner.documents).map(key => {
+              var _doc$documentType2;
+              const doc = owner.documents[key];
               return {
-                documentType: documentType.code,
-                fileStoreId
+                documentType: (doc === null || doc === void 0 ? void 0 : (_doc$documentType2 = doc.documentType) === null || _doc$documentType2 === void 0 ? void 0 : _doc$documentType2.code) || (doc === null || doc === void 0 ? void 0 : doc.documentType) || "",
+                fileStoreId: (doc === null || doc === void 0 ? void 0 : doc.fileStoreId) || ""
               };
-            }),
-            gender: (_owner$gender2 = owner.gender) === null || _owner$gender2 === void 0 ? void 0 : _owner$gender2.code,
-            ownerType: ((_owner$ownerType2 = owner.ownerType) === null || _owner$ownerType2 === void 0 ? void 0 : _owner$ownerType2.code) || "NONE",
-            relationship: (_owner$relationship2 = owner.relationship) === null || _owner$relationship2 === void 0 ? void 0 : _owner$relationship2.code,
+            }) : [],
+            gender: typeof owner.gender === "string" ? owner.gender : ((_owner$gender3 = owner.gender) === null || _owner$gender3 === void 0 ? void 0 : _owner$gender3.code) || ((_owner$gender4 = owner.gender) === null || _owner$gender4 === void 0 ? void 0 : _owner$gender4.value),
+            ownerType: ((_owner$ownerType2 = owner.ownerType) === null || _owner$ownerType2 === void 0 ? void 0 : _owner$ownerType2.code) || owner.ownerType || "NONE",
+            relationship: ((_owner$relationship2 = owner.relationship) === null || _owner$relationship2 === void 0 ? void 0 : _owner$relationship2.code) || owner.relationship,
             inistitutetype: owner === null || owner === void 0 ? void 0 : (_owner$inistitutetype2 = owner.inistitutetype) === null || _owner$inistitutetype2 === void 0 ? void 0 : _owner$inistitutetype2.value,
             landlineNumber: owner === null || owner === void 0 ? void 0 : owner.altContactNumber,
             status: "ACTIVE"
@@ -6205,19 +6099,20 @@ const convertToPropertyLightWeight = (data = {}) => {
       channel: "SYSTEM"
     }
   };
-  if (ownershipCategory.includes("INSTITUTIONALPRIVATE") || ownershipCategory.includes("INSTITUTIONALGOVERNMENT")) {
-    var _data3;
-    formdata.Property.institution = (_data3 = data) === null || _data3 === void 0 ? void 0 : _data3.institution;
+  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 _data2;
+    formdata.Property.institution = (_data2 = data) === null || _data2 === void 0 ? void 0 : _data2.institution;
   }
   return formdata;
 };
 const convertToUpdatePropertyLightWeight = (data = {}) => {
-  var _data4, _formdata$Property, _data5, _formdata$Property3;
-  let propertyType = data.PropertyType;
-  let noOfFloors = 1;
+  var _data$propertyDetails5, _data$propertyDetails6, _data$waterConnection17, _data$waterConnection18, _data$waterConnection19, _data$waterConnection20, _data$waterConnection21, _data$waterConnection22, _data$waterConnection23, _data$waterConnection24, _data$waterConnection25, _data$waterConnection26, _data$waterConnection27, _data$waterConnection28, _formdata$Property, _data3, _formdata$Property3;
   data = setOwnerDetailsLW(data);
   data = setAddressDetailsLW(data);
   data = setPropertyDetailsLW(data);
+  let propertyType = (_data$propertyDetails5 = data.propertyDetails) === null || _data$propertyDetails5 === void 0 ? void 0 : _data$propertyDetails5.propertyType;
+  let noOfFloors = ((_data$propertyDetails6 = data.propertyDetails) === null || _data$propertyDetails6 === void 0 ? void 0 : _data$propertyDetails6.noOfFloors) || 1;
   const formdata = {
     Property: {
       id: data.id,
@@ -6228,9 +6123,9 @@ const convertToUpdatePropertyLightWeight = (data = {}) => {
       tenantId: data.tenantId,
       address: data.address,
       propertyType: propertyType,
-      ownershipCategory: (_data4 = data) === null || _data4 === void 0 ? void 0 : _data4.ownershipCategory,
+      ownershipCategory: "INDIVIDUAL.SINGLEOWNER",
       owners: [...data.owners.map((owner, index) => {
-        var _owner$gender3, _owner$ownerType3, _owner$relationship3, _owner$inistitutetype3;
+        var _owner$gender5, _owner$ownerType3, _owner$relationship3, _owner$inistitutetype3;
         return {
           ...owner,
           additionalDetails: {
@@ -6247,7 +6142,7 @@ const convertToUpdatePropertyLightWeight = (data = {}) => {
               fileStoreId
             };
           }),
-          gender: (_owner$gender3 = owner.gender) === null || _owner$gender3 === void 0 ? void 0 : _owner$gender3.code,
+          gender: (_owner$gender5 = owner.gender) === null || _owner$gender5 === void 0 ? void 0 : _owner$gender5.code,
           ownerType: ((_owner$ownerType3 = owner.ownerType) === null || _owner$ownerType3 === void 0 ? void 0 : _owner$ownerType3.code) || "NONE",
           relationship: (_owner$relationship3 = owner.relationship) === null || _owner$relationship3 === void 0 ? void 0 : _owner$relationship3.code,
           inistitutetype: owner === null || owner === void 0 ? void 0 : (_owner$inistitutetype3 = owner.inistitutetype) === null || _owner$inistitutetype3 === void 0 ? void 0 : _owner$inistitutetype3.value,
@@ -6258,8 +6153,13 @@ const convertToUpdatePropertyLightWeight = (data = {}) => {
       noOfFloors: noOfFloors,
       additionalDetails: {
         isRainwaterHarvesting: false,
+        waterConnectionUsageType: (_data$waterConnection17 = data.waterConnection) === null || _data$waterConnection17 === void 0 ? void 0 : (_data$waterConnection18 = _data$waterConnection17.useDetails) === null || _data$waterConnection18 === void 0 ? void 0 : (_data$waterConnection19 = _data$waterConnection18.WaterConnectionUsageType) === null || _data$waterConnection19 === void 0 ? void 0 : _data$waterConnection19.code,
+        yearOfConstruction: (_data$waterConnection20 = data.waterConnection) === null || _data$waterConnection20 === void 0 ? void 0 : (_data$waterConnection21 = _data$waterConnection20.useDetails) === null || _data$waterConnection21 === void 0 ? void 0 : (_data$waterConnection22 = _data$waterConnection21.SelectYearofConstruction) === null || _data$waterConnection22 === void 0 ? void 0 : _data$waterConnection22.value,
+        numberOfDwellingUnits: (_data$waterConnection23 = data.waterConnection) === null || _data$waterConnection23 === void 0 ? void 0 : (_data$waterConnection24 = _data$waterConnection23.useDetails) === null || _data$waterConnection24 === void 0 ? void 0 : _data$waterConnection24.NumberofDwellingUnits,
+        numberOfRooms: (_data$waterConnection25 = data.waterConnection) === null || _data$waterConnection25 === void 0 ? void 0 : (_data$waterConnection26 = _data$waterConnection25.useDetails) === null || _data$waterConnection26 === void 0 ? void 0 : _data$waterConnection26.NumberofRooms,
+        hospitalBeds: (_data$waterConnection27 = data.waterConnection) === null || _data$waterConnection27 === void 0 ? void 0 : (_data$waterConnection28 = _data$waterConnection27.useDetails) === null || _data$waterConnection28 === void 0 ? void 0 : _data$waterConnection28.hospitalBeds,
         owners: [...data.owners.map((owner, index) => {
-          var _owner$gender4, _owner$ownerType4, _owner$relationship4, _owner$inistitutetype4;
+          var _owner$gender6, _owner$ownerType4, _owner$relationship4, _owner$inistitutetype4;
           return {
             ...owner,
             additionalDetails: {
@@ -6276,7 +6176,7 @@ const convertToUpdatePropertyLightWeight = (data = {}) => {
                 fileStoreId
               };
             }),
-            gender: (_owner$gender4 = owner.gender) === null || _owner$gender4 === void 0 ? void 0 : _owner$gender4.code,
+            gender: (_owner$gender6 = owner.gender) === null || _owner$gender6 === void 0 ? void 0 : _owner$gender6.code,
             ownerType: ((_owner$ownerType4 = owner.ownerType) === null || _owner$ownerType4 === void 0 ? void 0 : _owner$ownerType4.code) || "NONE",
             relationship: (_owner$relationship4 = owner.relationship) === null || _owner$relationship4 === void 0 ? void 0 : _owner$relationship4.code,
             inistitutetype: owner === null || owner === void 0 ? void 0 : (_owner$inistitutetype4 = owner.inistitutetype) === null || _owner$inistitutetype4 === void 0 ? void 0 : _owner$inistitutetype4.value,
@@ -6293,7 +6193,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) && (_data3 = data) !== null && _data3 !== void 0 && _data3.isEditProperty) {
     var _formdata$Property2;
     propertyInitialObject.units = propertyInitialObject.units.filter(unit => unit.active);
     let oldUnits = propertyInitialObject.units.map(unit => {
@@ -6322,113 +6222,288 @@ const stringReplaceAll = (str = "", searcher = "", replaceWith = "") => {
   return str;
 };
-const GetActionMessage = props => {
-  const {
-    t
-  } = useTranslation();
-  if (props.isSuccess) {
-    return !window.location.href.includes("edit-application") ? window.location.href.includes("employee") ? t("CS_NEW_PROPERTY_APPLICATION_CREATED_SUCCESS") : t("CS_NEW_PROPERTY_APPLICATION_SUBMITTED_SUCCESS") : t("CS_PROPERTY_UPDATE_APPLICATION_SUCCESS");
-  } else if (props.isLoading) {
-    return !window.location.href.includes("edit-application") ? t("CS_PROPERTY_APPLICATION_PENDING") : t("CS_PROPERTY_UPDATE_APPLICATION_PENDING");
-  } else if (!props.isSuccess) {
-    return !window.location.href.includes("edit-application") ? t("CS_PROPERTY_APPLICATION_FAILED") : t("CS_PROPERTY_UPDATE_APPLICATION_FAILED");
-  }
-};
-const rowContainerStyle = {
-  padding: "4px 0px",
-  justifyContent: "space-between"
-};
-const BannerPicker = props => {
-  var _props$data;
-  return /*#__PURE__*/React.createElement(Banner, {
-    message: GetActionMessage(props),
-    applicationNumber: (_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.Properties[0].acknowldgementNumber,
-    info: props.isSuccess ? props.t("PT_APPLICATION_NO") : "",
-    successful: props.isSuccess
-  });
-};
-const PTAcknowledgement = ({
-  onSuccess,
+const CreatePropertyForm = ({
+  config,
   onSelect,
-  formData,
-  redirectUrl,
-  userType
+  value,
+  userType,
+  redirectUrl
 }) => {
-  var _location$state, _mdmsConfig$PropertyT, _data, _data$locationDet, _data$locationDet2, _data$locationDet2$ci, _data2, _data2$locationDet, _data$locationDet3, _data$locationDet3$ci, _mutation$data6, _mutation$data6$Prope;
+  var _Digit$Hooks$pt$useTe;
+  const [showToast, setShowToast] = useState(null);
+  const tenantId = Digit.ULBService.getCurrentTenantId();
+  const tenants = Digit.Hooks.pt.useTenants();
   const {
     t
   } = useTranslation();
   const location = useLocation();
-  const stateId = Digit.ULBService.getStateId();
-  const tenantId = Digit.ULBService.getCurrentTenantId();
+  const [canSubmit, setCanSubmit] = useState(true);
+  const defaultValues = {
+    ...value
+  };
   const history = useHistory();
-  let data = location === null || location === void 0 ? void 0 : (_location$state = location.state) === null || _location$state === void 0 ? void 0 : _location$state.data;
-  if (onSelect) {
-    var _formData$cptNewPrope;
-    data = formData === null || formData === void 0 ? void 0 : (_formData$cptNewPrope = formData.cptNewProperty) === null || _formData$cptNewPrope === void 0 ? void 0 : _formData$cptNewPrope.property;
+  const match = useRouteMatch();
+  sessionStorage.setItem("VisitedCommonPTSearch", true);
+  sessionStorage.setItem("VisitedLightCreate", true);
+  const isMobile = window.Digit.Utils.browser.isMobile();
+  let allCities = (_Digit$Hooks$pt$useTe = Digit.Hooks.pt.useTenants()) === null || _Digit$Hooks$pt$useTe === void 0 ? void 0 : _Digit$Hooks$pt$useTe.sort((a, b) => {
+    var _a$i18nKey, _a$i18nKey$localeComp;
+    return a === null || a === void 0 ? void 0 : (_a$i18nKey = a.i18nKey) === null || _a$i18nKey === void 0 ? void 0 : (_a$i18nKey$localeComp = _a$i18nKey.localeCompare) === null || _a$i18nKey$localeComp === void 0 ? void 0 : _a$i18nKey$localeComp.call(_a$i18nKey, b === null || b === void 0 ? void 0 : b.i18nKey);
+  });
+  if (window.location.href.includes("obps")) {
+    allCities = Digit.SessionStorage.get("OBPS_TENANTS");
   }
-  let createNUpdate = false;
-  let {
-    data: mdmsConfig,
-    isLoading
-  } = Digit.Hooks.pt.useMDMS(stateId, "PropertyTax", "PTWorkflow");
-  ((mdmsConfig === null || mdmsConfig === void 0 ? void 0 : (_mdmsConfig$PropertyT = mdmsConfig.PropertyTax) === null || _mdmsConfig$PropertyT === void 0 ? void 0 : _mdmsConfig$PropertyT.PTWorkfow) || []).forEach(data => {
-    if (data.enable) {
-      if (data.businessService.includes("WNS")) {
-        createNUpdate = true;
+  if (window.location.href.includes("fsm")) {
+    allCities = Digit.SessionStorage.get("FSM_TENANTS");
+  }
+  const [formValue, setFormValue] = useState("");
+  const [owners, setOwners] = useState([]);
+  useEffect(() => {
+    if (location !== null && location !== void 0 && location.state && (!owners || owners.length === 0)) {
+      var _location$state, _location$state2, _location$state3, _location$state4;
+      const applicant = (_location$state = location.state) === null || _location$state === void 0 ? void 0 : _location$state.applicant;
+      const contact = (_location$state2 = location.state) === null || _location$state2 === void 0 ? void 0 : _location$state2.contact;
+      const useDetails = (_location$state3 = location.state) === null || _location$state3 === void 0 ? void 0 : _location$state3.useDetails;
+      const propertyAddress = (_location$state4 = location.state) === null || _location$state4 === void 0 ? void 0 : _location$state4.propertyAddress;
+      if (applicant && contact) {
+        setOwners([{
+          name: `${applicant.firstName}${applicant.middleName ? ` ${applicant.middleName}` : ""}${applicant.lastName ? ` ${applicant.lastName}` : ""}`,
+          mobileNumber: contact.mobileNumber,
+          gender: (useDetails === null || useDetails === void 0 ? void 0 : useDetails.gender) || {
+            code: "MALE",
+            name: "Male"
+          },
+          fatherOrHusbandName: applicant.ParentorSpouse || "NA",
+          relationship: {
+            code: "FATHER",
+            name: "Father"
+          },
+          ownerType: {
+            code: "NONE",
+            name: "None"
+          },
+          ownershipCategory: "INDIVIDUAL.SINGLEOWNER"
+        }]);
+      }
+      if (propertyAddress || useDetails) {
+        const initialFormValue = {
+          locationDet: {
+            cityCode: (propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.cityCode) || (propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.city),
+            locality: propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.locality,
+            houseDoorNo: (propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.houseNo) || (propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.houseDoorNo),
+            buildingColonyName: (propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.street) || (propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.buildingColonyName),
+            landmarkName: (propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.landmark) || (propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.landmarkName)
+          },
+          waterConnection: {
+            useDetails: useDetails
+          }
+        };
+        setFormValue(initialFormValue);
       }
     }
-  });
-  const mutation = Digit.Hooks.pt.usePropertyAPI((_data = data) !== null && _data !== void 0 && (_data$locationDet = _data.locationDet) !== null && _data$locationDet !== void 0 && _data$locationDet.city ? (_data$locationDet2 = data.locationDet) === null || _data$locationDet2 === void 0 ? void 0 : (_data$locationDet2$ci = _data$locationDet2.city) === null || _data$locationDet2$ci === void 0 ? void 0 : _data$locationDet2$ci.code : tenantId, true);
-  const mutationForUpdate = Digit.Hooks.pt.usePropertyAPI((_data2 = data) !== null && _data2 !== void 0 && (_data2$locationDet = _data2.locationDet) !== null && _data2$locationDet !== void 0 && _data2$locationDet.city ? (_data$locationDet3 = data.locationDet) === null || _data$locationDet3 === void 0 ? void 0 : (_data$locationDet3$ci = _data$locationDet3.city) === null || _data$locationDet3$ci === void 0 ? void 0 : _data$locationDet3$ci.code : tenantId, false);
+  }, [location === null || location === void 0 ? void 0 : location.state]);
+  const [cityCode, setCityCode] = useState("");
+  let enableSkip = userType == "employee" ? false : (config === null || config === void 0 ? void 0 : config.isSkipEnabled) || sessionStorage.getItem("skipenabled");
+  const [mutationHappened, setMutationHappened, clear] = Digit.Hooks.useSessionStorage("EMPLOYEE_MUTATION_HAPPENED", false);
+  const [successData, setsuccessData, clearSuccessData] = Digit.Hooks.useSessionStorage("EMPLOYEE_MUTATION_SUCCESS_DATA", {});
   const {
-    data: storeData
-  } = Digit.Hooks.useStore.getInitData();
+    data: commonFields,
+    isLoading
+  } = Digit.Hooks.pt.useMDMS(Digit.ULBService.getStateId(), "PropertyTax", "CommonFieldsConfig");
+  const mutation = Digit.Hooks.pt.usePropertyAPI(tenantId, true);
   useEffect(() => {
-    try {
-      var _data3, _data3$locationDet, _data3$locationDet$ci, _formdata$Property;
-      let tenant = userType === "employee" ? tenantId : (_data3 = data) === null || _data3 === void 0 ? void 0 : (_data3$locationDet = _data3.locationDet) === null || _data3$locationDet === void 0 ? void 0 : (_data3$locationDet$ci = _data3$locationDet.cityCode) === null || _data3$locationDet$ci === void 0 ? void 0 : _data3$locationDet$ci.code;
-      data.tenantId = tenant;
-      let formdata = convertToPropertyLightWeight(data);
-      formdata.Property.tenantId = (formdata === null || formdata === void 0 ? void 0 : (_formdata$Property = formdata.Property) === null || _formdata$Property === void 0 ? void 0 : _formdata$Property.tenantId) || tenant;
-      mutation.mutate(formdata, {
-        onSuccess
-      });
-      if (!createNUpdate) {
-        if (!(mutation.isLoading && mutation.isIdle)) {
-          if (mutation.isSuccess) {
-            setTimeout(() => {
-              if (redirectUrl) {
-                var _mutation$data, _mutation$data$Proper, _location$state2;
-                history.push(`${redirectUrl}?propertyId=${mutation === null || mutation === void 0 ? void 0 : (_mutation$data = mutation.data) === null || _mutation$data === void 0 ? void 0 : (_mutation$data$Proper = _mutation$data.Properties[0]) === null || _mutation$data$Proper === void 0 ? void 0 : _mutation$data$Proper.propertyId}&tenantId=${formdata.Property.tenantId}`, {
-                  ...(location === null || location === void 0 ? void 0 : (_location$state2 = location.state) === null || _location$state2 === void 0 ? void 0 : _location$state2.prevState)
-                });
-                const scrollConst = redirectUrl !== null && redirectUrl !== void 0 && redirectUrl.includes("employee/tl") ? 1600 : 300;
-                setTimeout(() => window.scrollTo(0, scrollConst), 400);
-                return;
-              }
-            }, 3000);
-          }
-        }
-      }
-    } catch (err) {}
+    setMutationHappened(false);
+    clearSuccessData();
   }, []);
-  useEffect(() => {
-    var _data4, _data4$locationDet, _data4$locationDet$ci;
-    let tenant = userType === "employee" ? tenantId : (_data4 = data) === null || _data4 === void 0 ? void 0 : (_data4$locationDet = _data4.locationDet) === null || _data4$locationDet === void 0 ? void 0 : (_data4$locationDet$ci = _data4$locationDet.city) === null || _data4$locationDet$ci === void 0 ? void 0 : _data4$locationDet$ci.code;
-    if (mutation.isSuccess) {
-      setTimeout(() => {
-        if (redirectUrl) {
-          var _mutation$data2, _mutation$data2$Prope, _location$state3;
-          history.push(`${redirectUrl}?propertyId=${mutation === null || mutation === void 0 ? void 0 : (_mutation$data2 = mutation.data) === null || _mutation$data2 === void 0 ? void 0 : (_mutation$data2$Prope = _mutation$data2.Properties[0]) === null || _mutation$data2$Prope === void 0 ? void 0 : _mutation$data2$Prope.propertyId}&tenantId=${tenant}`, {
-            ...(location === null || location === void 0 ? void 0 : (_location$state3 = location.state) === null || _location$state3 === void 0 ? void 0 : _location$state3.prevState)
+  if (isLoading) {
+    return /*#__PURE__*/React.createElement(Loader, null);
+  }
+  const onSubmit = async () => {
+    var _formValue$owners, _formValue$owners$own, _formValue$owners2, _formValue$owners2$, _formValue$owners2$$o, _formValue$owners2$$o2, _formValue$owners3;
+    const ownersArray = owners && owners.length > 0 ? owners : formValue === null || formValue === void 0 ? void 0 : formValue.owners;
+    if ((formValue !== null && formValue !== void 0 && (_formValue$owners = formValue.owners) !== null && _formValue$owners !== void 0 && (_formValue$owners$own = _formValue$owners.ownershipCategory) !== null && _formValue$owners$own !== void 0 && _formValue$owners$own.includes("MULTIPLEOWNERS") || formValue !== null && formValue !== void 0 && (_formValue$owners2 = formValue.owners) !== null && _formValue$owners2 !== void 0 && (_formValue$owners2$ = _formValue$owners2[0]) !== null && _formValue$owners2$ !== void 0 && (_formValue$owners2$$o = _formValue$owners2$.ownershipCategory) !== null && _formValue$owners2$$o !== void 0 && (_formValue$owners2$$o2 = _formValue$owners2$$o.code) !== null && _formValue$owners2$$o2 !== void 0 && _formValue$owners2$$o2.includes("MULTIPLEOWNERS")) && (formValue === null || formValue === void 0 ? void 0 : (_formValue$owners3 = formValue.owners) === null || _formValue$owners3 === void 0 ? void 0 : _formValue$owners3.length) == 1) {
+      setShowToast({
+        key: true,
+        label: "PT_COMMON_ONE_MORE_OWNER_INFROMATION_REQUIRED"
+      });
+    } else if (!ownersArray || ownersArray.length === 0) {
+      setShowToast({
+        key: true,
+        label: t("PT_COMMON_OWNER_DETAILS_REQUIRED")
+      });
+    } else {
+      const payload = convertToPropertyLightWeight({
+        ...formValue,
+        owners: ownersArray
+      });
+      payload.Property.tenantId = tenantId;
+      mutation.mutate(payload, {
+        onSuccess: data => {
+          var _data$Properties, _data$Properties$;
+          if (data !== null && data !== void 0 && data.Errors && (data === null || data === void 0 ? void 0 : data.Errors.length) > 0) {
+            var _data$Errors$;
+            setShowToast({
+              key: true,
+              label: (data === null || data === void 0 ? void 0 : (_data$Errors$ = data.Errors[0]) === null || _data$Errors$ === void 0 ? void 0 : _data$Errors$.message) || t("PT_COMMON_FAILED_TO_CREATE_PROPERTY")
+            });
+            return;
+          }
+          setShowToast({
+            key: false,
+            label: `${t("CS_NEW_PROPERTY_APPLICATION_CREATED_SUCCESS")} - ${data === null || data === void 0 ? void 0 : (_data$Properties = data.Properties) === null || _data$Properties === void 0 ? void 0 : (_data$Properties$ = _data$Properties[0]) === null || _data$Properties$ === void 0 ? void 0 : _data$Properties$.propertyId}`
+          });
+          if (onSelect) {
+            var _data$Properties2;
+            onSelect("cptNewProperty", {
+              property: data === null || data === void 0 ? void 0 : (_data$Properties2 = data.Properties) === null || _data$Properties2 === void 0 ? void 0 : _data$Properties2[0]
+            });
+          }
+        },
+        onError: error => {
+          var _error$response, _error$response$data, _error$response$data$, _error$response$data$2;
+          setShowToast({
+            key: true,
+            label: (error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : (_error$response$data$ = _error$response$data.Errors) === null || _error$response$data$ === void 0 ? void 0 : (_error$response$data$2 = _error$response$data$[0]) === null || _error$response$data$2 === void 0 ? void 0 : _error$response$data$2.message) || t("PT_COMMON_FAILED_TO_CREATE_PROPERTY")
           });
-          const scrollConst = redirectUrl !== null && redirectUrl !== void 0 && redirectUrl.includes("employee/tl") ? 1600 : 300;
-          setTimeout(() => window.scrollTo(0, scrollConst), 400);
-          return;
         }
-      }, 3000);
+      });
+    }
+  };
+  const onSkip = () => {
+    onSelect("isSkip", true);
+  };
+  const onFormValueChange = (setValue, data, formState) => {
+    if (!lodash.isEqual(data, formValue)) {
+      setFormValue(data);
+    }
+    setCanSubmit(true);
+  };
+  const getHeaderLabel = () => {
+    var _url$split, _url$split$, _url$split$$split;
+    let url = window.location.href;
+    let moduleName = url === null || url === void 0 ? void 0 : (_url$split = url.split("=")) === null || _url$split === void 0 ? void 0 : (_url$split$ = _url$split[1]) === null || _url$split$ === void 0 ? void 0 : (_url$split$$split = _url$split$.split("/")) === null || _url$split$$split === void 0 ? void 0 : _url$split$$split[3];
+    if (moduleName) return t(`ES_COMMON_CREATE_PROPERTY_HEADER_${moduleName === null || moduleName === void 0 ? void 0 : moduleName.toUpperCase()}`);else return t("ES_COMMON_CREATE_PROPERTY_HEADER");
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "employee-form-section-wrapper"
+  }, /*#__PURE__*/React.createElement(VerticalTimeline, {
+    config: [{
+      timeLine: [{
+        actions: getHeaderLabel(),
+        currentStep: 1
+      }]
+    }],
+    showFinalStep: false
+  }), /*#__PURE__*/React.createElement(FormComposer, {
+    onSkip: onSkip,
+    showSkip: enableSkip,
+    skipStyle: isMobile ? {} : {
+      textAlign: "right",
+      marginRight: "55px"
+    },
+    onSubmit: onSubmit,
+    noBoxShadow: true,
+    inline: true,
+    config: newConfig,
+    label: t("SUBMIT"),
+    isDisabled: !canSubmit,
+    defaultValues: defaultValues,
+    onFormValueChange: onFormValueChange,
+    noBreakLine: true,
+    noCard: true
+  })), showToast && /*#__PURE__*/React.createElement(Toast, {
+    error: showToast.key,
+    label: showToast.label,
+    onClose: () => {
+      setShowToast(null);
+    }
+  }));
+};
+const GetActionMessage = props => {
+  const {
+    t
+  } = useTranslation();
+  if (props.isSuccess) {
+    return !window.location.href.includes("edit-application") ? window.location.href.includes("employee") ? t("CS_NEW_PROPERTY_APPLICATION_CREATED_SUCCESS") : t("CS_NEW_PROPERTY_APPLICATION_SUBMITTED_SUCCESS") : t("CS_PROPERTY_UPDATE_APPLICATION_SUCCESS");
+  } else if (props.isLoading) {
+    return !window.location.href.includes("edit-application") ? t("CS_PROPERTY_APPLICATION_PENDING") : t("CS_PROPERTY_UPDATE_APPLICATION_PENDING");
+  } else if (!props.isSuccess) {
+    return !window.location.href.includes("edit-application") ? t("CS_PROPERTY_APPLICATION_FAILED") : t("CS_PROPERTY_UPDATE_APPLICATION_FAILED");
+  }
+};
+const rowContainerStyle = {
+  padding: "4px 0px",
+  justifyContent: "space-between"
+};
+const BannerPicker = props => {
+  var _props$data;
+  return /*#__PURE__*/React.createElement(Banner, {
+    message: GetActionMessage(props),
+    applicationNumber: (_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.Properties[0].acknowldgementNumber,
+    info: props.isSuccess ? props.t("PT_APPLICATION_NO") : "",
+    successful: props.isSuccess
+  });
+};
+const PTAcknowledgement = ({
+  onSuccess,
+  onSelect,
+  formData,
+  redirectUrl,
+  userType
+}) => {
+  var _location$state, _location$state2, _mdmsConfig$PropertyT, _data, _data$locationDet, _data$locationDet2, _data$locationDet2$ci, _data2, _data2$locationDet, _data$locationDet3, _data$locationDet3$ci, _responseData$Propert;
+  const {
+    t
+  } = useTranslation();
+  const location = useLocation();
+  const stateId = Digit.ULBService.getStateId();
+  const tenantId = Digit.ULBService.getCurrentTenantId();
+  const history = useHistory();
+  let data = location === null || location === void 0 ? void 0 : (_location$state = location.state) === null || _location$state === void 0 ? void 0 : _location$state.data;
+  if (onSelect) {
+    var _formData$cptNewPrope;
+    data = formData === null || formData === void 0 ? void 0 : (_formData$cptNewPrope = formData.cptNewProperty) === null || _formData$cptNewPrope === void 0 ? void 0 : _formData$cptNewPrope.property;
+  }
+  const propertyFromState = location === null || location === void 0 ? void 0 : (_location$state2 = location.state) === null || _location$state2 === void 0 ? void 0 : _location$state2.property;
+  let createNUpdate = false;
+  let {
+    data: mdmsConfig,
+    isLoading
+  } = Digit.Hooks.pt.useMDMS(stateId, "PropertyTax", "PTWorkflow");
+  ((mdmsConfig === null || mdmsConfig === void 0 ? void 0 : (_mdmsConfig$PropertyT = mdmsConfig.PropertyTax) === null || _mdmsConfig$PropertyT === void 0 ? void 0 : _mdmsConfig$PropertyT.PTWorkfow) || []).forEach(data => {
+    if (data.enable) {
+      if (data.businessService.includes("WNS")) {
+        createNUpdate = true;
+      }
     }
+  });
+  const mutation = Digit.Hooks.pt.usePropertyAPI((_data = data) !== null && _data !== void 0 && (_data$locationDet = _data.locationDet) !== null && _data$locationDet !== void 0 && _data$locationDet.city ? (_data$locationDet2 = data.locationDet) === null || _data$locationDet2 === void 0 ? void 0 : (_data$locationDet2$ci = _data$locationDet2.city) === null || _data$locationDet2$ci === void 0 ? void 0 : _data$locationDet2$ci.code : tenantId, true);
+  const mutationForUpdate = Digit.Hooks.pt.usePropertyAPI((_data2 = data) !== null && _data2 !== void 0 && (_data2$locationDet = _data2.locationDet) !== null && _data2$locationDet !== void 0 && _data2$locationDet.city ? (_data$locationDet3 = data.locationDet) === null || _data$locationDet3 === void 0 ? void 0 : (_data$locationDet3$ci = _data$locationDet3.city) === null || _data$locationDet3$ci === void 0 ? void 0 : _data$locationDet3$ci.code : tenantId, false);
+  const {
+    data: storeData
+  } = Digit.Hooks.useStore.getInitData();
+  useEffect(() => {
+    if (propertyFromState) return;
+    try {
+      var _data3, _data3$locationDet, _data3$locationDet$ci, _formdata$Property;
+      let tenant = userType === "employee" ? tenantId : (_data3 = data) === null || _data3 === void 0 ? void 0 : (_data3$locationDet = _data3.locationDet) === null || _data3$locationDet === void 0 ? void 0 : (_data3$locationDet$ci = _data3$locationDet.city) === null || _data3$locationDet$ci === void 0 ? void 0 : _data3$locationDet$ci.code;
+      data.tenantId = tenant;
+      let formdata = convertToPropertyLightWeight(data);
+      formdata.Property.tenantId = (formdata === null || formdata === void 0 ? void 0 : (_formdata$Property = formdata.Property) === null || _formdata$Property === void 0 ? void 0 : _formdata$Property.tenantId) || tenant;
+      mutation.mutate(formdata, {
+        onSuccess
+      });
+      if (!createNUpdate) {
+        if (!(mutation.isLoading && mutation.isIdle)) {
+          if (mutation.isSuccess) {}
+        }
+      }
+    } catch (err) {}
+  }, []);
+  useEffect(() => {
+    const queryParams = new URLSearchParams(location.search);
+    const redirectUrlFromQuery = queryParams.get("redirectToUrl");
   }, [mutation]);
   useEffect(() => {
     if (mutation.isSuccess && createNUpdate) {
@@ -6441,58 +6516,54 @@ const PTAcknowledgement = ({
         mutationForUpdate.mutate(formdata, {
           onSuccess
         });
-        if (mutationForUpdate.isSuccess) {
-          setTimeout(() => {
-            if (redirectUrl) {
-              var _mutationForUpdate$da, _mutationForUpdate$da2, _mutationForUpdate$da3, _mutationForUpdate$da4, _location$state4;
-              history.push(`${redirectUrl}?propertyId=${mutationForUpdate === null || mutationForUpdate === void 0 ? void 0 : (_mutationForUpdate$da = mutationForUpdate.data) === null || _mutationForUpdate$da === void 0 ? void 0 : (_mutationForUpdate$da2 = _mutationForUpdate$da.Properties[0]) === null || _mutationForUpdate$da2 === void 0 ? void 0 : _mutationForUpdate$da2.propertyId}&tenantId=${mutationForUpdate === null || mutationForUpdate === void 0 ? void 0 : (_mutationForUpdate$da3 = mutationForUpdate.data) === null || _mutationForUpdate$da3 === void 0 ? void 0 : (_mutationForUpdate$da4 = _mutationForUpdate$da3.Properties[0]) === null || _mutationForUpdate$da4 === void 0 ? void 0 : _mutationForUpdate$da4.tenantId}`, {
-                ...(location === null || location === void 0 ? void 0 : (_location$state4 = location.state) === null || _location$state4 === void 0 ? void 0 : _location$state4.prevState)
-              });
-              const scrollConst = redirectUrl !== null && redirectUrl !== void 0 && redirectUrl.includes("employee/tl") ? 1600 : 300;
-              setTimeout(() => window.scrollTo(0, scrollConst), 400);
-              return;
-            }
-          }, 3000);
-        }
+        if (mutationForUpdate.isSuccess) {}
       } catch (er) {}
     }
   }, [mutation.isSuccess]);
   const onNext = () => {
     if (onSelect) {
       if (mutation.isSuccess) {
-        var _mutation$data3, _mutation$data4, _mutation$data5;
-        sessionStorage.setItem("Digit_OBPS_PT", JSON.stringify(mutation === null || mutation === void 0 ? void 0 : (_mutation$data3 = mutation.data) === null || _mutation$data3 === void 0 ? void 0 : _mutation$data3.Properties[0]));
-        sessionStorage.setItem("Digit_FSM_PT", JSON.stringify(mutation === null || mutation === void 0 ? void 0 : (_mutation$data4 = mutation.data) === null || _mutation$data4 === void 0 ? void 0 : _mutation$data4.Properties[0]));
+        var _mutation$data, _mutation$data2, _mutation$data3;
+        sessionStorage.setItem("Digit_OBPS_PT", JSON.stringify(mutation === null || mutation === void 0 ? void 0 : (_mutation$data = mutation.data) === null || _mutation$data === void 0 ? void 0 : _mutation$data.Properties[0]));
+        sessionStorage.setItem("Digit_FSM_PT", JSON.stringify(mutation === null || mutation === void 0 ? void 0 : (_mutation$data2 = mutation.data) === null || _mutation$data2 === void 0 ? void 0 : _mutation$data2.Properties[0]));
         onSelect("cpt", {
-          details: mutation === null || mutation === void 0 ? void 0 : (_mutation$data5 = mutation.data) === null || _mutation$data5 === void 0 ? void 0 : _mutation$data5.Properties[0]
+          details: mutation === null || mutation === void 0 ? void 0 : (_mutation$data3 = mutation.data) === null || _mutation$data3 === void 0 ? void 0 : _mutation$data3.Properties[0]
         });
       }
     }
   };
-  return mutation.isLoading || mutation.isIdle ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(BannerPicker, {
+  const isMutationLoading = propertyFromState ? false : mutation.isLoading || mutation.isIdle;
+  const isMutationSuccess = propertyFromState ? true : mutation.isSuccess;
+  const responseData = propertyFromState ? {
+    Properties: [propertyFromState]
+  } : mutation.data;
+  return isMutationLoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(BannerPicker, {
     t: t,
-    data: mutation.data,
-    isSuccess: mutation.isSuccess,
-    isLoading: mutation.isIdle || mutation.isLoading
-  }), mutation.isSuccess && /*#__PURE__*/React.createElement(CardText, null, window.location.href.includes("employee") ? t("CS_CREATE_PROPERTY_SUCCESS_EMP_RESPONSE") : t("CS_CREATE_PROPERTY_SUCCESS_CITIZEN_RESPONSE")), !mutation.isSuccess && /*#__PURE__*/React.createElement(CardText, null, t("CS_FILE_PROPERTY_FAILED_RESPONSE")), /*#__PURE__*/React.createElement(StatusTable, null, mutation.isSuccess && /*#__PURE__*/React.createElement(Row, {
+    data: responseData,
+    isSuccess: isMutationSuccess,
+    isLoading: isMutationLoading
+  }), isMutationSuccess && /*#__PURE__*/React.createElement(CardText, null, window.location.href.includes("employee") ? t("CS_CREATE_PROPERTY_SUCCESS_EMP_RESPONSE") : t("CS_CREATE_PROPERTY_SUCCESS_CITIZEN_RESPONSE")), !isMutationSuccess && /*#__PURE__*/React.createElement(CardText, null, t("CS_FILE_PROPERTY_FAILED_RESPONSE")), /*#__PURE__*/React.createElement(StatusTable, null, isMutationSuccess && /*#__PURE__*/React.createElement(Row, {
     rowContainerStyle: rowContainerStyle,
     last: true,
     label: t("PT_COMMON_TABLE_COL_PT_ID"),
-    text: mutation === null || mutation === void 0 ? void 0 : (_mutation$data6 = mutation.data) === null || _mutation$data6 === void 0 ? void 0 : (_mutation$data6$Prope = _mutation$data6.Properties[0]) === null || _mutation$data6$Prope === void 0 ? void 0 : _mutation$data6$Prope.propertyId,
+    text: responseData === null || responseData === void 0 ? void 0 : (_responseData$Propert = responseData.Properties[0]) === null || _responseData$Propert === void 0 ? void 0 : _responseData$Propert.propertyId,
     textStyle: {
       whiteSpace: "pre",
       width: "200%"
     }
-  })), mutation.isSuccess && window.location.href.includes("/citizen/") && (onSelect ? /*#__PURE__*/React.createElement(SubmitBar, {
+  })), isMutationSuccess && (window.location.href.includes("/citizen/") || window.location.href.includes("/employee/")) && (onSelect ? /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("CS_COMMON_PROCEED"),
     onSubmit: onNext
   }) : /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("CS_COMMON_PROCEED"),
     onSubmit: () => {
-      if (redirectUrl) {
-        var _mutationForUpdate$da5, _mutationForUpdate$da6, _mutationForUpdate$da7, _mutationForUpdate$da8, _location$state5;
-        history.push(`${redirectUrl}?propertyId=${mutationForUpdate === null || mutationForUpdate === void 0 ? void 0 : (_mutationForUpdate$da5 = mutationForUpdate.data) === null || _mutationForUpdate$da5 === void 0 ? void 0 : (_mutationForUpdate$da6 = _mutationForUpdate$da5.Properties[0]) === null || _mutationForUpdate$da6 === void 0 ? void 0 : _mutationForUpdate$da6.propertyId}&tenantId=${mutationForUpdate === null || mutationForUpdate === void 0 ? void 0 : (_mutationForUpdate$da7 = mutationForUpdate.data) === null || _mutationForUpdate$da7 === void 0 ? void 0 : (_mutationForUpdate$da8 = _mutationForUpdate$da7.Properties[0]) === null || _mutationForUpdate$da8 === void 0 ? void 0 : _mutationForUpdate$da8.tenantId}`, {
-          ...(location === null || location === void 0 ? void 0 : (_location$state5 = location.state) === null || _location$state5 === void 0 ? void 0 : _location$state5.prevState)
+      const queryParams = new URLSearchParams(location.search);
+      const redirectUrlFromQuery = queryParams.get("redirectToUrl");
+      const finalRedirectUrl = redirectUrl && redirectUrl !== "undefined" ? redirectUrl : redirectUrlFromQuery && redirectUrlFromQuery !== "undefined" ? redirectUrlFromQuery : null;
+      if (finalRedirectUrl) {
+        var _responseData$Propert2, _responseData$Propert3, _location$state3;
+        history.push(`${finalRedirectUrl}?propertyId=${responseData === null || responseData === void 0 ? void 0 : (_responseData$Propert2 = responseData.Properties[0]) === null || _responseData$Propert2 === void 0 ? void 0 : _responseData$Propert2.propertyId}&tenantId=${responseData === null || responseData === void 0 ? void 0 : (_responseData$Propert3 = responseData.Properties[0]) === null || _responseData$Propert3 === void 0 ? void 0 : _responseData$Propert3.tenantId}`, {
+          ...(location === null || location === void 0 ? void 0 : (_location$state3 = location.state) === null || _location$state3 === void 0 ? void 0 : _location$state3.prevState)
         });
       }
     }
@@ -7653,7 +7724,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 +8364,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 +8375,7 @@ const PropertySearchResults = ({
     oldPropertyIds,
     locality,
     city,
+    tenantId: tId,
     doorNo,
     name,
     PToffset
@@ -8335,17 +8407,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 +8435,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 +8449,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 +8465,7 @@ const PropertySearchResults = ({
     ...fetchBillParams,
     tenantId: scity
   }, {
-    enabled: consumerCode ? true : false,
+    enabled: !!(consumerCode && scity),
     retry: false
   });
   const history = useHistory();
@@ -8398,7 +8477,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 +8500,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 +8602,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 +8635,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"
@@ -12902,23 +12979,26 @@ const ActionModal$b = ({
     isSuccess
   } = Digit.Hooks.fsm.useVehiclesSearch({
     tenantId,
+    filters: {
+      vendorId: applicationData === null || applicationData === void 0 ? void 0 : applicationData.vendorId
+    },
     config: {
       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$ = _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);
+    var _item$driverData, _item$driver, _item$owner2;
+    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) || (item === null || item === void 0 ? void 0 : (_item$owner2 = item.owner) === null || _item$owner2 === void 0 ? void 0 : _item$owner2.id);
   })) === null || _vehicleData$vehicle$ === void 0 ? void 0 : _vehicleData$vehicle$.map(item => {
-    var _item$driverData2, _item$driver2;
+    var _item$driverData2, _item$driver2, _item$owner3;
     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,
-      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)
+      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) || (item === null || item === void 0 ? void 0 : item.ownerId) || (item === null || item === void 0 ? void 0 : (_item$owner3 = item.owner) === null || _item$owner3 === void 0 ? void 0 : _item$owner3.uuid)
     });
   });
   const [config, setConfig] = useState({});
@@ -12987,7 +13067,11 @@ const ActionModal$b = ({
       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" ? {
+    if (businessService === "watertanker-fixedpoint") {
+      workflow.moduleName = "request-service.water_tanker";
+      workflow.businessService = "watertanker-fixedpoint";
+    }
+    let requestPayload = businessService === "watertanker" || businessService === "watertanker-fixedpoint" ? {
       waterTankerBookingDetail: {
         ...applicationData,
         workflow
@@ -13740,7 +13824,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: {
@@ -13765,9 +13849,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 {
@@ -14319,7 +14403,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");
   };
@@ -14999,7 +15083,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
@@ -15045,7 +15129,7 @@ const WSFeeEstimation = ({
       if (targetValueSign == 1) {
         values[value] = e.target.value;
       } else {
-        values[value] = '';
+        values[value] = "";
       }
     } else if (isDropDownValue) {
       values[`${value}_data`] = e;
@@ -15060,7 +15144,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) => {
@@ -15091,15 +15175,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"
@@ -15123,14 +15208,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",
@@ -15138,7 +15225,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,
@@ -15149,9 +15236,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: {
@@ -15168,7 +15253,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: {
@@ -15184,12 +15269,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",
@@ -15197,7 +15277,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,
@@ -15208,9 +15288,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"
     },
@@ -15225,7 +15303,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: {
@@ -15241,7 +15319,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"
     },
@@ -15355,10 +15433,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")
@@ -15800,15 +15875,11 @@ function ApplicationDetailsContent({
   oldValue,
   isInfoLabel = false
 }) {
-  var _applicationDetails$a2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data19, _workflowDetails$data20;
+  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();
@@ -15844,7 +15915,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,
@@ -15860,7 +15931,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);
@@ -15944,7 +16015,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 {
@@ -15983,13 +16053,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 {
@@ -16037,7 +16107,6 @@ function ApplicationDetailsContent({
     });
   };
   const handleViewClick = data => {
-    setSelectedData(data);
     setShowPopup(true);
   };
   return /*#__PURE__*/React.createElement(Card, {
@@ -16052,8 +16121,8 @@ 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$title, _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", {
@@ -16069,7 +16138,7 @@ function ApplicationDetailsContent({
         fontSize: "24px"
       } : {
         marginBottom: "16px",
-        marginTop: "32px",
+        marginTop: "16px",
         fontSize: "24px"
       }
     }, 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", {
@@ -16146,7 +16215,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"
         }
@@ -16247,8 +16316,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, {
@@ -16290,21 +16359,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, {
@@ -16994,7 +17053,7 @@ const NewApplication = ({
   const search = useLocation().search;
   const redirectUrl = new URLSearchParams(search).get('redirectToUrl');
   const createProperty = async () => {
-    history.push(`${match.path}/acknowledgement`);
+    history.push(`${match.path}/save-property`);
   };
   const onSuccess = () => {
     clearParams();
@@ -17009,7 +17068,6 @@ const NewApplication = ({
   }, /*#__PURE__*/React.createElement(CreatePropertyForm, {
     onSubmit: createProperty,
     value: params,
-    redirectUrl: redirectUrl,
     userType: "employee"
   })), /*#__PURE__*/React.createElement(Route, {
     exact: true,
@@ -17017,7 +17075,6 @@ const NewApplication = ({
   }, /*#__PURE__*/React.createElement(PTAcknowledgement, {
     data: params,
     onSuccess: onSuccess,
-    redirectUrl: redirectUrl,
     userType: "employee"
   })));
 };
@@ -17243,7 +17300,7 @@ const EmployeeApp = ({
     show: true
   }];
   const locationCheck = window.location.href.includes("/employee/commonpt/new-application");
-  return /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", {
     className: "ground-container"
   }, /*#__PURE__*/React.createElement("div", {
     style: locationCheck ? {
@@ -17251,7 +17308,7 @@ const EmployeeApp = ({
     } : {}
   }, /*#__PURE__*/React.createElement(BreadCrumb, {
     crumbs: crumbs
-  })), /*#__PURE__*/React.createElement(PrivateRoute, {
+  })), /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(PrivateRoute, {
     exact: true,
     path: `${path}/`,
     component: () => /*#__PURE__*/React.createElement(CommonPTLinks, {
@@ -17260,16 +17317,18 @@ const EmployeeApp = ({
     })
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/new-application`,
-    component: () => /*#__PURE__*/React.createElement(NewApplication, {
-      parentUrl: url
-    })
+    component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "action"
+    }, /*#__PURE__*/React.createElement(NewApplication, {
+      path: path
+    }))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/search`,
-    component: () => /*#__PURE__*/React.createElement(Search, null)
+    component: Search
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/view-property`,
-    component: () => /*#__PURE__*/React.createElement(ViewProperty, null)
-  }))));
+    component: ViewProperty
+  })));
 };
 const PropertyAssemblyDetails = ({
@@ -17283,78 +17342,59 @@ 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 = Digit.ULBService.getCurrentTenantId();
   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") || {};
+  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;
-      return proptype === null || proptype === void 0 ? void 0 : (_proptype$filter = proptype.filter(e => e.code === "VACANT" || e.code.split(".").length > 1)) === null || _proptype$filter === void 0 ? void 0 : (_proptype$filter$map = _proptype$filter.map(item => ({
-        i18nKey: "COMMON_PROPTYPE_" + stringReplaceAll(item === null || item === void 0 ? void 0 : item.code, ".", "_"),
-        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 {
-      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({
-            i18nKey: "COMMON_PROPTYPE_" + stringReplaceAll(proptype[i].code, ".", "_"),
-            code: proptype[i].code
-          });
-        }
+    let menu = [];
+    if (Array.isArray(proptype) && proptype.length > 0) {
+      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
+        });
       }
-      menu.sort((a, b) => a.i18nKey.split("_").pop().localeCompare(b.i18nKey.split("_").pop()));
-      return menu;
     }
+    menu.sort((a, b) => a.i18nKey.split("_").pop().localeCompare(b.i18nKey.split("_").pop()));
+    return menu;
   }
   function usageCategoryMajorMenu(usagecat) {
-    if (userType === "employee") {
-      var _usagecat$filter;
-      const catMenu = usagecat === null || usagecat === void 0 ? void 0 : (_usagecat$filter = usagecat.filter(e => (e === null || e === void 0 ? void 0 : e.code.split(".").length) <= 2 && e.code !== "NONRESIDENTIAL")) === null || _usagecat$filter === void 0 ? void 0 : _usagecat$filter.map(item => {
-        const arr = item === null || item === void 0 ? void 0 : item.code.split(".");
-        if (arr.length == 2) return {
-          i18nKey: "PROPERTYTAX_BILLING_SLAB_" + arr[1],
-          code: item === null || item === void 0 ? void 0 : item.code
-        };else return {
-          i18nKey: "PROPERTYTAX_BILLING_SLAB_" + (item === null || item === void 0 ? void 0 : item.code),
-          code: item === null || item === void 0 ? void 0 : item.code
-        };
-      });
-      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) {
-          menu.push({
-            i18nKey: "PROPERTYTAX_BILLING_SLAB_" + usagecat[i].code.split(".")[1],
-            code: usagecat[i].code
-          });
-        }
+    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
+        });
       }
-      return menu;
     }
+    return menu;
   }
   const {
     control,
@@ -17413,8 +17453,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,
@@ -17434,7 +17474,7 @@ const PropertyAssemblyDetails = ({
           props.onChange(value);
           setAssemblyDetails({
             ...assemblyDetails,
-            ['BuildingType']: value
+            ["BuildingType"]: value
           });
           setFocusField("BuildingType");
         },
@@ -17443,9 +17483,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",
@@ -17468,15 +17508,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",
@@ -17500,19 +17540,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",
@@ -17534,7 +17574,7 @@ const PropertyAssemblyDetails = ({
           setFocusField("usageCategoryMajor");
           setAssemblyDetails({
             ...assemblyDetails,
-            ['usageCategoryMajor']: value
+            ["usageCategoryMajor"]: value
           });
         },
         optionKey: "i18nKey",
@@ -17542,12 +17582,130 @@ 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 = ({
+  address,
+  actionCancelOnSubmit,
+  isEdit,
+  onSelect,
+  config,
+  formData: formDataProp,
+  ...props
+}) => {
+  var _formDataProp$cpt, _formDataProp$cpt$det, _formDataProp$cpt3;
+  const {
+    t
+  } = useTranslation();
+  const {
+    data: allCities
+  } = Digit.Hooks.useTenants();
+  const {
+    handleSubmit
+  } = useForm();
+  const [showToast, setShowToast] = useState(null);
+  const [formData, setFormData] = useState({
+    addressType: (address === null || address === void 0 ? void 0 : address.addressType) || "",
+    pincode: (address === null || address === void 0 ? void 0 : address.pinCode) || "",
+    city: (address === null || address === void 0 ? void 0 : address.city) || "",
+    locality: (address === null || address === void 0 ? void 0 : address.locality) || "",
+    streetName: (address === null || address === void 0 ? void 0 : address.streetName) || "",
+    houseNo: (address === null || address === void 0 ? void 0 : address.houseNumber) || "",
+    houseName: (address === null || address === void 0 ? void 0 : address.houseName) || "",
+    landmark: (address === null || address === void 0 ? void 0 : address.landmark) || "",
+    addressLine1: (address === null || address === void 0 ? void 0 : address.address) || "",
+    addressLine2: (address === null || address === void 0 ? void 0 : address.address2) || "",
+    latitude: (address === null || address === void 0 ? void 0 : address.latitude) || "",
+    longitude: (address === null || address === void 0 ? void 0 : address.longitude) || "",
+    assembly: (address === null || address === void 0 ? void 0 : address.assembly) || "",
+    block: (address === null || address === void 0 ? void 0 : address.block) || "",
+    zone: (address === null || address === void 0 ? void 0 : address.zone) || "",
+    zro: (address === null || address === void 0 ? void 0 : address.zro) || ""
+  });
+  const isPropertyFound = !!(formDataProp !== null && formDataProp !== void 0 && (_formDataProp$cpt = formDataProp.cpt) !== null && _formDataProp$cpt !== void 0 && (_formDataProp$cpt$det = _formDataProp$cpt.details) !== null && _formDataProp$cpt$det !== void 0 && _formDataProp$cpt$det.propertyId);
+  useEffect(() => {
+    var _formDataProp$cpt2;
+    if (formDataProp !== null && formDataProp !== void 0 && (_formDataProp$cpt2 = formDataProp.cpt) !== null && _formDataProp$cpt2 !== void 0 && _formDataProp$cpt2.details) {
+      var _addressData$locality, _addressData$geoLocat, _addressData$geoLocat2, _addressData$locality2, _addressData$geoLocat3, _addressData$geoLocat4, _addressData$locality3, _addressData$addition, _addressData$addition2, _addressData$addition3, _addressData$addition4, _addressData$addition5, _addressData$addition6, _addressData$addition7, _addressData$addition8;
+      const details = formDataProp.cpt.details;
+      const addressData = details.address || {};
+      const additionalDetails = details.additionalDetails || {};
+      const localityCode = ((_addressData$locality = addressData.locality) === null || _addressData$locality === void 0 ? void 0 : _addressData$locality.code) || addressData.locality || "";
+      const lat = (_addressData$geoLocat = addressData.geoLocation) !== null && _addressData$geoLocat !== void 0 && _addressData$geoLocat.latitude && ((_addressData$geoLocat2 = addressData.geoLocation) === null || _addressData$geoLocat2 === void 0 ? void 0 : _addressData$geoLocat2.latitude) !== 0 ? addressData.geoLocation.latitude : ((_addressData$locality2 = addressData.locality) === null || _addressData$locality2 === void 0 ? void 0 : _addressData$locality2.latitude) || addressData.latitude || "";
+      const lng = (_addressData$geoLocat3 = addressData.geoLocation) !== null && _addressData$geoLocat3 !== void 0 && _addressData$geoLocat3.longitude && ((_addressData$geoLocat4 = addressData.geoLocation) === null || _addressData$geoLocat4 === void 0 ? void 0 : _addressData$geoLocat4.longitude) !== 0 ? addressData.geoLocation.longitude : ((_addressData$locality3 = addressData.locality) === null || _addressData$locality3 === void 0 ? void 0 : _addressData$locality3.longitude) || addressData.longitude || "";
+      setFormData({
+        pincode: addressData.pincode || "",
+        city: addressData.city || "",
+        locality: localityCode,
+        streetName: addressData.street || "",
+        houseNo: addressData.houseNo || "",
+        landmark: addressData.landmark || "",
+        latitude: lat,
+        longitude: lng,
+        assembly: additionalDetails.assembly || ((_addressData$addition = addressData.additionalDetails) === null || _addressData$addition === void 0 ? void 0 : _addressData$addition.assembly) || "",
+        block: additionalDetails.block || ((_addressData$addition2 = addressData.additionalDetails) === null || _addressData$addition2 === void 0 ? void 0 : _addressData$addition2.block) || "",
+        zone: additionalDetails.zone || ((_addressData$addition3 = addressData.additionalDetails) === null || _addressData$addition3 === void 0 ? void 0 : _addressData$addition3.zone) || "",
+        zro: additionalDetails.zro || ((_addressData$addition4 = addressData.additionalDetails) === null || _addressData$addition4 === void 0 ? void 0 : _addressData$addition4.zro) || "",
+        address: {
+          ...addressData,
+          city: addressData.city || "",
+          pincode: addressData.pincode || "",
+          locality: localityCode,
+          streetName: addressData.street || "",
+          houseNo: addressData.houseNo || "",
+          addressLine1: addressData.street || "",
+          latitude: lat,
+          longitude: lng,
+          zro: additionalDetails.zro || ((_addressData$addition5 = addressData.additionalDetails) === null || _addressData$addition5 === void 0 ? void 0 : _addressData$addition5.zro) || "",
+          assembly: additionalDetails.assembly || ((_addressData$addition6 = addressData.additionalDetails) === null || _addressData$addition6 === void 0 ? void 0 : _addressData$addition6.assembly) || "",
+          block: additionalDetails.block || ((_addressData$addition7 = addressData.additionalDetails) === null || _addressData$addition7 === void 0 ? void 0 : _addressData$addition7.block) || "",
+          zone: additionalDetails.zone || ((_addressData$addition8 = addressData.additionalDetails) === null || _addressData$addition8 === void 0 ? void 0 : _addressData$addition8.zone) || ""
+        }
+      });
+    }
+  }, [formDataProp === null || formDataProp === void 0 ? void 0 : (_formDataProp$cpt3 = formDataProp.cpt) === null || _formDataProp$cpt3 === void 0 ? void 0 : _formDataProp$cpt3.details]);
+  useEffect(() => {
+    if (showToast) {
+      const timer = setTimeout(() => {
+        setShowToast(null);
+      }, 1000);
+      return () => clearTimeout(timer);
+    }
+  }, [showToast]);
+  const {
+    createAddress,
+    updateAddress: updateAddressMutation
+  } = Digit.Hooks.useAddress(null, Digit.ULBService.getCurrentTenantId());
+  return /*#__PURE__*/React.createElement(CollapsibleCardPage, {
+    title: t("PT_LOCATION_DETAILS"),
+    defaultOpen: true
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      boxShadow: "none",
+      ...props.style
+    }
+  }, /*#__PURE__*/React.createElement(AddressDetails, {
+    t: t,
+    formData: formData,
+    onSelect: (key, data) => {
+      setFormData(data);
+      onSelect(key, data);
+    },
+    config: {
+      isCollapsible: false,
+      ...config
+    },
+    isEdit: isEdit,
+    showZRO: true,
+    disable: isPropertyFound,
+    hideNextButton: true
+  })));
+};
+const PropertyOwnerDetails = ({
   t,
   config,
   onSelect,
@@ -17556,274 +17714,10 @@ const PropertyLocationDetails = ({
   formState,
   ownerIndex,
   setError,
-  clearErrors
+  clearErrors,
+  ...props
 }) => {
-  var _Digit$UserService$ge, _errors$cityCode, _errors$locality, _errors$houseDoorNo, _errors$buildingColon, _errors$landmarkName;
-  let validation = {};
-  let allCities = Digit.Hooks.pt.useTenants() ? Digit.Hooks.pt.useTenants() : Digit.Hooks.tl.useTenants();
-  if (window.location.href.includes("obps")) {
-    allCities = Digit.SessionStorage.get("OBPS_TENANTS");
-  }
-  if (window.location.href.includes("fsm")) {
-    allCities = Digit.SessionStorage.get("FSM_TENANTS");
-    console.log("allc", allCities);
-  }
-  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 [locationDetails, setLocationDetails] = React.useState({
-    ...(formData === null || formData === void 0 ? void 0 : formData.locationDet),
-    cityCode: cityObj,
-    locality: formData === null || formData === void 0 ? void 0 : formData.locality,
-    houseDoorNo: formData === null || formData === void 0 ? void 0 : formData.houseDoorNo,
-    buildingColonyName: formData === null || formData === void 0 ? void 0 : formData.buildingColonyName,
-    landmarkName: formData === null || formData === void 0 ? void 0 : formData.landmarkName
-  });
-  const [isErrors, setIsErrors] = React.useState(false);
-  const {
-    control,
-    formState: {
-      errors,
-      touched
-    },
-    trigger,
-    watch,
-    setError: setLocalError,
-    clearErrors: clearLocalErrors,
-    setValue,
-    getValues
-  } = useForm();
-  const formValue = watch();
-  React.useEffect(() => {
-    let hasErrors = false;
-    const part = {};
-    Object.keys(locationDetails).forEach(key => {
-      part[key] = formValue === null || formValue === void 0 ? void 0 : formValue[key];
-    });
-    if (!lodash.isEqual(part, locationDetails)) {
-      Object.keys(locationDetails).forEach(key => {
-        if (locationDetails[key]) {
-          hasErrors = false;
-          clearLocalErrors(key);
-        } else {
-          hasErrors = true;
-        }
-      });
-    }
-    if (hasErrors) {
-      setError(config === null || config === void 0 ? void 0 : config.key, {
-        type: errors
-      });
-    } else {
-      clearErrors(config === null || config === void 0 ? void 0 : config.key);
-    }
-    trigger();
-    setIsErrors(hasErrors);
-    onSelect(config === null || config === void 0 ? void 0 : config.key, locationDetails);
-  }, [locationDetails]);
-  React.useEffect(() => {
-    var _formState$errors$con;
-    if (Object.keys(errors).length && !lodash.isEqual(((_formState$errors$con = formState.errors[config.key]) === null || _formState$errors$con === void 0 ? void 0 : _formState$errors$con.type) || {}, errors)) {
-      setError(config.key, {
-        type: errors
-      });
-    } else if (!Object.keys(errors).length && formState.errors[config.key] && isErrors) {
-      clearErrors(config.key);
-    }
-  }, [errors]);
-  const errorStyle = {
-    width: "70%",
-    marginLeft: "30%",
-    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: "",
-    defaultValue: locationDetails === null || locationDetails === void 0 ? void 0 : locationDetails.cityCode,
-    control: control,
-    rules: {
-      required: t("REQUIRED_FIELD")
-    },
-    render: ({
-      value,
-      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),
-      select: value => {
-        onChange(value);
-        setLocationDetails({
-          ...locationDetails,
-          cityCode: value
-        });
-      },
-      optionKey: "code",
-      onBlur: onBlur,
-      t: t
-    })
-  })), /*#__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", {
-    className: "form-field"
-  }, /*#__PURE__*/React.createElement(Controller, {
-    name: "locality",
-    defaultValue: locationDetails === null || locationDetails === void 0 ? void 0 : locationDetails.locality,
-    control: control,
-    rules: {
-      required: t("REQUIRED_FIELD")
-    },
-    render: ({
-      value,
-      onBlur,
-      onChange
-    }) => {
-      var _locationDetails$city, _locationDetails$city2;
-      return /*#__PURE__*/React.createElement(Localities, {
-        selectLocality: value => {
-          onChange(value);
-          setLocationDetails({
-            ...locationDetails,
-            locality: value
-          });
-        },
-        tenantId: locationDetails === null || locationDetails === void 0 ? void 0 : (_locationDetails$city = locationDetails.cityCode) === null || _locationDetails$city === void 0 ? void 0 : _locationDetails$city.code,
-        boundaryType: "revenue",
-        keepNull: false,
-        optionCardStyles: {
-          height: "600px",
-          overflow: "auto",
-          zIndex: "10"
-        },
-        selected: value,
-        disable: !(locationDetails !== null && locationDetails !== void 0 && (_locationDetails$city2 = locationDetails.cityCode) !== null && _locationDetails$city2 !== void 0 && _locationDetails$city2.code),
-        disableLoader: true,
-        onBlur: onBlur
-      });
-    }
-  }))), /*#__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", {
-    className: "form-field"
-  }, /*#__PURE__*/React.createElement(Controller, {
-    name: "houseDoorNo",
-    defaultValue: locationDetails === null || locationDetails === void 0 ? void 0 : locationDetails.houseDoorNo,
-    control: control,
-    rules: {
-      required: t("REQUIRED_FIELD"),
-      validate: value => /^([a-zA-Z0-9 !@#$%^&*()_+\-={};':\\\\|,.<>/?]){1,64}$/i.test(value) ? true : t("PT_HOUSE_DOOR_NO_ERROR_MESSAGE")
-    },
-    render: ({
-      value,
-      onBlur,
-      onChange
-    }) => /*#__PURE__*/React.createElement(TextInput, Object.assign({
-      t: t,
-      type: "text",
-      isMandatory: false,
-      optionKey: "i18nKey",
-      name: "houseDoorNo",
-      value: value,
-      onChange: ev => {
-        onChange(ev.target.value);
-        setLocationDetails({
-          ...locationDetails,
-          houseDoorNo: ev.target.value
-        });
-      },
-      onBlur: onBlur
-    }, validation = {
-      pattern: "^([a-zA-Z0-9 !@#$%^&*()_+\-={};':\\\\|,.<>/?]){1,64}$",
-      title: t("PT_HOUSE_DOOR_NO_ERROR_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", {
-    className: "form-field"
-  }, /*#__PURE__*/React.createElement(Controller, {
-    name: "buildingColonyName",
-    defaultValue: locationDetails === null || locationDetails === void 0 ? void 0 : locationDetails.buildingColonyName,
-    control: control,
-    rules: {
-      required: t("REQUIRED_FIELD")
-    },
-    render: ({
-      value,
-      onChange,
-      onBlur
-    }) => /*#__PURE__*/React.createElement(TextInput, {
-      t: t,
-      type: "text",
-      isMandatory: false,
-      optionKey: "i18nKey",
-      name: "buildingColonyName",
-      value: value,
-      onChange: ev => {
-        onChange(ev.target.value);
-        setLocationDetails({
-          ...locationDetails,
-          buildingColonyName: ev.target.value
-        });
-      },
-      onBlur: onBlur
-    })
-  }))), /*#__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", {
-    className: "form-field"
-  }, /*#__PURE__*/React.createElement(Controller, {
-    name: "landmarkName",
-    defaultValue: locationDetails === null || locationDetails === void 0 ? void 0 : locationDetails.landmarkName,
-    control: control,
-    rules: {},
-    render: ({
-      value,
-      onChange,
-      onBlur
-    }) => /*#__PURE__*/React.createElement(TextInput, {
-      t: t,
-      type: "text",
-      isMandatory: false,
-      optionKey: "i18nKey",
-      name: "landmarkName",
-      value: value,
-      onChange: ev => {
-        onChange(ev.target.value);
-        setLocationDetails({
-          ...locationDetails,
-          landmarkName: ev.target.value
-        });
-      },
-      onBlur: onBlur
-    })
-  }))), /*#__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 : ""));
-};
-const getAddress = (address, t) => {
-  return `${address !== null && address !== void 0 && address.houseDoorNo ? `${address === null || address === void 0 ? void 0 : address.houseDoorNo}, ` : ""} ${address !== null && address !== void 0 && address.buildingColonyName ? `${address === null || address === void 0 ? void 0 : address.buildingColonyName}, ` : ""}${address !== null && address !== void 0 && address.landmarkName ? `${address === null || address === void 0 ? void 0 : address.landmarkName}, ` : ""}${t(address === null || address === void 0 ? void 0 : address.locality.i18nkey)}, ${t(address === null || address === void 0 ? void 0 : address.cityCode.i18nKey)},${t(address === null || address === void 0 ? void 0 : address.pincode) ? `${address.pincode}` : " "}`;
-};
-const PropertyOwnerDetails = ({
-  t,
-  config,
-  onSelect,
-  userType,
-  formData,
-  formState,
-  ownerIndex,
-  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();
@@ -17831,7 +17725,7 @@ const PropertyOwnerDetails = ({
   const mutationScreen = url.includes("/property-mutation/");
   const isMobile = window.Digit.Utils.browser.isMobile();
   let index = 0;
-  const [ownershipCategory, setOwnerCategory] = React.useState("");
+  const [ownershipCategory, setOwnerCategory] = React.useState((formData === null || formData === void 0 ? void 0 : formData.ownershipCategory) || "");
   const [ownerDetails, setOwnerDetails] = React.useState([{
     ...(formData.owners && formData.owners[index]),
     name: formData.owners && formData.owners[index] && formData.owners[index].name || (formData === null || formData === void 0 ? void 0 : (_formData$owners = formData.owners) === null || _formData$owners === void 0 ? void 0 : _formData$owners.name) || "",
@@ -17850,6 +17744,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");
@@ -17862,29 +17757,15 @@ 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 = "";
-    if (e.target.checked === true) {
-      var _formData$searchResul, _formData$searchResul2;
-      const locationDet = mutationScreen ? formData === null || formData === void 0 ? void 0 : (_formData$searchResul = formData.searchResult) === null || _formData$searchResul === void 0 ? void 0 : (_formData$searchResul2 = _formData$searchResul.property) === null || _formData$searchResul2 === void 0 ? void 0 : _formData$searchResul2.locationDet : formData === null || formData === void 0 ? void 0 : formData.locationDet;
-      address = getAddress(locationDet, t);
-    }
-    updateState("permanentAddress", ind, address);
-    updateState("isCoresAddr", ind, e.target.checked);
-  }
   const GuardianOptions = [{
     name: "HUSBAND",
     code: "HUSBAND",
@@ -17937,7 +17818,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(() => {
@@ -17960,10 +17841,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]);
     });
@@ -17972,10 +17860,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]);
@@ -17987,46 +17875,14 @@ const PropertyOwnerDetails = ({
   };
   const ismultiple = ownershipCategory !== null && ownershipCategory !== void 0 && (_ownershipCategory$co = ownershipCategory.code) !== null && _ownershipCategory$co !== void 0 && _ownershipCategory$co.includes("MULTIPLEOWNERS") ? true : false;
   const isInstitutionalOwnerType = ownershipCategory === null || ownershipCategory === void 0 ? void 0 : (_ownershipCategory$co2 = ownershipCategory.code) === null || _ownershipCategory$co2 === void 0 ? void 0 : _ownershipCategory$co2.includes("INSTITUTIONAL");
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: ""
-  }, `${t("TL_NEW_OWNER_DETAILS_OWNERSHIP_TYPE_LABEL")}*`), /*#__PURE__*/React.createElement(Controller, {
-    name: "ownershipCategory",
-    defaultValue: ownershipCategory,
-    control: control,
-    rules: {
-      required: t("REQUIRED_FIELD")
-    },
-    render: ({
-      value,
-      onChange,
-      onBlur
-    }) => /*#__PURE__*/React.createElement(Dropdown, {
-      className: "form-field",
-      selected: value,
-      option: dropdownData,
-      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) {
-          setOwnerDetails([...ownerDetails.filter((own, ind) => ind == 0)]);
-        }
-        onChange(value);
-        setOwnerCategory(value);
-      },
-      optionKey: "i18nKey",
-      onBlur: onBlur,
-      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;
+  return /*#__PURE__*/React.createElement(CollapsibleCardPage, {
+    title: t("PT_OWNER_DETAILS"),
+    defaultOpen: true,
+    style: props.style
+  }, ownerDetails === null || ownerDetails === void 0 ? void 0 : ownerDetails.map((owner, index) => {
+    var _errors, _errors2, _errors3, _errors4, _errors5, _errors6, _errors7, _errors8, _errors9, _errors0, _errors1, _errors10, _ownerDetails$index, _ownerDetails$index3;
     return /*#__PURE__*/React.createElement("div", {
-      style: {
-        border: "1px solid #D6D5D4",
-        background: "#FAFAFA",
-        borderRadius: "4px",
-        boxSizing: "border-box",
-        margin: "16px 0px",
-        padding: "16px 8px"
-      }
+      key: index
     }, isMobile && ismultiple && ownerDetails.length > 1 && /*#__PURE__*/React.createElement("div", {
       style: {
         display: "flex",
@@ -18045,245 +17901,9 @@ const PropertyOwnerDetails = ({
       onClick: e => {
         setOwnerDetails([...ownerDetails.filter((own, ind) => ind != index)]);
       }
-    })), isInstitutionalOwnerType ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_INSTITUTION_NAME")}*`), /*#__PURE__*/React.createElement("div", {
-      className: "form-field"
-    }, /*#__PURE__*/React.createElement(Controller, {
-      key: "institutionName" + index,
-      name: "institutionName" + index,
-      defaultValue: owner === null || owner === void 0 ? void 0 : owner.institutionName,
-      control: control,
-      rules: {
-        required: t("REQUIRED_FIELD"),
-        validate: value => {
-          return /^[a-zA-Z ]*$/i.test(value) ? true : t("PT_NAME_ERROR_MESSAGE");
-        }
-      },
-      render: ({
-        value,
-        onChange,
-        onBlur
-      }) => /*#__PURE__*/React.createElement(TextInput, {
-        t: t,
-        type: "text",
-        isMandatory: false,
-        optionKey: "i18nKey",
-        name: "institutionName" + index,
-        value: value,
-        onChange: ev => {
-          onChange(ev.target.value);
-          updateState("institutionName", index, ev.target.value);
-        },
-        disable: isUpdateProperty || isEditProperty,
-        onBlur: onBlur
-      })
-    }))), /*#__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, {
-      className: ""
-    }, `${t("PT_INSTITUTION_TYPE")}*`), /*#__PURE__*/React.createElement("div", {
-      className: "form-field"
-    }, /*#__PURE__*/React.createElement(Controller, {
-      key: "institutionType" + index,
-      name: "institutionType" + index,
-      defaultValue: owner === null || owner === void 0 ? void 0 : owner.institutionType,
-      control: control,
-      rules: {
-        required: t("REQUIRED_FIELD")
-      },
-      render: ({
-        value,
-        onChange,
-        onBlur
-      }) => /*#__PURE__*/React.createElement(Dropdown, {
-        selected: (institutionTypeMenu === null || institutionTypeMenu === void 0 ? void 0 : institutionTypeMenu.length) === 1 ? Menu1[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 => {
-          onChange(value);
-          updateState("institutionType", index, value);
-        },
-        optionKey: "i18nKey",
-        t: t,
-        onBlur: onBlur
-      })
-    }))), /*#__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", {
-      className: "form-field"
-    }, /*#__PURE__*/React.createElement(Controller, {
-      key: "name" + index,
-      name: "name" + index,
-      defaultValue: owner === null || owner === void 0 ? void 0 : owner.name,
-      control: control,
-      rules: {
-        required: t("REQUIRED_FIELD"),
-        validate: value => {
-          return /^[a-zA-Z ]+$/i.test(value) ? true : t("PT_NAME_ERROR_MESSAGE");
-        }
-      },
-      render: ({
-        value,
-        onChange,
-        onBlur
-      }) => /*#__PURE__*/React.createElement(TextInput, {
-        t: t,
-        type: "text",
-        isMandatory: false,
-        optionKey: "i18nKey",
-        name: "name" + index,
-        value: value,
-        onChange: ev => {
-          onChange(ev.target.value);
-          updateState("name", index, ev.target.value);
-        },
-        disable: isUpdateProperty || isEditProperty,
-        onBlur: onBlur
-      })
-    }))), /*#__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", {
-      className: "form-field"
-    }, /*#__PURE__*/React.createElement(Controller, {
-      key: "altContactNumber" + index,
-      name: "altContactNumber" + index,
-      defaultValue: owner.altContactNumber,
-      control: control,
-      rules: {
-        required: t("REQUIRED_FIELD"),
-        validate: value => /^[0-9]{11}$/i.test(value) ? true : t("ERR_DEFAULT_INPUT_FIELD_MSG")
-      },
-      render: ({
-        value,
-        onChange,
-        onBlur
-      }) => /*#__PURE__*/React.createElement(MobileNumber, {
-        type: "text",
-        t: t,
-        maxLength: 11,
-        value: value,
-        name: "altContactNumber" + index,
-        onChange: value => {
-          onChange(value);
-          updateState("altContactNumber", index, value);
-        },
-        disable: isUpdateProperty || isEditProperty,
-        labelStyle: {
-          border: "1px solid #000",
-          borderRight: "none"
-        },
-        onBlur: onBlur
-      })
-    }))), /*#__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", {
-      className: "form-field"
-    }, /*#__PURE__*/React.createElement(Controller, {
-      key: "mobileNumber" + index,
-      name: "mobileNumber" + index,
-      defaultValue: owner.mobileNumber,
-      control: control,
-      rules: {
-        required: t("REQUIRED_FIELD"),
-        validate: value => /[6-9]{1}[0-9]{9}/i.test(value) ? true : t("CORE_COMMON_APPLICANT_MOBILE_NUMBER_INVALID")
-      },
-      render: ({
-        value,
-        onChange,
-        onBlur
-      }) => /*#__PURE__*/React.createElement(MobileNumber, {
-        value: value,
-        name: "mobileNumber" + index,
-        onChange: value => {
-          onChange(value);
-          updateState("mobileNumber", index, value);
-        },
-        disable: isUpdateProperty || isEditProperty,
-        labelStyle: {
-          border: "1px solid #000",
-          borderRight: "none"
-        },
-        onBlur: onBlur
-      })
-    })), !isMobile && /*#__PURE__*/React.createElement("div", {
-      style: {
-        display: "flex",
-        justifyContent: "flex-end",
-        width: "20%",
-        alignSelf: "flex-start"
-      }
-    }, ismultiple && /*#__PURE__*/React.createElement(LinkButton, {
-      label: /*#__PURE__*/React.createElement(DeleteIcon, {
-        style: {
-          bottom: "0px"
-        },
-        fill: !(ownerDetails.length == 1) ? "#494848" : "#FAFAFA"
-      }),
-      style: {
-        margin: "0px"
-      },
-      onClick: e => {
-        setOwnerDetails([...ownerDetails.filter((own, ind) => ind != index)]);
-      }
-    }))), /*#__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", {
-      className: "form-field"
-    }, /*#__PURE__*/React.createElement(Controller, {
-      key: "designation" + index,
-      name: "designation" + index,
-      defaultValue: owner === null || owner === void 0 ? void 0 : owner.designation,
-      control: control,
-      rules: {
-        required: t("REQUIRED_FIELD"),
-        validate: value => {
-          return /^[a-zA-Z ]*$/i.test(value) ? true : t("PT_NAME_ERROR_MESSAGE");
-        }
-      },
-      render: ({
-        value,
-        onChange,
-        onBlur
-      }) => /*#__PURE__*/React.createElement(TextInput, {
-        t: t,
-        type: "text",
-        isMandatory: false,
-        optionKey: "i18nKey",
-        name: "designation" + index,
-        value: value,
-        onChange: ev => {
-          onChange(ev.target.value);
-          updateState("designation", index, ev.target.value);
-        },
-        disable: isUpdateProperty || isEditProperty,
-        onBlur: onBlur
-      })
-    }))), /*#__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", {
-      className: "form-field"
-    }, /*#__PURE__*/React.createElement(TextArea, {
-      isMandatory: false,
-      optionKey: "i18nKey",
-      t: t,
-      disabled: (ownerDetails === null || ownerDetails === void 0 ? void 0 : (_ownerDetails$index = ownerDetails[index]) === null || _ownerDetails$index === void 0 ? void 0 : _ownerDetails$index.isCoresAddr) === true,
-      name: "address" + index,
-      onChange: e => {
-        var _ownerDetails$index2;
-        if (!((ownerDetails === null || ownerDetails === void 0 ? void 0 : (_ownerDetails$index2 = ownerDetails[index]) === null || _ownerDetails$index2 === void 0 ? void 0 : _ownerDetails$index2.isCoresAddr) === true)) {
-          updateState("permanentAddress", index, e.target.value);
-        }
-      },
-      value: ownerDetails === null || ownerDetails === void 0 ? void 0 : (_ownerDetails$index3 = ownerDetails[index]) === null || _ownerDetails$index3 === void 0 ? void 0 : _ownerDetails$index3.permanentAddress
-    }))), /*#__PURE__*/React.createElement(CheckBox, {
-      className: "form-field",
-      label: `${t("PT_COMMON_SAME_AS_PROPERTY_ADDRESS")}`,
-      onChange: e => setCorrespondenceAddress(e, index),
-      value: ownerDetails === null || ownerDetails === void 0 ? void 0 : (_ownerDetails$index4 = ownerDetails[index]) === null || _ownerDetails$index4 === void 0 ? void 0 : _ownerDetails$index4.isCoresAddr,
-      checked: (ownerDetails === null || ownerDetails === void 0 ? void 0 : (_ownerDetails$index5 = ownerDetails[index]) === null || _ownerDetails$index5 === void 0 ? void 0 : _ownerDetails$index5.isCoresAddr) || false,
-      style: window.location.href.includes("/citizen/") ? {
-        paddingTop: "10px"
-      } : {}
-    })) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PT_FORM3_MOBILE_NUMBER")}*`), /*#__PURE__*/React.createElement("div", {
+    })), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+      className: "formcomposer-section-grid"
+    }, /*#__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,
@@ -18332,9 +17952,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 : (_errors = errors["mobileNumber" + index]) === null || _errors === void 0 ? void 0 : _errors.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 : (_errors2 = errors["mobileNumber" + index]) === null || _errors2 === void 0 ? void 0 : _errors2.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,
@@ -18365,9 +17985,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 : (_errors3 = errors["name" + index]) === null || _errors3 === void 0 ? void 0 : _errors3.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 : (_errors4 = errors["name" + index]) === null || _errors4 === void 0 ? void 0 : _errors4.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,
@@ -18395,9 +18015,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 : (_errors5 = errors["gender" + index]) === null || _errors5 === void 0 ? void 0 : _errors5.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 : (_errors6 = errors["gender" + index]) === null || _errors6 === void 0 ? void 0 : _errors6.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,
@@ -18426,9 +18046,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 : (_errors7 = errors["fatherOrHusbandName" + index]) === null || _errors7 === void 0 ? void 0 : _errors7.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 : (_errors8 = errors["fatherOrHusbandName" + index]) === null || _errors8 === void 0 ? void 0 : _errors8.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,
@@ -18456,9 +18076,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 : (_errors9 = errors["relationship" + index]) === null || _errors9 === void 0 ? void 0 : _errors9.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 : (_errors0 = errors["relationship" + index]) === null || _errors0 === void 0 ? void 0 : _errors0.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
       className: ""
     }, `${t("PT_SPECIAL_APPLICANT_CATEGORY")}*`), /*#__PURE__*/React.createElement("div", {
       className: "form-field"
@@ -18486,33 +18106,24 @@ 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 : (_errors1 = errors["ownerType" + index]) === null || _errors1 === void 0 ? void 0 : _errors1.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 : (_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", {
       className: "form-field"
     }, /*#__PURE__*/React.createElement(TextArea, {
       isMandatory: false,
       optionKey: "i18nKey",
       t: t,
-      disabled: (ownerDetails === null || ownerDetails === void 0 ? void 0 : (_ownerDetails$index6 = ownerDetails[index]) === null || _ownerDetails$index6 === void 0 ? void 0 : _ownerDetails$index6.isCoresAddr) === true,
+      disabled: (ownerDetails === null || ownerDetails === void 0 ? void 0 : (_ownerDetails$index = ownerDetails[index]) === null || _ownerDetails$index === void 0 ? void 0 : _ownerDetails$index.isCoresAddr) === true,
       name: "address" + index,
       onChange: e => {
-        var _ownerDetails$index7;
-        if (!((ownerDetails === null || ownerDetails === void 0 ? void 0 : (_ownerDetails$index7 = ownerDetails[index]) === null || _ownerDetails$index7 === void 0 ? void 0 : _ownerDetails$index7.isCoresAddr) === true)) {
+        var _ownerDetails$index2;
+        if (!((ownerDetails === null || ownerDetails === void 0 ? void 0 : (_ownerDetails$index2 = ownerDetails[index]) === null || _ownerDetails$index2 === void 0 ? void 0 : _ownerDetails$index2.isCoresAddr) === true)) {
           updateState("permanentAddress", index, e.target.value);
         }
       },
-      value: ownerDetails === null || ownerDetails === void 0 ? void 0 : (_ownerDetails$index8 = ownerDetails[index]) === null || _ownerDetails$index8 === void 0 ? void 0 : _ownerDetails$index8.permanentAddress
-    }))), /*#__PURE__*/React.createElement(CheckBox, {
-      className: "form-field",
-      label: `${t("PT_COMMON_SAME_AS_PROPERTY_ADDRESS")}`,
-      onChange: e => setCorrespondenceAddress(e, index),
-      value: ownerDetails === null || ownerDetails === void 0 ? void 0 : (_ownerDetails$index9 = ownerDetails[index]) === null || _ownerDetails$index9 === void 0 ? void 0 : _ownerDetails$index9.isCoresAddr,
-      checked: (ownerDetails === null || ownerDetails === void 0 ? void 0 : (_ownerDetails$index0 = ownerDetails[index]) === null || _ownerDetails$index0 === void 0 ? void 0 : _ownerDetails$index0.isCoresAddr) || false,
-      style: window.location.href.includes("/citizen/") ? {
-        paddingTop: "10px"
-      } : {}
-    })));
+      value: ownerDetails === null || ownerDetails === void 0 ? void 0 : (_ownerDetails$index3 = ownerDetails[index]) === null || _ownerDetails$index3 === void 0 ? void 0 : _ownerDetails$index3.permanentAddress
+    }))))));
   }), ismultiple ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
@@ -18546,6 +18157,319 @@ const PropertyOwnerDetails = ({
   }, t(((_formState$errors = formState.errors) === null || _formState$errors === void 0 ? void 0 : (_formState$errors$mul = _formState$errors.mulipleOwnerError) === null || _formState$errors$mul === void 0 ? void 0 : _formState$errors$mul.message) || ""))) : null);
 };
+const NUMBER_PATTERN = /^\d+$/;
+const DECIMAL_PATTERN = /^\d+(\.\d{1,2})?$/;
+const PropertyWaterConnection = ({
+  t,
+  config,
+  onSelect,
+  formData,
+  formState,
+  setError,
+  clearErrors,
+  ...props
+}) => {
+  var _formData$cpt, _formData$cpt$details, _formData$cpt3, _errors$useDetails, _errors$useDetails2, _errors$useDetails3, _errors$useDetails4, _errors$useDetails5, _errors$useDetails6, _errors$useDetails7, _errors$useDetails8, _errors$useDetails9, _errors$useDetails0;
+  const {
+    control,
+    register,
+    formState: {
+      errors,
+      touched
+    },
+    watch,
+    setValue
+  } = useForm({
+    defaultValues: (formData === null || formData === void 0 ? void 0 : formData[config.key]) || {
+      useDetails: {
+        propertyCategory: null,
+        propertyType: null,
+        WaterConnectionUsageType: null,
+        noOfFloors: null,
+        plotArea: "",
+        builtUpArea: "",
+        SelectYearofConstruction: null,
+        NumberofDwellingUnits: "",
+        NumberofRooms: "",
+        hospitalBeds: ""
+      }
+    }
+  });
+  const tenantId = Digit.ULBService.getCurrentTenantId();
+  const {
+    isLoading: isWSServicesMastersLoading,
+    data: ptServicesMastersData
+  } = Digit.Hooks.pt.usePropertyMDMS(tenantId, "PropertyTax", ["PropertyCategory", "PropertyType", "NoOfFloors", "PropertyNewUsageType"]);
+  const isPropertyFound = !!(formData !== null && formData !== void 0 && (_formData$cpt = formData.cpt) !== null && _formData$cpt !== void 0 && (_formData$cpt$details = _formData$cpt.details) !== null && _formData$cpt$details !== void 0 && _formData$cpt$details.propertyId);
+  const formValue = watch();
+  const watchPropertyType = watch("useDetails.propertyType");
+  const watchPropertyCategory = watch("useDetails.propertyCategory");
+  const isHospitalProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOSPITAL_NURSING_HOME" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HospitalNursingHome";
+  const yearOptions = useMemo(() => {
+    const currentYear = new Date().getFullYear();
+    const years = [];
+    for (let i = currentYear; i >= currentYear - 100; i--) {
+      years.push({
+        value: i.toString(),
+        name: i.toString()
+      });
+    }
+    return years;
+  }, []);
+  const categoryOptions = useMemo(() => {
+    var _ptServicesMastersDat, _ptServicesMastersDat2;
+    return ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat === void 0 ? void 0 : (_ptServicesMastersDat2 = _ptServicesMastersDat.PropertyCategory) === null || _ptServicesMastersDat2 === void 0 ? void 0 : _ptServicesMastersDat2.filter(item => item.active).map(item => ({
+      code: item.code,
+      name: item.name
+    }));
+  }, [ptServicesMastersData]);
+  const propertyTypeOptions = useMemo(() => {
+    var _ptServicesMastersDat3, _ptServicesMastersDat4;
+    return (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat3 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat3 === void 0 ? void 0 : (_ptServicesMastersDat4 = _ptServicesMastersDat3.PropertyType) === null || _ptServicesMastersDat4 === void 0 ? void 0 : _ptServicesMastersDat4.filter(item => item.active).map(item => ({
+      code: item.code,
+      name: item.name
+    }))) || [];
+  }, [ptServicesMastersData]);
+  const usageTypeOptions = useMemo(() => {
+    var _ptServicesMastersDat5, _ptServicesMastersDat6;
+    return ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat5 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat5 === void 0 ? void 0 : (_ptServicesMastersDat6 = _ptServicesMastersDat5.PropertyNewUsageType) === null || _ptServicesMastersDat6 === void 0 ? void 0 : _ptServicesMastersDat6.filter(item => item.active).map(item => ({
+      code: item.code,
+      name: item.name
+    }));
+  }, [ptServicesMastersData]);
+  const floorOptions = useMemo(() => {
+    var _ptServicesMastersDat7, _ptServicesMastersDat8;
+    return ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat7 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat7 === void 0 ? void 0 : (_ptServicesMastersDat8 = _ptServicesMastersDat7.NoOfFloors) === null || _ptServicesMastersDat8 === void 0 ? void 0 : _ptServicesMastersDat8.filter(item => item.active).map(item => ({
+      code: item.code,
+      name: item.name
+    }));
+  }, [ptServicesMastersData]);
+  const lastSentValue = React.useRef(null);
+  useEffect(() => {
+    if (!lodash.isEqual(lastSentValue.current, formValue)) {
+      lastSentValue.current = lodash.cloneDeep(formValue);
+      onSelect(config.key, formValue);
+    }
+  }, [formValue, config.key, onSelect]);
+  useEffect(() => {
+    var _formData$cpt2;
+    if (formData !== null && formData !== void 0 && (_formData$cpt2 = formData.cpt) !== null && _formData$cpt2 !== void 0 && _formData$cpt2.details) {
+      const details = formData.cpt.details;
+      const additionalDetails = (details === null || details === void 0 ? void 0 : details.additionalDetails) || {};
+      setValue("useDetails.propertyCategory", (categoryOptions === null || categoryOptions === void 0 ? void 0 : categoryOptions.find(o => o.code === additionalDetails.propertyCategory)) || null);
+      setValue("useDetails.propertyType", (propertyTypeOptions === null || propertyTypeOptions === void 0 ? void 0 : propertyTypeOptions.find(o => o.code === additionalDetails.propertyType)) || null);
+      setValue("useDetails.WaterConnectionUsageType", (usageTypeOptions === null || usageTypeOptions === void 0 ? void 0 : usageTypeOptions.find(o => o.code === additionalDetails.waterConnectionUsageType)) || null);
+      setValue("useDetails.noOfFloors", (floorOptions === null || floorOptions === void 0 ? void 0 : floorOptions.find(o => {
+        var _details$noOfFloors;
+        return o.code === (((_details$noOfFloors = details.noOfFloors) === null || _details$noOfFloors === void 0 ? void 0 : _details$noOfFloors.toString()) || additionalDetails.noOfFloors);
+      })) || null);
+      setValue("useDetails.plotArea", additionalDetails.plotArea || "");
+      setValue("useDetails.builtUpArea", additionalDetails.builtUpArea || "");
+      setValue("useDetails.SelectYearofConstruction", (yearOptions === null || yearOptions === void 0 ? void 0 : yearOptions.find(o => o.value === additionalDetails.yearOfConstruction)) || null);
+      setValue("useDetails.NumberofDwellingUnits", additionalDetails.numberOfDwellingUnits || "");
+      setValue("useDetails.NumberofRooms", additionalDetails.numberOfRooms || "");
+    }
+  }, [formData === null || formData === void 0 ? void 0 : (_formData$cpt3 = formData.cpt) === null || _formData$cpt3 === void 0 ? void 0 : _formData$cpt3.details, categoryOptions, propertyTypeOptions, usageTypeOptions, floorOptions, yearOptions, setValue]);
+  const lastErrorState = React.useRef(null);
+  useEffect(() => {
+    const hasErrors = Object.keys(errors).length > 0;
+    if (lastErrorState.current !== hasErrors) {
+      lastErrorState.current = hasErrors;
+      if (hasErrors) {
+        setError(config.key, {
+          type: "custom",
+          message: "Validation failed"
+        });
+      } else {
+        clearErrors(config.key);
+      }
+    }
+  }, [errors, config.key, setError, clearErrors]);
+  const errorStyle = {
+    width: "70%",
+    marginLeft: "30%",
+    fontSize: "12px",
+    marginTop: "-21px"
+  };
+  return /*#__PURE__*/React.createElement(CollapsibleCardPage, {
+    title: t("WS_PROPERTY_AND_WATER_CONNECTION_USE_DETAILS"),
+    defaultOpen: true,
+    style: props.style
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "formcomposer-section-grid"
+  }, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_PROPERTY_CATEGORY")}*`), /*#__PURE__*/React.createElement("div", {
+    className: "form-field"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "useDetails.propertyCategory",
+    rules: {
+      required: t("REQUIRED_FIELD")
+    },
+    render: props => /*#__PURE__*/React.createElement(Dropdown, {
+      option: categoryOptions,
+      optionKey: "name",
+      selected: props.value,
+      select: props.onChange,
+      t: t,
+      onBlur: props.onBlur,
+      disable: isPropertyFound
+    })
+  }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails = errors.useDetails) === null || _errors$useDetails === void 0 ? void 0 : _errors$useDetails.propertyCategory) && /*#__PURE__*/React.createElement(CardLabelError, {
+    style: errorStyle
+  }, errors.useDetails.propertyCategory.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_PROPERTY_TYPE")}*`), /*#__PURE__*/React.createElement("div", {
+    className: "form-field"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "useDetails.propertyType",
+    rules: {
+      required: t("REQUIRED_FIELD")
+    },
+    render: props => /*#__PURE__*/React.createElement(Dropdown, {
+      option: propertyTypeOptions,
+      optionKey: "name",
+      selected: props.value,
+      select: props.onChange,
+      t: t,
+      onBlur: props.onBlur,
+      disable: isPropertyFound
+    })
+  }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails2 = errors.useDetails) === null || _errors$useDetails2 === void 0 ? void 0 : _errors$useDetails2.propertyType) && /*#__PURE__*/React.createElement(CardLabelError, {
+    style: errorStyle
+  }, errors.useDetails.propertyType.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_WATER_CONNECTION_USAGE_TYPE")}*`), /*#__PURE__*/React.createElement("div", {
+    className: "form-field"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "useDetails.WaterConnectionUsageType",
+    rules: {
+      required: t("REQUIRED_FIELD")
+    },
+    render: props => /*#__PURE__*/React.createElement(Dropdown, {
+      option: usageTypeOptions,
+      optionKey: "name",
+      selected: props.value,
+      select: props.onChange,
+      t: t,
+      onBlur: props.onBlur,
+      disable: isPropertyFound
+    })
+  }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails3 = errors.useDetails) === null || _errors$useDetails3 === void 0 ? void 0 : _errors$useDetails3.WaterConnectionUsageType) && /*#__PURE__*/React.createElement(CardLabelError, {
+    style: errorStyle
+  }, errors.useDetails.WaterConnectionUsageType.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_NUMBER_OF_FLOORS")}*`), /*#__PURE__*/React.createElement("div", {
+    className: "form-field"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "useDetails.noOfFloors",
+    rules: {
+      required: t("REQUIRED_FIELD")
+    },
+    render: props => /*#__PURE__*/React.createElement(Dropdown, {
+      option: floorOptions,
+      optionKey: "name",
+      selected: props.value,
+      select: props.onChange,
+      t: t,
+      onBlur: props.onBlur,
+      disable: isPropertyFound
+    })
+  }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails4 = errors.useDetails) === null || _errors$useDetails4 === void 0 ? void 0 : _errors$useDetails4.noOfFloors) && /*#__PURE__*/React.createElement(CardLabelError, {
+    style: errorStyle
+  }, errors.useDetails.noOfFloors.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_PLOT_AREA")}*`), /*#__PURE__*/React.createElement("div", {
+    className: "form-field"
+  }, /*#__PURE__*/React.createElement(TextInput, {
+    t: t,
+    inputRef: register({
+      pattern: {
+        value: DECIMAL_PATTERN,
+        message: t("ERR_INVALID_DECIMAL")
+      },
+      required: t("REQUIRED_FIELD")
+    }),
+    name: "useDetails.plotArea",
+    disabled: isPropertyFound
+  }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails5 = errors.useDetails) === null || _errors$useDetails5 === void 0 ? void 0 : _errors$useDetails5.plotArea) && /*#__PURE__*/React.createElement(CardLabelError, {
+    style: errorStyle
+  }, errors.useDetails.plotArea.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_BUILT_UP_AREA")}*`), /*#__PURE__*/React.createElement("div", {
+    className: "form-field"
+  }, /*#__PURE__*/React.createElement(TextInput, {
+    t: t,
+    inputRef: register({
+      pattern: {
+        value: DECIMAL_PATTERN,
+        message: t("ERR_INVALID_DECIMAL")
+      },
+      required: t("REQUIRED_FIELD")
+    }),
+    name: "useDetails.builtUpArea",
+    disabled: isPropertyFound
+  }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails6 = errors.useDetails) === null || _errors$useDetails6 === void 0 ? void 0 : _errors$useDetails6.builtUpArea) && /*#__PURE__*/React.createElement(CardLabelError, {
+    style: errorStyle
+  }, errors.useDetails.builtUpArea.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_SELECT_YEAR_OF_CONSTRUCTION")}*`), /*#__PURE__*/React.createElement("div", {
+    className: "form-field"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "useDetails.SelectYearofConstruction",
+    rules: {
+      required: t("REQUIRED_FIELD")
+    },
+    render: props => /*#__PURE__*/React.createElement(Dropdown, {
+      option: yearOptions,
+      optionKey: "value",
+      selected: props.value,
+      select: props.onChange,
+      t: t,
+      onBlur: props.onBlur,
+      disable: isPropertyFound
+    })
+  }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails7 = errors.useDetails) === null || _errors$useDetails7 === void 0 ? void 0 : _errors$useDetails7.SelectYearofConstruction) && /*#__PURE__*/React.createElement(CardLabelError, {
+    style: errorStyle
+  }, errors.useDetails.SelectYearofConstruction.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_NUMBER_OF_DWELLING_UNITS")}*`), /*#__PURE__*/React.createElement("div", {
+    className: "form-field"
+  }, /*#__PURE__*/React.createElement(TextInput, {
+    t: t,
+    inputRef: register({
+      pattern: {
+        value: NUMBER_PATTERN,
+        message: t("ERR_INVALID_NUMBER")
+      },
+      required: t("REQUIRED_FIELD")
+    }),
+    name: "useDetails.NumberofDwellingUnits",
+    disabled: isPropertyFound
+  }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails8 = errors.useDetails) === null || _errors$useDetails8 === void 0 ? void 0 : _errors$useDetails8.NumberofDwellingUnits) && /*#__PURE__*/React.createElement(CardLabelError, {
+    style: errorStyle
+  }, errors.useDetails.NumberofDwellingUnits.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_NUMBER_OF_ROOMS")}*`), /*#__PURE__*/React.createElement("div", {
+    className: "form-field"
+  }, /*#__PURE__*/React.createElement(TextInput, {
+    t: t,
+    inputRef: register({
+      pattern: {
+        value: NUMBER_PATTERN,
+        message: t("ERR_INVALID_NUMBER")
+      },
+      required: t("REQUIRED_FIELD")
+    }),
+    name: "useDetails.NumberofRooms",
+    disabled: isPropertyFound
+  }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails9 = errors.useDetails) === null || _errors$useDetails9 === void 0 ? void 0 : _errors$useDetails9.NumberofRooms) && /*#__PURE__*/React.createElement(CardLabelError, {
+    style: errorStyle
+  }, errors.useDetails.NumberofRooms.message), isHospitalProperty ? /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_NUMBER_OF_BEDS")}*`), /*#__PURE__*/React.createElement("div", {
+    className: "form-field"
+  }, /*#__PURE__*/React.createElement(TextInput, {
+    t: t,
+    inputRef: register({
+      pattern: {
+        value: NUMBER_PATTERN,
+        message: t("ERR_INVALID_NUMBER")
+      },
+      required: isHospitalProperty ? t("REQUIRED_FIELD") : false
+    }),
+    name: "useDetails.hospitalBeds",
+    disabled: isPropertyFound
+  }))) : null, isHospitalProperty && (errors === null || errors === void 0 ? void 0 : (_errors$useDetails0 = errors.useDetails) === null || _errors$useDetails0 === void 0 ? void 0 : _errors$useDetails0.hospitalBeds) && /*#__PURE__*/React.createElement(CardLabelError, {
+    style: errorStyle
+  }, errors.useDetails.hospitalBeds.message)));
+};
 const SwitchComponent = props => {
   return /*#__PURE__*/React.createElement("div", {
     className: "w-fullwidth PropertySearchFormSwitcher"
@@ -18828,7 +18752,7 @@ const getAction = flow => {
       actions = [];
       break;
     case "WS":
-      actions = ['WS_COMMON_PROPERTY_DETAILS', 'WS_COMMON_CONNECTION_DETAIL', 'WS_COMMON_DOCUMENT_DETAILS', 'WS_COMMON_SUMMARY'];
+      actions = ['WS_COMMON_CONNECTION_DETAIL', 'WS_COMMON_DOCUMENT_DETAILS', 'WS_COMMON_SUMMARY'];
       break;
     case "TL":
       actions = ['TL_COMMON_TR_DETAILS', 'TL_LOCATION_AND_OWNER_DETAILS', 'TL_DOCUMENT_DETAIL', 'TL_COMMON_SUMMARY'];
@@ -19072,7 +18996,7 @@ const PropertyDetails = ({
   }))));
 };
-const getAddress$1 = (address, t) => {
+const getAddress = (address, t) => {
   return `${address !== null && address !== void 0 && address.doorNo ? `${address === null || address === void 0 ? void 0 : address.doorNo}, ` : ""} ${address !== null && address !== void 0 && address.street ? `${address === null || address === void 0 ? void 0 : address.street}, ` : ""}${address !== null && address !== void 0 && address.landmark ? `${address === null || address === void 0 ? void 0 : address.landmark}, ` : ""}${t(Digit.Utils.pt.getMohallaLocale(address === null || address === void 0 ? void 0 : address.locality.code, address === null || address === void 0 ? void 0 : address.tenantId))}, ${t(Digit.Utils.pt.getCityLocale(address === null || address === void 0 ? void 0 : address.tenantId))}${address !== null && address !== void 0 && address.pincode && t(address === null || address === void 0 ? void 0 : address.pincode) ? `, ${address.pincode}` : " "}`;
 };
 const PropertySearchNSummary = ({
@@ -19084,7 +19008,7 @@ const PropertySearchNSummary = ({
   formState,
   clearErrors
 }) => {
-  var _formData$cptId, _formData$tradedetils, _formData$tradedetils2, _formData$tradedetils3, _propertyDetails$Prop3, _propertyDetails$Prop4, _propertyDetails$Prop5, _propertyDetails$Prop6, _propertyDetails$Prop7, _propertyDetails$Prop8, _window$location$path, _window$location$path2, _window$location$path3;
+  var _formData$cptId, _formData$tradedetils, _formData$tradedetils2, _formData$tradedetils3, _propertyDetails$Prop3, _propertyDetails$Prop4, _propertyDetails$Prop5, _propertyDetails$Prop6, _propertyDetails$Prop7, _propertyDetails$Prop8;
   const {
     t
   } = useTranslation();
@@ -19159,11 +19083,10 @@ const PropertySearchNSummary = ({
   if (isEditScreen) {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
-  const redirectBackUrl = window.location.pathname;
   let propertyAddress = "";
   if (propertyDetails && propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.Properties.length) {
     var _propertyDetails$Prop2;
-    propertyAddress = getAddress$1(propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop2 = propertyDetails.Properties[0]) === null || _propertyDetails$Prop2 === void 0 ? void 0 : _propertyDetails$Prop2.address, t);
+    propertyAddress = getAddress(propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop2 = propertyDetails.Properties[0]) === null || _propertyDetails$Prop2 === void 0 ? void 0 : _propertyDetails$Prop2.address, t);
   }
   const getInputStyles = () => {
     if (window.location.href.includes("/ws/")) {
@@ -19182,8 +19105,9 @@ const PropertySearchNSummary = ({
     return getOwnersList ? getOwnersList : t("NA");
   };
   if (window.location.href.includes("/ws/")) ;
-  return /*#__PURE__*/React.createElement(Card, {
-    className: "no-shadow"
+  return /*#__PURE__*/React.createElement(CollapsibleCardPage, {
+    title: t("PT_PROPERTY_DETAILS"),
+    defaultOpen: true
   }, (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", {
@@ -19203,7 +19127,8 @@ const PropertySearchNSummary = ({
     style: {
       width: "80%",
       float: "left"
-    }
+    },
+    placeholder: `${t("PT_ENTER_PROPERTY_ID")}`
   }), /*#__PURE__*/React.createElement("button", {
     className: "submit-bar",
     type: "button",
@@ -19211,56 +19136,72 @@ const PropertySearchNSummary = ({
       color: "white"
     },
     onClick: searchProperty
-  }, `${t("PT_SEARCH")}`))), /*#__PURE__*/React.createElement("span", {
-    onClick: () => history.push(`/digit-ui/employee/commonpt/search?redirectToUrl=${redirectBackUrl}&${serachParams}`, {
-      ...state
+  }, `${t("PT_SEARCH")}`), /*#__PURE__*/React.createElement("span", {
+    onClick: () => history.push(`/digit-ui/${userType}/${pathname.split("/")[3]}/create-application/create-property`, {
+      ...state,
+      ...formData
     })
-  }, /*#__PURE__*/React.createElement(LinkButton, {
-    label: t("CPT_SEARCH_PROPERTY"),
+  }, /*#__PURE__*/React.createElement("button", {
+    className: "submit-bar",
+    type: "button",
     style: {
-      color: "#a82227",
-      display: "inline-block"
+      color: "white"
     }
-  })), "\xA0 | \xA0", /*#__PURE__*/React.createElement("span", {
-    onClick: () => history.push(`/digit-ui/employee/commonpt/new-application?redirectToUrl=${redirectBackUrl}&${serachParams}`, {
-      ...state
-    })
-  }, /*#__PURE__*/React.createElement(LinkButton, {
-    label: t("CPT_CREATE_PROPERTY"),
+  }, t("CPT_CREATE_PROPERTY"))))), propertyDetails && propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.Properties.length ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Card, {
+    className: "card-with-background",
     style: {
-      color: "#a82227",
-      display: "inline-block"
+      margin: "16px 0px",
+      padding: "20px",
+      boxShadow: "none"
     }
-  })), propertyDetails && propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.Properties.length ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("header", {
-    className: "card-section-header",
+  }, /*#__PURE__*/React.createElement(StatusTable, {
     style: {
-      marginBottom: "5px",
-      marginTop: "20px"
+      padding: "0",
+      margin: "0"
     }
-  }, t("PT_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
     className: "formcomposer-section-grid",
     style: isMobile ? {} : {}
   }, /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     labelStyle: isMobile ? {
       width: "40%"
-    } : {},
+    } : {
+      width: "30%",
+      color: "#505a5f",
+      fontWeight: "600"
+    },
+    textStyle: {
+      color: "#000"
+    },
     label: t(`PROPERTY_ID`),
     text: propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop3 = propertyDetails.Properties[0]) === null || _propertyDetails$Prop3 === void 0 ? void 0 : _propertyDetails$Prop3.propertyId
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     labelStyle: isMobile ? {
       width: "40%"
-    } : {},
+    } : {
+      width: "30%",
+      color: "#505a5f",
+      fontWeight: "600"
+    },
+    textStyle: {
+      color: "#000"
+    },
     label: t(`OWNER_NAME`),
     text: getOwnerNames(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.Properties[0])
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     labelStyle: isMobile ? {
       width: "40%"
-    } : {},
+    } : {
+      width: "30%",
+      color: "#505a5f",
+      fontWeight: "600"
+    },
     textStyle: {
-      wordBreak: "break-word"
+      wordBreak: "break-word",
+      color: "#000"
     },
     label: t(`PROPERTY_ADDRESS`),
     text: propertyAddress,
@@ -19284,15 +19225,7 @@ const PropertySearchNSummary = ({
         isArray: false
       }
     }
-  }))), /*#__PURE__*/React.createElement(Link, {
-    to: `/digit-ui/employee/commonpt/view-property?propertyId=${propertyId}&tenantId=${tenantId}&from=${(_window$location$path = window.location.pathname) !== null && _window$location$path !== void 0 && _window$location$path.includes("employee/ws/new-application") ? "ES_COMMON_WS_NEW_CONNECTION" : (_window$location$path2 = window.location.pathname) !== null && _window$location$path2 !== void 0 && _window$location$path2.includes("employee/ws/modify-application") ? "WS_MODIFY_CONNECTION_BUTTON" : (_window$location$path3 = window.location.pathname) !== null && _window$location$path3 !== void 0 && _window$location$path3.includes("employee/tl/new-application") ? "ES_TITLE_NEW_TRADE_LICESE_APPLICATION" : "WF_EMPLOYEE_NEWTL_RENEWAL_SUBMIT_BUTTON"}`
-  }, /*#__PURE__*/React.createElement(LinkButton, {
-    label: t("CPT_COMPLETE_PROPERTY_DETAILS"),
-    style: {
-      color: "#a82227",
-      textAlign: "Left"
-    }
-  }))) : null, showToast && /*#__PURE__*/React.createElement(Toast, {
+  }))))) : null, showToast && /*#__PURE__*/React.createElement(Toast, {
     isDleteBtn: true,
     labelstyle: {
       width: "100%"
@@ -19339,6 +19272,7 @@ const componentsToRegister = {
   CPTPropertyAssemblyDetails: PropertyAssemblyDetails,
   CPTPropertyLocationDetails: PropertyLocationDetails,
   CPTPropertyOwnerDetails: PropertyOwnerDetails,
+  PropertyWaterConnection,
   CPTKnowYourProperty: KnowYourProperty,
   CPTPropertyDetails: PropertyDetails,
   CPTPropertySearchNSummary: PropertySearchNSummary,