@mseva/digit-ui-module-ndc 1.0.19 → 1.0.20

package/dist/index.modern.js

@@ -1,4 +1,4 @@
-import { Card, Banner, ActionBar, SubmitBar as SubmitBar$1, PrivateRoute, BreadCrumb, BackButton, AppContainer, Loader, Dropdown, UploadFile, Modal, FormComposer, Toast, CardSubHeader, StatusTable, Row, CheckPoint, ConnectingCheckPoints, DisplayPhotos, Menu, LinkButton, EmployeeModuleCard, SearchField, TextInput, FilterFormField, RadioButtons, CheckBox, ComplaintIcon, Header, InboxComposer, MobileNumber, CardLabelError, SearchAction, PopUp, DetailsCard, SearchForm, CloseSvg, Table, CardHeader, LabelFieldPair, CardLabel, DeleteIcon, KeyNote } from '@mseva/digit-ui-react-components';
+import { Card, Banner, ActionBar, SubmitBar as SubmitBar$1, PrivateRoute, BreadCrumb, AppContainer, Loader, Dropdown, UploadFile, Modal, FormComposer, Toast, Header, CardSubHeader, StatusTable, Row, CheckPoint, ConnectingCheckPoints, DisplayPhotos, Menu, LinkButton, EmployeeModuleCard, SearchField, TextInput, FilterFormField, RadioButtons, CheckBox, InboxComposer, ComplaintIcon, MobileNumber, CardLabelError, SearchAction, PopUp, DetailsCard, SearchForm, CloseSvg, Table, CardHeader, LabelFieldPair, CardLabel, DeleteIcon, KeyNote } from '@mseva/digit-ui-react-components';
 import React, { Fragment as Fragment$1, useState, useEffect, useRef, useMemo, useReducer, useCallback, forwardRef } from 'react';
 import { useHistory, useLocation, Switch, Route, useRouteMatch, useParams, Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
@@ -642,16 +642,14 @@ const App = () => {
     url,
     ...match
   } = useRouteMatch();
-  const {
-    t
-  } = useTranslation();
+  console.log("NDC Citizen App Loaded", path);
   const NewNDCStepForm = Digit.ComponentRegistryService.getComponent("NewNDCStepFormCitizen");
   const MyApplications = Digit.ComponentRegistryService.getComponent("MyApplications");
   const NDCResponseCitizen = Digit.ComponentRegistryService.getComponent("NDCResponseCitizen");
   const ApplicationOverview = (_Digit = Digit) === null || _Digit === void 0 ? void 0 : (_Digit$ComponentRegis = _Digit.ComponentRegistryService) === null || _Digit$ComponentRegis === void 0 ? void 0 : _Digit$ComponentRegis.getComponent("CitizenApplicationOverview");
   return /*#__PURE__*/React.createElement("span", {
     className: "tl-citizen"
-  }, /*#__PURE__*/React.createElement(BackButton, null, t("CS_COMMON_BACK")), /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(AppContainer, null, /*#__PURE__*/React.createElement(PrivateRoute, {
+  }, /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(AppContainer, null, /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/new-application`,
     component: NewNDCStepForm
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
@@ -1027,7 +1025,6 @@ const NDCModal = ({
       Licenses: [applicationData]
     });
   }
-  console.log("config.label.submit", config);
   useEffect(() => {
     if (action) {
       setConfig(ModalConfig({
@@ -1082,6 +1079,7 @@ const getTimelineCaptions = (checkpoint, index, arr, t) => {
     thumbnailsToShow,
     wfDocuments
   } = checkpoint;
+  console.log("wfDocuments", wfDocuments);
   const caption = {
     date: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$auditDeta = checkpoint.auditDetails) === null || _checkpoint$auditDeta === void 0 ? void 0 : _checkpoint$auditDeta.lastModified,
     name: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$assigner = checkpoint.assigner) === null || _checkpoint$assigner === void 0 ? void 0 : _checkpoint$assigner.name,
@@ -1114,7 +1112,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$NdcDetai, _displayData$Document, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _workflowDetails$data15;
   const {
     id
   } = useParams();
@@ -1223,6 +1221,7 @@ const ApplicationOverview = () => {
   useEffect(() => {
     var _applicationDetails$A;
     const ndcObject = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A = applicationDetails.Applications) === null || _applicationDetails$A === void 0 ? void 0 : _applicationDetails$A[0];
+    console.log("ndcObject", ndcObject);
     if (ndcObject) {
       var _ndcObject$owners, _ndcObject$owners$, _ndcObject$owners2, _ndcObject$owners2$, _ndcObject$owners3, _ndcObject$owners3$, _ndcObject$NdcDetails, _ndcObject$NdcDetails2, _ndcObject$NdcDetails3, _removeDuplicatesByUU;
       const applicantData = {
@@ -1251,12 +1250,14 @@ const ApplicationOverview = () => {
     }
   }, [applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.Applications]);
   useEffect(() => {
+    console.log("applicationDetails", applicationDetails);
     if (applicationDetails) {
       setIsDetailsLoading(true);
       setIsDetailsLoading(false);
     }
   }, [applicationDetails]);
   function onActionSelect(action) {
+    console.log("action", action);
     const payload = {
       Licenses: [action]
     };
@@ -1274,6 +1275,7 @@ const ApplicationOverview = () => {
   const submitAction = async data => {
     var _data$Licenses;
     const payloadData = applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.Applications[0];
+    console.log("data", data);
     const updatedApplicant = {
       ...payloadData,
       workflow: {}
@@ -1285,6 +1287,7 @@ const ApplicationOverview = () => {
       comment: filtData === null || filtData === void 0 ? void 0 : filtData.comment,
       documents: filtData === null || filtData === void 0 ? void 0 : filtData.wfDocuments
     };
+    console.log("filtData", filtData);
     if (!(filtData !== null && filtData !== void 0 && filtData.assignee) && filtData.action == "FORWARD") {
       setShowToast({
         key: "error"
@@ -1333,7 +1336,11 @@ const ApplicationOverview = () => {
   }
   return /*#__PURE__*/React.createElement("div", {
     className: "employee-main-application-details"
-  }, /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, null, 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, {
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Header, {
+    styles: {
+      fontSize: "32px"
+    }
+  }, t("NDC_APP_OVER_VIEW_HEADER"))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, null, 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, {
     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")
@@ -1375,10 +1382,10 @@ const ApplicationOverview = () => {
   }) : /*#__PURE__*/React.createElement(ConnectingCheckPoints, null, workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data11 = workflowDetails.data) === null || _workflowDetails$data11 === void 0 ? void 0 : _workflowDetails$data11.timeline.map((checkpoint, index, arr) => /*#__PURE__*/React.createElement(CheckPoint, {
     keyValue: index,
     isCompleted: index === 0,
-    label: t(checkpoint.status),
+    label: t("NDC_STATUS_" + checkpoint.status),
     customChild: getTimelineCaptions(checkpoint, index, arr, t)
-  })))), (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A3 = applicationDetails.Applications) === null || _applicationDetails$A3 === void 0 ? void 0 : (_applicationDetails$A4 = _applicationDetails$A3[0]) === null || _applicationDetails$A4 === void 0 ? void 0 : _applicationDetails$A4.applicationStatus) !== "INITIATED" && actions && /*#__PURE__*/React.createElement(ActionBar, null, displayMenu && (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data12 = workflowDetails.data) !== null && _workflowDetails$data12 !== void 0 && (_workflowDetails$data13 = _workflowDetails$data12.actionState) !== null && _workflowDetails$data13 !== void 0 && _workflowDetails$data13.nextActions || workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data14 = workflowDetails.data) !== null && _workflowDetails$data14 !== void 0 && _workflowDetails$data14.nextActions) ? /*#__PURE__*/React.createElement(Menu, {
-    localeKeyPrefix: `WF_EDITRENEWAL`,
+  })))), actions && /*#__PURE__*/React.createElement(ActionBar, null, displayMenu && (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data12 = workflowDetails.data) !== null && _workflowDetails$data12 !== void 0 && (_workflowDetails$data13 = _workflowDetails$data12.actionState) !== null && _workflowDetails$data13 !== void 0 && _workflowDetails$data13.nextActions || workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data14 = workflowDetails.data) !== null && _workflowDetails$data14 !== void 0 && _workflowDetails$data14.nextActions) ? /*#__PURE__*/React.createElement(Menu, {
+    localeKeyPrefix: `WF_EMPLOYEE_${"NDC"}`,
     options: actions,
     optionKey: "action",
     t: t,
@@ -1387,13 +1394,6 @@ const ApplicationOverview = () => {
     ref: menuRef,
     label: t("WF_TAKE_ACTION"),
     onSubmit: () => setDisplayMenu(!displayMenu)
-  })), (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/employee/ndc/create/${id}`);
-    }
   })), showModal ? /*#__PURE__*/React.createElement(NDCModal, {
     t: t,
     action: selectedAction,
@@ -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({});
@@ -8901,12 +8875,12 @@ const CitizenApplicationOverview = () => {
     var _applicationDetails$A;
     const ndcObject = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A = applicationDetails.Applications) === null || _applicationDetails$A === void 0 ? void 0 : _applicationDetails$A[0];
     if (ndcObject) {
-      var _ndcObject$owners, _ndcObject$owners$, _ndcObject$owners2, _ndcObject$owners2$, _ndcObject$owners3, _ndcObject$owners3$, _ndcObject$NdcDetails, _ndcObject$NdcDetails2, _ndcObject$NdcDetails3, _removeDuplicatesByUU;
+      var _ndcObject$NdcDetails, _ndcObject$NdcDetails2, _ndcObject$NdcDetails3, _ndcObject$owners, _ndcObject$owners$, _ndcObject$owners2, _ndcObject$owners2$, _ndcObject$owners3, _ndcObject$owners3$, _removeDuplicatesByUU;
       const applicantData = {
-        name: ndcObject === null || ndcObject === void 0 ? void 0 : (_ndcObject$owners = ndcObject.owners) === null || _ndcObject$owners === void 0 ? void 0 : (_ndcObject$owners$ = _ndcObject$owners[0]) === null || _ndcObject$owners$ === void 0 ? void 0 : _ndcObject$owners$.name,
-        mobile: ndcObject === null || ndcObject === void 0 ? void 0 : (_ndcObject$owners2 = ndcObject.owners) === null || _ndcObject$owners2 === void 0 ? void 0 : (_ndcObject$owners2$ = _ndcObject$owners2[0]) === null || _ndcObject$owners2$ === void 0 ? void 0 : _ndcObject$owners2$.mobileNumber,
-        email: ndcObject === null || ndcObject === void 0 ? void 0 : (_ndcObject$owners3 = ndcObject.owners) === null || _ndcObject$owners3 === void 0 ? void 0 : (_ndcObject$owners3$ = _ndcObject$owners3[0]) === null || _ndcObject$owners3$ === void 0 ? void 0 : _ndcObject$owners3$.emailId,
         address: ndcObject === null || ndcObject === void 0 ? void 0 : (_ndcObject$NdcDetails = ndcObject.NdcDetails) === null || _ndcObject$NdcDetails === void 0 ? void 0 : (_ndcObject$NdcDetails2 = _ndcObject$NdcDetails[0]) === null || _ndcObject$NdcDetails2 === void 0 ? void 0 : (_ndcObject$NdcDetails3 = _ndcObject$NdcDetails2.additionalDetails) === null || _ndcObject$NdcDetails3 === void 0 ? void 0 : _ndcObject$NdcDetails3.propertyAddress,
+        email: ndcObject === null || ndcObject === void 0 ? void 0 : (_ndcObject$owners = ndcObject.owners) === null || _ndcObject$owners === void 0 ? void 0 : (_ndcObject$owners$ = _ndcObject$owners[0]) === null || _ndcObject$owners$ === void 0 ? void 0 : _ndcObject$owners$.emailId,
+        mobile: ndcObject === null || ndcObject === void 0 ? void 0 : (_ndcObject$owners2 = ndcObject.owners) === null || _ndcObject$owners2 === void 0 ? void 0 : (_ndcObject$owners2$ = _ndcObject$owners2[0]) === null || _ndcObject$owners2$ === void 0 ? void 0 : _ndcObject$owners2$.mobileNumber,
+        name: ndcObject === null || ndcObject === void 0 ? void 0 : (_ndcObject$owners3 = ndcObject.owners) === null || _ndcObject$owners3 === void 0 ? void 0 : (_ndcObject$owners3$ = _ndcObject$owners3[0]) === null || _ndcObject$owners3$ === void 0 ? void 0 : _ndcObject$owners3$.name,
         applicationNo: ndcObject === null || ndcObject === void 0 ? void 0 : ndcObject.uuid
       };
       const Documents = removeDuplicatesByUUID((ndcObject === null || ndcObject === void 0 ? void 0 : ndcObject.Documents) || []);
@@ -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;
-    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));
+    console.log("applicationDetails in StakeholderAck", applicationDetails);
+    console.log("tenants", tenants);
+    const tenantInfo = tenants.find(tenant => tenant.code === 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);
@@ -8953,34 +8931,25 @@ const CitizenApplicationOverview = () => {
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
-      justifyContent: "end",
+      justifyContent: "space-between",
       alignItems: "center",
       padding: "16px"
     }
-  }, (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A3 = applicationDetails.Applications) === null || _applicationDetails$A3 === void 0 ? void 0 : (_applicationDetails$A4 = _applicationDetails$A3[0]) === null || _applicationDetails$A4 === void 0 ? void 0 : _applicationDetails$A4.applicationStatus) === "APPROVED" && /*#__PURE__*/React.createElement(LinkButton, {
-    className: "downLoadButton",
+  }, /*#__PURE__*/React.createElement(Header, {
+    styles: {
+      fontSize: "32px"
+    }
+  }, t("NDC_APP_OVER_VIEW_HEADER")), (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A3 = applicationDetails.Applications) === null || _applicationDetails$A3 === void 0 ? void 0 : (_applicationDetails$A4 = _applicationDetails$A3[0]) === null || _applicationDetails$A4 === void 0 ? void 0 : _applicationDetails$A4.applicationStatus) === "APPROVED" && /*#__PURE__*/React.createElement(LinkButton, {
     label: t("DOWNLOAD_CERTIFICATE"),
+    style: {
+      color: "#A52A2A"
+    },
     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, {
-    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, {
+  })), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, null, 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")
-  }))))), /*#__PURE__*/React.createElement(Card, {
-    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) => {
+  }))))), /*#__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;
     return /*#__PURE__*/React.createElement("div", {
       key: index,
@@ -9003,11 +8972,7 @@ const CitizenApplicationOverview = () => {
       label: t("NDC_PROPERTY_TYPE"),
       text: t(detail.propertyType) || detail.propertyType
     })));
-  })), /*#__PURE__*/React.createElement(Card, {
-    className: "ndc_card_main"
-  }, /*#__PURE__*/React.createElement(CardSubHeader, {
-    className: "ndc_label"
-  }, t("NDC_APPLICATION_DOCUMENTS_OVERVIEW")), /*#__PURE__*/React.createElement("div", {
+  })), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, null, t("NDC_APPLICATION_DOCUMENTS_OVERVIEW")), /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
       gap: "16px"
@@ -9016,17 +8981,13 @@ const CitizenApplicationOverview = () => {
     value: {
       workflowDocs: displayData === null || displayData === void 0 ? void 0 : displayData.Documents
     }
-  }) : /*#__PURE__*/React.createElement("div", null, t("TL_NO_DOCUMENTS_MSG")))), (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : _workflowDetails$data.timeline) && /*#__PURE__*/React.createElement(Card, {
-    className: "ndc_card_main"
-  }, /*#__PURE__*/React.createElement(CardSubHeader, {
-    className: "ndc_label"
-  }, t("CS_APPLICATION_DETAILS_APPLICATION_TIMELINE")), (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data2 = workflowDetails.data) === null || _workflowDetails$data2 === void 0 ? void 0 : _workflowDetails$data2.timeline.length) === 1 ? /*#__PURE__*/React.createElement(CheckPoint, {
+  }) : /*#__PURE__*/React.createElement("div", null, t("TL_NO_DOCUMENTS_MSG")))), (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : _workflowDetails$data.timeline) && /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, null, t("CS_APPLICATION_DETAILS_APPLICATION_TIMELINE")), (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data2 = workflowDetails.data) === null || _workflowDetails$data2 === void 0 ? void 0 : _workflowDetails$data2.timeline.length) === 1 ? /*#__PURE__*/React.createElement(CheckPoint, {
     isCompleted: true,
-    label: t(workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data3 = workflowDetails.data) === null || _workflowDetails$data3 === void 0 ? void 0 : (_workflowDetails$data4 = _workflowDetails$data3.timeline[0]) === null || _workflowDetails$data4 === void 0 ? void 0 : _workflowDetails$data4.status)
+    label: t("NDC_STATUS_" + (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data3 = workflowDetails.data) === null || _workflowDetails$data3 === void 0 ? void 0 : (_workflowDetails$data4 = _workflowDetails$data3.timeline[0]) === null || _workflowDetails$data4 === void 0 ? void 0 : _workflowDetails$data4.status))
   }) : /*#__PURE__*/React.createElement(ConnectingCheckPoints, null, workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data5 = workflowDetails.data) === null || _workflowDetails$data5 === void 0 ? void 0 : _workflowDetails$data5.timeline.map((checkpoint, index, arr) => /*#__PURE__*/React.createElement(CheckPoint, {
     keyValue: index,
     isCompleted: index === 0,
-    label: t(checkpoint.status),
+    label: t("NDC_STATUS_" + checkpoint.status),
     customChild: getTimelineCaptions$1(checkpoint, index, arr, t)
   })))));
 };
@@ -9557,7 +9518,7 @@ const Inbox = ({
   }, [data]);
   const PropsForInboxLinks = {
     logoIcon: /*#__PURE__*/React.createElement(ComplaintIcon, null),
-    headerText: `${t("MODULE_NKS_NO_DUE_CERTIFICATE_FEES")}`,
+    headerText: "NDC Module",
     links: [{
       text: "Create NDC Application",
       link: "/digit-ui/employee/ndc/create"
@@ -11453,12 +11414,6 @@ const config = [{
   head: "",
   stepNumber: 1,
   body: [{
-    name: "NDC_COMMON_NDC_REASON",
-    type: "component",
-    component: "SelectNDCReason",
-    key: "NDCReason",
-    withoutLabel: true
-  }, {
     name: "",
     type: "component",
     component: "NDCPropertySearch",
@@ -11470,6 +11425,12 @@ const config = [{
     component: "PropertyDetailsFormCitizen",
     key: "PropertyDetails",
     withoutLabel: true
+  }, {
+    name: "NDC_COMMON_NDC_REASON",
+    type: "component",
+    component: "SelectNDCReason",
+    key: "NDCReason",
+    withoutLabel: true
   }]
 }, {
   head: "NDC_COMMON_DOCUMENTS_REQUIRED",
@@ -11544,29 +11505,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 +11695,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"));
@@ -11826,10 +11768,6 @@ function SelectNDCReason({
   const {
     t
   } = useTranslation();
-  const apiDataCheck = useSelector(state => {
-    var _state$ndc$NDCForm, _state$ndc$NDCForm$fo;
-    return (_state$ndc$NDCForm = state.ndc.NDCForm) === null || _state$ndc$NDCForm === void 0 ? void 0 : (_state$ndc$NDCForm$fo = _state$ndc$NDCForm.formData) === null || _state$ndc$NDCForm$fo === void 0 ? void 0 : _state$ndc$NDCForm$fo.responseData;
-  });
   const {
     data: menuList,
     isLoading
@@ -11853,18 +11791,6 @@ function SelectNDCReason({
   useEffect(() => {
     onSelect("NDCReason", ndcReason, config);
   }, [ndcReason]);
-  useEffect(() => {
-    if (apiDataCheck && (ndcReasonOptions === null || ndcReasonOptions === void 0 ? void 0 : ndcReasonOptions.length) > 0) {
-      const matchedOption = ndcReasonOptions.find(opt => {
-        var _apiDataCheck$;
-        return (opt === null || opt === void 0 ? void 0 : opt.code) === (apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$ = apiDataCheck[0]) === null || _apiDataCheck$ === void 0 ? void 0 : _apiDataCheck$.reason);
-      });
-      if (matchedOption) {
-        setNDCReason(matchedOption);
-        setValue("NDCReason", matchedOption);
-      }
-    }
-  }, [apiDataCheck, ndcReasonOptions]);
   if (isLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
@@ -11876,10 +11802,10 @@ function SelectNDCReason({
   };
   return /*#__PURE__*/React.createElement("div", {
     style: {
-      paddingBottom: "16px"
+      marginBottom: "16px"
     }
   }, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller ndc_card_labels"
+    className: "card-label-smaller"
   }, `${t("NDC_NEW_NDC_APPLICATION_NDC_REASON")} * `), /*#__PURE__*/React.createElement(Controller, {
     name: "NDCReason",
     rules: {
@@ -11893,7 +11819,6 @@ function SelectNDCReason({
       option: ndcReasonOptions,
       select: e => {
         setNDCReason(e);
-        props.onChange(e);
       },
       optionKey: "i18nKey",
       onBlur: props.onBlur,
@@ -11912,7 +11837,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;
+  var _formData$cpt, _formData$cpt$details, _formData$cpt3, _Digit, _Digit$ComponentRegis, _formData$cpt4, _propertyDetails$wate, _propertyDetails$sewe;
   const {
     control,
     formState: localFormState,
@@ -11925,10 +11850,6 @@ const PropertyDetailsForm$1 = ({
     t
   } = useTranslation();
   const tenantId = window.location.href.includes("citizen") ? window.localStorage.getItem("CITIZEN.CITY") : window.localStorage.getItem("Employee.tenant-id");
-  const apiDataCheck = useSelector(state => {
-    var _state$ndc$NDCForm, _state$ndc$NDCForm$fo;
-    return (_state$ndc$NDCForm = state.ndc.NDCForm) === null || _state$ndc$NDCForm === void 0 ? void 0 : (_state$ndc$NDCForm$fo = _state$ndc$NDCForm.formData) === null || _state$ndc$NDCForm$fo === void 0 ? void 0 : _state$ndc$NDCForm$fo.responseData;
-  });
   const [showToast, setShowToast] = useState(null);
   const [propertyLoader, setPropertyLoader] = useState(false);
   const [showPayModal, setShowPayModal] = useState(false);
@@ -11997,63 +11918,39 @@ 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(() => {
-    var _apiDataCheck$;
-    let waterConnection;
-    if (apiDataCheck !== null && apiDataCheck !== void 0 && (_apiDataCheck$ = apiDataCheck[0]) !== null && _apiDataCheck$ !== void 0 && _apiDataCheck$.NdcDetails) {
-      var _apiDataCheck$2;
-      const resData = apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$2 = apiDataCheck[0]) === null || _apiDataCheck$2 === void 0 ? void 0 : _apiDataCheck$2.NdcDetails.filter(item => {
-        return item.businessService == "WS";
-      });
-      waterConnection = (resData === null || resData === void 0 ? void 0 : resData.map(item => ({
-        connectionNo: item === null || item === void 0 ? void 0 : item.consumerCode,
-        isEdit: false,
-        billData: {
-          totalAmount: 0
-        },
-        isLoading: false
-      }))) || [];
-    } else {
-      waterConnection = (waterConnectionData === null || waterConnectionData === void 0 ? void 0 : waterConnectionData.map(item => ({
-        connectionNo: item === null || item === void 0 ? void 0 : item.connectionNo,
-        isEdit: false,
-        billData: {},
-        isLoading: false
-      }))) || [];
+    var _formData$PropertyDet3, _formData$PropertyDet4;
+    if (!(formData !== null && formData !== void 0 && (_formData$PropertyDet3 = formData.PropertyDetails) !== null && _formData$PropertyDet3 !== void 0 && (_formData$PropertyDet4 = _formData$PropertyDet3.waterConnection) !== null && _formData$PropertyDet4 !== void 0 && _formData$PropertyDet4.length) > 0) {
+      setPropertyDetails(prev => {
+        const waterConnection = waterConnectionData === null || waterConnectionData === void 0 ? void 0 : waterConnectionData.map(item => ({
+          connectionNo: item === null || item === void 0 ? void 0 : item.connectionNo,
+          isEdit: false,
+          billData: {},
+          isLoading: false
+        }));
+        return {
+          ...prev,
+          waterConnection: waterConnection
+        };
+      });
     }
-    setPropertyDetails(prev => ({
-      ...prev,
-      waterConnection
-    }));
-  }, [waterConnectionData, apiDataCheck]);
+  }, [waterConnectionData, waterConnectionLoading]);
   useEffect(() => {
-    var _apiDataCheck$3;
-    let sewerageConnection;
-    if (apiDataCheck !== null && apiDataCheck !== void 0 && (_apiDataCheck$3 = apiDataCheck[0]) !== null && _apiDataCheck$3 !== void 0 && _apiDataCheck$3.NdcDetails) {
-      var _apiDataCheck$4;
-      const resData = apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$4 = apiDataCheck[0]) === null || _apiDataCheck$4 === void 0 ? void 0 : _apiDataCheck$4.NdcDetails.filter(item => {
-        return item.businessService == "SW";
-      });
-      sewerageConnection = (resData === null || resData === void 0 ? void 0 : resData.map(item => ({
-        connectionNo: item === null || item === void 0 ? void 0 : item.consumerCode,
-        isEdit: false,
-        billData: {
-          totalAmount: 0
-        },
-        isLoading: false
-      }))) || [];
-    } else {
-      sewerageConnection = (sewerageConnectionData === null || sewerageConnectionData === void 0 ? void 0 : sewerageConnectionData.map(item => ({
-        connectionNo: item === null || item === void 0 ? void 0 : item.connectionNo,
-        isEdit: false,
-        billData: {},
-        isLoading: false
-      }))) || [];
+    var _formData$PropertyDet5, _formData$PropertyDet6;
+    if (!(formData !== null && formData !== void 0 && (_formData$PropertyDet5 = formData.PropertyDetails) !== null && _formData$PropertyDet5 !== void 0 && (_formData$PropertyDet6 = _formData$PropertyDet5.sewerageConnection) !== null && _formData$PropertyDet6 !== void 0 && _formData$PropertyDet6.length) > 0) {
+      setPropertyDetails(prev => {
+        const sewerageConnection = sewerageConnectionData === null || sewerageConnectionData === void 0 ? void 0 : sewerageConnectionData.map(item => ({
+          connectionNo: item === null || item === void 0 ? void 0 : item.connectionNo,
+          isEdit: false,
+          billData: {},
+          isLoading: false
+        }));
+        return {
+          ...prev,
+          sewerageConnection: sewerageConnection
+        };
+      });
     }
-    setPropertyDetails(prev => ({
-      ...prev,
-      sewerageConnection
-    }));
-  }, [sewerageConnectionData, apiDataCheck]);
+  }, [sewerageConnectionData, sewerageConnectionLoading]);
   useEffect(() => {
     onSelect("PropertyDetails", propertyDetails, config);
   }, [propertyDetails]);
@@ -12108,6 +12005,7 @@ const PropertyDetailsForm$1 = ({
         consumerCode: consumercodes
       });
       setPropertyLoader(false);
+      console.log("result======???????", result);
       if ((result === null || result === void 0 ? void 0 : (_result$Bill = result.Bill) === null || _result$Bill === void 0 ? void 0 : _result$Bill.length) > 0) {
         var _result$Bill$;
         if ((result === null || result === void 0 ? void 0 : (_result$Bill$ = result.Bill[0]) === null || _result$Bill$ === void 0 ? void 0 : _result$Bill$.totalAmount) > 0) {
@@ -12149,6 +12047,10 @@ const PropertyDetailsForm$1 = ({
           }));
         }
       } else if (result !== null && result !== void 0 && result.Bill) {
+        setShowToast({
+          error: false,
+          label: t("NDC_MESSAGE_NO_BILLS_FOUND_FOR_THIS_CONSUMER_NUMBER")
+        });
         if (bussinessService === "WS") {
           const updated = [...propertyDetails.waterConnection];
           updated[index].billData = {
@@ -12159,10 +12061,6 @@ const PropertyDetailsForm$1 = ({
             ...prev,
             waterConnection: updated
           }));
-          setShowToast({
-            error: false,
-            label: t("NDC_NO_BILLS_FOUND_WS")
-          });
         } else if (bussinessService === "SW") {
           const updated = [...propertyDetails.sewerageConnection];
           updated[index].billData = {
@@ -12173,10 +12071,6 @@ const PropertyDetailsForm$1 = ({
             ...prev,
             sewerageConnection: updated
           }));
-          setShowToast({
-            error: false,
-            label: t("NDC_NO_BILLS_FOUND_SW")
-          });
         } else if (bussinessService === "PT") {
           let updated = {
             ...propertyDetails.propertyBillData
@@ -12186,12 +12080,12 @@ const PropertyDetailsForm$1 = ({
             ...prev,
             propertyBillData: updated
           }));
-          setShowToast({
-            error: false,
-            label: t("NDC_NO_BILLS_FOUND_PROPERTY")
-          });
         }
       } else {
+        setShowToast({
+          error: false,
+          label: t("NDC_MESSAGE_NO_BILLS_FOUND_FOR_THIS_CONSUMER_NUMBER")
+        });
         if (bussinessService === "WS") {
           const updated = [...propertyDetails.waterConnection];
           updated[index].isLoading = false;
@@ -12202,10 +12096,6 @@ const PropertyDetailsForm$1 = ({
             ...prev,
             waterConnection: updated
           }));
-          setShowToast({
-            error: false,
-            label: t("NDC_NO_BILLS_FOUND_WS")
-          });
         } else if (bussinessService === "SW") {
           const updated = [...propertyDetails.sewerageConnection];
           updated[index].isLoading = false;
@@ -12216,10 +12106,6 @@ const PropertyDetailsForm$1 = ({
             ...prev,
             sewerageConnection: updated
           }));
-          setShowToast({
-            error: false,
-            label: t("NDC_NO_BILLS_FOUND_SW")
-          });
         } else if (bussinessService === "PT") {
           let updated = {
             ...propertyDetails.propertyBillData
@@ -12229,10 +12115,6 @@ const PropertyDetailsForm$1 = ({
             ...prev,
             propertyBillData: updated
           }));
-          setShowToast({
-            error: false,
-            label: t("NDC_NO_BILLS_FOUND_PROPERTY")
-          });
         }
       }
     } catch (error) {
@@ -12304,36 +12186,16 @@ const PropertyDetailsForm$1 = ({
     }
   }
   const PayWSBillModal = (_Digit = Digit) === null || _Digit === void 0 ? void 0 : (_Digit$ComponentRegis = _Digit.ComponentRegistryService) === null || _Digit$ComponentRegis === void 0 ? void 0 : _Digit$ComponentRegis.getComponent("PayWSBillModal");
-  useEffect(() => {
-    if (showToast) {
-      const timer = setTimeout(() => {
-        setShowToast(null);
-      }, 3000);
-      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]);
-  console.log("propertyDetails====", propertyDetails, formData);
   return /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: "16px"
     }
-  }, ((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$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) && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, {
     style: {
       marginTop: "40px"
     }
   }, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller ndc_card_labels"
+    className: "card-label-smaller"
   }, `${t("NDC_WATER_CONNECTION")}`), waterConnectionLoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement("div", {
     className: "field",
     style: {
@@ -12343,7 +12205,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 _item$billData, _item$billData2, _item$billData3, _item$billData4;
     return /*#__PURE__*/React.createElement("div", {
       className: "ndc_property_search",
       key: index,
@@ -12384,7 +12246,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", {
+    }, (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: {
@@ -12441,7 +12303,7 @@ const PropertyDetailsForm$1 = ({
       marginTop: "40px"
     }
   }, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller ndc_card_labels"
+    className: "card-label-smaller"
   }, `${t("NDC_SEWERAGE_CONNECTION")} `), sewerageConnectionLoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement("div", {
     className: "field",
     style: {
@@ -12451,7 +12313,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 _item$billData5, _item$billData6, _item$billData7, _item$billData8;
     return /*#__PURE__*/React.createElement("div", {
       className: "ndc_property_search",
       key: index,
@@ -12492,7 +12354,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", {
+    }, (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: {
@@ -12549,7 +12411,7 @@ const PropertyDetailsForm$1 = ({
       marginTop: "40px"
     }
   }, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller ndc_card_labels"
+    className: "card-label-smaller"
   }, `${t("NDC_FIRST_NAME")} * `), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
@@ -12580,7 +12442,7 @@ const PropertyDetailsForm$1 = ({
       });
     }
   }))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller ndc_card_labels"
+    className: "card-label-smaller"
   }, `${t("NDC_LAST_NAME")} * `), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
@@ -12611,7 +12473,7 @@ const PropertyDetailsForm$1 = ({
       });
     }
   }))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller ndc_card_labels"
+    className: "card-label-smaller"
   }, `${t("NDC_EMAIL")} * `), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
@@ -12619,9 +12481,9 @@ const PropertyDetailsForm$1 = ({
     name: "email",
     defaultValue: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.email) || "",
     render: props => {
-      var _formData$cpt7, _formData$cpt7$detail, _formData$cpt7$detail2, _formData$cpt7$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,
+        value: propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.email,
         onChange: e => {
           setPropertyDetails(prev => ({
             ...prev,
@@ -12632,11 +12494,11 @@ const PropertyDetailsForm$1 = ({
         onBlur: e => {
           props.onBlur(e);
         },
-        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$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, {
-    className: "card-label-smaller ndc_card_labels"
+    className: "card-label-smaller"
   }, `${t("NDC_MOBILE_NUMBER")} * `), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
@@ -12657,7 +12519,7 @@ const PropertyDetailsForm$1 = ({
       }
     })
   }))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller ndc_card_labels"
+    className: "card-label-smaller"
   }, `${t("NDC_ADDRESS")} * `), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
@@ -12682,7 +12544,7 @@ const PropertyDetailsForm$1 = ({
       });
     }
   })))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller ndc_card_labels"
+    className: "card-label-smaller"
   }, `${t("NDC_TL_NUMBER")}`), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
@@ -12724,30 +12586,23 @@ const PropertySearchNSummary = ({
   onSelect,
   formData
 }) => {
-  var _apiDataCheck$, _apiDataCheck$$NdcDet, _formData$cpt, _formData$cpt2, _propertyDetails$Prop3, _apiDataCheck$2, _formData$cpt12, _formData$cpt13, _formData$cpt13$dues;
+  var _formData$cpt, _formData$cpt2, _propertyDetails$Prop3, _formData$cpt11, _formData$cpt12, _formData$cpt14, _formData$cpt15, _formData$cpt15$dues, _formData$cpt17, _formData$cpt18, _formData$cpt18$dues;
   const {
     t
   } = useTranslation();
   const myElementRef = useRef(null);
-  const dispatch = useDispatch();
   let {
     pathname,
     state
   } = useLocation();
   state = state && (typeof state === "string" || state instanceof String) ? JSON.parse(state) : state;
-  const apiDataCheck = useSelector(state => {
-    var _state$ndc$NDCForm, _state$ndc$NDCForm$fo;
-    return (_state$ndc$NDCForm = state.ndc.NDCForm) === null || _state$ndc$NDCForm === void 0 ? void 0 : (_state$ndc$NDCForm$fo = _state$ndc$NDCForm.formData) === null || _state$ndc$NDCForm$fo === void 0 ? void 0 : _state$ndc$NDCForm$fo.responseData;
-  });
   const isEditScreen = pathname.includes("/modify-application/");
   const tenantId = window.location.href.includes("employee") ? Digit.ULBService.getCurrentPermanentCity() : localStorage.getItem("CITIZEN.CITY");
   const search = useLocation().search;
   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 [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 : "") || "");
+  const [searchPropertyId, setSearchPropertyId] = useState(formData !== null && formData !== void 0 && (_formData$cpt2 = formData.cpt) !== null && _formData$cpt2 !== void 0 && _formData$cpt2.id || urlPropertyId !== "null" ? urlPropertyId : "");
   const [showToast, setShowToast] = useState(null);
   const [propertyDetails, setPropertyDetails] = useState(() => {
     var _formData$cpt3, _formData$cpt4;
@@ -12780,8 +12635,6 @@ const PropertySearchNSummary = ({
     }
   });
   const [isSearchClicked, setIsSearchClicked] = useState(false);
-  const [getNoDue, setNoDue] = useState(false);
-  const [getCheckStatus, setCheckStats] = useState(false);
   const {
     isLoading,
     isError,
@@ -12800,25 +12653,11 @@ 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);
-      setPropertyId(ptFromApi.consumerCode);
-      setSearchPropertyId(ptFromApi.consumerCode);
-      setNoDue(true);
-      onSelect(config.key, {
-        ...formData[config.key],
-        id: ptFromApi.consumerCode
-      });
-    }
-  }, [ptFromApi]);
   useEffect(() => {
     var _propertyDetailsFetch;
     if (propertyDetailsFetch && propertyDetailsFetch !== null && propertyDetailsFetch !== void 0 && propertyDetailsFetch.Properties && (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch === void 0 ? void 0 : _propertyDetailsFetch.length) > 0) {
       setPropertyDetails(propertyDetailsFetch);
       setShowToast(null);
-      setCheckStats(true);
     } else {
       var _formData$cpt9;
       if (isfirstRender.current) {
@@ -12826,6 +12665,7 @@ const PropertySearchNSummary = ({
         return;
       }
       if (!(formData !== null && formData !== void 0 && (_formData$cpt9 = formData.cpt) !== null && _formData$cpt9 !== void 0 && _formData$cpt9.details)) {
+        console.log("Property Id not found in response", propertyId);
         setPropertyDetails({});
         setShowToast({
           error: true,
@@ -12840,6 +12680,7 @@ const PropertySearchNSummary = ({
   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) {
+      console.log("Error Caught", error, propertyDetails);
       setShowToast({
         error: true,
         label: "PT_ENTER_VALID_PROPERTY_ID"
@@ -12879,8 +12720,6 @@ const PropertySearchNSummary = ({
     setPropertyId(e.target.value);
     setValue(e.target.value, propertyIdInput.name);
     setIsSearchClicked(false);
-    setNoDue(false);
-    setCheckStats(false);
   };
   if (isEditScreen) {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
@@ -12909,6 +12748,9 @@ const PropertySearchNSummary = ({
       [input]: value
     });
   }
+  function getValue(input) {
+    return formData && formData[config.key] ? formData[config.key][input] : undefined;
+  }
   async function fetchBill() {
     try {
       var _formData$cpt0, _result$Bill;
@@ -12926,10 +12768,8 @@ const PropertySearchNSummary = ({
         } else {
           setShowToast({
             error: false,
-            label: t("NDC_NO_BILLS_FOUND_PROPERTY")
+            label: t("NDC_MESSAGE_NO_DUES_FOUND")
           });
-          setNoDue(true);
-          setCheckStats(false);
         }
         setPropertyDues({
           dues: result === null || result === void 0 ? void 0 : result.Bill[0]
@@ -12937,27 +12777,23 @@ const PropertySearchNSummary = ({
       } else if (result !== null && result !== void 0 && result.Bill) {
         setShowToast({
           error: false,
-          label: t("NDC_NO_BILLS_FOUND_PROPERTY")
+          label: t("NDC_MESSAGE_NO_BILLS_FOUND_FOR_THIS_CONSUMER_NUMBER")
         });
         setPropertyDues({
           dues: {
             totalAmount: 0
           }
         });
-        setNoDue(true);
-        setCheckStats(false);
       } else {
         setShowToast({
           error: false,
-          label: t("NDC_NO_BILLS_FOUND_PROPERTY")
+          label: t("NDC_MESSAGE_NO_BILLS_FOUND_FOR_THIS_CONSUMER_NUMBER")
         });
         setPropertyDues({
           dues: {
             totalAmount: 0
           }
         });
-        setNoDue(true);
-        setCheckStats(false);
       }
     } catch (error) {
       setShowToast({
@@ -12973,20 +12809,12 @@ const PropertySearchNSummary = ({
     window.open(payUrl, "_blank");
     setPropertyDues({});
   }
-  useEffect(() => {
-    if (showToast) {
-      const timer = setTimeout(() => {
-        setShowToast(null);
-      }, 3000);
-      return () => clearTimeout(timer);
-    }
-  }, [showToast]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, isLoading && /*#__PURE__*/React.createElement(Loader, null), /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: "16px"
     }
   }, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller ndc_card_labels",
+    className: "card-label-smaller",
     style: getInputStyles()
   }, `${t(propertyIdInput.label)}`,  null), /*#__PURE__*/React.createElement("div", {
     className: "field ndc_property_search",
@@ -13001,7 +12829,7 @@ const PropertySearchNSummary = ({
     id: "search-property-field"
   }, /*#__PURE__*/React.createElement(TextInput, Object.assign({
     key: propertyIdInput.name,
-    value: propertyId,
+    value: getValue(propertyIdInput.name),
     onChange: handlePropertyChange,
     disable: false,
     maxlength: 16,
@@ -13015,7 +12843,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 && /*#__PURE__*/React.createElement("button", {
+  }, `${t("PT_SEARCH")}`), (formData === null || formData === void 0 ? void 0 : (_formData$cpt11 = formData.cpt) === null || _formData$cpt11 === void 0 ? void 0 : _formData$cpt11.details) && !(formData !== null && formData !== void 0 && (_formData$cpt12 = formData.cpt) !== null && _formData$cpt12 !== void 0 && _formData$cpt12.dues) && /*#__PURE__*/React.createElement("button", {
     className: "submit-bar",
     type: "button",
     style: {
@@ -13027,7 +12855,7 @@ const PropertySearchNSummary = ({
     onClick: () => {
       fetchBill();
     }
-  }, `${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", {
+  }, `${t("CHECK_STATUS_PROPERTY")}`), (formData === null || formData === void 0 ? void 0 : (_formData$cpt14 = formData.cpt) === null || _formData$cpt14 === void 0 ? void 0 : _formData$cpt14.id) && (formData === null || formData === void 0 ? void 0 : (_formData$cpt15 = formData.cpt) === null || _formData$cpt15 === void 0 ? void 0 : (_formData$cpt15$dues = _formData$cpt15.dues) === null || _formData$cpt15$dues === void 0 ? void 0 : _formData$cpt15$dues.totalAmount) > 0 && /*#__PURE__*/React.createElement("button", {
     className: "submit-bar",
     type: "button",
     style: {
@@ -13038,7 +12866,7 @@ const PropertySearchNSummary = ({
     onClick: () => {
       redirectToPayBill();
     }
-  }, `${t("PAY_DUES")}`), getNoDue && /*#__PURE__*/React.createElement("div", {
+  }, `${t("PAY_DUES")}`), (formData === null || formData === void 0 ? void 0 : (_formData$cpt17 = formData.cpt) === null || _formData$cpt17 === void 0 ? void 0 : _formData$cpt17.id) && (formData === null || formData === void 0 ? void 0 : (_formData$cpt18 = formData.cpt) === null || _formData$cpt18 === void 0 ? void 0 : (_formData$cpt18$dues = _formData$cpt18.dues) === null || _formData$cpt18$dues === void 0 ? void 0 : _formData$cpt18$dues.totalAmount) == 0 && /*#__PURE__*/React.createElement("div", {
     style: {
       color: "green",
       width: "100%",
@@ -13110,7 +12938,6 @@ const SelectNDCDocuments = ({
       formState: formState
     });
   }), error && /*#__PURE__*/React.createElement(Toast, {
-    isDleteBtn: true,
     label: error,
     onClose: () => setError(null),
     error: true
@@ -13807,18 +13634,6 @@ const NewNDCStepForm$1 = () => {
   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));
   };
@@ -13973,7 +13788,6 @@ const NewNDCStepFormOne$1 = ({
   };
   function validateStepData(data) {
     var _data$cpt6, _data$cpt6$dues, _data$cpt7, _data$cpt7$dues, _data$dues, _propertyDetails$wate, _propertyDetails$sewe;
-    console.log("data", data);
     const missingFields = [];
     const invalidFields = [];
     const cpt = (data === null || data === void 0 ? void 0 : data.cpt) || {};
@@ -14017,7 +13831,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"));