@mseva/digit-ui-module-ndc 1.0.25 → 1.0.27

package/dist/index.modern.js

@@ -547,7 +547,7 @@ const Response = props => {
     label: t("CORE_COMMON_GO_TO_NDC"),
     onSubmit: onGoToNDC
   }), /*#__PURE__*/React.createElement(SubmitBar$1, {
-    label: t("COMMON_MAKE_PAYMENT"),
+    label: t("CS_APPLICATION_DETAILS_MAKE_PAYMENT"),
     onSubmit: handlePayment
   }))));
 };
@@ -849,7 +849,7 @@ const ModalConfig = ({
           selected: selectedApprover
         })
       }, {
-        label: `${t("WF_COMMON_COMMENTS")} *`,
+        label: `${t("CS_COMMON_COMMENTS")} *`,
         type: "textarea",
         populators: {
           name: "comments"
@@ -1101,7 +1101,7 @@ const getTimelineCaptions = (checkpoint, index, arr, t) => {
   }, caption.date && /*#__PURE__*/React.createElement("p", null, caption.date), caption.name && /*#__PURE__*/React.createElement("p", null, caption.name), caption.mobileNumber && /*#__PURE__*/React.createElement("p", null, caption.mobileNumber), caption.source && /*#__PURE__*/React.createElement("p", null, t("ES_COMMON_FILED_VIA_" + caption.source.toUpperCase()))));
 };
 const ApplicationOverview = () => {
-  var _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _user, _user$info, _user$info$roles, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetailsTemp$, _workflowDetailsTemp$2, _Object$entries, _displayData$NdcDetai, _displayData$Document, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _applicationDetails$A3, _applicationDetails$A4, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _applicationDetails$A5, _applicationDetails$A6, _workflowDetails$data15;
+  var _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _user, _user$info, _user$info$roles, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetailsTemp$, _workflowDetailsTemp$2, _Object$entries, _displayData$NdcDetai2, _displayData$Document, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _applicationDetails$A3, _applicationDetails$A4, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _applicationDetails$A5, _applicationDetails$A6, _workflowDetails$data15;
   const {
     id
   } = useParams();
@@ -1117,6 +1117,24 @@ const ApplicationOverview = () => {
   const [errorOne, setErrorOne] = useState(null);
   const [displayData, setDisplayData] = useState({});
   const [isDetailsLoading, setIsDetailsLoading] = useState(false);
+  const [markedPending, setMarkedPending] = useState({});
+  const handleMarkPending = consumerCode => {
+    setMarkedPending(prev => {
+      const updated = {
+        ...prev,
+        [consumerCode]: !prev[consumerCode]
+      };
+      if (updated[consumerCode]) {
+        console.log("✅ Marked dues pending for", consumerCode);
+      } else {
+        console.log("↩️ Undo marking dues pending for", consumerCode);
+      }
+      return updated;
+    });
+  };
+  useEffect(() => {
+    console.log("markedPending", markedPending);
+  }, [markedPending]);
   const {
     isLoading,
     data: applicationDetails
@@ -1263,8 +1281,13 @@ const ApplicationOverview = () => {
     const payloadData = applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.Applications[0];
     const updatedApplicant = {
       ...payloadData,
+      NdcDetails: payloadData.NdcDetails.map(detail => ({
+        ...detail,
+        isDuePending: markedPending[detail.consumerCode] || false
+      })),
       workflow: {}
     };
+    console.log("updatedApplicant", updatedApplicant);
     const filtData = data === null || data === void 0 ? void 0 : (_data$Licenses = data.Licenses) === null || _data$Licenses === void 0 ? void 0 : _data$Licenses[0];
     updatedApplicant.workflow = {
       action: filtData.action,
@@ -1272,48 +1295,49 @@ const ApplicationOverview = () => {
       comment: filtData === null || filtData === void 0 ? void 0 : filtData.comment,
       documents: filtData === null || filtData === void 0 ? void 0 : filtData.wfDocuments
     };
-    if (!(filtData !== null && filtData !== void 0 && filtData.assignee) && filtData.action == "FORWARD") {
+    console.log("filtData action", filtData.action);
+    if (!(filtData !== null && filtData !== void 0 && filtData.assignee) && filtData.action !== "SENDBACKTOCITIZEN" && filtData.action !== "APPROVE" && filtData.action !== "REJECT" && filtData.action !== "SENDBACK") {
       setErrorOne("Assignee is Mandatory");
       setShowErrorToastt(true);
       return;
-    } else if (!(filtData !== null && filtData !== void 0 && filtData.comment) && ((filtData === null || filtData === void 0 ? void 0 : filtData.action) == "FORWARD" || (filtData === null || filtData === void 0 ? void 0 : filtData.action) == "REJECT")) {
+    } else if (!(filtData !== null && filtData !== void 0 && filtData.comment)) {
       setErrorOne("Comment is Mandatory");
       setShowErrorToastt(true);
       return;
     }
-    const finalPayload = {
-      Applications: [updatedApplicant]
-    };
-    try {
-      const response = await Digit.NDCService.NDCUpdate({
-        tenantId,
-        details: finalPayload
-      });
-      setShowToast({
-        key: "success",
-        message: "Successfully updated the status"
-      });
-      setError("Successfully updated the status");
-      workflowDetails.revalidate();
-      setTimeout(() => {
-        history.push("/digit-ui/employee/ndc/inbox");
-        window.location.reload();
-      }, 2000);
-      setSelectedAction(null);
-      setShowModal(false);
-    } catch (err) {
-      setShowToast({
-        key: "error",
-        message: "Something went wrong"
-      });
-      setError("Something went wrong");
-    }
+    return;
   };
   const closeModal = () => {
     setSelectedAction(null);
     setShowModal(false);
   };
-  if (isLoading || isDetailsLoading) {
+  const [getPropertyId, setPropertyId] = useState(null);
+  useEffect(() => {
+    if (displayData) {
+      var _displayData$NdcDetai, _checkProperty$;
+      const checkProperty = displayData === null || displayData === void 0 ? void 0 : (_displayData$NdcDetai = displayData.NdcDetails) === null || _displayData$NdcDetai === void 0 ? void 0 : _displayData$NdcDetai.filter(item => (item === null || item === void 0 ? void 0 : item.businessService) == "NDC_PROPERTY_TAX");
+      setPropertyId(checkProperty === null || checkProperty === void 0 ? void 0 : (_checkProperty$ = checkProperty[0]) === null || _checkProperty$ === void 0 ? void 0 : _checkProperty$.consumerCode);
+    }
+  }, [displayData]);
+  const {
+    isLoading: checkLoading,
+    isError,
+    error: checkError,
+    data: propertyDetailsFetch
+  } = Digit.Hooks.pt.usePropertySearch({
+    filters: {
+      propertyIds: getPropertyId
+    },
+    tenantId: tenantId
+  }, {
+    filters: {
+      propertyIds: getPropertyId
+    },
+    tenantId: tenantId,
+    enabled: getPropertyId ? true : false,
+    privacy: Digit.Utils.getPrivacyObject()
+  });
+  if (isLoading || isDetailsLoading || checkLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
   return /*#__PURE__*/React.createElement("div", {
@@ -1322,8 +1346,13 @@ const ApplicationOverview = () => {
     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")
-  }))))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, null, t("NDC_APPLICATION_NDC_DETAILS_OVERVIEW")), displayData === null || displayData === void 0 ? void 0 : (_displayData$NdcDetai = displayData.NdcDetails) === null || _displayData$NdcDetai === void 0 ? void 0 : _displayData$NdcDetai.map((detail, index) => {
-    var _detail$dueAmount;
+  }))))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, null, t("NDC_APPLICATION_NDC_DETAILS_OVERVIEW")), displayData === null || displayData === void 0 ? void 0 : (_displayData$NdcDetai2 = displayData.NdcDetails) === null || _displayData$NdcDetai2 === void 0 ? void 0 : _displayData$NdcDetai2.map((detail, index) => {
+    var _detail$dueAmount, _propertyDetailsFetch, _propertyDetailsFetch2, _propertyDetailsFetch3, _propertyDetailsFetch4, _propertyDetailsFetch5, _propertyDetailsFetch6, _propertyDetailsFetch7, _propertyDetailsFetch8, _propertyDetailsFetch9, _propertyDetailsFetch0, _propertyDetailsFetch1, _propertyDetailsFetch10, _propertyDetailsFetch11, _propertyDetailsFetch12, _propertyDetailsFetch13, _propertyDetailsFetch14, _propertyDetailsFetch15, _propertyDetailsFetch16, _propertyDetailsFetch17, _propertyDetailsFetch18;
+    const isPT = (detail === null || detail === void 0 ? void 0 : detail.businessService) === "NDC_PROPERTY_TAX";
+    const isSW = (detail === null || detail === void 0 ? void 0 : detail.businessService) === "NDC_SEWERAGE_SERVICE_CONNECTION";
+    const isWS = (detail === null || detail === void 0 ? void 0 : detail.businessService) === "NDC_WATER_SERVICE_CONNECTION";
+    const canRaiseFlag = isPT && (userRoles === null || userRoles === void 0 ? void 0 : userRoles.includes("NDC_PT_VERIFIER")) || (isSW || isWS) && (userRoles === null || userRoles === void 0 ? void 0 : userRoles.includes("NDC_WS_SW_VERIFIER"));
+    const isMarked = markedPending[detail.consumerCode];
     return /*#__PURE__*/React.createElement("div", {
       key: index,
       style: {
@@ -1344,6 +1373,36 @@ const ApplicationOverview = () => {
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("NDC_PROPERTY_TYPE"),
       text: t(detail.propertyType) || detail.propertyType
+    }), isPT && (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : propertyDetailsFetch.Properties) && /*#__PURE__*/React.createElement(Fragment$1, null, /*#__PURE__*/React.createElement(Row, {
+      label: t("City"),
+      text: propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch2 = _propertyDetailsFetch[0]) === null || _propertyDetailsFetch2 === void 0 ? void 0 : (_propertyDetailsFetch3 = _propertyDetailsFetch2.address) === null || _propertyDetailsFetch3 === void 0 ? void 0 : _propertyDetailsFetch3.city
+    }), /*#__PURE__*/React.createElement(Row, {
+      label: t("House No"),
+      text: propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch4 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch4 === void 0 ? void 0 : (_propertyDetailsFetch5 = _propertyDetailsFetch4[0]) === null || _propertyDetailsFetch5 === void 0 ? void 0 : (_propertyDetailsFetch6 = _propertyDetailsFetch5.address) === null || _propertyDetailsFetch6 === void 0 ? void 0 : _propertyDetailsFetch6.doorNo
+    }), /*#__PURE__*/React.createElement(Row, {
+      label: t("Colony Name"),
+      text: propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch7 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch7 === void 0 ? void 0 : (_propertyDetailsFetch8 = _propertyDetailsFetch7[0]) === null || _propertyDetailsFetch8 === void 0 ? void 0 : (_propertyDetailsFetch9 = _propertyDetailsFetch8.address) === null || _propertyDetailsFetch9 === void 0 ? void 0 : _propertyDetailsFetch9.buildingName
+    }), /*#__PURE__*/React.createElement(Row, {
+      label: t("Street Name"),
+      text: propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch0 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch0 === void 0 ? void 0 : (_propertyDetailsFetch1 = _propertyDetailsFetch0[0]) === null || _propertyDetailsFetch1 === void 0 ? void 0 : (_propertyDetailsFetch10 = _propertyDetailsFetch1.address) === null || _propertyDetailsFetch10 === void 0 ? void 0 : _propertyDetailsFetch10.street
+    }), /*#__PURE__*/React.createElement(Row, {
+      label: t("Pincode"),
+      text: (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch11 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch11 === void 0 ? void 0 : (_propertyDetailsFetch12 = _propertyDetailsFetch11[0]) === null || _propertyDetailsFetch12 === void 0 ? void 0 : (_propertyDetailsFetch13 = _propertyDetailsFetch12.address) === null || _propertyDetailsFetch13 === void 0 ? void 0 : _propertyDetailsFetch13.pincode) || "N/A"
+    }), /*#__PURE__*/React.createElement(Row, {
+      label: t("Survey Id/UID"),
+      text: propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch14 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch14 === void 0 ? void 0 : (_propertyDetailsFetch15 = _propertyDetailsFetch14[0]) === null || _propertyDetailsFetch15 === void 0 ? void 0 : _propertyDetailsFetch15.surveyId
+    }), /*#__PURE__*/React.createElement(Row, {
+      label: t("Year of creation of Property"),
+      text: propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch16 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch16 === void 0 ? void 0 : (_propertyDetailsFetch17 = _propertyDetailsFetch16[0]) === null || _propertyDetailsFetch17 === void 0 ? void 0 : (_propertyDetailsFetch18 = _propertyDetailsFetch17.additionalDetails) === null || _propertyDetailsFetch18 === void 0 ? void 0 : _propertyDetailsFetch18.yearConstruction
+    }))), canRaiseFlag && /*#__PURE__*/React.createElement("div", {
+      style: {
+        marginTop: "16px",
+        display: "flex",
+        justifyContent: "right"
+      }
+    }, /*#__PURE__*/React.createElement(SubmitBar$1, {
+      label: isMarked ? "Undo Mark Pending" : "Mark Dues Pending",
+      onSubmit: () => handleMarkPending(detail === null || detail === void 0 ? void 0 : detail.consumerCode)
     })));
   })), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, null, t("NDC_APPLICATION_DOCUMENTS_OVERVIEW")), /*#__PURE__*/React.createElement("div", {
     style: {
@@ -8801,7 +8860,7 @@ 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, _applicationDetails$A5, _applicationDetails$A6, _Object$entries, _displayData$NdcDetai2, _displayData$Document, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5;
   const {
     id
   } = useParams();
@@ -8906,6 +8965,34 @@ const CitizenApplicationOverview = () => {
     console.log("acknowledgementData", acknowledgementData);
     Digit.Utils.pdf.generateNDC(acknowledgementData);
   };
+  const [getPropertyId, setPropertyId] = useState(null);
+  useEffect(() => {
+    if (displayData) {
+      var _displayData$NdcDetai, _checkProperty$;
+      console.log("here");
+      const checkProperty = displayData === null || displayData === void 0 ? void 0 : (_displayData$NdcDetai = displayData.NdcDetails) === null || _displayData$NdcDetai === void 0 ? void 0 : _displayData$NdcDetai.filter(item => (item === null || item === void 0 ? void 0 : item.businessService) == "NDC_PROPERTY_TAX");
+      console.log("checkProperty", checkProperty);
+      setPropertyId(checkProperty === null || checkProperty === void 0 ? void 0 : (_checkProperty$ = checkProperty[0]) === null || _checkProperty$ === void 0 ? void 0 : _checkProperty$.consumerCode);
+    }
+  }, [displayData]);
+  const {
+    isLoading: checkLoading,
+    isError,
+    error: checkError,
+    data: propertyDetailsFetch
+  } = Digit.Hooks.pt.usePropertySearch({
+    filters: {
+      propertyIds: getPropertyId
+    },
+    tenantId: tenantId
+  }, {
+    filters: {
+      propertyIds: getPropertyId
+    },
+    tenantId: tenantId,
+    enabled: getPropertyId ? true : false,
+    privacy: Digit.Utils.getPrivacyObject()
+  });
   if (isLoading || isDetailsLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
@@ -8941,8 +9028,8 @@ const CitizenApplicationOverview = () => {
     className: "ndc_card_main"
   }, /*#__PURE__*/React.createElement(CardSubHeader, {
     className: "ndc_label"
-  }, t("NDC_APPLICATION_NDC_DETAILS_OVERVIEW")), displayData === null || displayData === void 0 ? void 0 : (_displayData$NdcDetai = displayData.NdcDetails) === null || _displayData$NdcDetai === void 0 ? void 0 : _displayData$NdcDetai.map((detail, index) => {
-    var _detail$dueAmount;
+  }, t("NDC_APPLICATION_NDC_DETAILS_OVERVIEW")), displayData === null || displayData === void 0 ? void 0 : (_displayData$NdcDetai2 = displayData.NdcDetails) === null || _displayData$NdcDetai2 === void 0 ? void 0 : _displayData$NdcDetai2.map((detail, index) => {
+    var _detail$dueAmount, _propertyDetailsFetch, _propertyDetailsFetch2, _propertyDetailsFetch3, _propertyDetailsFetch4, _propertyDetailsFetch5, _propertyDetailsFetch6, _propertyDetailsFetch7, _propertyDetailsFetch8, _propertyDetailsFetch9, _propertyDetailsFetch0, _propertyDetailsFetch1, _propertyDetailsFetch10, _propertyDetailsFetch11, _propertyDetailsFetch12, _propertyDetailsFetch13, _propertyDetailsFetch14, _propertyDetailsFetch15, _propertyDetailsFetch16, _propertyDetailsFetch17, _propertyDetailsFetch18;
     return /*#__PURE__*/React.createElement("div", {
       key: index,
       style: {
@@ -8963,7 +9050,28 @@ const CitizenApplicationOverview = () => {
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("NDC_PROPERTY_TYPE"),
       text: t(detail.propertyType) || detail.propertyType
-    })));
+    }), (detail === null || detail === void 0 ? void 0 : detail.businessService) == "NDC_PROPERTY_TAX" && (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : propertyDetailsFetch.Properties) && /*#__PURE__*/React.createElement(Fragment$1, null, /*#__PURE__*/React.createElement(Row, {
+      label: t("City"),
+      text: propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch2 = _propertyDetailsFetch[0]) === null || _propertyDetailsFetch2 === void 0 ? void 0 : (_propertyDetailsFetch3 = _propertyDetailsFetch2.address) === null || _propertyDetailsFetch3 === void 0 ? void 0 : _propertyDetailsFetch3.city
+    }), /*#__PURE__*/React.createElement(Row, {
+      label: t("House No"),
+      text: propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch4 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch4 === void 0 ? void 0 : (_propertyDetailsFetch5 = _propertyDetailsFetch4[0]) === null || _propertyDetailsFetch5 === void 0 ? void 0 : (_propertyDetailsFetch6 = _propertyDetailsFetch5.address) === null || _propertyDetailsFetch6 === void 0 ? void 0 : _propertyDetailsFetch6.doorNo
+    }), /*#__PURE__*/React.createElement(Row, {
+      label: t("Colony Name"),
+      text: propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch7 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch7 === void 0 ? void 0 : (_propertyDetailsFetch8 = _propertyDetailsFetch7[0]) === null || _propertyDetailsFetch8 === void 0 ? void 0 : (_propertyDetailsFetch9 = _propertyDetailsFetch8.address) === null || _propertyDetailsFetch9 === void 0 ? void 0 : _propertyDetailsFetch9.buildingName
+    }), /*#__PURE__*/React.createElement(Row, {
+      label: t("Street Name"),
+      text: propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch0 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch0 === void 0 ? void 0 : (_propertyDetailsFetch1 = _propertyDetailsFetch0[0]) === null || _propertyDetailsFetch1 === void 0 ? void 0 : (_propertyDetailsFetch10 = _propertyDetailsFetch1.address) === null || _propertyDetailsFetch10 === void 0 ? void 0 : _propertyDetailsFetch10.street
+    }), /*#__PURE__*/React.createElement(Row, {
+      label: t("Pincode"),
+      text: (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch11 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch11 === void 0 ? void 0 : (_propertyDetailsFetch12 = _propertyDetailsFetch11[0]) === null || _propertyDetailsFetch12 === void 0 ? void 0 : (_propertyDetailsFetch13 = _propertyDetailsFetch12.address) === null || _propertyDetailsFetch13 === void 0 ? void 0 : _propertyDetailsFetch13.pincode) || "N/A"
+    }), /*#__PURE__*/React.createElement(Row, {
+      label: t("Survey Id/UID"),
+      text: propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch14 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch14 === void 0 ? void 0 : (_propertyDetailsFetch15 = _propertyDetailsFetch14[0]) === null || _propertyDetailsFetch15 === void 0 ? void 0 : _propertyDetailsFetch15.surveyId
+    }), /*#__PURE__*/React.createElement(Row, {
+      label: t("Year of creation of Property"),
+      text: propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch16 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch16 === void 0 ? void 0 : (_propertyDetailsFetch17 = _propertyDetailsFetch16[0]) === null || _propertyDetailsFetch17 === void 0 ? void 0 : (_propertyDetailsFetch18 = _propertyDetailsFetch17.additionalDetails) === null || _propertyDetailsFetch18 === void 0 ? void 0 : _propertyDetailsFetch18.yearConstruction
+    }))));
   })), /*#__PURE__*/React.createElement(Card, {
     className: "ndc_card_main"
   }, /*#__PURE__*/React.createElement(CardSubHeader, {
@@ -9109,11 +9217,14 @@ const SearchFormFieldsComponents = ({
         textAlign: "start"
       }
     }, /*#__PURE__*/React.createElement(SearchField, null, /*#__PURE__*/React.createElement("label", null, t("NOC_HOME_SEARCH_RESULTS_APP_NO_LABEL")), /*#__PURE__*/React.createElement(TextInput, {
-      style: {
-        marginTop: "10px"
-      },
       name: "uuid",
       inputRef: registerRef({})
+    })), /*#__PURE__*/React.createElement(SearchField, null, /*#__PURE__*/React.createElement("label", null, t("CORE_COMMON_PHONE_NUMBER")), /*#__PURE__*/React.createElement(TextInput, {
+      name: "phoneNumber",
+      inputRef: registerRef({})
+    })), /*#__PURE__*/React.createElement(SearchField, null, /*#__PURE__*/React.createElement("label", null, t("NDC_MSG_PROPERTY_LABEL")), /*#__PURE__*/React.createElement(TextInput, {
+      name: "propertyId",
+      inputRef: registerRef({})
     })), /*#__PURE__*/React.createElement("div", {
       className: "search-action-wrapper",
       style: {
@@ -9521,7 +9632,8 @@ const Inbox = ({
     headerText: `${t("MODULE_NKS_NO_DUE_CERTIFICATE_FEES")}`,
     links: [{
       text: "Create NDC Application",
-      link: "/digit-ui/employee/ndc/create"
+      link: "/digit-ui/employee/ndc/create",
+      accessTo: [""]
     }]
   };
   const SearchFormFields = useCallback(({
@@ -11523,7 +11635,6 @@ const NewNDCStepForm = () => {
   const handleSubmit = () => {};
   useEffect(() => {
     const unlisten = history.listen(() => {
-      console.log("route changes guys");
       dispatch(resetNDCForm());
     });
     return () => unlisten();
@@ -11670,17 +11781,17 @@ const NewNDCStepFormOne = ({
     }
   };
   function validateStepData(data) {
-    var _data$cpt6, _data$cpt6$dues, _data$cpt7, _data$cpt7$dues, _data$dues, _propertyDetails$wate, _propertyDetails$sewe;
+    var _data$cpt6, _data$cpt7, _data$cpt7$dues, _propertyDetails$wate, _propertyDetails$sewe;
     const missingFields = [];
     const invalidFields = [];
     const cpt = (data === null || data === void 0 ? void 0 : data.cpt) || {};
     const cptDetails = (cpt === null || cpt === void 0 ? void 0 : cpt.details) || {};
     const propertyDetails = (data === null || data === void 0 ? void 0 : data.PropertyDetails) || {};
     const NDCReason = (data === null || data === void 0 ? void 0 : data.NDCReason) || {};
-    if ((data === null || data === void 0 ? void 0 : (_data$cpt6 = data.cpt) === null || _data$cpt6 === void 0 ? void 0 : (_data$cpt6$dues = _data$cpt6.dues) === null || _data$cpt6$dues === void 0 ? void 0 : _data$cpt6$dues.totalAmount) != 0) {
+    if (!(data !== null && data !== void 0 && (_data$cpt6 = data.cpt) !== null && _data$cpt6 !== void 0 && _data$cpt6.dues)) {
       missingFields.push(`${t("NDC_MESSAGE_PLEASE_CHECK_STATUS_OF_PROPERTY_TAX")} ${cpt === null || cpt === void 0 ? void 0 : cpt.id}`);
     }
-    if (data !== null && data !== void 0 && (_data$cpt7 = data.cpt) !== null && _data$cpt7 !== void 0 && (_data$cpt7$dues = _data$cpt7.dues) !== null && _data$cpt7$dues !== void 0 && _data$cpt7$dues.id && (data === null || data === void 0 ? void 0 : (_data$dues = data.dues) === null || _data$dues === void 0 ? void 0 : _data$dues.totalAmount) > 0) {
+    if ((data === null || data === void 0 ? void 0 : (_data$cpt7 = data.cpt) === null || _data$cpt7 === void 0 ? void 0 : (_data$cpt7$dues = _data$cpt7.dues) === null || _data$cpt7$dues === void 0 ? void 0 : _data$cpt7$dues.totalAmount) > 0) {
       missingFields.push(`${t("NDC_MESSAGE_PLEASE_PAY_DUES_OF_PROPERTY_TAX")} ${cpt === null || cpt === void 0 ? void 0 : cpt.id}`);
     }
     if ((propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$wate = propertyDetails.waterConnection) === null || _propertyDetails$wate === void 0 ? void 0 : _propertyDetails$wate.length) > 0) {
@@ -11713,7 +11824,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 = /^(?!\.)(?!.*\.\.)[a-zA-Z0-9._%+-]+@[a-zA-Z0-9-]+(\.[a-zA-Z]{2,})+$/;
     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"));
@@ -11865,7 +11976,7 @@ const PropertyDetailsForm$1 = ({
   formState,
   clearErrors
 }) => {
-  var _formData$cpt, _formData$cpt$details, _formData$cpt3, _Digit, _Digit$ComponentRegis, _formData$cpt6, _formData$cpt6$detail, _formData$cpt7, _apiDataCheck$6, _propertyDetails$wate, _propertyDetails$sewe;
+  var _formData$cpt, _formData$cpt$details, _formData$cpt3, _Digit, _Digit$ComponentRegis, _formData$cpt4, _apiDataCheck$5, _propertyDetails$wate, _propertyDetails$sewe;
   const {
     control,
     formState: localFormState,
@@ -11921,21 +12032,23 @@ const PropertyDetailsForm$1 = ({
     t
   });
   useEffect(() => {
-    var _formData$cpt2, _formData$cpt2$detail, _formData$cpt2$detail2, _owner$name, _formData$PropertyDet, _formData$PropertyDet2;
+    var _formData$cpt2, _formData$cpt2$detail, _formData$cpt2$detail2, _owner$name, _formData$PropertyDet, _formData$PropertyDet2, _formData$PropertyDet3;
+    console.log("coming here everytime", formData);
     const owner = 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$detail2 = _formData$cpt2$detail.owners) === null || _formData$cpt2$detail2 === void 0 ? void 0 : _formData$cpt2$detail2[0];
     const fullName = owner === null || owner === void 0 ? void 0 : (_owner$name = owner.name) === null || _owner$name === void 0 ? void 0 : _owner$name.split(" ");
     const firstName = owner === null || owner === void 0 ? void 0 : owner.name;
-    const email = owner === null || owner === void 0 ? void 0 : owner.email;
+    console.log("ikiki email", owner === null || owner === void 0 ? void 0 : owner.emailId);
+    const email = (owner === null || owner === void 0 ? void 0 : owner.emailId) || (formData === null || formData === void 0 ? void 0 : (_formData$PropertyDet = formData.PropertyDetails) === null || _formData$PropertyDet === void 0 ? void 0 : _formData$PropertyDet.email) || "";
     const mobileNumber = owner === null || owner === void 0 ? void 0 : owner.mobileNumber;
     const address = owner === null || owner === void 0 ? void 0 : owner.permanentAddress;
     const combinedObject = {};
     if (firstName) combinedObject.firstName = firstName;
-    if (email) combinedObject.email = email;
+    combinedObject.email = email;
     if (mobileNumber) combinedObject.mobileNumber = mobileNumber;
     if (address) combinedObject.address = address;
     combinedObject.propertyBillData = {
       isLoading: false,
-      billData: (formData === null || formData === void 0 ? void 0 : (_formData$PropertyDet = formData.PropertyDetails) === null || _formData$PropertyDet === void 0 ? void 0 : (_formData$PropertyDet2 = _formData$PropertyDet.propertyBillData) === null || _formData$PropertyDet2 === void 0 ? void 0 : _formData$PropertyDet2.billData) || {}
+      billData: (formData === null || formData === void 0 ? void 0 : (_formData$PropertyDet2 = formData.PropertyDetails) === null || _formData$PropertyDet2 === void 0 ? void 0 : (_formData$PropertyDet3 = _formData$PropertyDet2.propertyBillData) === null || _formData$PropertyDet3 === void 0 ? void 0 : _formData$PropertyDet3.billData) || {}
     };
     setPropertyDetails(prev => {
       return {
@@ -11944,6 +12057,9 @@ const PropertyDetailsForm$1 = ({
       };
     });
   }, [formData === null || formData === void 0 ? void 0 : (_formData$cpt3 = formData.cpt) === null || _formData$cpt3 === void 0 ? void 0 : _formData$cpt3.details]);
+  useEffect(() => {
+    console.log("updated propertyDetails", propertyDetails);
+  }, [propertyDetails]);
   useEffect(() => {
     var _apiDataCheck$;
     let waterConnection;
@@ -12260,35 +12376,11 @@ const PropertyDetailsForm$1 = ({
       return () => clearTimeout(timer);
     }
   }, [showToast]);
-  useEffect(() => {
-    if (apiDataCheck) {
-      var _apiDataCheck$5, _apiDataCheck$5$owner, _apiDataCheck$5$owner2;
-      const apiEmail = (apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$5 = apiDataCheck[0]) === null || _apiDataCheck$5 === void 0 ? void 0 : (_apiDataCheck$5$owner = _apiDataCheck$5.owners) === null || _apiDataCheck$5$owner === void 0 ? void 0 : (_apiDataCheck$5$owner2 = _apiDataCheck$5$owner[0]) === null || _apiDataCheck$5$owner2 === void 0 ? void 0 : _apiDataCheck$5$owner2.emailId) || "";
-      setValue("email", apiEmail);
-      setPropertyDetails(prev => ({
-        ...prev,
-        email: apiEmail
-      }));
-    }
-  }, [apiDataCheck]);
-  useEffect(() => {
-    var _formData$cpt4, _formData$cpt4$detail;
-    if (formData !== null && formData !== void 0 && (_formData$cpt4 = formData.cpt) !== null && _formData$cpt4 !== void 0 && (_formData$cpt4$detail = _formData$cpt4.details) !== null && _formData$cpt4$detail !== void 0 && _formData$cpt4$detail.owners) {
-      var _formData$cpt5, _formData$cpt5$detail, _formData$cpt5$detail2, _formData$cpt5$detail3;
-      const formDataEmail = formData === null || formData === void 0 ? void 0 : (_formData$cpt5 = formData.cpt) === null || _formData$cpt5 === void 0 ? void 0 : (_formData$cpt5$detail = _formData$cpt5.details) === null || _formData$cpt5$detail === void 0 ? void 0 : (_formData$cpt5$detail2 = _formData$cpt5$detail.owners) === null || _formData$cpt5$detail2 === void 0 ? void 0 : (_formData$cpt5$detail3 = _formData$cpt5$detail2[0]) === null || _formData$cpt5$detail3 === void 0 ? void 0 : _formData$cpt5$detail3.emailId;
-      setValue("email", formDataEmail);
-      setPropertyDetails(prev => ({
-        ...prev,
-        email: formDataEmail
-      }));
-    }
-  }, [formData === null || formData === void 0 ? void 0 : (_formData$cpt6 = formData.cpt) === null || _formData$cpt6 === void 0 ? void 0 : (_formData$cpt6$detail = _formData$cpt6.details) === null || _formData$cpt6$detail === void 0 ? void 0 : _formData$cpt6$detail.owners]);
-  console.log("propertyDetails====", propertyDetails, formData);
   return /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: "16px"
     }
-  }, ((formData === null || formData === void 0 ? void 0 : (_formData$cpt7 = formData.cpt) === null || _formData$cpt7 === void 0 ? void 0 : _formData$cpt7.details) || (apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$6 = apiDataCheck[0]) === null || _apiDataCheck$6 === void 0 ? void 0 : _apiDataCheck$6.NdcDetails)) && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, {
+  }, ((formData === null || formData === void 0 ? void 0 : (_formData$cpt4 = formData.cpt) === null || _formData$cpt4 === void 0 ? void 0 : _formData$cpt4.details) || (apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$5 = apiDataCheck[0]) === null || _apiDataCheck$5 === void 0 ? void 0 : _apiDataCheck$5.NdcDetails)) && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, {
     style: {
       marginTop: "40px"
     }
@@ -12303,7 +12395,7 @@ const PropertyDetailsForm$1 = ({
       width: "100%"
     }
   }, propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$wate = propertyDetails.waterConnection) === null || _propertyDetails$wate === void 0 ? void 0 : _propertyDetails$wate.map((item, index) => {
-    var _apiDataCheck$7, _item$billData, _item$billData2, _item$billData3, _item$billData4;
+    var _apiDataCheck$6, _item$billData, _item$billData2, _item$billData3, _item$billData4;
     return /*#__PURE__*/React.createElement("div", {
       className: "ndc_property_search",
       key: index,
@@ -12344,7 +12436,7 @@ const PropertyDetailsForm$1 = ({
         alignItems: "center",
         gap: "12px"
       }
-    }, !(apiDataCheck !== null && apiDataCheck !== void 0 && (_apiDataCheck$7 = apiDataCheck[0]) !== null && _apiDataCheck$7 !== void 0 && _apiDataCheck$7.NdcDetails) && (item === null || item === void 0 ? void 0 : item.connectionNo) && !(item !== null && item !== void 0 && (_item$billData = item.billData) !== null && _item$billData !== void 0 && _item$billData.id) && (item === null || item === void 0 ? void 0 : (_item$billData2 = item.billData) === null || _item$billData2 === void 0 ? void 0 : _item$billData2.totalAmount) != 0 && /*#__PURE__*/React.createElement("button", {
+    }, !(apiDataCheck !== null && apiDataCheck !== void 0 && (_apiDataCheck$6 = apiDataCheck[0]) !== null && _apiDataCheck$6 !== void 0 && _apiDataCheck$6.NdcDetails) && (item === null || item === void 0 ? void 0 : item.connectionNo) && !(item !== null && item !== void 0 && (_item$billData = item.billData) !== null && _item$billData !== void 0 && _item$billData.id) && (item === null || item === void 0 ? void 0 : (_item$billData2 = item.billData) === null || _item$billData2 === void 0 ? void 0 : _item$billData2.totalAmount) != 0 && /*#__PURE__*/React.createElement("button", {
       className: "submit-bar",
       type: "button",
       style: {
@@ -12411,7 +12503,7 @@ const PropertyDetailsForm$1 = ({
       width: "100%"
     }
   }, propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$sewe = propertyDetails.sewerageConnection) === null || _propertyDetails$sewe === void 0 ? void 0 : _propertyDetails$sewe.map((item, index) => {
-    var _apiDataCheck$8, _item$billData5, _item$billData6, _item$billData7, _item$billData8;
+    var _apiDataCheck$7, _item$billData5, _item$billData6, _item$billData7, _item$billData8;
     return /*#__PURE__*/React.createElement("div", {
       className: "ndc_property_search",
       key: index,
@@ -12452,7 +12544,7 @@ const PropertyDetailsForm$1 = ({
         alignItems: "center",
         gap: "12px"
       }
-    }, !(apiDataCheck !== null && apiDataCheck !== void 0 && (_apiDataCheck$8 = apiDataCheck[0]) !== null && _apiDataCheck$8 !== void 0 && _apiDataCheck$8.NdcDetails) && (item === null || item === void 0 ? void 0 : item.connectionNo) && !(item !== null && item !== void 0 && (_item$billData5 = item.billData) !== null && _item$billData5 !== void 0 && _item$billData5.id) && (item === null || item === void 0 ? void 0 : (_item$billData6 = item.billData) === null || _item$billData6 === void 0 ? void 0 : _item$billData6.totalAmount) != 0 && /*#__PURE__*/React.createElement("button", {
+    }, !(apiDataCheck !== null && apiDataCheck !== void 0 && (_apiDataCheck$7 = apiDataCheck[0]) !== null && _apiDataCheck$7 !== void 0 && _apiDataCheck$7.NdcDetails) && (item === null || item === void 0 ? void 0 : item.connectionNo) && !(item !== null && item !== void 0 && (_item$billData5 = item.billData) !== null && _item$billData5 !== void 0 && _item$billData5.id) && (item === null || item === void 0 ? void 0 : (_item$billData6 = item.billData) === null || _item$billData6 === void 0 ? void 0 : _item$billData6.totalAmount) != 0 && /*#__PURE__*/React.createElement("button", {
       className: "submit-bar",
       type: "button",
       style: {
@@ -12523,7 +12615,7 @@ const PropertyDetailsForm$1 = ({
       }
     },
     render: props => {
-      var _formData$cpt8, _formData$cpt8$detail, _formData$cpt8$detail2, _formData$cpt8$detail3, _formData$cpt8$detail4, _formData$cpt8$detail5, _formData$cpt8$detail6;
+      var _formData$cpt5, _formData$cpt5$detail, _formData$cpt5$detail2, _formData$cpt5$detail3, _formData$cpt5$detail4, _formData$cpt5$detail5, _formData$cpt5$detail6;
       return /*#__PURE__*/React.createElement(TextInput, {
         value: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.firstName) || "",
         onChange: e => {
@@ -12536,7 +12628,7 @@ const PropertyDetailsForm$1 = ({
         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$detail4 = _formData$cpt8$detail3.name) === null || _formData$cpt8$detail4 === void 0 ? void 0 : (_formData$cpt8$detail5 = _formData$cpt8$detail4.split(" ")) === null || _formData$cpt8$detail5 === void 0 ? void 0 : (_formData$cpt8$detail6 = _formData$cpt8$detail5[0]) === null || _formData$cpt8$detail6 === void 0 ? void 0 : _formData$cpt8$detail6.length) > 0
+        disabled: (formData === null || formData === void 0 ? void 0 : (_formData$cpt5 = formData.cpt) === null || _formData$cpt5 === void 0 ? void 0 : (_formData$cpt5$detail = _formData$cpt5.details) === null || _formData$cpt5$detail === void 0 ? void 0 : (_formData$cpt5$detail2 = _formData$cpt5$detail.owners) === null || _formData$cpt5$detail2 === void 0 ? void 0 : (_formData$cpt5$detail3 = _formData$cpt5$detail2[0]) === null || _formData$cpt5$detail3 === void 0 ? void 0 : (_formData$cpt5$detail4 = _formData$cpt5$detail3.name) === null || _formData$cpt5$detail4 === void 0 ? void 0 : (_formData$cpt5$detail5 = _formData$cpt5$detail4.split(" ")) === null || _formData$cpt5$detail5 === void 0 ? void 0 : (_formData$cpt5$detail6 = _formData$cpt5$detail5[0]) === null || _formData$cpt5$detail6 === void 0 ? void 0 : _formData$cpt5$detail6.length) > 0
       });
     }
   }))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
@@ -12546,24 +12638,20 @@ const PropertyDetailsForm$1 = ({
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "email",
-    defaultValue: propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.email,
-    render: props => {
-      var _formData$cpt9, _formData$cpt9$detail, _formData$cpt9$detail2, _formData$cpt9$detail3;
-      return /*#__PURE__*/React.createElement(TextInput, {
-        value: props === null || props === void 0 ? void 0 : props.value,
-        onChange: e => {
-          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$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$detail3.emailId
-      });
-    }
+    defaultValue: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.email) || "",
+    render: props => /*#__PURE__*/React.createElement(TextInput, {
+      value: propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.email,
+      onChange: e => {
+        setPropertyDetails(prev => ({
+          ...prev,
+          email: e.target.value
+        }));
+        props.onChange(e.target.value);
+      },
+      onBlur: e => {
+        props.onBlur(e);
+      }
+    })
   }))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller ndc_card_labels"
   }, `${t("NDC_MOBILE_NUMBER")} * `), /*#__PURE__*/React.createElement("div", {
@@ -12594,7 +12682,7 @@ const PropertyDetailsForm$1 = ({
     name: "address",
     defaultValue: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.address) || "",
     render: props => {
-      var _formData$cpt0, _formData$cpt0$detail, _formData$cpt0$detail2, _formData$cpt0$detail3, _formData$cpt0$detail4;
+      var _formData$cpt6, _formData$cpt6$detail, _formData$cpt6$detail2, _formData$cpt6$detail3, _formData$cpt6$detail4;
       return /*#__PURE__*/React.createElement(TextInput, {
         value: propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.address,
         onChange: e => {
@@ -12607,7 +12695,7 @@ const PropertyDetailsForm$1 = ({
         onBlur: e => {
           props.onBlur(e);
         },
-        disabled: (formData === null || formData === void 0 ? void 0 : (_formData$cpt0 = formData.cpt) === null || _formData$cpt0 === void 0 ? void 0 : (_formData$cpt0$detail = _formData$cpt0.details) === null || _formData$cpt0$detail === void 0 ? void 0 : (_formData$cpt0$detail2 = _formData$cpt0$detail.owners) === null || _formData$cpt0$detail2 === void 0 ? void 0 : (_formData$cpt0$detail3 = _formData$cpt0$detail2[0]) === null || _formData$cpt0$detail3 === void 0 ? void 0 : (_formData$cpt0$detail4 = _formData$cpt0$detail3.permanentAddress) === null || _formData$cpt0$detail4 === void 0 ? void 0 : _formData$cpt0$detail4.length) > 0
+        disabled: (formData === null || formData === void 0 ? void 0 : (_formData$cpt6 = formData.cpt) === null || _formData$cpt6 === void 0 ? void 0 : (_formData$cpt6$detail = _formData$cpt6.details) === null || _formData$cpt6$detail === void 0 ? void 0 : (_formData$cpt6$detail2 = _formData$cpt6$detail.owners) === null || _formData$cpt6$detail2 === void 0 ? void 0 : (_formData$cpt6$detail3 = _formData$cpt6$detail2[0]) === null || _formData$cpt6$detail3 === void 0 ? void 0 : (_formData$cpt6$detail4 = _formData$cpt6$detail3.permanentAddress) === null || _formData$cpt6$detail4 === void 0 ? void 0 : _formData$cpt6$detail4.length) > 0
       });
     }
   })))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
@@ -12653,7 +12741,7 @@ const PropertySearchNSummary = ({
   onSelect,
   formData
 }) => {
-  var _apiDataCheck$, _apiDataCheck$$NdcDet, _formData$cpt, _formData$cpt2, _propertyDetails$Prop3, _apiDataCheck$2, _formData$cpt13, _formData$cpt13$dues;
+  var _apiDataCheck$, _apiDataCheck$$NdcDet, _formData$cpt, _formData$cpt2, _propertyDetails$Prop3, _apiDataCheck$2, _formData$cpt12, _formData$cpt12$dues;
   const {
     t
   } = useTranslation();
@@ -12674,7 +12762,6 @@ const PropertySearchNSummary = ({
   const urlPropertyId = new URLSearchParams(search).get("propertyId");
   const isfirstRender = useRef(true);
   const ptFromApi = apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$ = apiDataCheck[0]) === null || _apiDataCheck$ === void 0 ? void 0 : (_apiDataCheck$$NdcDet = _apiDataCheck$.NdcDetails) === null || _apiDataCheck$$NdcDet === void 0 ? void 0 : _apiDataCheck$$NdcDet.find(item => item.businessService == "PT");
-  console.log("ptFromApi", ptFromApi);
   const [propertyId, setPropertyId] = useState((formData === null || formData === void 0 ? void 0 : (_formData$cpt = formData.cpt) === null || _formData$cpt === void 0 ? void 0 : _formData$cpt.id) || (urlPropertyId !== "null" ? urlPropertyId : "") || (ptFromApi === null || ptFromApi === void 0 ? void 0 : ptFromApi.consumerCode) || "");
   const [searchPropertyId, setSearchPropertyId] = useState((formData === null || formData === void 0 ? void 0 : (_formData$cpt2 = formData.cpt) === null || _formData$cpt2 === void 0 ? void 0 : _formData$cpt2.id) || (urlPropertyId !== "null" ? urlPropertyId : "") || (ptFromApi === null || ptFromApi === void 0 ? void 0 : ptFromApi.consumerCode) || "");
   const [showToast, setShowToast] = useState(null);
@@ -12730,7 +12817,6 @@ const PropertySearchNSummary = ({
     enabled: searchPropertyId ? true : false,
     privacy: Digit.Utils.getPrivacyObject()
   });
-  console.log("apiDataCheck", apiDataCheck);
   useEffect(() => {
     if (ptFromApi !== null && ptFromApi !== void 0 && ptFromApi.consumerCode) {
       setIsSearchClicked(true);
@@ -12759,7 +12845,7 @@ const PropertySearchNSummary = ({
         setPropertyDetails({});
         setShowToast({
           error: true,
-          label: "PT_ENTER_VALID_PROPERTY_ID"
+          label: "CS_PT_NO_PROPERTIES_FOUND"
         });
       }
     }
@@ -12772,7 +12858,7 @@ const PropertySearchNSummary = ({
     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) {
       setShowToast({
         error: true,
-        label: "PT_ENTER_VALID_PROPERTY_ID"
+        label: "CS_PT_NO_PROPERTIES_FOUND"
       });
     }
   }, [error, propertyDetails]);
@@ -12803,6 +12889,22 @@ const PropertySearchNSummary = ({
       });
       setSearchPropertyId(propertyId);
       setIsSearchClicked(true);
+      setPropertyDues({
+        dues: null
+      });
+      onSelect("PropertyDetails", {
+        email: "",
+        propertyBillData: {
+          isLoading: false,
+          billData: {}
+        },
+        waterConnection: [],
+        sewerageConnection: [],
+        firstName: "",
+        mobileNumber: "",
+        address: ""
+      });
+      dispatch(resetNDCForm());
     }
   };
   const handlePropertyChange = e => {
@@ -12936,7 +13038,6 @@ const PropertySearchNSummary = ({
     value: propertyId,
     onChange: handlePropertyChange,
     disable: false,
-    maxlength: 16,
     defaultValue: undefined
   }, propertyIdInput.validation)), !isSearchClicked && /*#__PURE__*/React.createElement("button", {
     className: "submit-bar",
@@ -12959,19 +13060,25 @@ const PropertySearchNSummary = ({
     onClick: () => {
       fetchBill();
     }
-  }, `${t("CHECK_STATUS_PROPERTY")}`), getPayDuesButton && /*#__PURE__*/React.createElement("button", {
+  }, `${t("CHECK_STATUS_PROPERTY")}`), getPayDuesButton && /*#__PURE__*/React.createElement("div", {
+    style: {
+      color: "red",
+      width: "100%",
+      maxWidth: "70px"
+    }
+  }, "Rs. ", formData === null || formData === void 0 ? void 0 : (_formData$cpt12 = formData.cpt) === null || _formData$cpt12 === void 0 ? void 0 : (_formData$cpt12$dues = _formData$cpt12.dues) === null || _formData$cpt12$dues === void 0 ? void 0 : _formData$cpt12$dues.totalAmount, " "), getPayDuesButton && /*#__PURE__*/React.createElement("button", {
     className: "submit-bar",
     type: "button",
     style: {
       color: "white",
       width: "100%",
-      maxWidth: "190px"
+      maxWidth: "115px"
     },
     onClick: () => {
       redirectToPayBill();
       setPayDuesButton(false);
     }
-  }, `${t("PAY_DUES")} (Rs.${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})`), getNoDue && /*#__PURE__*/React.createElement("div", {
+  }, `${t("PAY_DUES")} `), getNoDue && /*#__PURE__*/React.createElement("div", {
     style: {
       color: "green",
       width: "100%",
@@ -13756,6 +13863,12 @@ const NewNDCStepForm$1 = () => {
     dispatch(setNDCStep(updatedStepNumber));
   };
   const handleSubmit = () => {};
+  useEffect(() => {
+    const unlisten = history.listen(() => {
+      dispatch(resetNDCForm());
+    });
+    return () => unlisten();
+  }, [history, dispatch]);
   return /*#__PURE__*/React.createElement("div", {
     className: "pageCard"
   }, /*#__PURE__*/React.createElement(CardHeader, {
@@ -13809,64 +13922,64 @@ const NewNDCStepFormOne$1 = ({
     } else createApplication(data);
   }
   const createApplication = async data => {
-    var _Digit$UserService$ge, _data$PropertyDetails, _data$PropertyDetails2, _data$PropertyDetails3, _data$PropertyDetails4, _data$PropertyDetails5, _data$PropertyDetails6, _data$PropertyDetails8, _data$PropertyDetails0, _data$PropertyDetails10, _data$PropertyDetails11, _data$NDCReason, _response$ResponseInf;
+    var _Digit$UserService$ge, _data$PropertyDetails, _data$PropertyDetails2, _data$PropertyDetails3, _data$PropertyDetails4, _data$PropertyDetails5, _data$PropertyDetails7, _data$PropertyDetails9, _data$PropertyDetails1, _data$PropertyDetails10, _data$NDCReason, _response$ResponseInf;
     const applicant = ((_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.info) || {};
     const applicantId = applicant === null || applicant === void 0 ? void 0 : applicant.uuid;
     const owners = [{
-      name: `${data === null || data === void 0 ? void 0 : (_data$PropertyDetails = data.PropertyDetails) === null || _data$PropertyDetails === void 0 ? void 0 : _data$PropertyDetails.firstName} ${data === null || data === void 0 ? void 0 : (_data$PropertyDetails2 = data.PropertyDetails) === null || _data$PropertyDetails2 === void 0 ? void 0 : _data$PropertyDetails2.lastName}`.trim(),
-      mobileNumber: data === null || data === void 0 ? void 0 : (_data$PropertyDetails3 = data.PropertyDetails) === null || _data$PropertyDetails3 === void 0 ? void 0 : _data$PropertyDetails3.mobileNumber,
-      gender: data === null || data === void 0 ? void 0 : (_data$PropertyDetails4 = data.PropertyDetails) === null || _data$PropertyDetails4 === void 0 ? void 0 : _data$PropertyDetails4.gender,
-      emailId: data === null || data === void 0 ? void 0 : (_data$PropertyDetails5 = data.PropertyDetails) === null || _data$PropertyDetails5 === void 0 ? void 0 : _data$PropertyDetails5.email,
+      name: data === null || data === void 0 ? void 0 : (_data$PropertyDetails = data.PropertyDetails) === null || _data$PropertyDetails === void 0 ? void 0 : _data$PropertyDetails.firstName,
+      mobileNumber: data === null || data === void 0 ? void 0 : (_data$PropertyDetails2 = data.PropertyDetails) === null || _data$PropertyDetails2 === void 0 ? void 0 : _data$PropertyDetails2.mobileNumber,
+      gender: data === null || data === void 0 ? void 0 : (_data$PropertyDetails3 = data.PropertyDetails) === null || _data$PropertyDetails3 === void 0 ? void 0 : _data$PropertyDetails3.gender,
+      emailId: data === null || data === void 0 ? void 0 : (_data$PropertyDetails4 = data.PropertyDetails) === null || _data$PropertyDetails4 === void 0 ? void 0 : _data$PropertyDetails4.email,
       type: "CITIZEN"
     }];
     const ndcDetails = [];
-    ((data === null || data === void 0 ? void 0 : (_data$PropertyDetails6 = data.PropertyDetails) === null || _data$PropertyDetails6 === void 0 ? void 0 : _data$PropertyDetails6.waterConnection) || []).forEach(wc => {
-      var _wc$billData, _data$PropertyDetails7, _data$cpt2, _data$cpt2$details, _wc$billData2, _wc$billData3;
+    ((data === null || data === void 0 ? void 0 : (_data$PropertyDetails5 = data.PropertyDetails) === null || _data$PropertyDetails5 === void 0 ? void 0 : _data$PropertyDetails5.waterConnection) || []).forEach(wc => {
+      var _wc$billData, _data$PropertyDetails6, _data$cpt2, _data$cpt2$details, _wc$billData2, _wc$billData3;
       ndcDetails.push({
         uuid: wc === null || wc === void 0 ? void 0 : (_wc$billData = wc.billData) === null || _wc$billData === void 0 ? void 0 : _wc$billData.id,
         applicantId: applicantId,
         businessService: "WS",
         consumerCode: wc === null || wc === void 0 ? void 0 : wc.connectionNo,
         additionalDetails: {
-          propertyAddress: data === null || data === void 0 ? void 0 : (_data$PropertyDetails7 = data.PropertyDetails) === null || _data$PropertyDetails7 === void 0 ? void 0 : _data$PropertyDetails7.address,
+          propertyAddress: data === null || data === void 0 ? void 0 : (_data$PropertyDetails6 = data.PropertyDetails) === null || _data$PropertyDetails6 === void 0 ? void 0 : _data$PropertyDetails6.address,
           propertyType: data === null || data === void 0 ? void 0 : (_data$cpt2 = data.cpt) === null || _data$cpt2 === void 0 ? void 0 : (_data$cpt2$details = _data$cpt2.details) === null || _data$cpt2$details === void 0 ? void 0 : _data$cpt2$details.usageCategory
         },
         dueAmount: (wc === null || wc === void 0 ? void 0 : (_wc$billData2 = wc.billData) === null || _wc$billData2 === void 0 ? void 0 : _wc$billData2.totalAmount) || 0,
         status: wc === null || wc === void 0 ? void 0 : (_wc$billData3 = wc.billData) === null || _wc$billData3 === void 0 ? void 0 : _wc$billData3.status
       });
     });
-    ((data === null || data === void 0 ? void 0 : (_data$PropertyDetails8 = data.PropertyDetails) === null || _data$PropertyDetails8 === void 0 ? void 0 : _data$PropertyDetails8.sewerageConnection) || []).forEach(sc => {
-      var _sc$billData, _data$PropertyDetails9, _data$cpt3, _data$cpt3$details, _sc$billData2, _sc$billData3;
+    ((data === null || data === void 0 ? void 0 : (_data$PropertyDetails7 = data.PropertyDetails) === null || _data$PropertyDetails7 === void 0 ? void 0 : _data$PropertyDetails7.sewerageConnection) || []).forEach(sc => {
+      var _sc$billData, _data$PropertyDetails8, _data$cpt3, _data$cpt3$details, _sc$billData2, _sc$billData3;
       ndcDetails.push({
         uuid: sc === null || sc === void 0 ? void 0 : (_sc$billData = sc.billData) === null || _sc$billData === void 0 ? void 0 : _sc$billData.id,
         applicantId: applicantId,
         businessService: "SW",
         consumerCode: sc === null || sc === void 0 ? void 0 : sc.connectionNo,
         additionalDetails: {
-          propertyAddress: data === null || data === void 0 ? void 0 : (_data$PropertyDetails9 = data.PropertyDetails) === null || _data$PropertyDetails9 === void 0 ? void 0 : _data$PropertyDetails9.address,
+          propertyAddress: data === null || data === void 0 ? void 0 : (_data$PropertyDetails8 = data.PropertyDetails) === null || _data$PropertyDetails8 === void 0 ? void 0 : _data$PropertyDetails8.address,
           propertyType: data === null || data === void 0 ? void 0 : (_data$cpt3 = data.cpt) === null || _data$cpt3 === void 0 ? void 0 : (_data$cpt3$details = _data$cpt3.details) === null || _data$cpt3$details === void 0 ? void 0 : _data$cpt3$details.usageCategory
         },
         dueAmount: (sc === null || sc === void 0 ? void 0 : (_sc$billData2 = sc.billData) === null || _sc$billData2 === void 0 ? void 0 : _sc$billData2.totalAmount) || 0,
         status: sc === null || sc === void 0 ? void 0 : (_sc$billData3 = sc.billData) === null || _sc$billData3 === void 0 ? void 0 : _sc$billData3.status
       });
     });
-    if (data !== null && data !== void 0 && (_data$PropertyDetails0 = data.PropertyDetails) !== null && _data$PropertyDetails0 !== void 0 && _data$PropertyDetails0.tlNumber) {
-      var _data$PropertyDetails1;
+    if (data !== null && data !== void 0 && (_data$PropertyDetails9 = data.PropertyDetails) !== null && _data$PropertyDetails9 !== void 0 && _data$PropertyDetails9.tlNumber) {
+      var _data$PropertyDetails0;
       ndcDetails.push({
         businessService: "TL",
-        consumerCode: data === null || data === void 0 ? void 0 : (_data$PropertyDetails1 = data.PropertyDetails) === null || _data$PropertyDetails1 === void 0 ? void 0 : _data$PropertyDetails1.tlNumber
+        consumerCode: data === null || data === void 0 ? void 0 : (_data$PropertyDetails0 = data.PropertyDetails) === null || _data$PropertyDetails0 === void 0 ? void 0 : _data$PropertyDetails0.tlNumber
       });
     }
-    if (data !== null && data !== void 0 && (_data$PropertyDetails10 = data.PropertyDetails) !== null && _data$PropertyDetails10 !== void 0 && (_data$PropertyDetails11 = _data$PropertyDetails10.propertyBillData) !== null && _data$PropertyDetails11 !== void 0 && _data$PropertyDetails11.billData) {
-      var _data$PropertyDetails12, _data$PropertyDetails13, _data$cpt4, _data$PropertyDetails14, _data$cpt5, _data$cpt5$details;
-      const billData = data === null || data === void 0 ? void 0 : (_data$PropertyDetails12 = data.PropertyDetails) === null || _data$PropertyDetails12 === void 0 ? void 0 : (_data$PropertyDetails13 = _data$PropertyDetails12.propertyBillData) === null || _data$PropertyDetails13 === void 0 ? void 0 : _data$PropertyDetails13.billData;
+    if (data !== null && data !== void 0 && (_data$PropertyDetails1 = data.PropertyDetails) !== null && _data$PropertyDetails1 !== void 0 && (_data$PropertyDetails10 = _data$PropertyDetails1.propertyBillData) !== null && _data$PropertyDetails10 !== void 0 && _data$PropertyDetails10.billData) {
+      var _data$PropertyDetails11, _data$PropertyDetails12, _data$cpt4, _data$PropertyDetails13, _data$cpt5, _data$cpt5$details;
+      const billData = data === null || data === void 0 ? void 0 : (_data$PropertyDetails11 = data.PropertyDetails) === null || _data$PropertyDetails11 === void 0 ? void 0 : (_data$PropertyDetails12 = _data$PropertyDetails11.propertyBillData) === null || _data$PropertyDetails12 === void 0 ? void 0 : _data$PropertyDetails12.billData;
       ndcDetails.push({
         uuid: billData === null || billData === void 0 ? void 0 : billData.id,
         applicantId: applicantId,
         businessService: "PT",
         consumerCode: data === null || data === void 0 ? void 0 : (_data$cpt4 = data.cpt) === null || _data$cpt4 === void 0 ? void 0 : _data$cpt4.id,
         additionalDetails: {
-          propertyAddress: data === null || data === void 0 ? void 0 : (_data$PropertyDetails14 = data.PropertyDetails) === null || _data$PropertyDetails14 === void 0 ? void 0 : _data$PropertyDetails14.address,
+          propertyAddress: data === null || data === void 0 ? void 0 : (_data$PropertyDetails13 = data.PropertyDetails) === null || _data$PropertyDetails13 === void 0 ? void 0 : _data$PropertyDetails13.address,
           propertyType: data === null || data === void 0 ? void 0 : (_data$cpt5 = data.cpt) === null || _data$cpt5 === void 0 ? void 0 : (_data$cpt5$details = _data$cpt5.details) === null || _data$cpt5$details === void 0 ? void 0 : _data$cpt5$details.usageCategory
         },
         dueAmount: (billData === null || billData === void 0 ? void 0 : billData.totalAmount) || 0,
@@ -13905,7 +14018,7 @@ const NewNDCStepFormOne$1 = ({
     }
   };
   function validateStepData(data) {
-    var _data$cpt6, _data$cpt6$dues, _data$cpt7, _data$cpt7$dues, _data$dues, _propertyDetails$wate, _propertyDetails$sewe;
+    var _data$cpt6, _data$cpt7, _data$cpt7$dues, _propertyDetails$wate, _propertyDetails$sewe;
     console.log("data", data);
     const missingFields = [];
     const invalidFields = [];
@@ -13913,10 +14026,10 @@ const NewNDCStepFormOne$1 = ({
     const cptDetails = (cpt === null || cpt === void 0 ? void 0 : cpt.details) || {};
     const propertyDetails = (data === null || data === void 0 ? void 0 : data.PropertyDetails) || {};
     const NDCReason = (data === null || data === void 0 ? void 0 : data.NDCReason) || {};
-    if ((data === null || data === void 0 ? void 0 : (_data$cpt6 = data.cpt) === null || _data$cpt6 === void 0 ? void 0 : (_data$cpt6$dues = _data$cpt6.dues) === null || _data$cpt6$dues === void 0 ? void 0 : _data$cpt6$dues.totalAmount) != 0) {
+    if (!(data !== null && data !== void 0 && (_data$cpt6 = data.cpt) !== null && _data$cpt6 !== void 0 && _data$cpt6.dues)) {
       invalidFields.push(`${t("NDC_MESSAGE_PLEASE_CHECK_STATUS_OF_PROPERTY_TAX")} ${cpt === null || cpt === void 0 ? void 0 : cpt.id}`);
     }
-    if (data !== null && data !== void 0 && (_data$cpt7 = data.cpt) !== null && _data$cpt7 !== void 0 && (_data$cpt7$dues = _data$cpt7.dues) !== null && _data$cpt7$dues !== void 0 && _data$cpt7$dues.id && (data === null || data === void 0 ? void 0 : (_data$dues = data.dues) === null || _data$dues === void 0 ? void 0 : _data$dues.totalAmount) > 0) {
+    if ((data === null || data === void 0 ? void 0 : (_data$cpt7 = data.cpt) === null || _data$cpt7 === void 0 ? void 0 : (_data$cpt7$dues = _data$cpt7.dues) === null || _data$cpt7$dues === void 0 ? void 0 : _data$cpt7$dues.totalAmount) > 0) {
       invalidFields.push(`${t("NDC_MESSAGE_PLEASE_PAY_DUES_OF_PROPERTY_TAX")} ${cpt === null || cpt === void 0 ? void 0 : cpt.id}`);
     }
     if ((propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$wate = propertyDetails.waterConnection) === null || _propertyDetails$wate === void 0 ? void 0 : _propertyDetails$wate.length) > 0) {
@@ -13944,24 +14057,16 @@ const NewNDCStepFormOne$1 = ({
     if (!(cpt !== null && cpt !== void 0 && cpt.id)) missingFields.push(t("NDC_MESSAGE_PROPERTY_ID"));
     if (!cptDetails || Object.keys(cptDetails).length === 0) missingFields.push(t("NDC_MESSAGE_PLEASE_SEARCH_PROPERTY_ID"));
     if (!(propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.firstName)) missingFields.push(t("NDC_MESSAGE_FIRST_NAME"));
-    if (!(propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.lastName)) missingFields.push(t("NDC_MESSAGE_LAST_NAME"));
     if (!(propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.mobileNumber)) missingFields.push(t("NDC_MESSAGE_MOBILE_NUMBER"));
     if (!(propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.address)) missingFields.push(t("NDC_MESSAGE_ADDRESS"));
     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 = /^(?!\.)(?!.*\.\.)[a-zA-Z0-9._%+-]+@[a-zA-Z0-9-]+(\.[a-zA-Z]{2,})+$/;
     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"));
     }
-    if (propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.lastName) {
-      if (!nameRegex.test(propertyDetails.lastName)) {
-        invalidFields.push(t("NDC_MESSAGE_LAST_NAME_ONLY_ALPHABETS_ALLOWED"));
-      } else if (propertyDetails.lastName.length > 100) {
-        invalidFields.push(t("NDC_MESSAGE_LAST_NAME_MAX_100_CHARACTERS"));
-      }
-    }
     if (propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.email && !emailRegex.test(propertyDetails.email)) {
       invalidFields.push(t("NDC_MESSAGE_EMAIL_INVALID_FORMAT"));
     }