@mseva/digit-ui-module-ndc 1.0.21 → 1.0.23

package/dist/index.modern.js

@@ -8731,74 +8731,49 @@ function cleanEscapedString(input) {
 const capitalize = text => text.substr(0, 1).toUpperCase() + text.substr(1);
 const ulbCamel = ulb => ulb.toLowerCase().split(" ").map(capitalize).join(" ");
 const getAcknowledgementData = async (application, tenantInfo, t) => {
-  var _application$Applicat, _appData$owners, _tenantInfo$city, _appData$auditDetails, _appData$NdcDetails, _appData$NdcDetails$, _appData$NdcDetails$$, _appData$NdcDetails2, _appData$NdcDetails2$, _appData$NdcDetails3, _appData$NdcDetails3$, _appData$additionalDe;
-  const appData = application === null || application === void 0 ? void 0 : (_application$Applicat = application.Applications) === null || _application$Applicat === void 0 ? void 0 : _application$Applicat[0];
+  var _application$Applicat, _appData$owners, _appData$NdcDetails, _appData$additionalDe, _tenantInfo$city;
+  const appData = (application === null || application === void 0 ? void 0 : (_application$Applicat = application.Applications) === null || _application$Applicat === void 0 ? void 0 : _application$Applicat[0]) || {};
   const owner = (appData === null || appData === void 0 ? void 0 : (_appData$owners = appData.owners) === null || _appData$owners === void 0 ? void 0 : _appData$owners[0]) || {};
+  const ndc = (appData === null || appData === void 0 ? void 0 : (_appData$NdcDetails = appData.NdcDetails) === null || _appData$NdcDetails === void 0 ? void 0 : _appData$NdcDetails[0]) || {};
+  const add = (ndc === null || ndc === void 0 ? void 0 : ndc.additionalDetails) || {};
+  const applicationNumber = (appData === null || appData === void 0 ? void 0 : appData.uuid) || "NA";
+  const propertyId = (ndc === null || ndc === void 0 ? void 0 : ndc.consumerCode) || "NA";
+  const propertyType = add !== null && add !== void 0 && add.propertyType ? t(add.propertyType) : "NA";
+  const applicantName = (owner === null || owner === void 0 ? void 0 : owner.name) || "NA";
+  const address = (owner === null || owner === void 0 ? void 0 : owner.permanentAddress) || (owner === null || owner === void 0 ? void 0 : owner.correspondenceAddress) || "NA";
+  const ulbName = (tenantInfo === null || tenantInfo === void 0 ? void 0 : tenantInfo.name) || (appData === null || appData === void 0 ? void 0 : appData.tenantId) || "NA";
+  const duesAmount = (add === null || add === void 0 ? void 0 : add.duesAmount) || (appData === null || appData === void 0 ? void 0 : (_appData$additionalDe = appData.additionalDetails) === null || _appData$additionalDe === void 0 ? void 0 : _appData$additionalDe.duesAmount) || "0";
+  const certificateBody = `${t("NDC_MSG_INTRO")}
+
+${t("NDC_MSG_APPLICATION_LABEL")}: ${applicationNumber}
+
+${t("NDC_MSG_PROPERTY_LABEL")}: ${propertyId}  ${t("NDC_MSG_PROPERTY_TYPE_LABEL")} ${propertyType}
+
+${t("NDC_MSG_APPLICANT_LABEL")}: ${applicantName} ${t("NDC_MSG_FOR_LAND")} ${address}
+
+${t("NDC_MSG_FALLING_CLAUSE_PART1")} ${t("NDC_MSG_FALLING_CLAUSE_PART2")} ${ulbName} ${t("NDC_MSG_AFTER_RECOVERY")} ${duesAmount} ${t("NDC_MSG_DUES_LIST")}
+
+${t("NDC_MSG_DECLARATION_TITLE")}
+${t("NDC_MSG_DECL_A")}
+${t("NDC_MSG_DECL_B")}
+${t("NDC_MSG_DECL_C")}
+${t("NDC_MSG_DECL_D")}
+${t("NDC_MSG_DECL_E")}
+
+${t("NDC_MSG_DISCLAIMER_TITLE")}
+${t("NDC_MSG_DISCLAIMER_BODY")}
+
+${t("NDC_MSG_NOTE")} ${t("NDC_MSG_VERIFICATION_LINK_LABEL")}`;
   return {
-    t: t,
+    t,
     tenantId: tenantInfo === null || tenantInfo === void 0 ? void 0 : tenantInfo.code,
     name: `${t(tenantInfo === null || tenantInfo === void 0 ? void 0 : tenantInfo.i18nKey)} ${ulbCamel(t(`ULBGRADE_${tenantInfo === null || tenantInfo === void 0 ? void 0 : (_tenantInfo$city = tenantInfo.city) === null || _tenantInfo$city === void 0 ? void 0 : _tenantInfo$city.ulbGrade.toUpperCase().replace(" ", "_").replace(".", "_")}`))}`,
     email: tenantInfo === null || tenantInfo === void 0 ? void 0 : tenantInfo.emailId,
     phoneNumber: tenantInfo === null || tenantInfo === void 0 ? void 0 : tenantInfo.contactNumber,
     heading: t("NDC_CERTIFICATE"),
-    applicationNumber: (appData === null || appData === void 0 ? void 0 : appData.uuid) || "NA",
+    applicationNumber,
     details: [{
-      title: t("CS_APPLICATION_DETAILS"),
-      values: [{
-        title: t("REGISTRATION_FILED_DATE"),
-        value: Digit.DateUtils.ConvertTimestampToDate(appData === null || appData === void 0 ? void 0 : (_appData$auditDetails = appData.auditDetails) === null || _appData$auditDetails === void 0 ? void 0 : _appData$auditDetails.createdTime, "dd/MM/yyyy") || "NA"
-      }, {
-        title: t("NDC_REASON"),
-        value: (appData === null || appData === void 0 ? void 0 : appData.reason) || "NA"
-      }]
-    }, {
-      title: t("NDC_LICENSE_DETAILS_LABEL"),
-      values: [{
-        title: t("NDC_LICENSE_TYPE"),
-        value: t(appData === null || appData === void 0 ? void 0 : (_appData$NdcDetails = appData.NdcDetails) === null || _appData$NdcDetails === void 0 ? void 0 : (_appData$NdcDetails$ = _appData$NdcDetails[0]) === null || _appData$NdcDetails$ === void 0 ? void 0 : (_appData$NdcDetails$$ = _appData$NdcDetails$.additionalDetails) === null || _appData$NdcDetails$$ === void 0 ? void 0 : _appData$NdcDetails$$.propertyType) || "NA"
-      }, {
-        title: t("NDC_COUNCIL_NUMBER"),
-        value: (appData === null || appData === void 0 ? void 0 : (_appData$NdcDetails2 = appData.NdcDetails) === null || _appData$NdcDetails2 === void 0 ? void 0 : (_appData$NdcDetails2$ = _appData$NdcDetails2[0]) === null || _appData$NdcDetails2$ === void 0 ? void 0 : _appData$NdcDetails2$.consumerCode) || "NA"
-      }, {
-        title: t("NDC_TRADE_TYPE_LABEL"),
-        value: (appData === null || appData === void 0 ? void 0 : (_appData$NdcDetails3 = appData.NdcDetails) === null || _appData$NdcDetails3 === void 0 ? void 0 : (_appData$NdcDetails3$ = _appData$NdcDetails3[0]) === null || _appData$NdcDetails3$ === void 0 ? void 0 : _appData$NdcDetails3$.businessService) || "NA"
-      }, {
-        title: t("NDC_QUALIFICATION_TYPE"),
-        value: (appData === null || appData === void 0 ? void 0 : (_appData$additionalDe = appData.additionalDetails) === null || _appData$additionalDe === void 0 ? void 0 : _appData$additionalDe.qualificationType) || "NA"
-      }]
-    }, {
-      title: t("NDC_LICENSEE_DETAILS_HEADER_OWNER_INFO"),
-      values: [{
-        title: t("NDC_APPLICANT_NAME_LABEL"),
-        value: (owner === null || owner === void 0 ? void 0 : owner.name) || "NA"
-      }, {
-        title: t("NDC_OWNER_MOBILE_NO_LABEL"),
-        value: (owner === null || owner === void 0 ? void 0 : owner.mobileNumber) || "NA"
-      }, {
-        title: t("NDC_APPLICANT_GENDER_LABEL"),
-        value: owner !== null && owner !== void 0 && owner.gender ? t(owner.gender) : "NA"
-      }, {
-        title: t("NDC_APPLICANT_EMAIL_LABEL"),
-        value: (owner === null || owner === void 0 ? void 0 : owner.emailId) || "NA"
-      }, {
-        title: t("NDC_APPLICANT_DOB_LABEL"),
-        value: owner !== null && owner !== void 0 && owner.dob ? Digit.DateUtils.ConvertTimestampToDate(owner.dob, "dd/MM/yyyy") : "NA"
-      }]
-    }, {
-      title: t("NDC_NEW_ADDRESS_HEADER_DETAILS"),
-      values: [{
-        title: t("NDC_PERMANANT_ADDRESS_LABEL"),
-        value: (owner === null || owner === void 0 ? void 0 : owner.permanentAddress) || "NA"
-      }, {
-        title: t("NDC_APPLICANT_CORRESPONDENCE_ADDRESS_LABEL"),
-        value: (owner === null || owner === void 0 ? void 0 : owner.correspondenceAddress) || "NA"
-      }, {
-        title: t("NDC_PINCODE_LABEL"),
-        value: (owner === null || owner === void 0 ? void 0 : owner.permanentPinCode) || (owner === null || owner === void 0 ? void 0 : owner.correspondencePinCode) || "NA"
-      }, {
-        title: t("NDC_SELECT_ULB"),
-        value: (tenantInfo === null || tenantInfo === void 0 ? void 0 : tenantInfo.name) || (appData === null || appData === void 0 ? void 0 : appData.tenantId) || "NA"
-      }]
+      value: certificateBody
     }]
   };
 };
@@ -8841,14 +8816,13 @@ const getTimelineCaptions$1 = (checkpoint, index, arr, t) => {
   }, caption.date && /*#__PURE__*/React.createElement("p", null, caption.date), caption.name && /*#__PURE__*/React.createElement("p", null, caption.name), caption.mobileNumber , caption.source && /*#__PURE__*/React.createElement("p", null, t("ES_COMMON_FILED_VIA_" + caption.source.toUpperCase()))));
 };
 const CitizenApplicationOverview = () => {
-  var _user, _user$info, _user$info$roles, _applicationDetails$A3, _applicationDetails$A4, _applicationDetails$A5, _applicationDetails$A6, _Object$entries, _displayData$NdcDetai, _displayData$Document, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5;
+  var _user, _user$info, _user$info$roles, _applicationDetails$A3, _applicationDetails$A4, _Object$entries, _displayData$NdcDetai, _displayData$Document, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5;
   const {
     id
   } = useParams();
   const {
     t
   } = useTranslation();
-  const history = useHistory();
   const tenantId = window.localStorage.getItem("CITIZEN.CITY");
   const state = tenantId === null || tenantId === void 0 ? void 0 : tenantId.split(".")[0];
   const [appDetails, setAppDetails] = useState({});
@@ -8928,6 +8902,7 @@ const CitizenApplicationOverview = () => {
     }
   }, [applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.Applications]);
   useEffect(() => {
+    console.log("applicationDetails", applicationDetails);
     if (applicationDetails) {
       setIsDetailsLoading(true);
       setAppDetails({
@@ -8941,9 +8916,12 @@ const CitizenApplicationOverview = () => {
   }, [applicationDetails]);
   const handleDownloadPdf = async () => {
     const Property = applicationDetails;
+    console.log("applicationDetails in StakeholderAck", applicationDetails);
+    console.log("tenants", tenants);
     const tenantInfo = tenants === null || tenants === void 0 ? void 0 : tenants.find(tenant => (tenant === null || tenant === void 0 ? void 0 : tenant.code) === (Property === null || Property === void 0 ? void 0 : Property.tenantId));
     const acknowledgementData = await getAcknowledgementData(Property, tenantInfo, t);
-    Digit.Utils.pdf.generate(acknowledgementData);
+    console.log("acknowledgementData", acknowledgementData);
+    Digit.Utils.pdf.generateNDC(acknowledgementData);
   };
   if (isLoading || isDetailsLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
@@ -8961,18 +8939,11 @@ const CitizenApplicationOverview = () => {
     className: "downLoadButton",
     label: t("DOWNLOAD_CERTIFICATE"),
     onClick: handleDownloadPdf
-  }), (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A5 = applicationDetails.Applications) === null || _applicationDetails$A5 === void 0 ? void 0 : (_applicationDetails$A6 = _applicationDetails$A5[0]) === null || _applicationDetails$A6 === void 0 ? void 0 : _applicationDetails$A6.applicationStatus) == "INITIATED" && /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar$1, {
-    label: t("COMMON_EDIT"),
-    onSubmit: () => {
-      var _applicationDetails$A7, _applicationDetails$A8;
-      const id = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A7 = applicationDetails.Applications) === null || _applicationDetails$A7 === void 0 ? void 0 : (_applicationDetails$A8 = _applicationDetails$A7[0]) === null || _applicationDetails$A8 === void 0 ? void 0 : _applicationDetails$A8.uuid;
-      history.push(`/digit-ui/citizen/ndc/new-application/${id}`);
-    }
-  }))), /*#__PURE__*/React.createElement(Card, {
+  })), /*#__PURE__*/React.createElement(Card, {
     className: "ndc_card_main"
   }, /*#__PURE__*/React.createElement(CardSubHeader, {
     className: "ndc_label"
-  }, t("NDC_APPLICATION_DETAILS_OVERVIEW")), /*#__PURE__*/React.createElement(StatusTable, null, (displayData === null || displayData === void 0 ? void 0 : displayData.applicantData) && ((_Object$entries = Object.entries(displayData === null || displayData === void 0 ? void 0 : displayData.applicantData)) === null || _Object$entries === void 0 ? void 0 : _Object$entries.map(([key, value]) => /*#__PURE__*/React.createElement(Row, {
+  }, t("NDC_APPLICATION_DETAILS_OVERVIEW")), /*#__PURE__*/React.createElement(StatusTable, null, console.log("displayData?.applicantData", displayData === null || displayData === void 0 ? void 0 : displayData.applicantData), (displayData === null || displayData === void 0 ? void 0 : displayData.applicantData) && ((_Object$entries = Object.entries(displayData === null || displayData === void 0 ? void 0 : displayData.applicantData)) === null || _Object$entries === void 0 ? void 0 : _Object$entries.map(([key, value]) => /*#__PURE__*/React.createElement(Row, {
     key: key,
     label: t(`${key === null || key === void 0 ? void 0 : key.toUpperCase()}`),
     text: Array.isArray(value) ? value.map(item => typeof item === "object" ? t((item === null || item === void 0 ? void 0 : item.code) || "N/A") : t(item || "N/A")).join(", ") : typeof value === "object" ? t((value === null || value === void 0 ? void 0 : value.code) || "N/A") : t(value || "N/A")
@@ -11544,29 +11515,10 @@ const NewNDCStepForm = () => {
   const formState = useSelector(state => state.ndc.NDCForm);
   const step = formState.step;
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const id = window.location.pathname.split("/").pop();
-  const {
-    isLoading,
-    data: applicationDetails
-  } = Digit.Hooks.ndc.useSearchEmployeeApplication({
-    uuid: id
-  }, tenantId);
-  useEffect(() => {
-    if (applicationDetails !== null && applicationDetails !== void 0 && applicationDetails.Applications.length) {
-      dispatch(updateNDCForm("responseData", applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.Applications));
-    }
-  }, [applicationDetails]);
   const setStep = updatedStepNumber => {
     dispatch(setNDCStep(updatedStepNumber));
   };
   const handleSubmit = () => {};
-  useEffect(() => {
-    const unlisten = history.listen(() => {
-      console.log("route changes guys");
-      dispatch(resetNDCForm());
-    });
-    return () => unlisten();
-  }, [history, dispatch]);
   return /*#__PURE__*/React.createElement("div", {
     className: "pageCard"
   }, /*#__PURE__*/React.createElement(CardHeader, {
@@ -11753,7 +11705,7 @@ const NewNDCStepFormOne = ({
     if (!(propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.email)) missingFields.push(t("NDC_MESSAGE_EMAIL"));
     if (!(NDCReason !== null && NDCReason !== void 0 && NDCReason.code)) missingFields.push(t("NDC_MESSAGE_NDC_REASON"));
     const nameRegex = /^[A-Za-z\s]+$/;
-    const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9-]+\.[a-zA-Z]{2,}$/;
+    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
     const mobileRegex = /^[6-9]\d{9}$/;
     if (propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.firstName && !nameRegex.test(propertyDetails.firstName)) {
       invalidFields.push(t("NDC_MESSAGE_FIRST_NAME_ONLY_ALPHABETS_ALLOWED"));
@@ -11912,7 +11864,7 @@ const PropertyDetailsForm$1 = ({
   formState,
   clearErrors
 }) => {
-  var _formData$cpt, _formData$cpt$details, _formData$cpt3, _Digit, _Digit$ComponentRegis, _formData$cpt4, _apiDataCheck$6, _propertyDetails$wate, _propertyDetails$sewe, _formData$cpt7, _formData$cpt7$detail, _formData$cpt7$detail2, _formData$cpt7$detail3;
+  var _formData$cpt, _formData$cpt$details, _formData$cpt3, _Digit, _Digit$ComponentRegis, _formData$cpt4, _apiDataCheck$6, _propertyDetails$wate, _propertyDetails$sewe;
   const {
     control,
     formState: localFormState,
@@ -12323,7 +12275,6 @@ const PropertyDetailsForm$1 = ({
       }));
     }
   }, [apiDataCheck]);
-  console.log("propertyDetails====", propertyDetails, formData);
   return /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: "16px"
@@ -12617,22 +12568,22 @@ const PropertyDetailsForm$1 = ({
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "email",
-    defaultValue: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.email) || (formData === null || formData === void 0 ? void 0 : (_formData$cpt7 = formData.cpt) === null || _formData$cpt7 === void 0 ? void 0 : (_formData$cpt7$detail = _formData$cpt7.details) === null || _formData$cpt7$detail === void 0 ? void 0 : (_formData$cpt7$detail2 = _formData$cpt7$detail.owners) === null || _formData$cpt7$detail2 === void 0 ? void 0 : (_formData$cpt7$detail3 = _formData$cpt7$detail2[0]) === null || _formData$cpt7$detail3 === void 0 ? void 0 : _formData$cpt7$detail3.emailId),
+    defaultValue: "",
     render: props => {
-      var _formData$cpt8, _formData$cpt8$detail, _formData$cpt8$detail2, _formData$cpt8$detail3;
+      var _formData$cpt7, _formData$cpt7$detail, _formData$cpt7$detail2, _formData$cpt7$detail3, _formData$cpt7$detail4;
       return /*#__PURE__*/React.createElement(TextInput, {
         value: props === null || props === void 0 ? void 0 : props.value,
         onChange: e => {
+          props.onChange(e.target.value);
           setPropertyDetails(prev => ({
             ...prev,
             email: e.target.value
           }));
-          props.onChange(e.target.value);
         },
         onBlur: e => {
           props.onBlur(e);
         },
-        disabled: formData === null || formData === void 0 ? void 0 : (_formData$cpt8 = formData.cpt) === null || _formData$cpt8 === void 0 ? void 0 : (_formData$cpt8$detail = _formData$cpt8.details) === null || _formData$cpt8$detail === void 0 ? void 0 : (_formData$cpt8$detail2 = _formData$cpt8$detail.owners) === null || _formData$cpt8$detail2 === void 0 ? void 0 : (_formData$cpt8$detail3 = _formData$cpt8$detail2[0]) === null || _formData$cpt8$detail3 === void 0 ? void 0 : _formData$cpt8$detail3.emailId
+        disabled: (formData === null || formData === void 0 ? void 0 : (_formData$cpt7 = formData.cpt) === null || _formData$cpt7 === void 0 ? void 0 : (_formData$cpt7$detail = _formData$cpt7.details) === null || _formData$cpt7$detail === void 0 ? void 0 : (_formData$cpt7$detail2 = _formData$cpt7$detail.owners) === null || _formData$cpt7$detail2 === void 0 ? void 0 : (_formData$cpt7$detail3 = _formData$cpt7$detail2[0]) === null || _formData$cpt7$detail3 === void 0 ? void 0 : (_formData$cpt7$detail4 = _formData$cpt7$detail3.email) === null || _formData$cpt7$detail4 === void 0 ? void 0 : _formData$cpt7$detail4.length) > 0
       });
     }
   }))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
@@ -12665,7 +12616,7 @@ const PropertyDetailsForm$1 = ({
     name: "address",
     defaultValue: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.address) || "",
     render: props => {
-      var _formData$cpt9, _formData$cpt9$detail, _formData$cpt9$detail2, _formData$cpt9$detail3, _formData$cpt9$detail4;
+      var _formData$cpt8, _formData$cpt8$detail, _formData$cpt8$detail2, _formData$cpt8$detail3, _formData$cpt8$detail4;
       return /*#__PURE__*/React.createElement(TextInput, {
         value: propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.address,
         onChange: e => {
@@ -12678,7 +12629,7 @@ const PropertyDetailsForm$1 = ({
         onBlur: e => {
           props.onBlur(e);
         },
-        disabled: (formData === null || formData === void 0 ? void 0 : (_formData$cpt9 = formData.cpt) === null || _formData$cpt9 === void 0 ? void 0 : (_formData$cpt9$detail = _formData$cpt9.details) === null || _formData$cpt9$detail === void 0 ? void 0 : (_formData$cpt9$detail2 = _formData$cpt9$detail.owners) === null || _formData$cpt9$detail2 === void 0 ? void 0 : (_formData$cpt9$detail3 = _formData$cpt9$detail2[0]) === null || _formData$cpt9$detail3 === void 0 ? void 0 : (_formData$cpt9$detail4 = _formData$cpt9$detail3.permanentAddress) === null || _formData$cpt9$detail4 === void 0 ? void 0 : _formData$cpt9$detail4.length) > 0
+        disabled: (formData === null || formData === void 0 ? void 0 : (_formData$cpt8 = formData.cpt) === null || _formData$cpt8 === void 0 ? void 0 : (_formData$cpt8$detail = _formData$cpt8.details) === null || _formData$cpt8$detail === void 0 ? void 0 : (_formData$cpt8$detail2 = _formData$cpt8$detail.owners) === null || _formData$cpt8$detail2 === void 0 ? void 0 : (_formData$cpt8$detail3 = _formData$cpt8$detail2[0]) === null || _formData$cpt8$detail3 === void 0 ? void 0 : (_formData$cpt8$detail4 = _formData$cpt8$detail3.permanentAddress) === null || _formData$cpt8$detail4 === void 0 ? void 0 : _formData$cpt8$detail4.length) > 0
       });
     }
   })))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
@@ -12724,7 +12675,7 @@ const PropertySearchNSummary = ({
   onSelect,
   formData
 }) => {
-  var _apiDataCheck$, _apiDataCheck$$NdcDet, _formData$cpt, _formData$cpt2, _propertyDetails$Prop3, _apiDataCheck$2;
+  var _apiDataCheck$, _apiDataCheck$$NdcDet, _formData$cpt, _formData$cpt2, _propertyDetails$Prop3, _apiDataCheck$2, _formData$cpt12, _formData$cpt13, _formData$cpt13$dues;
   const {
     t
   } = useTranslation();
@@ -12782,7 +12733,6 @@ const PropertySearchNSummary = ({
   const [isSearchClicked, setIsSearchClicked] = useState(false);
   const [getNoDue, setNoDue] = useState(false);
   const [getCheckStatus, setCheckStats] = useState(false);
-  const [getPayDuesButton, setPayDuesButton] = useState(false);
   const {
     isLoading,
     isError,
@@ -12882,7 +12832,6 @@ const PropertySearchNSummary = ({
     setIsSearchClicked(false);
     setNoDue(false);
     setCheckStats(false);
-    setPayDuesButton(false);
   };
   if (isEditScreen) {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
@@ -12925,7 +12874,6 @@ const PropertySearchNSummary = ({
             error: true,
             label: t("NDC_MESSAGE_DUES_FOUND_PLEASE_PAY")
           });
-          setPayDuesButton(true);
         } else {
           setShowToast({
             error: false,
@@ -13018,7 +12966,7 @@ const PropertySearchNSummary = ({
       maxWidth: "100px"
     },
     onClick: searchProperty
-  }, `${t("PT_SEARCH")}`), !(apiDataCheck !== null && apiDataCheck !== void 0 && (_apiDataCheck$2 = apiDataCheck[0]) !== null && _apiDataCheck$2 !== void 0 && _apiDataCheck$2.NdcDetails) && getCheckStatus && !getPayDuesButton && /*#__PURE__*/React.createElement("button", {
+  }, `${t("PT_SEARCH")}`), !(apiDataCheck !== null && apiDataCheck !== void 0 && (_apiDataCheck$2 = apiDataCheck[0]) !== null && _apiDataCheck$2 !== void 0 && _apiDataCheck$2.NdcDetails) && getCheckStatus && /*#__PURE__*/React.createElement("button", {
     className: "submit-bar",
     type: "button",
     style: {
@@ -13030,7 +12978,7 @@ const PropertySearchNSummary = ({
     onClick: () => {
       fetchBill();
     }
-  }, `${t("CHECK_STATUS_PROPERTY")}`), getPayDuesButton && /*#__PURE__*/React.createElement("button", {
+  }, `${t("CHECK_STATUS_PROPERTY")}`), (formData === null || formData === void 0 ? void 0 : (_formData$cpt12 = formData.cpt) === null || _formData$cpt12 === void 0 ? void 0 : _formData$cpt12.id) && (formData === null || formData === void 0 ? void 0 : (_formData$cpt13 = formData.cpt) === null || _formData$cpt13 === void 0 ? void 0 : (_formData$cpt13$dues = _formData$cpt13.dues) === null || _formData$cpt13$dues === void 0 ? void 0 : _formData$cpt13$dues.totalAmount) > 0 && !isSearchClicked && /*#__PURE__*/React.createElement("button", {
     className: "submit-bar",
     type: "button",
     style: {
@@ -13040,7 +12988,6 @@ const PropertySearchNSummary = ({
     },
     onClick: () => {
       redirectToPayBill();
-      setPayDuesButton(false);
     }
   }, `${t("PAY_DUES")}`), getNoDue && /*#__PURE__*/React.createElement("div", {
     style: {
@@ -14021,7 +13968,7 @@ const NewNDCStepFormOne$1 = ({
     if (!(propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.email)) missingFields.push(t("NDC_MESSAGE_EMAIL"));
     if (!(NDCReason !== null && NDCReason !== void 0 && NDCReason.code)) missingFields.push(t("NDC_MESSAGE_NDC_REASON"));
     const nameRegex = /^[A-Za-z\s]+$/;
-    const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9-]+\.[a-zA-Z]{2,}$/;
+    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
     const mobileRegex = /^[6-9]\d{9}$/;
     if (propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.firstName && !nameRegex.test(propertyDetails.firstName)) {
       invalidFields.push(t("NDC_MESSAGE_FIRST_NAME_ONLY_ALPHABETS_ALLOWED"));