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

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, 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, Label, 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';
@@ -6460,7 +6460,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 +6534,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 +6565,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 +6580,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 +6612,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();
@@ -6613,7 +6632,7 @@ const CreateProperty = ({
     exact: true,
     path: `${match.path}`
   }, /*#__PURE__*/React.createElement(CreatePropertyForm, {
-    onSubmit: createProperty,
+    onSelect: createProperty,
     value: params,
     userType: "citizen"
   })), /*#__PURE__*/React.createElement(Route, {
@@ -7620,12 +7639,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,6 +7863,8 @@ 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,
@@ -7931,14 +7950,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 +8198,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 +8518,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 +8543,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 +14073,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 +14156,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"))
@@ -17238,8 +17308,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 +17328,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 +17492,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 +17501,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,
@@ -18775,17 +18851,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 +18962,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 +19406,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, _propertyDetails$Prop3, _propertyDetails$Prop4, _activeProperty$owner, _activeProperty$owner2;
   const {
     t
   } = useTranslation();
@@ -19321,33 +19424,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,29 +19465,28 @@ 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 (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}`);
-  };
+  }, [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]);
   const clearSearch = () => {
     setPropertyId("");
     setSearchPropertyId("");
+    setMobileNumber("");
+    setSearchMobileNumber("");
+    setSelectedProperty(null);
     onSelect(config === null || config === void 0 ? void 0 : config.key, {
       id: ""
     });
@@ -19387,9 +19496,9 @@ const PropertySearchNSummary = ({
     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/")) {
@@ -19401,53 +19510,132 @@ const PropertySearchNSummary = ({
   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(",");
     return getOwnersList ? getOwnersList : t("NA");
   };
   if (window.location.href.includes("/ws/")) ;
+  const onPropertySelect = property => {
+    setSelectedProperty(property);
+    onSelect("cpt", {
+      details: property
+    });
+    sessionStorage.setItem("Digit_FSM_PT", JSON.stringify(property));
+    localStorage.setItem("pgrProperty", JSON.stringify(property));
+  };
   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, {
+  }, (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, isCitizen && isWsApplication ? /*#__PURE__*/React.createElement("div", {
+    className: "formcomposer-section-grid",
+    style: isMobile ? {} : {}
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginBottom: "16px"
+    }
+  }, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(Label, {
     style: getInputStyles()
-  }, `${t(`PROPERTY_ID`)}`), /*#__PURE__*/React.createElement("div", {
+  }, `${t("PROPERTY_ID")}`), /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      gap: "12px",
+      width: "100%",
+      flexDirection: "column"
+    }
+  }, isLoading ? /*#__PURE__*/React.createElement("div", null, t("CS_COMMON_LOADING")) : propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.Properties && (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop3 = propertyDetails.Properties) === null || _propertyDetails$Prop3 === void 0 ? void 0 : _propertyDetails$Prop3.length) > 0 ? /*#__PURE__*/React.createElement(Dropdown, {
+    option: propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.Properties,
+    optionKey: "propertyId",
+    id: "propertyId",
+    selected: selectedProperty,
+    select: onPropertySelect,
+    t: t,
+    placeholder: t("PT_SELECT_PROPERTY")
+  }) : /*#__PURE__*/React.createElement("span", {
+    onClick: () => history.push(`/digit-ui/${userType}/${pathname.split("/")[3]}/create-application/create-property?redirectToUrl=${window.location.pathname}`, {
+      ...state,
+      ...formData
+    })
+  }, /*#__PURE__*/React.createElement("button", {
+    className: "submit-bar",
+    type: "button",
+    style: {
+      color: "white"
+    }
+  }, t("CPT_CREATE_PROPERTY"))))))) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
-      gap: "12px"
+      flexDirection: isMobile ? "column" : "row",
+      gap: "16px",
+      width: "100%",
+      alignItems: "flex-end",
+      marginBottom: "16px"
     }
-  }, /*#__PURE__*/React.createElement(TextInput, {
-    key: config === null || config === void 0 ? void 0 : config.key,
-    value: propertyId,
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: 1
+    }
+  }, /*#__PURE__*/React.createElement(Label, null, `${t("CORE_COMMON_MOBILE_NUMBER")}`), /*#__PURE__*/React.createElement(TextInput, {
+    value: mobileNumber,
     onChange: e => {
-      setPropertyId(e.target.value);
-      onSelect(config === null || config === void 0 ? void 0 : config.key, {
-        id: e.target.value
-      });
+      const val = e.target.value;
+      if (val.length <= 10) {
+        setMobileNumber(val);
+        if (val.length === 10) {
+          setSearchMobileNumber(val);
+        }
+      }
     },
     style: {
-      width: "80%",
-      float: "left"
+      width: "100%"
     },
-    placeholder: `${t("PT_ENTER_PROPERTY_ID")}`
-  }), /*#__PURE__*/React.createElement("button", {
-    className: "submit-bar",
-    type: "button",
+    placeholder: `${t("PT_ENTER_MOBILE_NUMBER")}`,
+    maxLength: 10
+  })), /*#__PURE__*/React.createElement("div", {
     style: {
-      color: "white"
-    },
-    onClick: searchProperty
-  }, `${t("PT_SEARCH")}`), /*#__PURE__*/React.createElement("button", {
+      flex: 1
+    }
+  }, /*#__PURE__*/React.createElement(Label, null, `${t("PROPERTY_ID")}`), isLoading ? /*#__PURE__*/React.createElement("div", null, t("CS_COMMON_LOADING")) : /*#__PURE__*/React.createElement(Dropdown, {
+    option: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.Properties) || [],
+    optionKey: "propertyId",
+    id: "propertyId",
+    selected: selectedProperty,
+    select: onPropertySelect,
+    t: t,
+    placeholder: t("PT_SELECT_PROPERTY")
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: 1
+    }
+  }, /*#__PURE__*/React.createElement("button", {
     className: "submit-bar",
     type: "button",
     style: {
-      color: "white"
+      color: "white",
+      width: "100%",
+      margin: 0
     },
     onClick: clearSearch
-  }, `${t("CLEAR")}`), /*#__PURE__*/React.createElement("span", {
-    onClick: () => history.push(`/digit-ui/${userType}/${pathname.split("/")[3]}/create-application/create-property`, {
+  }, `${t("CLEAR")}`)), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: 1
+    }
+  }, searchMobileNumber && (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop4 = propertyDetails.Properties) === null || _propertyDetails$Prop4 === void 0 ? void 0 : _propertyDetails$Prop4.length) === 0 && /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      flexDirection: "column",
+      gap: "8px"
+    }
+  }, /*#__PURE__*/React.createElement("span", {
+    style: {
+      color: "#d60505",
+      fontWeight: "bold",
+      fontSize: "12px",
+      lineHeight: "1"
+    }
+  }, "No property created this number"), /*#__PURE__*/React.createElement("span", {
+    onClick: () => history.push(`/digit-ui/${userType}/${pathname.split("/")[3]}/create-application/create-property?redirectToUrl=${window.location.pathname}`, {
       ...state,
       ...formData
     })
@@ -19455,9 +19643,11 @@ const PropertySearchNSummary = ({
     className: "submit-bar",
     type: "button",
     style: {
-      color: "white"
+      color: "white",
+      width: "100%",
+      margin: 0
     }
-  }, t("CPT_CREATE_PROPERTY"))))), searchPropertyId && propertyDetails && propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.Properties.length ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Card, {
+  }, t("CPT_CREATE_PROPERTY"))))))), activeProperty ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Card, {
     className: "card-with-background",
     style: {
       margin: "16px 0px",
@@ -19485,7 +19675,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 +19689,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 +19706,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 +19714,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 => {