@mseva/digit-ui-module-ndc 1.0.15 → 1.0.17

package/dist/index.modern.js

@@ -1,4 +1,4 @@
-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 { Card, Banner, ActionBar, SubmitBar as SubmitBar$1, PrivateRoute, BreadCrumb, BackButton, AppContainer, Loader, Dropdown, UploadFile, Modal, FormComposer, Toast, Header, CardSubHeader, StatusTable, Row, CheckPoint, ConnectingCheckPoints, DisplayPhotos, Menu, LinkButton, EmployeeModuleCard, SearchField, TextInput, FilterFormField, RadioButtons, CheckBox, ComplaintIcon, InboxComposer, 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,14 +642,16 @@ const App = () => {
     url,
     ...match
   } = useRouteMatch();
-  console.log("NDC Citizen App Loaded", path);
+  const {
+    t
+  } = useTranslation();
   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(Switch, null, /*#__PURE__*/React.createElement(AppContainer, null, /*#__PURE__*/React.createElement(PrivateRoute, {
+  }, /*#__PURE__*/React.createElement(BackButton, null, t("CS_COMMON_BACK")), /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(AppContainer, null, /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/new-application`,
     component: NewNDCStepForm
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
@@ -1079,7 +1081,6 @@ 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,
@@ -1112,7 +1113,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, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _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, _applicationDetails$A3, _applicationDetails$A4, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _applicationDetails$A5, _applicationDetails$A6, _workflowDetails$data15;
   const {
     id
   } = useParams();
@@ -1222,12 +1223,12 @@ const ApplicationOverview = () => {
     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$NdcDetails, _ndcObject$NdcDetails2, _ndcObject$NdcDetails3, _ndcObject$owners, _ndcObject$owners$, _ndcObject$owners2, _ndcObject$owners2$, _ndcObject$owners3, _ndcObject$owners3$, _removeDuplicatesByUU;
+      var _ndcObject$owners, _ndcObject$owners$, _ndcObject$owners2, _ndcObject$owners2$, _ndcObject$owners3, _ndcObject$owners3$, _ndcObject$NdcDetails, _ndcObject$NdcDetails2, _ndcObject$NdcDetails3, _removeDuplicatesByUU;
       const applicantData = {
-        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,
+        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,
-        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,
+        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,
         applicationNo: ndcObject === null || ndcObject === void 0 ? void 0 : ndcObject.uuid
       };
       const Documents = removeDuplicatesByUUID((ndcObject === null || ndcObject === void 0 ? void 0 : ndcObject.Documents) || []);
@@ -1249,14 +1250,12 @@ 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,7 +1273,6 @@ 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: {}
@@ -1286,7 +1284,6 @@ 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"
@@ -1375,15 +1372,15 @@ const ApplicationOverview = () => {
     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$data9 = workflowDetails.data) === null || _workflowDetails$data9 === void 0 ? void 0 : _workflowDetails$data9.timeline) && /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, null, t("NDC_APPLICATION_TIMELINE")), (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data0 = workflowDetails.data) === null || _workflowDetails$data0 === void 0 ? void 0 : _workflowDetails$data0.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$data9 = workflowDetails.data) === null || _workflowDetails$data9 === void 0 ? void 0 : _workflowDetails$data9.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$data0 = workflowDetails.data) === null || _workflowDetails$data0 === void 0 ? void 0 : _workflowDetails$data0.timeline.length) === 1 ? /*#__PURE__*/React.createElement(CheckPoint, {
     isCompleted: true,
-    label: t("NDC_STATUS_" + (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data1 = workflowDetails.data) === null || _workflowDetails$data1 === void 0 ? void 0 : (_workflowDetails$data10 = _workflowDetails$data1.timeline[0]) === null || _workflowDetails$data10 === void 0 ? void 0 : _workflowDetails$data10.status))
+    label: t(workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data1 = workflowDetails.data) === null || _workflowDetails$data1 === void 0 ? void 0 : (_workflowDetails$data10 = _workflowDetails$data1.timeline[0]) === null || _workflowDetails$data10 === void 0 ? void 0 : _workflowDetails$data10.status)
   }) : /*#__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("NDC_STATUS_" + checkpoint.status),
+    label: t(checkpoint.status),
     customChild: getTimelineCaptions(checkpoint, index, arr, t)
-  })))), 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, {
+  })))), (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_EMPLOYEE_${"NDC"}`,
     options: actions,
     optionKey: "action",
@@ -1393,6 +1390,13 @@ 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,
@@ -9005,7 +9009,7 @@ 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, null, /*#__PURE__*/React.createElement(CardSubHeader, null, t("NDC_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("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, {
@@ -9542,7 +9546,7 @@ const Inbox = ({
   }, [data]);
   const PropsForInboxLinks = {
     logoIcon: /*#__PURE__*/React.createElement(ComplaintIcon, null),
-    headerText: "NDC Module",
+    headerText: `${t("MODULE_NKS_NO_DUE_CERTIFICATE_FEES")}`,
     links: [{
       text: "Create NDC Application",
       link: "/digit-ui/employee/ndc/create"
@@ -11435,9 +11439,15 @@ const PropertyDetailsStep2 = ({
 };
 
 const config = [{
-  head: "NDC_COMMON_NEW_APPLICATION",
+  head: "",
   stepNumber: 1,
   body: [{
+    name: "NDC_COMMON_NDC_REASON",
+    type: "component",
+    component: "SelectNDCReason",
+    key: "NDCReason",
+    withoutLabel: true
+  }, {
     name: "",
     type: "component",
     component: "NDCPropertySearch",
@@ -11449,12 +11459,6 @@ 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",
@@ -11477,8 +11481,8 @@ const config = [{
 }];
 
 const createEmployeeConfig = [{
-  head: "NDC Details",
-  stepLabel: "NDC Details",
+  head: "Applicant Details",
+  stepLabel: "Applicant Details",
   stepNumber: 1,
   isStepEnabled: true,
   type: "component",
@@ -11542,7 +11546,7 @@ const NewNDCStepForm = () => {
       color: "#1C1D1F"
     },
     divider: true
-  }, t("New NDC Application")), /*#__PURE__*/React.createElement(Stepper, {
+  }, t("ndc_header_application")), /*#__PURE__*/React.createElement(Stepper, {
     stepsList: updatedCreateEmployeeconfig,
     onSubmit: handleSubmit,
     step: step,
@@ -11572,7 +11576,6 @@ const NewNDCStepFormOne = ({
   const tenantId = window.localStorage.getItem("CITIZEN.CITY");
   function goNext(data) {
     var _checkFormData$apiDat, _checkFormData$apiDat2, _checkFormData$apiDat3;
-    console.log(`Data in step ${config.currStepNumber} is: \n`, data);
     const missingFields = validateStepData(currentStepData);
     if (missingFields.length > 0) {
       setError(`${missingFields[0]}`);
@@ -11675,19 +11678,43 @@ const NewNDCStepFormOne = ({
       };
     }
   };
-  const validatePropertyId = value => {
-    const regex = /^PT-\d{4}-\d{7,8}$/;
-    return regex.test(value);
-  };
   function validateStepData(data) {
+    var _data$cpt6, _data$cpt6$dues, _data$cpt7, _data$cpt7$dues, _data$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) {
+      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) {
+      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) {
+      propertyDetails.waterConnection.forEach(value => {
+        var _value$billData, _value$billData2, _value$billData3;
+        if ((value === null || value === void 0 ? void 0 : (_value$billData = value.billData) === null || _value$billData === void 0 ? void 0 : _value$billData.totalAmount) != 0) {
+          missingFields.push(`${t("NDC_MESSAGE_PLEASE_CHECK_STATUS_OF_WATER_CONNECTION")} ${value === null || value === void 0 ? void 0 : value.connectionNo}`);
+        }
+        if (value !== null && value !== void 0 && (_value$billData2 = value.billData) !== null && _value$billData2 !== void 0 && _value$billData2.id && (value === null || value === void 0 ? void 0 : (_value$billData3 = value.billData) === null || _value$billData3 === void 0 ? void 0 : _value$billData3.totalAmount) > 0) {
+          missingFields.push(`${t("NDC_MESSAGE_PLEASE_PAY_DUES_OF_WATER_CONNECTION")} ${value === null || value === void 0 ? void 0 : value.connectionNo}`);
+        }
+      });
+    }
+    if ((propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$sewe = propertyDetails.sewerageConnection) === null || _propertyDetails$sewe === void 0 ? void 0 : _propertyDetails$sewe.length) > 0) {
+      propertyDetails.sewerageConnection.forEach(value => {
+        var _value$billData4, _value$billData5, _value$billData6;
+        if ((value === null || value === void 0 ? void 0 : (_value$billData4 = value.billData) === null || _value$billData4 === void 0 ? void 0 : _value$billData4.totalAmount) != 0) {
+          missingFields.push(`${t("NDC_MESSAGE_PLEASE_CHECK_STATUS_OF_SEWERAGE_CONNECTION")} ${value === null || value === void 0 ? void 0 : value.connectionNo}`);
+        }
+        if (value !== null && value !== void 0 && (_value$billData5 = value.billData) !== null && _value$billData5 !== void 0 && _value$billData5.id && (value === null || value === void 0 ? void 0 : (_value$billData6 = value.billData) === null || _value$billData6 === void 0 ? void 0 : _value$billData6.totalAmount) > 0) {
+          missingFields.push(`${t("NDC_MESSAGE_PLEASE_PAY_DUES_OF_SEWERAGE_CONNECTION")} ${value === null || value === void 0 ? void 0 : value.connectionNo}`);
+        }
+      });
+    }
     if (!(cpt !== null && cpt !== void 0 && cpt.id)) missingFields.push(t("NDC_MESSAGE_PROPERTY_ID"));
-    if (!validatePropertyId(cpt === null || cpt === void 0 ? void 0 : cpt.id)) missingFields.push(t("PT_PROPERTY_ID_INVALID"));
     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"));
@@ -11701,8 +11728,12 @@ const NewNDCStepFormOne = ({
     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 && !nameRegex.test(propertyDetails.lastName)) {
-      invalidFields.push(t("NDC_MESSAGE_LAST_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"));
@@ -11765,6 +11796,10 @@ 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
@@ -11788,6 +11823,18 @@ 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);
   }
@@ -11799,10 +11846,10 @@ function SelectNDCReason({
   };
   return /*#__PURE__*/React.createElement("div", {
     style: {
-      marginBottom: "16px"
+      paddingBottom: "16px"
     }
   }, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller"
+    className: "card-label-smaller ndc_card_labels"
   }, `${t("NDC_NEW_NDC_APPLICATION_NDC_REASON")} * `), /*#__PURE__*/React.createElement(Controller, {
     name: "NDCReason",
     rules: {
@@ -11816,6 +11863,7 @@ function SelectNDCReason({
       option: ndcReasonOptions,
       select: e => {
         setNDCReason(e);
+        props.onChange(e);
       },
       optionKey: "i18nKey",
       onBlur: props.onBlur,
@@ -11834,7 +11882,7 @@ const PropertyDetailsForm$1 = ({
   formState,
   clearErrors
 }) => {
-  var _formData$cpt, _formData$cpt$details, _formData$cpt3, _Digit, _Digit$ComponentRegis, _formData$cpt4, _formData$cpt5, _propertyDetails$prop, _propertyDetails$prop2, _formData$cpt7, _propertyDetails$prop3, _propertyDetails$prop4, _formData$cpt8, _propertyDetails$prop6, _propertyDetails$prop7, _propertyDetails$wate, _propertyDetails$sewe;
+  var _formData$cpt, _formData$cpt$details, _formData$cpt3, _Digit, _Digit$ComponentRegis, _formData$cpt4, _apiDataCheck$6, _propertyDetails$wate, _propertyDetails$sewe;
   const {
     control,
     formState: localFormState,
@@ -11847,6 +11895,10 @@ 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);
@@ -11915,39 +11967,63 @@ 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 _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
-        };
-      });
+    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
+      }))) || [];
     }
-  }, [waterConnectionData, waterConnectionLoading]);
+    setPropertyDetails(prev => ({
+      ...prev,
+      waterConnection
+    }));
+  }, [waterConnectionData, apiDataCheck]);
   useEffect(() => {
-    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
-        };
-      });
+    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
+      }))) || [];
     }
-  }, [sewerageConnectionData, sewerageConnectionLoading]);
+    setPropertyDetails(prev => ({
+      ...prev,
+      sewerageConnection
+    }));
+  }, [sewerageConnectionData, apiDataCheck]);
   useEffect(() => {
     onSelect("PropertyDetails", propertyDetails, config);
   }, [propertyDetails]);
@@ -12043,24 +12119,34 @@ const PropertyDetailsForm$1 = ({
           }));
         }
       } else if (result !== null && result !== void 0 && result.Bill) {
-        setShowToast({
-          error: true,
-          label: t("NDC_MESSAGE_NO_BILLS_FOUND_FOR_THIS_CONSUMER_NUMBER")
-        });
         if (bussinessService === "WS") {
           const updated = [...propertyDetails.waterConnection];
+          updated[index].billData = {
+            totalAmount: 0
+          };
           updated[index].isLoading = false;
           setPropertyDetails(prev => ({
             ...prev,
             waterConnection: updated
           }));
+          setShowToast({
+            error: false,
+            label: t("NDC_NO_BILLS_FOUND_WS")
+          });
         } else if (bussinessService === "SW") {
           const updated = [...propertyDetails.sewerageConnection];
+          updated[index].billData = {
+            totalAmount: 0
+          };
           updated[index].isLoading = false;
           setPropertyDetails(prev => ({
             ...prev,
             sewerageConnection: updated
           }));
+          setShowToast({
+            error: false,
+            label: t("NDC_NO_BILLS_FOUND_SW")
+          });
         } else if (bussinessService === "PT") {
           let updated = {
             ...propertyDetails.propertyBillData
@@ -12070,26 +12156,40 @@ const PropertyDetailsForm$1 = ({
             ...prev,
             propertyBillData: updated
           }));
+          setShowToast({
+            error: false,
+            label: t("NDC_NO_BILLS_FOUND_PROPERTY")
+          });
         }
       } else {
-        setShowToast({
-          error: true,
-          label: t("INVALID_CONSUMER_NUMBER")
-        });
         if (bussinessService === "WS") {
           const updated = [...propertyDetails.waterConnection];
           updated[index].isLoading = false;
+          updated[index].billData = {
+            totalAmount: 0
+          };
           setPropertyDetails(prev => ({
             ...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;
+          updated[index].billData = {
+            totalAmount: 0
+          };
           setPropertyDetails(prev => ({
             ...prev,
             sewerageConnection: updated
           }));
+          setShowToast({
+            error: false,
+            label: t("NDC_NO_BILLS_FOUND_SW")
+          });
         } else if (bussinessService === "PT") {
           let updated = {
             ...propertyDetails.propertyBillData
@@ -12099,6 +12199,10 @@ const PropertyDetailsForm$1 = ({
             ...prev,
             propertyBillData: updated
           }));
+          setShowToast({
+            error: false,
+            label: t("NDC_NO_BILLS_FOUND_PROPERTY")
+          });
         }
       }
     } catch (error) {
@@ -12170,63 +12274,47 @@ 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");
-  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) && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement("div", {
-    className: "field",
-    style: {
-      display: "flex",
-      flexDirection: "column",
-      gap: "4px"
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: "flex",
-      flexDirection: "row"
-    }
-  }, propertyLoader ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement("div", null, (formData === null || formData === void 0 ? void 0 : (_formData$cpt5 = formData.cpt) === null || _formData$cpt5 === void 0 ? void 0 : _formData$cpt5.id) && !(propertyDetails !== null && propertyDetails !== void 0 && (_propertyDetails$prop = propertyDetails.propertyBillData) !== null && _propertyDetails$prop !== void 0 && (_propertyDetails$prop2 = _propertyDetails$prop.billData) !== null && _propertyDetails$prop2 !== void 0 && _propertyDetails$prop2.id) && /*#__PURE__*/React.createElement("button", {
-    className: "submit-bar",
-    type: "button",
-    style: {
-      color: "white",
-      fontSize: "13px"
-    },
-    onClick: () => {
-      var _formData$cpt6;
-      fetchBill("PT", formData === null || formData === void 0 ? void 0 : (_formData$cpt6 = formData.cpt) === null || _formData$cpt6 === void 0 ? void 0 : _formData$cpt6.id);
+  useEffect(() => {
+    if (showToast) {
+      const timer = setTimeout(() => {
+        setShowToast(null);
+      }, 3000);
+      return () => clearTimeout(timer);
     }
-  }, "Check Status for Property"), (formData === null || formData === void 0 ? void 0 : (_formData$cpt7 = formData.cpt) === null || _formData$cpt7 === void 0 ? void 0 : _formData$cpt7.id) && (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$prop3 = propertyDetails.propertyBillData) === null || _propertyDetails$prop3 === void 0 ? void 0 : (_propertyDetails$prop4 = _propertyDetails$prop3.billData) === null || _propertyDetails$prop4 === void 0 ? void 0 : _propertyDetails$prop4.totalAmount) > 0 && /*#__PURE__*/React.createElement("button", {
-    className: "submit-bar",
-    type: "button",
-    style: {
-      color: "white"
-    },
-    onClick: () => {
-      var _propertyDetails$prop5;
-      redirectToPayBill(propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$prop5 = propertyDetails.propertyBillData) === null || _propertyDetails$prop5 === void 0 ? void 0 : _propertyDetails$prop5.billData);
+  }, [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
+      }));
     }
-  }, `${t("PAY_DUES")}`), (formData === null || formData === void 0 ? void 0 : (_formData$cpt8 = formData.cpt) === null || _formData$cpt8 === void 0 ? void 0 : _formData$cpt8.id) && (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$prop6 = propertyDetails.propertyBillData) === null || _propertyDetails$prop6 === void 0 ? void 0 : (_propertyDetails$prop7 = _propertyDetails$prop6.billData) === null || _propertyDetails$prop7 === void 0 ? void 0 : _propertyDetails$prop7.totalAmount) == 0 && /*#__PURE__*/React.createElement("div", {
+  }, [apiDataCheck]);
+  return /*#__PURE__*/React.createElement("div", {
     style: {
-      color: "green"
+      marginBottom: "16px"
     }
-  }, t("NO_DUES_FOUND_FOR_PROPERTY")))))), /*#__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$6 = apiDataCheck[0]) === null || _apiDataCheck$6 === void 0 ? void 0 : _apiDataCheck$6.NdcDetails)) && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, {
     style: {
       marginTop: "40px"
     }
   }, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller"
+    className: "card-label-smaller ndc_card_labels"
   }, `${t("NDC_WATER_CONNECTION")}`), waterConnectionLoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement("div", {
     className: "field",
     style: {
       display: "flex",
       flexDirection: "column",
-      gap: "8px"
+      gap: "8px",
+      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 _item$billData, _item$billData2, _item$billData3;
+    var _apiDataCheck$7, _item$billData, _item$billData2, _item$billData3, _item$billData4;
     return /*#__PURE__*/React.createElement("div", {
+      className: "ndc_property_search",
       key: index,
       style: {
         display: "flex",
@@ -12265,7 +12353,7 @@ const PropertyDetailsForm$1 = ({
         alignItems: "center",
         gap: "12px"
       }
-    }, (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) && /*#__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$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: {
@@ -12275,7 +12363,7 @@ const PropertyDetailsForm$1 = ({
       onClick: () => {
         fetchBill("WS", item.connectionNo, index);
       }
-    }, "Check Status for Water"), (item === null || item === void 0 ? void 0 : item.connectionNo) && (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", {
+    }, `${t("CHECK_STATUS_WATER")}`), (item === null || item === void 0 ? void 0 : item.connectionNo) && (item === null || item === void 0 ? void 0 : (_item$billData3 = item.billData) === null || _item$billData3 === void 0 ? void 0 : _item$billData3.totalAmount) > 0 && /*#__PURE__*/React.createElement("button", {
       className: "submit-bar",
       type: "button",
       style: {
@@ -12284,7 +12372,7 @@ const PropertyDetailsForm$1 = ({
       onClick: () => {
         redirectToPayBill(item === null || item === void 0 ? void 0 : item.billData, index, item.isEdit);
       }
-    }, `${t("PAY_DUES")}`), (item === null || item === void 0 ? void 0 : item.connectionNo) && (item === null || item === void 0 ? void 0 : (_item$billData3 = item.billData) === null || _item$billData3 === void 0 ? void 0 : _item$billData3.totalAmount) == 0 && /*#__PURE__*/React.createElement("div", {
+    }, `${t("PAY_DUES")}`), (item === null || item === void 0 ? void 0 : item.connectionNo) && (item === null || item === void 0 ? void 0 : (_item$billData4 = item.billData) === null || _item$billData4 === void 0 ? void 0 : _item$billData4.totalAmount) == 0 && /*#__PURE__*/React.createElement("div", {
       style: {
         color: "green"
       }
@@ -12311,7 +12399,8 @@ const PropertyDetailsForm$1 = ({
     className: "submit-bar",
     type: "button",
     style: {
-      color: "white"
+      color: "white",
+      fontSize: "12px"
     },
     onClick: () => {
       addWaterConnection();
@@ -12321,17 +12410,19 @@ const PropertyDetailsForm$1 = ({
       marginTop: "40px"
     }
   }, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller"
+    className: "card-label-smaller ndc_card_labels"
   }, `${t("NDC_SEWERAGE_CONNECTION")} `), sewerageConnectionLoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement("div", {
     className: "field",
     style: {
       display: "flex",
       flexDirection: "column",
-      gap: "8px"
+      gap: "8px",
+      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 _item$billData4, _item$billData5, _item$billData6;
+    var _apiDataCheck$8, _item$billData5, _item$billData6, _item$billData7, _item$billData8;
     return /*#__PURE__*/React.createElement("div", {
+      className: "ndc_property_search",
       key: index,
       style: {
         display: "flex",
@@ -12370,7 +12461,7 @@ const PropertyDetailsForm$1 = ({
         alignItems: "center",
         gap: "12px"
       }
-    }, (item === null || item === void 0 ? void 0 : item.connectionNo) && !(item !== null && item !== void 0 && (_item$billData4 = item.billData) !== null && _item$billData4 !== void 0 && _item$billData4.id) && /*#__PURE__*/React.createElement("button", {
+    }, !(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", {
       className: "submit-bar",
       type: "button",
       style: {
@@ -12380,7 +12471,7 @@ const PropertyDetailsForm$1 = ({
       onClick: () => {
         fetchBill("SW", item.connectionNo, index);
       }
-    }, "Check Status for Sewerage"), (item === null || item === void 0 ? void 0 : item.connectionNo) && (item === null || item === void 0 ? void 0 : (_item$billData5 = item.billData) === null || _item$billData5 === void 0 ? void 0 : _item$billData5.totalAmount) > 0 && /*#__PURE__*/React.createElement("button", {
+    }, `${t("CHECK_STATUS_SEWERAGE")}`), (item === null || item === void 0 ? void 0 : item.connectionNo) && (item === null || item === void 0 ? void 0 : (_item$billData7 = item.billData) === null || _item$billData7 === void 0 ? void 0 : _item$billData7.totalAmount) > 0 && /*#__PURE__*/React.createElement("button", {
       className: "submit-bar",
       type: "button",
       style: {
@@ -12389,7 +12480,11 @@ const PropertyDetailsForm$1 = ({
       onClick: () => {
         redirectToPayBill(item === null || item === void 0 ? void 0 : item.billData, index);
       }
-    }, `${t("PAY_DUES")}`), (item === null || item === void 0 ? void 0 : item.connectionNo) && (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("div", null, t("NO_DUES")), (item === null || item === void 0 ? void 0 : item.isEdit) && /*#__PURE__*/React.createElement("button", {
+    }, `${t("PAY_DUES")}`), (item === null || item === void 0 ? void 0 : item.connectionNo) && (item === null || item === void 0 ? void 0 : (_item$billData8 = item.billData) === null || _item$billData8 === void 0 ? void 0 : _item$billData8.totalAmount) == 0 && /*#__PURE__*/React.createElement("div", {
+      style: {
+        color: "green"
+      }
+    }, t("NO_DUES")), (item === null || item === void 0 ? void 0 : item.isEdit) && /*#__PURE__*/React.createElement("button", {
       onClick: () => {
         let updated = [...propertyDetails.sewerageConnection];
         updated.splice(index, 1);
@@ -12412,7 +12507,8 @@ const PropertyDetailsForm$1 = ({
     className: "submit-bar",
     type: "button",
     style: {
-      color: "white"
+      color: "white",
+      fontSize: " 12px"
     },
     onClick: () => {
       addSewerageConnection();
@@ -12422,7 +12518,7 @@ const PropertyDetailsForm$1 = ({
       marginTop: "40px"
     }
   }, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller"
+    className: "card-label-smaller ndc_card_labels"
   }, `${t("NDC_FIRST_NAME")} * `), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
@@ -12436,7 +12532,7 @@ const PropertyDetailsForm$1 = ({
       }
     },
     render: props => {
-      var _formData$cpt9, _formData$cpt9$detail, _formData$cpt9$detail2, _formData$cpt9$detail3, _formData$cpt9$detail4, _formData$cpt9$detail5, _formData$cpt9$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 => {
@@ -12449,11 +12545,11 @@ const PropertyDetailsForm$1 = ({
         onBlur: e => {
           props.onBlur(e);
         },
-        disabled: (formData === null || formData === void 0 ? void 0 : (_formData$cpt9 = formData.cpt) === null || _formData$cpt9 === void 0 ? void 0 : (_formData$cpt9$detail = _formData$cpt9.details) === null || _formData$cpt9$detail === void 0 ? void 0 : (_formData$cpt9$detail2 = _formData$cpt9$detail.owners) === null || _formData$cpt9$detail2 === void 0 ? void 0 : (_formData$cpt9$detail3 = _formData$cpt9$detail2[0]) === null || _formData$cpt9$detail3 === void 0 ? void 0 : (_formData$cpt9$detail4 = _formData$cpt9$detail3.name) === null || _formData$cpt9$detail4 === void 0 ? void 0 : (_formData$cpt9$detail5 = _formData$cpt9$detail4.split(" ")) === null || _formData$cpt9$detail5 === void 0 ? void 0 : (_formData$cpt9$detail6 = _formData$cpt9$detail5[0]) === null || _formData$cpt9$detail6 === void 0 ? void 0 : _formData$cpt9$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, {
-    className: "card-label-smaller"
+    className: "card-label-smaller ndc_card_labels"
   }, `${t("NDC_LAST_NAME")} * `), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
@@ -12467,7 +12563,7 @@ const PropertyDetailsForm$1 = ({
       }
     },
     render: props => {
-      var _formData$cpt0, _formData$cpt0$detail, _formData$cpt0$detail2, _formData$cpt0$detail3, _formData$cpt0$detail4, _formData$cpt0$detail5, _formData$cpt0$detail6;
+      var _formData$cpt6, _formData$cpt6$detail, _formData$cpt6$detail2, _formData$cpt6$detail3, _formData$cpt6$detail4, _formData$cpt6$detail5, _formData$cpt6$detail6;
       return /*#__PURE__*/React.createElement(TextInput, {
         value: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.lastName) || "",
         onChange: e => {
@@ -12480,36 +12576,36 @@ 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.name) === null || _formData$cpt0$detail4 === void 0 ? void 0 : (_formData$cpt0$detail5 = _formData$cpt0$detail4.split(" ")) === null || _formData$cpt0$detail5 === void 0 ? void 0 : (_formData$cpt0$detail6 = _formData$cpt0$detail5[1]) === null || _formData$cpt0$detail6 === void 0 ? void 0 : _formData$cpt0$detail6.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.name) === null || _formData$cpt6$detail4 === void 0 ? void 0 : (_formData$cpt6$detail5 = _formData$cpt6$detail4.split(" ")) === null || _formData$cpt6$detail5 === void 0 ? void 0 : (_formData$cpt6$detail6 = _formData$cpt6$detail5[1]) === null || _formData$cpt6$detail6 === void 0 ? void 0 : _formData$cpt6$detail6.length) > 0
       });
     }
   }))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller"
+    className: "card-label-smaller ndc_card_labels"
   }, `${t("NDC_EMAIL")} * `), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "email",
-    defaultValue: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.email) || "",
+    defaultValue: "",
     render: props => {
-      var _formData$cpt1, _formData$cpt1$detail, _formData$cpt1$detail2, _formData$cpt1$detail3, _formData$cpt1$detail4;
+      var _formData$cpt7, _formData$cpt7$detail, _formData$cpt7$detail2, _formData$cpt7$detail3, _formData$cpt7$detail4;
       return /*#__PURE__*/React.createElement(TextInput, {
-        value: propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.email,
+        value: props === null || props === void 0 ? void 0 : props.value,
         onChange: e => {
+          props.onChange(e.target.value);
           setPropertyDetails(prev => ({
             ...prev,
             email: e.target.value
           }));
-          props.onChange(e.target.value);
         },
         onBlur: e => {
           props.onBlur(e);
         },
-        disabled: (formData === null || formData === void 0 ? void 0 : (_formData$cpt1 = formData.cpt) === null || _formData$cpt1 === void 0 ? void 0 : (_formData$cpt1$detail = _formData$cpt1.details) === null || _formData$cpt1$detail === void 0 ? void 0 : (_formData$cpt1$detail2 = _formData$cpt1$detail.owners) === null || _formData$cpt1$detail2 === void 0 ? void 0 : (_formData$cpt1$detail3 = _formData$cpt1$detail2[0]) === null || _formData$cpt1$detail3 === void 0 ? void 0 : (_formData$cpt1$detail4 = _formData$cpt1$detail3.email) === null || _formData$cpt1$detail4 === void 0 ? void 0 : _formData$cpt1$detail4.length) > 0
+        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"
+    className: "card-label-smaller ndc_card_labels"
   }, `${t("NDC_MOBILE_NUMBER")} * `), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
@@ -12530,7 +12626,7 @@ const PropertyDetailsForm$1 = ({
       }
     })
   }))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller"
+    className: "card-label-smaller ndc_card_labels"
   }, `${t("NDC_ADDRESS")} * `), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
@@ -12538,7 +12634,7 @@ const PropertyDetailsForm$1 = ({
     name: "address",
     defaultValue: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.address) || "",
     render: props => {
-      var _formData$cpt10, _formData$cpt10$detai, _formData$cpt10$detai2, _formData$cpt10$detai3, _formData$cpt10$detai4;
+      var _formData$cpt8, _formData$cpt8$detail, _formData$cpt8$detail2, _formData$cpt8$detail3, _formData$cpt8$detail4;
       return /*#__PURE__*/React.createElement(TextInput, {
         value: propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.address,
         onChange: e => {
@@ -12551,11 +12647,11 @@ const PropertyDetailsForm$1 = ({
         onBlur: e => {
           props.onBlur(e);
         },
-        disabled: (formData === null || formData === void 0 ? void 0 : (_formData$cpt10 = formData.cpt) === null || _formData$cpt10 === void 0 ? void 0 : (_formData$cpt10$detai = _formData$cpt10.details) === null || _formData$cpt10$detai === void 0 ? void 0 : (_formData$cpt10$detai2 = _formData$cpt10$detai.owners) === null || _formData$cpt10$detai2 === void 0 ? void 0 : (_formData$cpt10$detai3 = _formData$cpt10$detai2[0]) === null || _formData$cpt10$detai3 === void 0 ? void 0 : (_formData$cpt10$detai4 = _formData$cpt10$detai3.permanentAddress) === null || _formData$cpt10$detai4 === void 0 ? void 0 : _formData$cpt10$detai4.length) > 0
+        disabled: (formData === null || formData === void 0 ? void 0 : (_formData$cpt8 = formData.cpt) === null || _formData$cpt8 === void 0 ? void 0 : (_formData$cpt8$detail = _formData$cpt8.details) === null || _formData$cpt8$detail === void 0 ? void 0 : (_formData$cpt8$detail2 = _formData$cpt8$detail.owners) === null || _formData$cpt8$detail2 === void 0 ? void 0 : (_formData$cpt8$detail3 = _formData$cpt8$detail2[0]) === null || _formData$cpt8$detail3 === void 0 ? void 0 : (_formData$cpt8$detail4 = _formData$cpt8$detail3.permanentAddress) === null || _formData$cpt8$detail4 === void 0 ? void 0 : _formData$cpt8$detail4.length) > 0
       });
     }
   })))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller"
+    className: "card-label-smaller ndc_card_labels"
   }, `${t("NDC_TL_NUMBER")}`), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
@@ -12595,30 +12691,32 @@ const getAddress = (address, t) => {
 const PropertySearchNSummary = ({
   config,
   onSelect,
-  userType,
-  formData,
-  setError,
-  formState,
-  clearErrors
+  formData
 }) => {
-  var _formData$cpt, _formData$cpt2, _propertyDetails$Prop3;
+  var _apiDataCheck$, _apiDataCheck$$NdcDet, _formData$cpt, _formData$cpt2, _propertyDetails$Prop3, _apiDataCheck$2, _formData$cpt12, _formData$cpt13, _formData$cpt13$dues;
   const {
     t
   } = useTranslation();
-  const history = useHistory();
+  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 = Digit.ULBService.getCurrentPermanentCity();
-  const isEmpNewApplication = window.location.href.includes("/employee/tl/new-application") || window.location.href.includes("/citizen/tl/tradelicence/new-application");
-  const isEmpRenewLicense = window.location.href.includes("/employee/tl/renew-application-details") || window.location.href.includes("/employee/tl/edit-application-details");
+  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 [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 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);
   const [propertyDetails, setPropertyDetails] = useState(() => {
     var _formData$cpt3, _formData$cpt4;
@@ -12635,9 +12733,24 @@ const PropertySearchNSummary = ({
       };
     }
   });
-  const isMobile = window.Digit.Utils.browser.isMobile();
-  const serachParams = window.location.href.includes("?") ? window.location.href.substring(window.location.href.indexOf("?") + 1, window.location.href.length) : "";
-  const myElementRef = useRef(null);
+  const [propertyDues, setPropertyDues] = useState(() => {
+    var _formData$cpt6, _formData$cpt7;
+    if (formData !== null && formData !== void 0 && (_formData$cpt6 = formData.cpt) !== null && _formData$cpt6 !== void 0 && _formData$cpt6.dues && Object.keys(formData === null || formData === void 0 ? void 0 : (_formData$cpt7 = formData.cpt) === null || _formData$cpt7 === void 0 ? void 0 : _formData$cpt7.dues).length > 0) {
+      var _formData$cpt8;
+      return {
+        dues: {
+          ...(formData === null || formData === void 0 ? void 0 : (_formData$cpt8 = formData.cpt) === null || _formData$cpt8 === void 0 ? void 0 : _formData$cpt8.dues)
+        }
+      };
+    } else {
+      return {
+        dues: {}
+      };
+    }
+  });
+  const [isSearchClicked, setIsSearchClicked] = useState(false);
+  const [getNoDue, setNoDue] = useState(false);
+  const [getCheckStatus, setCheckStats] = useState(false);
   const {
     isLoading,
     isError,
@@ -12656,20 +12769,32 @@ const PropertySearchNSummary = ({
     enabled: searchPropertyId ? true : false,
     privacy: Digit.Utils.getPrivacyObject()
   });
-  const isfirstRender = useRef(true);
+  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$cpt6;
+      var _formData$cpt9;
       if (isfirstRender.current) {
         isfirstRender.current = false;
         return;
       }
-      if (!(formData !== null && formData !== void 0 && (_formData$cpt6 = formData.cpt) !== null && _formData$cpt6 !== void 0 && _formData$cpt6.details)) {
-        console.log("Property Id not found in response", propertyId);
+      if (!(formData !== null && formData !== void 0 && (_formData$cpt9 = formData.cpt) !== null && _formData$cpt9 !== void 0 && _formData$cpt9.details)) {
         setPropertyDetails({});
         setShowToast({
           error: true,
@@ -12684,7 +12809,6 @@ 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"
@@ -12698,6 +12822,12 @@ const PropertySearchNSummary = ({
       details: propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop2 = propertyDetails.Properties) === null || _propertyDetails$Prop2 === void 0 ? void 0 : _propertyDetails$Prop2[0]
     });
   }, [propertyDetails, pathname]);
+  useEffect(() => {
+    onSelect(config.key, {
+      ...formData[config.key],
+      dues: propertyDues === null || propertyDues === void 0 ? void 0 : propertyDues.dues
+    });
+  }, [propertyDues, pathname]);
   const searchProperty = () => {
     if (!propertyId) {
       setShowToast({
@@ -12711,8 +12841,16 @@ const PropertySearchNSummary = ({
         Properties: []
       });
       setSearchPropertyId(propertyId);
+      setIsSearchClicked(true);
     }
   };
+  const handlePropertyChange = e => {
+    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);
   }
@@ -12740,47 +12878,142 @@ 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;
+      const result = await Digit.PaymentService.fetchBill(tenantId, {
+        businessService: "PT",
+        consumerCode: formData === null || formData === void 0 ? void 0 : (_formData$cpt0 = formData.cpt) === null || _formData$cpt0 === void 0 ? void 0 : _formData$cpt0.id
+      });
+      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) {
+          setShowToast({
+            error: true,
+            label: t("NDC_MESSAGE_DUES_FOUND_PLEASE_PAY")
+          });
+        } else {
+          setShowToast({
+            error: false,
+            label: t("NDC_NO_BILLS_FOUND_PROPERTY")
+          });
+          setNoDue(true);
+          setCheckStats(false);
+        }
+        setPropertyDues({
+          dues: result === null || result === void 0 ? void 0 : result.Bill[0]
+        });
+      } else if (result !== null && result !== void 0 && result.Bill) {
+        setShowToast({
+          error: false,
+          label: t("NDC_NO_BILLS_FOUND_PROPERTY")
+        });
+        setPropertyDues({
+          dues: {
+            totalAmount: 0
+          }
+        });
+        setNoDue(true);
+        setCheckStats(false);
+      } else {
+        setShowToast({
+          error: false,
+          label: t("NDC_NO_BILLS_FOUND_PROPERTY")
+        });
+        setPropertyDues({
+          dues: {
+            totalAmount: 0
+          }
+        });
+        setNoDue(true);
+        setCheckStats(false);
+      }
+    } catch (error) {
+      setShowToast({
+        error: true,
+        label: t("NDC_MESSAGE_FETCH_FAILED")
+      });
+    }
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+  function redirectToPayBill(billData, index, isEdit) {
+    var _formData$cpt1, _formData$cpt10, _formData$cpt10$detai;
+    const userType = window.location.href.includes("employee") ? "employee" : "citizen";
+    const payUrl = "https://sdc-uat.lgpunjab.gov.in" + `/${userType}/egov-common/pay?consumerCode=${formData === null || formData === void 0 ? void 0 : (_formData$cpt1 = formData.cpt) === null || _formData$cpt1 === void 0 ? void 0 : _formData$cpt1.id}&tenantId=${formData === null || formData === void 0 ? void 0 : (_formData$cpt10 = formData.cpt) === null || _formData$cpt10 === void 0 ? void 0 : (_formData$cpt10$detai = _formData$cpt10.details) === null || _formData$cpt10$detai === void 0 ? void 0 : _formData$cpt10$detai.tenantId}&businessService=PT`;
+    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",
+    className: "card-label-smaller ndc_card_labels",
     style: getInputStyles()
   }, `${t(propertyIdInput.label)}`,  null), /*#__PURE__*/React.createElement("div", {
-    className: "field",
+    className: "field ndc_property_search",
     style: {
       marginTop: "20px",
-      display: "flex"
+      display: "flex",
+      gap: "16px",
+      alignItems: "baseline",
+      width: "100%"
     },
     ref: myElementRef,
     id: "search-property-field"
   }, /*#__PURE__*/React.createElement(TextInput, Object.assign({
     key: propertyIdInput.name,
-    value: getValue(propertyIdInput.name),
-    onChange: e => {
-      setPropertyId(e.target.value);
-      setValue(e.target.value, propertyIdInput.name);
-    },
+    value: propertyId,
+    onChange: handlePropertyChange,
     disable: false,
     maxlength: 16,
-    defaultValue: undefined,
+    defaultValue: undefined
+  }, propertyIdInput.validation)), !isSearchClicked && /*#__PURE__*/React.createElement("button", {
+    className: "submit-bar",
+    type: "button",
+    style: {
+      color: "white",
+      width: "100%",
+      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", {
+    className: "submit-bar",
+    type: "button",
     style: {
-      width: "80%",
-      float: "left",
-      marginRight: "20px"
+      color: "white",
+      fontSize: "13px",
+      width: "100%",
+      maxWidth: "180px"
+    },
+    onClick: () => {
+      fetchBill();
     }
-  }, propertyIdInput.validation)), /*#__PURE__*/React.createElement("button", {
+  }, `${t("CHECK_STATUS_PROPERTY")}`), (formData === null || formData === void 0 ? void 0 : (_formData$cpt12 = formData.cpt) === null || _formData$cpt12 === void 0 ? void 0 : _formData$cpt12.id) && (formData === null || formData === void 0 ? void 0 : (_formData$cpt13 = formData.cpt) === null || _formData$cpt13 === void 0 ? void 0 : (_formData$cpt13$dues = _formData$cpt13.dues) === null || _formData$cpt13$dues === void 0 ? void 0 : _formData$cpt13$dues.totalAmount) > 0 && !isSearchClicked && /*#__PURE__*/React.createElement("button", {
     className: "submit-bar",
     type: "button",
     style: {
-      color: "white"
+      color: "white",
+      width: "100%",
+      maxWidth: "100px"
     },
-    onClick: searchProperty
-  }, `${t("PT_SEARCH")}`))), showToast && /*#__PURE__*/React.createElement(Toast, {
+    onClick: () => {
+      redirectToPayBill();
+    }
+  }, `${t("PAY_DUES")}`), getNoDue && /*#__PURE__*/React.createElement("div", {
+    style: {
+      color: "green",
+      width: "100%",
+      maxWidth: "75px"
+    }
+  }, t("NO_DUES_FOUND_FOR_PROPERTY")))), showToast && /*#__PURE__*/React.createElement(Toast, {
     isDleteBtn: true,
     labelstyle: {
       width: "100%"
@@ -12846,6 +13079,7 @@ const SelectNDCDocuments = ({
       formState: formState
     });
   }), error && /*#__PURE__*/React.createElement(Toast, {
+    isDleteBtn: true,
     label: error,
     onClose: () => setError(null),
     error: true
@@ -13493,8 +13727,8 @@ const PayWSBillModal = ({
 };
 
 const createEmployeeConfig$1 = [{
-  head: "NDC Details",
-  stepLabel: "NDC Details",
+  head: "Applicant Details",
+  stepLabel: "Applicant Details",
   stepNumber: 1,
   isStepEnabled: true,
   type: "component",
@@ -13542,6 +13776,18 @@ 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));
   };
@@ -13555,7 +13801,7 @@ const NewNDCStepForm$1 = () => {
       color: "#1C1D1F"
     },
     divider: true
-  }, t("New NDC Application")), /*#__PURE__*/React.createElement(Stepper, {
+  }, t("ndc_header_application")), /*#__PURE__*/React.createElement(Stepper, {
     stepsList: updatedCreateEmployeeconfig$1,
     onSubmit: handleSubmit,
     step: step,
@@ -13695,12 +13941,42 @@ 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) || {};
     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) {
+      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) {
+      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) {
+      propertyDetails.waterConnection.forEach(value => {
+        var _value$billData, _value$billData2, _value$billData3;
+        if ((value === null || value === void 0 ? void 0 : (_value$billData = value.billData) === null || _value$billData === void 0 ? void 0 : _value$billData.totalAmount) != 0) {
+          invalidFields.push(`${t("NDC_MESSAGE_PLEASE_CHECK_STATUS_OF_WATER_CONNECTION")} ${value === null || value === void 0 ? void 0 : value.connectionNo}`);
+        }
+        if (value !== null && value !== void 0 && (_value$billData2 = value.billData) !== null && _value$billData2 !== void 0 && _value$billData2.id && (value === null || value === void 0 ? void 0 : (_value$billData3 = value.billData) === null || _value$billData3 === void 0 ? void 0 : _value$billData3.totalAmount) > 0) {
+          invalidFields.push(`${t("NDC_MESSAGE_PLEASE_PAY_DUES_OF_WATER_CONNECTION")} ${value === null || value === void 0 ? void 0 : value.connectionNo}`);
+        }
+      });
+    }
+    if ((propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$sewe = propertyDetails.sewerageConnection) === null || _propertyDetails$sewe === void 0 ? void 0 : _propertyDetails$sewe.length) > 0) {
+      propertyDetails.sewerageConnection.forEach(value => {
+        var _value$billData4, _value$billData5, _value$billData6;
+        if ((value === null || value === void 0 ? void 0 : (_value$billData4 = value.billData) === null || _value$billData4 === void 0 ? void 0 : _value$billData4.totalAmount) != 0) {
+          invalidFields.push(`${t("NDC_MESSAGE_PLEASE_CHECK_STATUS_OF_SEWERAGE_CONNECTION")} ${value === null || value === void 0 ? void 0 : value.connectionNo}`);
+        }
+        if (value !== null && value !== void 0 && (_value$billData5 = value.billData) !== null && _value$billData5 !== void 0 && _value$billData5.id && (value === null || value === void 0 ? void 0 : (_value$billData6 = value.billData) === null || _value$billData6 === void 0 ? void 0 : _value$billData6.totalAmount) > 0) {
+          invalidFields.push(`${t("NDC_MESSAGE_PLEASE_PAY_DUES_OF_SEWERAGE_CONNECTION")} ${value === null || value === void 0 ? void 0 : value.connectionNo}`);
+        }
+      });
+    }
     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"));