@djb25/digit-ui-module-commonpt 1.0.12 → 1.0.14

package/dist/index.modern.js

@@ -1,4 +1,4 @@
-import { Loader, VerticalTimeline, FormComposer, Toast, Card, CardText, StatusTable, Row, SubmitBar, Banner, Header, ResponseComposer, Table, Modal, KeyNote, Dropdown, Localities, OTPInput, CardLabelError, FormStep, UploadFile, RadioButtons, DatePicker, CardSubHeader, PDFSvg, LabelFieldPair, CardLabel, MultiUploadWrapper, CardHeader, CardSectionHeader, CheckBox, TextInput, LinkButton, Close as Close$e, ViewsIcon, BreakLine, TelePhone, DisplayPhotos, InfoBannerIcon, EditIcon, CheckPoint, ConnectingCheckPoints, ActionBar, Menu, ButtonSelector, HomeIcon, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, CollapsibleCardPage, AddressDetails, DeleteIcon, MobileNumber, RadioOrSelect, TextArea, 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, LayoutWrapper, Header, ResponseComposer, Table, Modal, KeyNote, Dropdown, InfoBannerIcon, Localities, OTPInput, CardLabelError, FormStep, UploadFile, RadioButtons, DatePicker, CardSubHeader, PDFSvg, LabelFieldPair, CardLabel, MultiUploadWrapper, CardHeader, CardSectionHeader, CheckBox, TextInput, LinkButton, Close as Close$e, ViewsIcon, BreakLine, TelePhone, DisplayPhotos, EditIcon, CheckPoint, ConnectingCheckPoints, ActionBar, Menu, ButtonSelector, HomeIcon, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, CollapsibleCardPage, AddressDetails, DeleteIcon, MobileNumber, RadioOrSelect, TextArea, SearchForm, SearchField, DetailsCard, TickMark, PropertyHouse, EmployeeModuleCard, CitizenHomeCard, PTIcon } from '@djb25/digit-ui-react-components';
 import React, { useState, useEffect, useRef, useLayoutEffect, useMemo, 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';
@@ -43,24 +43,6 @@ const newConfig = [{
     withoutLabel: true,
     colSpan: "span 2"
   }]
-}, {
-  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",
-    colSpan: "span 2"
-  }]
 }];
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -6246,9 +6228,9 @@ const CreatePropertyForm = ({
   } = useTranslation();
   const location = useLocation();
   const [canSubmit, setCanSubmit] = useState(true);
-  const defaultValues = {
+  const defaultValues = React.useMemo(() => ({
     ...value
-  };
+  }), []);
   const history = useHistory();
   const match = useRouteMatch();
   sessionStorage.setItem("VisitedCommonPTSearch", true);
@@ -6328,17 +6310,34 @@ const CreatePropertyForm = ({
   }
   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;
+    let ownersArray = owners && owners.length > 0 ? owners : formValue === null || formValue === void 0 ? void 0 : formValue.owners;
+    if (!ownersArray || ownersArray.length === 0) {
+      var _Digit$UserService$ge;
+      const userInfo = (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.info;
+      ownersArray = [{
+        name: (userInfo === null || userInfo === void 0 ? void 0 : userInfo.name) || "Citizen",
+        mobileNumber: userInfo === null || userInfo === void 0 ? void 0 : userInfo.mobileNumber,
+        gender: {
+          code: (userInfo === null || userInfo === void 0 ? void 0 : userInfo.gender) || "MALE",
+          name: (userInfo === null || userInfo === void 0 ? void 0 : userInfo.gender) || "Male"
+        },
+        fatherOrHusbandName: "NA",
+        relationship: {
+          code: "FATHER",
+          name: "Father"
+        },
+        ownerType: {
+          code: "NONE",
+          name: "None"
+        },
+        ownershipCategory: "INDIVIDUAL.SINGLEOWNER"
+      }];
+    }
     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,
@@ -6460,7 +6459,7 @@ const PTAcknowledgement = ({
   redirectUrl,
   userType
 }) => {
-  var _location$state, _location$state2, _formData$cptNewPrope2, _formData$cptNewPrope3, _mdmsConfig$PropertyT, _data, _data$locationDet, _data$locationDet2, _data$locationDet2$ci, _data2, _data2$locationDet, _data$locationDet3, _data$locationDet3$ci, _responseData$Propert4;
+  var _location$state, _location$state2, _formData$cptNewPrope2, _formData$cptNewPrope3, _mdmsConfig$PropertyT, _data, _data$locationDet, _data$locationDet2, _data$locationDet2$ci, _data2, _data2$locationDet, _data$locationDet3, _data$locationDet3$ci, _responseData$Propert6;
   const {
     t
   } = useTranslation();
@@ -6534,13 +6533,24 @@ const PTAcknowledgement = ({
     Properties: [propertyFromState]
   } : mutation.data;
   const onNext = () => {
-    if (onSelect) {
-      if (isMutationSuccess) {
-        var _responseData$Propert, _responseData$Propert2, _responseData$Propert3;
-        sessionStorage.setItem("Digit_OBPS_PT", JSON.stringify(responseData === null || responseData === void 0 ? void 0 : (_responseData$Propert = responseData.Properties) === null || _responseData$Propert === void 0 ? void 0 : _responseData$Propert[0]));
-        sessionStorage.setItem("Digit_FSM_PT", JSON.stringify(responseData === null || responseData === void 0 ? void 0 : (_responseData$Propert2 = responseData.Properties) === null || _responseData$Propert2 === void 0 ? void 0 : _responseData$Propert2[0]));
+    if (isMutationSuccess) {
+      var _responseData$Propert, _responseData$Propert2;
+      sessionStorage.setItem("Digit_OBPS_PT", JSON.stringify(responseData === null || responseData === void 0 ? void 0 : (_responseData$Propert = responseData.Properties) === null || _responseData$Propert === void 0 ? void 0 : _responseData$Propert[0]));
+      sessionStorage.setItem("Digit_FSM_PT", JSON.stringify(responseData === null || responseData === void 0 ? void 0 : (_responseData$Propert2 = responseData.Properties) === null || _responseData$Propert2 === void 0 ? void 0 : _responseData$Propert2[0]));
+      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$Propert3, _responseData$Propert4, _location$state3;
+        history.push(`${finalRedirectUrl}?propertyId=${responseData === null || responseData === void 0 ? void 0 : (_responseData$Propert3 = responseData.Properties[0]) === null || _responseData$Propert3 === void 0 ? void 0 : _responseData$Propert3.propertyId}&tenantId=${responseData === null || responseData === void 0 ? void 0 : (_responseData$Propert4 = responseData.Properties[0]) === null || _responseData$Propert4 === void 0 ? void 0 : _responseData$Propert4.tenantId}`, {
+          ...(location === null || location === void 0 ? void 0 : (_location$state3 = location.state) === null || _location$state3 === void 0 ? void 0 : _location$state3.prevState)
+        });
+        return;
+      }
+      if (onSelect) {
+        var _responseData$Propert5;
         onSelect("cpt", {
-          details: responseData === null || responseData === void 0 ? void 0 : (_responseData$Propert3 = responseData.Properties) === null || _responseData$Propert3 === void 0 ? void 0 : _responseData$Propert3[0]
+          details: responseData === null || responseData === void 0 ? void 0 : (_responseData$Propert5 = responseData.Properties) === null || _responseData$Propert5 === void 0 ? void 0 : _responseData$Propert5[0]
         });
       }
     }
@@ -6554,7 +6564,7 @@ const PTAcknowledgement = ({
     rowContainerStyle: rowContainerStyle,
     last: true,
     label: t("PT_COMMON_TABLE_COL_PT_ID"),
-    text: responseData === null || responseData === void 0 ? void 0 : (_responseData$Propert4 = responseData.Properties[0]) === null || _responseData$Propert4 === void 0 ? void 0 : _responseData$Propert4.propertyId,
+    text: responseData === null || responseData === void 0 ? void 0 : (_responseData$Propert6 = responseData.Properties[0]) === null || _responseData$Propert6 === void 0 ? void 0 : _responseData$Propert6.propertyId,
     textStyle: {
       whiteSpace: "pre",
       width: "200%"
@@ -6569,10 +6579,12 @@ const PTAcknowledgement = ({
       const redirectUrlFromQuery = queryParams.get("redirectToUrl");
       const finalRedirectUrl = redirectUrl && redirectUrl !== "undefined" ? redirectUrl : redirectUrlFromQuery && redirectUrlFromQuery !== "undefined" ? redirectUrlFromQuery : null;
       if (finalRedirectUrl) {
-        var _responseData$Propert5, _responseData$Propert6, _location$state3;
-        history.push(`${finalRedirectUrl}?propertyId=${responseData === null || responseData === void 0 ? void 0 : (_responseData$Propert5 = responseData.Properties[0]) === null || _responseData$Propert5 === void 0 ? void 0 : _responseData$Propert5.propertyId}&tenantId=${responseData === null || responseData === void 0 ? void 0 : (_responseData$Propert6 = responseData.Properties[0]) === null || _responseData$Propert6 === void 0 ? void 0 : _responseData$Propert6.tenantId}`, {
-          ...(location === null || location === void 0 ? void 0 : (_location$state3 = location.state) === null || _location$state3 === void 0 ? void 0 : _location$state3.prevState)
+        var _responseData$Propert7, _responseData$Propert8, _location$state4;
+        history.push(`${finalRedirectUrl}?propertyId=${responseData === null || responseData === void 0 ? void 0 : (_responseData$Propert7 = responseData.Properties[0]) === null || _responseData$Propert7 === void 0 ? void 0 : _responseData$Propert7.propertyId}&tenantId=${responseData === null || responseData === void 0 ? void 0 : (_responseData$Propert8 = responseData.Properties[0]) === null || _responseData$Propert8 === void 0 ? void 0 : _responseData$Propert8.tenantId}`, {
+          ...(location === null || location === void 0 ? void 0 : (_location$state4 = location.state) === null || _location$state4 === void 0 ? void 0 : _location$state4.prevState)
         });
+      } else {
+        history.push(window.location.href.includes("/employee/") ? "/digit-ui/employee" : "/digit-ui/citizen");
       }
     }
   })));
@@ -6599,8 +6611,14 @@ const CreateProperty = ({
   } = Digit.Hooks.pt.useMDMS(stateId, "PropertyTax", "CommonFieldsConfig");
   const search = useLocation().search;
   const redirectUrl = new URLSearchParams(search).get('redirectUrl');
-  const createProperty = async () => {
-    history.push(`${match.path}/acknowledgement`);
+  const createProperty = async (key, data) => {
+    history.push({
+      pathname: `${match.path}/save-property`,
+      search: search,
+      state: {
+        property: data === null || data === void 0 ? void 0 : data.property
+      }
+    });
   };
   const onSuccess = () => {
     clearParams();
@@ -6612,11 +6630,13 @@ const CreateProperty = ({
   return /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(Route, {
     exact: true,
     path: `${match.path}`
+  }, /*#__PURE__*/React.createElement(LayoutWrapper, {
+    layoutClass: "action"
   }, /*#__PURE__*/React.createElement(CreatePropertyForm, {
-    onSubmit: createProperty,
+    onSelect: createProperty,
     value: params,
     userType: "citizen"
-  })), /*#__PURE__*/React.createElement(Route, {
+  }))), /*#__PURE__*/React.createElement(Route, {
     exact: true,
     path: `${match.path}/save-property`
   }, /*#__PURE__*/React.createElement(PTAcknowledgement, {
@@ -7620,12 +7640,10 @@ const PropertySearchResults = ({
     t1 = 5;
   }
   let filter1 = !isNaN(parseInt(OfsetForSearch)) ? {
-    limit: "5",
     sortOrder: "ASC",
     sortBy: "createdTime",
     offset: off
   } : {
-    limit: "5",
     sortOrder: "ASC",
     sortBy: "createdTime",
     offset: "0"
@@ -7846,10 +7864,21 @@ const PropertySearchResults = ({
     data: searchResults,
     totalCount: searchResults === null || searchResults === void 0 ? void 0 : searchResults.length,
     totalRecords: searchResults === null || searchResults === void 0 ? void 0 : searchResults.length,
+    manualPagination: false,
+    disableSort: true,
     columns: [{
       Header: t("PT_PROPERTY_PTUID"),
       disableSortBy: true,
-      accessor: "property_id"
+      accessor: "property_id",
+      Cell: ({
+        row
+      }) => {
+        return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
+          className: "link"
+        }, /*#__PURE__*/React.createElement(Link, {
+          to: `/digit-ui/citizen/commonpt/view-property?propertyId=${row.original.property_id}&tenantId=${tenantId}`
+        }, row.original.property_id)));
+      }
     }, {
       Header: t("PT_OWNER_NAME"),
       disableSortBy: true,
@@ -7931,14 +7960,14 @@ const SearchProperty = ({
   } = Digit.Hooks.useQueryParams();
   const [searchData, setSearchData] = useState(() => {
     var _Digit$UserService$ge, _Digit$UserService$ge2;
-    const isFirstVisit = sessionStorage.getItem("VisitedCitizenSearchRedirect");
     const mobileNumber = (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : (_Digit$UserService$ge2 = _Digit$UserService$ge.info) === null || _Digit$UserService$ge2 === void 0 ? void 0 : _Digit$UserService$ge2.mobileNumber;
-    if (!isFirstVisit && mobileNumber && window.location.href.includes("digit-ui/citizen/commonpt/property/citizen-search")) {
-      sessionStorage.setItem("VisitedCitizenSearchRedirect", "true");
+    const tenantId = Digit.ULBService.getCurrentTenantId() || Digit.ULBService.getStateId() || "dl";
+    if (mobileNumber && window.location.href.includes("digit-ui/citizen/commonpt/property/citizen-search")) {
       return {
         filters: {
           mobileNumber
-        }
+        },
+        city: tenantId
       };
     }
     return {};
@@ -8179,6 +8208,35 @@ const SearchProperty = ({
         validation: mobileNumber === null || mobileNumber === void 0 ? void 0 : mobileNumber.validation
       },
       isMandatory: false
+    }, {
+      label: "",
+      labelChildren: /*#__PURE__*/React.createElement("div", {
+        className: "tooltip"
+      }, /*#__PURE__*/React.createElement("div", {
+        style: {
+          display: "flex",
+          gap: "0 4px"
+        }
+      }, /*#__PURE__*/React.createElement("h2", null, t(property.label)), /*#__PURE__*/React.createElement(InfoBannerIcon, {
+        fill: "#0b0c0c"
+      }), /*#__PURE__*/React.createElement("span", {
+        className: "tooltiptext",
+        style: {
+          position: "absolute",
+          width: "72%",
+          marginLeft: "50%",
+          fontSize: "medium"
+        }
+      }, t(property.description) + " " + "PG-PT-xxxx-xxxxxx"))),
+      type: property.type,
+      populators: {
+        name: property.name,
+        defaultValue: "",
+        validation: property === null || property === void 0 ? void 0 : property.validation
+      },
+      isMandatory: false,
+      isInsideBox: true,
+      placementinbox: 1
     }],
     body1: [{
       label: "PT_SELECT_CITY",
@@ -8470,8 +8528,20 @@ const SearchProperty = ({
       fontWeight: action == 0 ? "bold" : "normal"
     },
     onClick: () => {
+      var _Digit$UserService$ge5, _Digit$UserService$ge6;
       history.replace(`${history.location.pathname}?action=0`);
-      setSearchData({});
+      const mobileNumber = (_Digit$UserService$ge5 = Digit.UserService.getUser()) === null || _Digit$UserService$ge5 === void 0 ? void 0 : (_Digit$UserService$ge6 = _Digit$UserService$ge5.info) === null || _Digit$UserService$ge6 === void 0 ? void 0 : _Digit$UserService$ge6.mobileNumber;
+      const tenantId = Digit.ULBService.getCurrentTenantId() || Digit.ULBService.getStateId() || "dl";
+      if (mobileNumber) {
+        setSearchData({
+          filters: {
+            mobileNumber
+          },
+          city: tenantId
+        });
+      } else {
+        setSearchData({});
+      }
     }
   }, t("PT_KNOW_PTID")), /*#__PURE__*/React.createElement("div", {
     className: `search-tab ${action == 1 ? "active" : ""}`,
@@ -8483,8 +8553,20 @@ const SearchProperty = ({
       fontWeight: action == 1 ? "bold" : "normal"
     },
     onClick: () => {
+      var _Digit$UserService$ge7, _Digit$UserService$ge8;
       history.replace(`${history.location.pathname}?action=1`);
-      setSearchData({});
+      const mobileNumber = (_Digit$UserService$ge7 = Digit.UserService.getUser()) === null || _Digit$UserService$ge7 === void 0 ? void 0 : (_Digit$UserService$ge8 = _Digit$UserService$ge7.info) === null || _Digit$UserService$ge8 === void 0 ? void 0 : _Digit$UserService$ge8.mobileNumber;
+      const tenantId = Digit.ULBService.getCurrentTenantId() || Digit.ULBService.getStateId() || "dl";
+      if (mobileNumber) {
+        setSearchData({
+          filters: {
+            mobileNumber
+          },
+          city: tenantId
+        });
+      } else {
+        setSearchData({});
+      }
     }
   }, t("PT_SEARCH_DOOR_NO")), /*#__PURE__*/React.createElement("div", {
     style: {
@@ -14001,7 +14083,7 @@ function PropertyDocuments({
     }));
   };
   const renderDocumentRow = (value, index) => {
-    var _pdfFiles$value$fileS, _value$originalDoc, _value$originalDoc$ad;
+    var _pdfFiles$value$fileS, _value$originalDoc, _value$originalDoc2, _value$originalDoc3;
     const fileUrl = (_pdfFiles$value$fileS = pdfFiles[value.fileStoreId]) === null || _pdfFiles$value$fileS === void 0 ? void 0 : _pdfFiles$value$fileS.split(",")[0];
     const docSubType = getDocSubType(value === null || value === void 0 ? void 0 : value.documentType);
     const docUid = (value === null || value === void 0 ? void 0 : value.documentUid) || "";
@@ -14084,19 +14166,17 @@ function PropertyDocuments({
           margin: 0
         }
       }, /*#__PURE__*/React.createElement("input", {
+        key: `chk-${value === null || value === void 0 ? void 0 : (_value$originalDoc = value.originalDoc) === null || _value$originalDoc === void 0 ? void 0 : _value$originalDoc.id}-${value === null || value === void 0 ? void 0 : (_value$originalDoc2 = value.originalDoc) === null || _value$originalDoc2 === void 0 ? void 0 : _value$originalDoc2.isVerified}`,
         type: "checkbox",
         style: {
           width: "18px",
           height: "18px",
           accentColor: "#F47738"
         },
-        defaultChecked: value === null || value === void 0 ? void 0 : (_value$originalDoc = value.originalDoc) === null || _value$originalDoc === void 0 ? void 0 : (_value$originalDoc$ad = _value$originalDoc.additionalDetails) === null || _value$originalDoc$ad === void 0 ? void 0 : _value$originalDoc$ad.isDocumentVerified,
+        defaultChecked: value === null || value === void 0 ? void 0 : (_value$originalDoc3 = value.originalDoc) === null || _value$originalDoc3 === void 0 ? void 0 : _value$originalDoc3.isVerified,
         onChange: e => {
           if (value !== null && value !== void 0 && value.originalDoc) {
-            if (!value.originalDoc.additionalDetails) {
-              value.originalDoc.additionalDetails = {};
-            }
-            value.originalDoc.additionalDetails.isDocumentVerified = e.target.checked;
+            value.originalDoc.isVerified = e.target.checked;
           }
         }
       }), "Check Verified"))
@@ -14352,131 +14432,6 @@ function PropertyFloors({
   }));
 }
 
-function PropertyOwners({
-  owners
-}) {
-  let ownerSequences = {};
-  if (window.location.href.includes("/employee/pt/")) {
-    ownerSequences = owners.slice().reverse();
-  } else {
-    ownerSequences = owners;
-  }
-  const {
-    t
-  } = useTranslation();
-  const checkOwnerLength = (owners === null || owners === void 0 ? void 0 : owners.length) || 1;
-  let cardStyles = {
-    marginTop: "19px"
-  };
-  let statusTableStyles = {
-    position: "relative",
-    padding: "8px"
-  };
-  let rowContainerStyle = {
-    justifyContent: "space-between",
-    fontSize: "16px",
-    lineHeight: "19px",
-    color: "#0B0C0C"
-  };
-  if ( Number(checkOwnerLength) > 1) {
-    cardStyles = {
-      marginTop: "19px",
-      background: "#FAFAFA",
-      border: "1px solid #D6D5D4",
-      borderRadius: "4px",
-      padding: "8px",
-      lineHeight: "19px",
-      maxWidth: "600px",
-      minWidth: "280px"
-    };
-  } else if ( !(Number(checkOwnerLength) > 1)) {
-    cardStyles = {
-      marginTop: "19px",
-      lineHeight: "19px",
-      maxWidth: "600px",
-      minWidth: "280px"
-    };
-    statusTableStyles = {
-      position: "relative",
-      marginTop: "19px"
-    };
-  }
-  if (window.location.href.includes("obps")) {
-    cardStyles = {
-      ...cardStyles,
-      maxWidth: "950px"
-    };
-    cardStyles = {
-      ...cardStyles,
-      maxWidth: "950px"
-    };
-    rowContainerStyle = {};
-  }
-  let owners1 = owners.sort((item, item2) => {
-    var _item$additionalDetai, _item2$additionalDeta;
-    return (item === null || item === void 0 ? void 0 : (_item$additionalDetai = item.additionalDetails) === null || _item$additionalDetai === void 0 ? void 0 : _item$additionalDetai.ownerSequence) - (item2 === null || item2 === void 0 ? void 0 : (_item2$additionalDeta = item2.additionalDetails) === null || _item2$additionalDeta === void 0 ? void 0 : _item2$additionalDeta.ownerSequence);
-  });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "owner-details"
-  }, ownerSequences.map((owner, index) => {
-    var _owner$values;
-    return /*#__PURE__*/React.createElement("div", {
-      key: t(owner === null || owner === void 0 ? void 0 : owner.title),
-      style: cardStyles,
-      className: "owner-details-child"
-    }, /*#__PURE__*/React.createElement(CardSubHeader, {
-      style:  Number(checkOwnerLength) > 1 ? {
-        marginBottom: "8px",
-        paddingBottom: "9px",
-        color: "#0B0C0C",
-        fontSize: "16px",
-        lineHeight: "19px"
-      } : {
-        marginBottom: "8px",
-        color: "#505A5F",
-        fontSize: "24px"
-      }
-    },  Number(checkOwnerLength) > 1 ? `${t(owner === null || owner === void 0 ? void 0 : owner.title)} ${index + 1}` : t(owner === null || owner === void 0 ? void 0 : owner.title)), /*#__PURE__*/React.createElement(React.Fragment, {
-      key: index
-    }, /*#__PURE__*/React.createElement(StatusTable, {
-      style: statusTableStyles
-    }, /*#__PURE__*/React.createElement("div", {
-      style: {
-        maxWidth: "640px",
-        top: 0,
-        left: 0,
-        bottom: 0,
-        right: 0,
-        width: "auto"
-      }
-    }), owner === null || owner === void 0 ? void 0 : (_owner$values = owner.values) === null || _owner$values === void 0 ? void 0 : _owner$values.map((value, index) => {
-      var _value$values;
-      if (value.map === true && value.value !== "N/A") {
-        return /*#__PURE__*/React.createElement(Row, {
-          key: t(value.title),
-          label: t(value.title),
-          text: /*#__PURE__*/React.createElement("img", {
-            src: t(value.value),
-            alt: "",
-            privacy: value === null || value === void 0 ? void 0 : value.privacy
-          })
-        });
-      }
-      return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Row, {
-        key: t(value.title),
-        label:  `${t(value.title)}`,
-        text: t(value.value) || "N/A",
-        last: index === (value === null || value === void 0 ? void 0 : (_value$values = value.values) === null || _value$values === void 0 ? void 0 : _value$values.length) - 1,
-        caption: value.caption,
-        className: "border-none",
-        textStyle: value.textStyle,
-        privacy: value === null || value === void 0 ? void 0 : value.privacy,
-        rowContainerStyle: rowContainerStyle
-      }));
-    }))));
-  })));
-}
-
 const ScruntinyDetails = ({
   scrutinyDetails,
   paymentsList: _paymentsList = []
@@ -16278,7 +16233,7 @@ function ApplicationDetailsContent({
     infoClickInfoLabel: getClickInfoDetails(),
     infoClickInfoLabel1: getClickInfoDetails1()
   }) : 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;
+    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, _workflowDetails$data, _workflowDetails$data2, _detail$additionalDet0, _detail$additionalDet1, _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;
     return /*#__PURE__*/React.createElement(React.Fragment, {
       key: index
     }, /*#__PURE__*/React.createElement("div", {
@@ -16476,53 +16431,51 @@ function ApplicationDetailsContent({
       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, {
-      owners: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet6 = detail.additionalDetails) === null || _detail$additionalDet6 === void 0 ? void 0 : _detail$additionalDet6.owners
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet7 = detail.additionalDetails) === null || _detail$additionalDet7 === void 0 ? void 0 : _detail$additionalDet7.units) && /*#__PURE__*/React.createElement(TLTradeUnits, {
-      units: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet8 = detail.additionalDetails) === null || _detail$additionalDet8 === void 0 ? void 0 : _detail$additionalDet8.units
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet9 = detail.additionalDetails) === null || _detail$additionalDet9 === void 0 ? void 0 : _detail$additionalDet9.accessories) && /*#__PURE__*/React.createElement(TLTradeAccessories, {
-      units: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet0 = detail.additionalDetails) === null || _detail$additionalDet0 === void 0 ? void 0 : _detail$additionalDet0.accessories
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet1 = detail.additionalDetails) === null || _detail$additionalDet1 === void 0 ? void 0 : _detail$additionalDet1.permissions) && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : (_workflowDetails$data2 = _workflowDetails$data.nextActions) === null || _workflowDetails$data2 === void 0 ? void 0 : _workflowDetails$data2.length) > 0 && /*#__PURE__*/React.createElement(PermissionCheck, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet5 = detail.additionalDetails) === null || _detail$additionalDet5 === void 0 ? void 0 : _detail$additionalDet5.units) && /*#__PURE__*/React.createElement(TLTradeUnits, {
+      units: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet6 = detail.additionalDetails) === null || _detail$additionalDet6 === void 0 ? void 0 : _detail$additionalDet6.units
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet7 = detail.additionalDetails) === null || _detail$additionalDet7 === void 0 ? void 0 : _detail$additionalDet7.accessories) && /*#__PURE__*/React.createElement(TLTradeAccessories, {
+      units: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet8 = detail.additionalDetails) === null || _detail$additionalDet8 === void 0 ? void 0 : _detail$additionalDet8.accessories
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet9 = detail.additionalDetails) === null || _detail$additionalDet9 === void 0 ? void 0 : _detail$additionalDet9.permissions) && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : (_workflowDetails$data2 = _workflowDetails$data.nextActions) === null || _workflowDetails$data2 === void 0 ? void 0 : _workflowDetails$data2.length) > 0 && /*#__PURE__*/React.createElement(PermissionCheck, {
       applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData,
       t: t,
-      permissions: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet10 = detail.additionalDetails) === null || _detail$additionalDet10 === void 0 ? void 0 : _detail$additionalDet10.permissions
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet11 = detail.additionalDetails) === null || _detail$additionalDet11 === void 0 ? void 0 : _detail$additionalDet11.obpsDocuments) && /*#__PURE__*/React.createElement(BPADocuments, {
+      permissions: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet0 = detail.additionalDetails) === null || _detail$additionalDet0 === void 0 ? void 0 : _detail$additionalDet0.permissions
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet1 = detail.additionalDetails) === null || _detail$additionalDet1 === void 0 ? void 0 : _detail$additionalDet1.obpsDocuments) && /*#__PURE__*/React.createElement(BPADocuments, {
       t: t,
       applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData,
       docs: detail.additionalDetails.obpsDocuments,
       bpaActionsDetails: workflowDetails
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet12 = detail.additionalDetails) === null || _detail$additionalDet12 === void 0 ? void 0 : _detail$additionalDet12.noc) && /*#__PURE__*/React.createElement(NOCDocuments, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet10 = detail.additionalDetails) === null || _detail$additionalDet10 === void 0 ? void 0 : _detail$additionalDet10.noc) && /*#__PURE__*/React.createElement(NOCDocuments, {
       t: t,
       isNoc: true,
       NOCdata: detail.values,
       applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData,
       docs: detail.additionalDetails.noc,
-      noc: (_detail$additionalDet13 = detail.additionalDetails) === null || _detail$additionalDet13 === void 0 ? void 0 : _detail$additionalDet13.data,
+      noc: (_detail$additionalDet11 = detail.additionalDetails) === null || _detail$additionalDet11 === void 0 ? void 0 : _detail$additionalDet11.data,
       bpaActionsDetails: workflowDetails
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet14 = detail.additionalDetails) === null || _detail$additionalDet14 === void 0 ? void 0 : _detail$additionalDet14.scruntinyDetails) && /*#__PURE__*/React.createElement(ScruntinyDetails, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet12 = detail.additionalDetails) === null || _detail$additionalDet12 === void 0 ? void 0 : _detail$additionalDet12.scruntinyDetails) && /*#__PURE__*/React.createElement(ScruntinyDetails, {
       scrutinyDetails: detail === null || detail === void 0 ? void 0 : detail.additionalDetails
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet15 = detail.additionalDetails) === null || _detail$additionalDet15 === void 0 ? void 0 : _detail$additionalDet15.buildingExtractionDetails) && /*#__PURE__*/React.createElement(ScruntinyDetails, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet13 = detail.additionalDetails) === null || _detail$additionalDet13 === void 0 ? void 0 : _detail$additionalDet13.buildingExtractionDetails) && /*#__PURE__*/React.createElement(ScruntinyDetails, {
       scrutinyDetails: detail === null || detail === void 0 ? void 0 : detail.additionalDetails
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet16 = detail.additionalDetails) === null || _detail$additionalDet16 === void 0 ? void 0 : _detail$additionalDet16.subOccupancyTableDetails) && /*#__PURE__*/React.createElement(SubOccupancyTable, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet14 = detail.additionalDetails) === null || _detail$additionalDet14 === void 0 ? void 0 : _detail$additionalDet14.subOccupancyTableDetails) && /*#__PURE__*/React.createElement(SubOccupancyTable, {
       edcrDetails: detail === null || detail === void 0 ? void 0 : detail.additionalDetails,
       applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet17 = detail.additionalDetails) === null || _detail$additionalDet17 === void 0 ? void 0 : _detail$additionalDet17.documentsWithUrl) && /*#__PURE__*/React.createElement(DocumentsPreview, {
-      documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet18 = detail.additionalDetails) === null || _detail$additionalDet18 === void 0 ? void 0 : _detail$additionalDet18.documentsWithUrl
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet19 = detail.additionalDetails) === null || _detail$additionalDet19 === void 0 ? void 0 : _detail$additionalDet19.documents) && /*#__PURE__*/React.createElement(PropertyDocuments, {
-      documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet20 = detail.additionalDetails) === null || _detail$additionalDet20 === void 0 ? void 0 : _detail$additionalDet20.documents
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet21 = detail.additionalDetails) === null || _detail$additionalDet21 === void 0 ? void 0 : _detail$additionalDet21.taxHeadEstimatesCalculation) && /*#__PURE__*/React.createElement(PropertyEstimates, {
-      taxHeadEstimatesCalculation: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet22 = detail.additionalDetails) === null || _detail$additionalDet22 === void 0 ? void 0 : _detail$additionalDet22.taxHeadEstimatesCalculation
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet15 = detail.additionalDetails) === null || _detail$additionalDet15 === void 0 ? void 0 : _detail$additionalDet15.documentsWithUrl) && /*#__PURE__*/React.createElement(DocumentsPreview, {
+      documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet16 = detail.additionalDetails) === null || _detail$additionalDet16 === void 0 ? void 0 : _detail$additionalDet16.documentsWithUrl
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet17 = detail.additionalDetails) === null || _detail$additionalDet17 === void 0 ? void 0 : _detail$additionalDet17.documents) && /*#__PURE__*/React.createElement(PropertyDocuments, {
+      documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet18 = detail.additionalDetails) === null || _detail$additionalDet18 === void 0 ? void 0 : _detail$additionalDet18.documents
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet19 = detail.additionalDetails) === null || _detail$additionalDet19 === void 0 ? void 0 : _detail$additionalDet19.taxHeadEstimatesCalculation) && /*#__PURE__*/React.createElement(PropertyEstimates, {
+      taxHeadEstimatesCalculation: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet20 = detail.additionalDetails) === null || _detail$additionalDet20 === void 0 ? void 0 : _detail$additionalDet20.taxHeadEstimatesCalculation
     }), (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.isDueVerification) && (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_FIELD_INSPECTION" && /*#__PURE__*/React.createElement(DueVerification, null), (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
+    }), (detail === null || detail === void 0 ? void 0 : detail.isDueVerification) && (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_FIELD_INSPECTION" && /*#__PURE__*/React.createElement(DueVerification, null), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet21 = detail.additionalDetails) === null || _detail$additionalDet21 === void 0 ? void 0 : _detail$additionalDet21.redirectUrl) && /*#__PURE__*/React.createElement(Link, {
+      to: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet22 = detail.additionalDetails) === null || _detail$additionalDet22 === void 0 ? void 0 : (_detail$additionalDet23 = _detail$additionalDet22.redirectUrl) === null || _detail$additionalDet23 === void 0 ? void 0 : _detail$additionalDet23.url
     }, /*#__PURE__*/React.createElement("span", {
       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, {
+    }, 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.title)), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet26 = detail.additionalDetails) === null || _detail$additionalDet26 === void 0 ? void 0 : _detail$additionalDet26.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, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet27 = detail.additionalDetails) === null || _detail$additionalDet27 === void 0 ? void 0 : _detail$additionalDet27.estimationDetails) && /*#__PURE__*/React.createElement(ViewBreakup, {
       wsAdditionalDetails: detail,
       workflowDetails: workflowDetails
     }));
@@ -17132,7 +17085,7 @@ const ViewProperty = () => {
       history.replace("/digit-ui/employee");
     } else sessionStorage.removeItem("isCreateEnabledEmployee");
   });
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Header, null, t("PT_PROPERTY_INFO_HEADER"))), /*#__PURE__*/React.createElement(ApplicationDetails, {
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(ApplicationDetails, {
     applicationDetails: applicationDetails,
     isLoading: isLoading,
     isDataLoading: isLoading,
@@ -17191,21 +17144,22 @@ const App = ({
     style: {
       width: "100%"
     }
-  }, /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(Route, {
+  }, /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/search`,
     component: SearchProperty$1
-  }), /*#__PURE__*/React.createElement(Route, {
+  }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/property/citizen-search`,
     component: SearchProperty$1
+  }), /*#__PURE__*/React.createElement(PrivateRoute, {
+    path: `${path}/property/search-results`,
+    component: props => /*#__PURE__*/React.createElement(SearchResultsComponent, Object.assign({}, props, {
+      stateCode: stateCode
+    }))
   }), /*#__PURE__*/React.createElement(Route, {
-    path: `${path}/property/search-results`
-  }, /*#__PURE__*/React.createElement(SearchResultsComponent, {
-    stateCode: stateCode
-  })), /*#__PURE__*/React.createElement(Route, {
     path: `${path}/property/citizen-otp`
   }, /*#__PURE__*/React.createElement(CitizenOtp, {
     stateCode: stateCode
-  }), " "), /*#__PURE__*/React.createElement(PrivateRoute, {
+  })), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/property/link-success/:propertyIds`,
     component: PropertyLinkSuccess
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
@@ -17213,7 +17167,7 @@ const App = ({
     component: CreateProperty
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/view-property`,
-    component: () => /*#__PURE__*/React.createElement(ViewProperty, null)
+    component: ViewProperty
   })))))));
 };
 
@@ -17238,8 +17192,14 @@ const NewApplication = ({
   } = Digit.Hooks.pt.useMDMS(stateId, "PropertyTax", "CommonFieldsConfig");
   const search = useLocation().search;
   const redirectUrl = new URLSearchParams(search).get('redirectToUrl');
-  const createProperty = async () => {
-    history.push(`${match.path}/save-property`);
+  const createProperty = async (key, data) => {
+    history.push({
+      pathname: `${match.path}/save-property`,
+      search: search,
+      state: {
+        property: data === null || data === void 0 ? void 0 : data.property
+      }
+    });
   };
   const onSuccess = () => {
     clearParams();
@@ -17252,7 +17212,7 @@ const NewApplication = ({
     exact: true,
     path: `${match.path}`
   }, /*#__PURE__*/React.createElement(CreatePropertyForm, {
-    onSubmit: createProperty,
+    onSelect: createProperty,
     value: params,
     userType: "employee"
   })), /*#__PURE__*/React.createElement(Route, {
@@ -17416,7 +17376,7 @@ const Search = ({
     }
   });
   if (isLoading) return /*#__PURE__*/React.createElement(Loader, null);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Header, null, t("SEARCH_PROPERTY")), /*#__PURE__*/React.createElement(SearchComponent, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(SearchComponent, {
     t: t,
     payload: formData,
     searchBy: searchBy,
@@ -17425,7 +17385,7 @@ const Search = ({
     tenantId: tenantId,
     onSubmit: onSubmit,
     onReset: onReset
-  }), Object.keys(payload).length > 0 && /*#__PURE__*/React.createElement(SearchResultComponent, {
+  })), Object.keys(payload).length > 0 && /*#__PURE__*/React.createElement(SearchResultComponent, {
     t: t,
     showToast: showToast,
     setShowToast: setShowToast,
@@ -17895,8 +17855,8 @@ const PropertyLocationDetails = ({
     }
   }, [showToast]);
   return /*#__PURE__*/React.createElement(CollapsibleCardPage, {
-    title: t("PT_LOCATION_DETAILS"),
-    defaultOpen: true
+    title: t("PT_LOCATION_DETAILS") + (config !== null && config !== void 0 && config.isAutomaticFill ? " (Automatic Fill by Property )" : ""),
+    defaultOpen: config !== null && config !== void 0 && config.isAutomaticFill ? false : true
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       boxShadow: "none",
@@ -18582,8 +18542,8 @@ const PropertyWaterConnection = ({
     marginTop: "-21px"
   };
   return /*#__PURE__*/React.createElement(CollapsibleCardPage, {
-    title: t("WS_PROPERTY_AND_WATER_CONNECTION_USE_DETAILS"),
-    defaultOpen: true,
+    title: t("WS_PROPERTY_AND_WATER_CONNECTION_USE_DETAILS") + (config !== null && config !== void 0 && config.isAutomaticFill ? " (Automatic Fill by Property )" : ""),
+    defaultOpen: config !== null && config !== void 0 && config.isAutomaticFill ? false : true,
     style: props.style
   }, /*#__PURE__*/React.createElement("div", {
     className: "formcomposer-section-grid"
@@ -18775,17 +18735,34 @@ const PropertyWaterConnection = ({
 
 const SwitchComponent = props => {
   return /*#__PURE__*/React.createElement("div", {
-    className: "w-fullwidth PropertySearchFormSwitcher"
-  }, props.keys.map(key => /*#__PURE__*/React.createElement("span", {
-    key: key,
-    className: props.searchBy === key ? "selected" : "non-selected",
-    onClick: () => {
-      key === "searchDetail" && !sessionStorage.getItem("searchDetailValue") ? sessionStorage.setItem("searchDetailValue", 1) : "";
-      key === "searchId" && sessionStorage.getItem("searchDetailValue") == 1 ? sessionStorage.setItem("searchDetailValue", 2) : "";
-      props.onSwitch(key);
-      props.onReset();
+    className: "search-tabs-container PropertySearchFormSwitcher",
+    style: {
+      marginBottom: "16px",
+      display: "flex",
+      gap: "24px",
+      justifyContent: "flex-start",
+      borderBottom: "1px solid #ccc"
     }
-  }, props.t(`PT_SEARCH_BY_${key === null || key === void 0 ? void 0 : key.toUpperCase()}`))));
+  }, props.keys.map(key => {
+    const isSelected = props.searchBy === key;
+    return /*#__PURE__*/React.createElement("div", {
+      key: key,
+      className: `search-tab ${isSelected ? "active" : ""}`,
+      style: {
+        padding: "8px 16px",
+        cursor: "pointer",
+        borderBottom: isSelected ? "2px solid #f47738" : "2px solid transparent",
+        color: isSelected ? "#f47738" : "#0b0c0c",
+        fontWeight: isSelected ? "bold" : "normal"
+      },
+      onClick: () => {
+        key === "searchDetail" && !sessionStorage.getItem("searchDetailValue") ? sessionStorage.setItem("searchDetailValue", 1) : "";
+        key === "searchId" && sessionStorage.getItem("searchDetailValue") == 1 ? sessionStorage.setItem("searchDetailValue", 2) : "";
+        props.onSwitch(key);
+        props.onReset();
+      }
+    }, props.t(`PT_SEARCH_BY_${key === null || key === void 0 ? void 0 : key.toUpperCase()}`));
+  }));
 };
 const SearchPTID = ({
   tenantId,
@@ -18869,16 +18846,26 @@ const SearchPTID = ({
   })), /*#__PURE__*/React.createElement("div", {
     className: "formcomposer-section-button",
     style: {
-      marginTop: "16px"
+      marginTop: "16px",
+      display: "flex",
+      justifyContent: "space-between",
+      alignItems: "center",
+      width: "100%"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "pt-search-action-reset generic-button clear-search",
+    style: {
+      margin: 0
     }
-  }, /*#__PURE__*/React.createElement(SearchField, {
-    className: "pt-search-action-reset generic-button clear-search"
   }, /*#__PURE__*/React.createElement("p", {
     onClick: () => {
       onReset({});
     }
-  }, t(`ES_COMMON_CLEAR_ALL`))), /*#__PURE__*/React.createElement(SearchField, {
-    className: "pt-search-action-submit submit-bar generic-button"
+  }, t(`ES_COMMON_CLEAR_SEARCH`))), /*#__PURE__*/React.createElement("div", {
+    className: "pt-search-action-submit submit-bar generic-button",
+    style: {
+      margin: 0
+    }
   }, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("ES_COMMON_SEARCH"),
     submit: true
@@ -19303,7 +19290,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;
+  var _formData$cptId, _Digit$UserService$ge, _Digit$UserService$ge2, _Digit$UserService$ge3, _Digit$UserService$ge4, _formData$cpt, _formData$cpt3, _formData$cpt3$detail, _propertyDetails$Prop2, _formData$tradedetils, _formData$tradedetils2, _formData$tradedetils3, _activeProperty$owner, _activeProperty$owner2;
   const {
     t
   } = useTranslation();
@@ -19321,33 +19308,40 @@ const PropertySearchNSummary = ({
   const urlPropertyId = new URLSearchParams(search).get("propertyId");
   const [propertyId, setPropertyId] = useState((formData === null || formData === void 0 ? void 0 : (_formData$cptId = formData.cptId) === null || _formData$cptId === void 0 ? void 0 : _formData$cptId.id) || (urlPropertyId !== "null" ? urlPropertyId : "") || "");
   const [searchPropertyId, setSearchPropertyId] = useState(urlPropertyId !== "null" ? urlPropertyId : "");
+  const [mobileNumber, setMobileNumber] = useState("");
+  const [searchMobileNumber, setSearchMobileNumber] = useState("");
   const [showToast, setShowToast] = useState(null);
   const isMobile = window.Digit.Utils.browser.isMobile();
-  const serachParams = window.location.href.includes("?") ? window.location.href.substring(window.location.href.indexOf("?") + 1, window.location.href.length) : "";
+  const userMobileNumber = (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : (_Digit$UserService$ge2 = _Digit$UserService$ge.info) === null || _Digit$UserService$ge2 === void 0 ? void 0 : _Digit$UserService$ge2.mobileNumber;
+  const isCitizen = ((_Digit$UserService$ge3 = Digit.UserService.getUser()) === null || _Digit$UserService$ge3 === void 0 ? void 0 : (_Digit$UserService$ge4 = _Digit$UserService$ge3.info) === null || _Digit$UserService$ge4 === void 0 ? void 0 : _Digit$UserService$ge4.type) === "CITIZEN";
+  const isWsApplication = window.location.href.includes("/ws/");
+  const [selectedProperty, setSelectedProperty] = useState((formData === null || formData === void 0 ? void 0 : (_formData$cpt = formData.cpt) === null || _formData$cpt === void 0 ? void 0 : _formData$cpt.details) || null);
+  const searchFilters = isCitizen && isWsApplication ? {
+    mobileNumber: userMobileNumber
+  } : searchMobileNumber ? {
+    mobileNumber: searchMobileNumber
+  } : {
+    propertyIds: searchPropertyId
+  };
   const {
     isLoading,
     isError,
     error,
     data: propertyDetails
   } = Digit.Hooks.pt.usePropertySearch({
-    filters: {
-      propertyIds: searchPropertyId
-    },
+    filters: searchFilters,
     tenantId: tenantId
   }, {
-    filters: {
-      propertyIds: searchPropertyId
-    },
+    filters: searchFilters,
     tenantId: tenantId,
-    enabled: searchPropertyId ? true : false,
+    enabled: isCitizen && isWsApplication && userMobileNumber || !isCitizen && (searchPropertyId || searchMobileNumber) || isCitizen && !isWsApplication && (searchPropertyId || searchMobileNumber) ? true : false,
     privacy: Digit.Utils.getPrivacyObject()
   });
   useEffect(() => {
     if (propertyId && (window.location.href.includes("/renew-application-details/") || window.location.href.includes("/edit-application-details/"))) setSearchPropertyId(propertyId);
   }, [propertyId]);
   useEffect(() => {
-    var _propertyDetails$Prop;
-    if (isLoading == false && error && error == true || (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop = propertyDetails.Properties) === null || _propertyDetails$Prop === void 0 ? void 0 : _propertyDetails$Prop.length) == 0) {
+    if (isLoading == false && error && error == true) {
       setShowToast({
         error: true,
         label: "PT_ENTER_VALID_PROPERTY_ID"
@@ -19355,53 +19349,48 @@ const PropertySearchNSummary = ({
     }
   }, [error, propertyDetails]);
   useEffect(() => {
-    onSelect("cpt", {
-      details: propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.Properties[0]
-    });
-    sessionStorage.setItem("Digit_FSM_PT", JSON.stringify(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.Properties[0]));
-    localStorage.setItem("pgrProperty", JSON.stringify(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.Properties[0]));
-  }, [propertyDetails, pathname]);
-  const searchProperty = () => {
-    if (!propertyId) {
-      setShowToast({
-        error: true,
-        label: "PT_ENTER_PROPERTY_ID_AND_SEARCH"
-      });
+    var _formData$cpt2, _formData$cpt2$detail, _propertyDetails$Prop;
+    const currentCptId = formData === null || formData === void 0 ? void 0 : (_formData$cpt2 = formData.cpt) === null || _formData$cpt2 === void 0 ? void 0 : (_formData$cpt2$detail = _formData$cpt2.details) === null || _formData$cpt2$detail === void 0 ? void 0 : _formData$cpt2$detail.propertyId;
+    if ((propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop = propertyDetails.Properties) === null || _propertyDetails$Prop === void 0 ? void 0 : _propertyDetails$Prop.length) > 0) {
+      if (urlPropertyId && (!selectedProperty || selectedProperty.propertyId !== urlPropertyId)) {
+        const matchingProp = propertyDetails.Properties.find(p => p.propertyId === urlPropertyId);
+        if (matchingProp) {
+          setSelectedProperty(matchingProp);
+          if (currentCptId !== urlPropertyId) {
+            onSelect("cpt", {
+              details: matchingProp
+            });
+            sessionStorage.setItem("Digit_FSM_PT", JSON.stringify(matchingProp));
+            localStorage.setItem("pgrProperty", JSON.stringify(matchingProp));
+          }
+          return;
+        }
+      }
+      if (propertyDetails.Properties.length === 1 && !selectedProperty) {
+        const fetchedId = propertyDetails.Properties[0].propertyId;
+        setSelectedProperty(propertyDetails.Properties[0]);
+        if (currentCptId !== fetchedId) {
+          onSelect("cpt", {
+            details: propertyDetails.Properties[0]
+          });
+          sessionStorage.setItem("Digit_FSM_PT", JSON.stringify(propertyDetails.Properties[0]));
+          localStorage.setItem("pgrProperty", JSON.stringify(propertyDetails.Properties[0]));
+        }
+      }
     }
-    setSearchPropertyId(propertyId);
-    if (window.location.pathname.includes("/tl/new-application")) {
-      history.push(`/digit-ui/employee/tl/new-application?propertyId=${propertyId}`);
-      const scrollConst = 1600;
-      setTimeout(() => window.scrollTo(0, scrollConst), 0);
-    } else if (window.location.pathname.includes("/ws/new-application")) history.push(`/digit-ui/employee/ws/new-application?propertyId=${propertyId}`);
-  };
-  const clearSearch = () => {
-    setPropertyId("");
-    setSearchPropertyId("");
-    onSelect(config === null || config === void 0 ? void 0 : config.key, {
-      id: ""
-    });
-    onSelect("cpt", null);
-  };
+  }, [propertyDetails, pathname, isCitizen, isWsApplication, formData === null || formData === void 0 ? void 0 : (_formData$cpt3 = formData.cpt) === null || _formData$cpt3 === void 0 ? void 0 : (_formData$cpt3$detail = _formData$cpt3.details) === null || _formData$cpt3$detail === void 0 ? void 0 : _formData$cpt3$detail.propertyId, urlPropertyId, selectedProperty]);
   if (isEditScreen) {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
   let propertyAddress = "";
-  if (propertyDetails && propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.Properties.length) {
-    var _propertyDetails$Prop2;
-    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 activeProperty = selectedProperty ? selectedProperty : (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop2 = propertyDetails.Properties) === null || _propertyDetails$Prop2 === void 0 ? void 0 : _propertyDetails$Prop2.length) === 1 ? propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.Properties[0] : null;
+  if (activeProperty) {
+    propertyAddress = getAddress(activeProperty === null || activeProperty === void 0 ? void 0 : activeProperty.address, t);
   }
-  const getInputStyles = () => {
-    if (window.location.href.includes("/ws/")) {
-      return {
-        fontWeight: "700"
-      };
-    } else return {};
-  };
   const getOwnerNames = propertyData => {
     var _propertyData$owners, _getActiveOwners$sort, _getActiveOwners$sort2;
     const getActiveOwners = propertyData === null || propertyData === void 0 ? void 0 : (_propertyData$owners = propertyData.owners) === null || _propertyData$owners === void 0 ? void 0 : _propertyData$owners.filter(owner => owner === null || owner === void 0 ? void 0 : owner.active);
-    const getOwnersList = (_getActiveOwners$sort = getActiveOwners.sort((a, b) => {
+    const getOwnersList = getActiveOwners === null || getActiveOwners === void 0 ? void 0 : (_getActiveOwners$sort = getActiveOwners.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);
     })) === null || _getActiveOwners$sort === void 0 ? void 0 : (_getActiveOwners$sort2 = _getActiveOwners$sort.map(activeOwner => activeOwner === null || activeOwner === void 0 ? void 0 : activeOwner.name)) === null || _getActiveOwners$sort2 === void 0 ? void 0 : _getActiveOwners$sort2.join(",");
@@ -19411,57 +19400,9 @@ const PropertySearchNSummary = ({
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CollapsibleCardPage, {
     title: t("PT_PROPERTY_SEARCH"),
     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", {
-    style: {
-      display: "flex",
-      gap: "12px"
-    }
-  }, /*#__PURE__*/React.createElement(TextInput, {
-    key: config === null || config === void 0 ? void 0 : config.key,
-    value: propertyId,
-    onChange: e => {
-      setPropertyId(e.target.value);
-      onSelect(config === null || config === void 0 ? void 0 : config.key, {
-        id: e.target.value
-      });
-    },
-    style: {
-      width: "80%",
-      float: "left"
-    },
-    placeholder: `${t("PT_ENTER_PROPERTY_ID")}`
-  }), /*#__PURE__*/React.createElement("button", {
-    className: "submit-bar",
-    type: "button",
-    style: {
-      color: "white"
-    },
-    onClick: searchProperty
-  }, `${t("PT_SEARCH")}`), /*#__PURE__*/React.createElement("button", {
-    className: "submit-bar",
-    type: "button",
-    style: {
-      color: "white"
-    },
-    onClick: clearSearch
-  }, `${t("CLEAR")}`), /*#__PURE__*/React.createElement("span", {
-    onClick: () => history.push(`/digit-ui/${userType}/${pathname.split("/")[3]}/create-application/create-property`, {
-      ...state,
-      ...formData
-    })
-  }, /*#__PURE__*/React.createElement("button", {
-    className: "submit-bar",
-    type: "button",
-    style: {
-      color: "white"
-    }
-  }, t("CPT_CREATE_PROPERTY"))))), searchPropertyId && propertyDetails && propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.Properties.length ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Card, {
+  }, (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, activeProperty ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Card, {
     className: "card-with-background",
     style: {
-      margin: "16px 0px",
-      padding: "20px",
       boxShadow: "none"
     }
   }, /*#__PURE__*/React.createElement(StatusTable, {
@@ -19485,7 +19426,7 @@ const PropertySearchNSummary = ({
       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
+    text: activeProperty === null || activeProperty === void 0 ? void 0 : activeProperty.propertyId
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     labelStyle: isMobile ? {
@@ -19499,7 +19440,7 @@ const PropertySearchNSummary = ({
       color: "#000"
     },
     label: t(`OWNER_NAME`),
-    text: getOwnerNames(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.Properties[0])
+    text: getOwnerNames(activeProperty)
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     labelStyle: isMobile ? {
@@ -19516,7 +19457,7 @@ const PropertySearchNSummary = ({
     label: t(`PROPERTY_ADDRESS`),
     text: propertyAddress,
     privacy: {
-      uuid: propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop4 = propertyDetails.Properties[0]) === null || _propertyDetails$Prop4 === void 0 ? void 0 : (_propertyDetails$Prop5 = _propertyDetails$Prop4.owners) === null || _propertyDetails$Prop5 === void 0 ? void 0 : (_propertyDetails$Prop6 = _propertyDetails$Prop5[0]) === null || _propertyDetails$Prop6 === void 0 ? void 0 : _propertyDetails$Prop6.uuid,
+      uuid: activeProperty === null || activeProperty === void 0 ? void 0 : (_activeProperty$owner = activeProperty.owners) === null || _activeProperty$owner === void 0 ? void 0 : (_activeProperty$owner2 = _activeProperty$owner[0]) === null || _activeProperty$owner2 === void 0 ? void 0 : _activeProperty$owner2.uuid,
       fieldName: ["doorNo", "street", "landmark"],
       model: "Property",
       showValue: true,
@@ -19524,8 +19465,8 @@ const PropertySearchNSummary = ({
         serviceName: "/property-services/property/_search",
         requestBody: {},
         requestParam: {
-          tenantId: propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop7 = propertyDetails.Properties[0]) === null || _propertyDetails$Prop7 === void 0 ? void 0 : _propertyDetails$Prop7.tenantId,
-          propertyIds: propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop8 = propertyDetails.Properties[0]) === null || _propertyDetails$Prop8 === void 0 ? void 0 : _propertyDetails$Prop8.propertyId
+          tenantId: activeProperty === null || activeProperty === void 0 ? void 0 : activeProperty.tenantId,
+          propertyIds: activeProperty === null || activeProperty === void 0 ? void 0 : activeProperty.propertyId
         },
         jsonPath: "Properties[0].address.street",
         d: res => {