@mseva/digit-ui-module-ndc 1.0.36 → 1.0.37

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, TextInput, CardLabel, FilterFormField, RadioButtons, CheckPoint, ConnectingCheckPoints, DisplayPhotos, Menu, LinkButton, EmployeeModuleCard, SearchField, CheckBox, ComplaintIcon, Header, InboxComposer, MobileNumber, CardLabelError, SearchAction, PopUp, DetailsCard, SearchForm, CloseSvg, Table, CardHeader, LabelFieldPair, DeleteIcon, KeyNote } from '@mseva/digit-ui-react-components';
+import { Card, Banner, ActionBar, SubmitBar as SubmitBar$1, PrivateRoute, BreadCrumb, BackButton, AppContainer, Loader as Loader$1, Dropdown, UploadFile, Modal, FormComposer, Toast, CardSubHeader, StatusTable, Row, TextInput, CardLabel, FilterFormField, RadioButtons, CheckPoint, ConnectingCheckPoints, DisplayPhotos, Menu, LinkButton, EmployeeModuleCard, SearchField, CheckBox, ComplaintIcon, Header, InboxComposer, MobileNumber, CardLabelError, SearchAction, PopUp, DetailsCard, SearchForm, CloseSvg, Table, CardHeader, LabelFieldPair, DeleteIcon, CardSectionHeader, 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';
@@ -781,7 +781,7 @@ function NDCDocument$1({
     documentType: doc.documentType.replace(/\./g, "_")
   }));
   if (isLoading) {
-    return /*#__PURE__*/React.createElement(Loader, null);
+    return /*#__PURE__*/React.createElement(Loader$1, null);
   }
   return /*#__PURE__*/React.createElement("div", {
     style: {
@@ -911,7 +911,7 @@ const NDCModal = ({
   errorOne,
   closeToastOne
 }) => {
-  var _action$assigneeRoles, _action$assigneeRoles2;
+  var _action$state;
   const [config, setConfig] = useState({});
   const [defaultValues, setDefaultValues] = useState({});
   const [approvers, setApprovers] = useState([]);
@@ -921,12 +921,14 @@ const NDCModal = ({
   const [error, setError] = useState(null);
   const [financialYears, setFinancialYears] = useState([]);
   const [selectedFinancialYear, setSelectedFinancialYear] = useState(null);
+  const checkRole = action === null || action === void 0 ? void 0 : (_action$state = action.state) === null || _action$state === void 0 ? void 0 : _action$state.actions;
+  const allRoles = [...new Set(checkRole === null || checkRole === void 0 ? void 0 : checkRole.flatMap(a => a.roles))];
   const {
     data: approverData,
     isLoading: PTALoading
   } = Digit.Hooks.useEmployeeSearch(tenantId, {
-    roles: action === null || action === void 0 ? void 0 : (_action$assigneeRoles = action.assigneeRoles) === null || _action$assigneeRoles === void 0 ? void 0 : (_action$assigneeRoles2 = _action$assigneeRoles.map) === null || _action$assigneeRoles2 === void 0 ? void 0 : _action$assigneeRoles2.call(_action$assigneeRoles, e => ({
-      code: e
+    roles: allRoles === null || allRoles === void 0 ? void 0 : allRoles.map(role => ({
+      code: role
     })),
     isActive: true
   }, {
@@ -1059,7 +1061,7 @@ const NDCModal = ({
     label: errorOne,
     isDleteBtn: true,
     onClose: closeToastOne
-  })) : /*#__PURE__*/React.createElement(Loader, null);
+  })) : /*#__PURE__*/React.createElement(Loader$1, null);
 };
 
 const getTimelineCaptions = (checkpoint, index, arr, t) => {
@@ -1153,7 +1155,7 @@ const ApplicationOverview = () => {
     isLoading,
     data: applicationDetails
   } = Digit.Hooks.ndc.useSearchEmployeeApplication({
-    uuid: id
+    applicationNo: id
   }, tenantId);
   const workflowDetails = Digit.Hooks.useWorkflowDetails({
     tenantId: tenantId,
@@ -1161,6 +1163,7 @@ const ApplicationOverview = () => {
     moduleCode: "ndc-services",
     role: "EMPLOYEE"
   });
+  console.log("workflowDetails", workflowDetails);
   if (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data = workflowDetails.data) !== null && _workflowDetails$data !== void 0 && (_workflowDetails$data2 = _workflowDetails$data.actionState) !== null && _workflowDetails$data2 !== void 0 && _workflowDetails$data2.nextActions && !workflowDetails.isLoading) workflowDetails.data.actionState.nextActions = [...(workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data3 = workflowDetails.data) === null || _workflowDetails$data3 === void 0 ? void 0 : _workflowDetails$data3.nextActions)];
   if (workflowDetails && workflowDetails.data && !workflowDetails.isLoading) {
     var _workflowDetails$data4, _workflowDetails$data5;
@@ -1215,6 +1218,7 @@ const ApplicationOverview = () => {
       return (_e$roles2 = e.roles) === null || _e$roles2 === void 0 ? void 0 : _e$roles2.includes(role);
     })) || !e.roles;
   }));
+  console.log("actions", actions);
   const [displayMenu, setDisplayMenu] = useState(false);
   const [selectedAction, setSelectedAction] = useState(null);
   const [showModal, setShowModal] = useState(false);
@@ -1249,7 +1253,7 @@ const ApplicationOverview = () => {
         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,
-        applicationNo: ndcObject === null || ndcObject === void 0 ? void 0 : ndcObject.uuid
+        applicationNo: ndcObject === null || ndcObject === void 0 ? void 0 : ndcObject.applicationNo
       };
       const Documents = removeDuplicatesByUUID((ndcObject === null || ndcObject === void 0 ? void 0 : ndcObject.Documents) || []);
       const NdcDetails = (_removeDuplicatesByUU = removeDuplicatesByUUID((ndcObject === null || ndcObject === void 0 ? void 0 : ndcObject.NdcDetails) || [])) === null || _removeDuplicatesByUU === void 0 ? void 0 : _removeDuplicatesByUU.map(item => {
@@ -1278,6 +1282,7 @@ const ApplicationOverview = () => {
   }, [applicationDetails]);
   function onActionSelect(action) {
     var _displayData$applican;
+    console.log("action====???", action);
     const payload = {
       Licenses: [action]
     };
@@ -1350,11 +1355,8 @@ const ApplicationOverview = () => {
       setSelectedAction(null);
       setShowModal(false);
     } catch (err) {
-      setShowToast({
-        key: "error",
-        message: "Something went wrong"
-      });
-      setError("Something went wrong");
+      setErrorOne("Something went wrong");
+      setShowErrorToastt(true);
     }
   };
   const closeModal = () => {
@@ -1388,7 +1390,7 @@ const ApplicationOverview = () => {
     privacy: Digit.Utils.getPrivacyObject()
   });
   if (isLoading || isDetailsLoading || checkLoading) {
-    return /*#__PURE__*/React.createElement(Loader, null);
+    return /*#__PURE__*/React.createElement(Loader$1, null);
   }
   return /*#__PURE__*/React.createElement("div", {
     className: "employee-main-application-details"
@@ -1530,7 +1532,7 @@ const ApplicationOverview = () => {
     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;
+      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.applicationNo;
       history.push(`/digit-ui/employee/ndc/create/${id}`);
     }
   })), showModal ? /*#__PURE__*/React.createElement(NDCModal, {
@@ -8870,17 +8872,16 @@ 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, _appData$NdcDetails, _appData$additionalDe, _tenantInfo$city;
+  var _application$Applicat, _appData$owners, _appData$NdcDetails, _appData$NdcDetails2, _appData$NdcDetails2$, _appData$NdcDetails3, _appData$NdcDetails3$, _appData$NdcDetails3$2, _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 applicationNumber = (appData === null || appData === void 0 ? void 0 : appData.applicationNo) || "NA";
+  const propertyId = appData === null || appData === void 0 ? void 0 : (_appData$NdcDetails2 = appData.NdcDetails) === null || _appData$NdcDetails2 === void 0 ? void 0 : (_appData$NdcDetails2$ = _appData$NdcDetails2[3]) === null || _appData$NdcDetails2$ === void 0 ? void 0 : _appData$NdcDetails2$.consumerCode;
   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 address = (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$2 = _appData$NdcDetails3$.additionalDetails) === null || _appData$NdcDetails3$2 === void 0 ? void 0 : _appData$NdcDetails3$2.propertyAddress) || (owner === null || owner === void 0 ? void 0 : owner.permanentAddress) || (owner === null || owner === void 0 ? void 0 : owner.correspondenceAddress) || "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")}
 
@@ -8888,9 +8889,7 @@ ${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_APPLICANT_LABEL")}: ${applicantName} ${t("NDC_MSG_FOR_LAND")} ${address} ${t("NDC_MSG_FALLING_CLAUSE_PART1")} ${t("NDC_MSG_FALLING_CLAUSE_PART2")} Municipal Council/ Corporation ${t("NDC_MSG_AFTER_RECOVERY")} ${duesAmount} ${t("NDC_MSG_DUES_LIST")}
 
 ${t("NDC_MSG_DECLARATION_TITLE")}
 ${t("NDC_MSG_DECL_A")}
@@ -8979,7 +8978,7 @@ const CitizenApplicationOverview = () => {
     isLoading,
     data: applicationDetails
   } = Digit.Hooks.ndc.useSearchEmployeeApplication({
-    uuid: id
+    applicationNo: id
   }, tenantId);
   const workflowDetails = Digit.Hooks.useWorkflowDetails({
     tenantId: tenantId,
@@ -9021,7 +9020,7 @@ const CitizenApplicationOverview = () => {
         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,
-        applicationNo: ndcObject === null || ndcObject === void 0 ? void 0 : ndcObject.uuid
+        applicationNo: ndcObject === null || ndcObject === void 0 ? void 0 : ndcObject.applicationNo
       };
       const Documents = removeDuplicatesByUUID((ndcObject === null || ndcObject === void 0 ? void 0 : ndcObject.Documents) || []);
       const NdcDetails = (_removeDuplicatesByUU = removeDuplicatesByUUID((ndcObject === null || ndcObject === void 0 ? void 0 : ndcObject.NdcDetails) || [])) === null || _removeDuplicatesByUU === void 0 ? void 0 : _removeDuplicatesByUU.map(item => {
@@ -9089,7 +9088,7 @@ const CitizenApplicationOverview = () => {
     privacy: Digit.Utils.getPrivacyObject()
   });
   if (isLoading || isDetailsLoading) {
-    return /*#__PURE__*/React.createElement(Loader, null);
+    return /*#__PURE__*/React.createElement(Loader$1, null);
   }
   console.log("applicationDetails", applicationDetails);
   return /*#__PURE__*/React.createElement("div", {
@@ -9109,7 +9108,7 @@ const CitizenApplicationOverview = () => {
     label: t("COMMON_EDIT"),
     onSubmit: () => {
       var _applicationDetails$A9, _applicationDetails$A0;
-      const id = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A9 = applicationDetails.Applications) === null || _applicationDetails$A9 === void 0 ? void 0 : (_applicationDetails$A0 = _applicationDetails$A9[0]) === null || _applicationDetails$A0 === void 0 ? void 0 : _applicationDetails$A0.uuid;
+      const id = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A9 = applicationDetails.Applications) === null || _applicationDetails$A9 === void 0 ? void 0 : (_applicationDetails$A0 = _applicationDetails$A9[0]) === null || _applicationDetails$A0 === void 0 ? void 0 : _applicationDetails$A0.applicationNo;
       history.push(`/digit-ui/citizen/ndc/new-application/${id}`);
     }
   }))), /*#__PURE__*/React.createElement(Card, {
@@ -9322,7 +9321,7 @@ const SearchFormFieldsComponents = ({
         textAlign: "start"
       }
     }, /*#__PURE__*/React.createElement(SearchField, null, /*#__PURE__*/React.createElement("label", null, t("NOC_HOME_SEARCH_RESULTS_APP_NO_LABEL")), /*#__PURE__*/React.createElement(TextInput, {
-      name: "uuid",
+      name: "applicationNo",
       inputRef: registerRef({})
     })), /*#__PURE__*/React.createElement(SearchField, null, /*#__PURE__*/React.createElement("label", null, t("CORE_COMMON_PHONE_NUMBER")), /*#__PURE__*/React.createElement(TextInput, {
       name: "mobileNumber",
@@ -9335,7 +9334,7 @@ const SearchFormFieldsComponents = ({
     }, searchFieldComponents)))));
   }
   return /*#__PURE__*/React.createElement(Fragment$1, null, /*#__PURE__*/React.createElement(SearchField, null, /*#__PURE__*/React.createElement("label", null, t("NOC_APPLICATION_NUMBER_LABEL")), /*#__PURE__*/React.createElement(TextInput, {
-    name: "uuid",
+    name: "applicationNo",
     inputRef: registerRef({})
   })), /*#__PURE__*/React.createElement(SearchField, null, /*#__PURE__*/React.createElement("label", null, t("NOC_BPA_APPLICATION_NUMBER_LABEL")), /*#__PURE__*/React.createElement(TextInput, {
     name: "sourceRefId",
@@ -9434,6 +9433,7 @@ const useInboxTableConfig = ({
         row
       }) => {
         var _row$original, _row$original2;
+        console.log("row", row);
         return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Link, {
           to: `${parentRoute}/inbox/application-overview/${(_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.applicationId}`
         }, /*#__PURE__*/React.createElement("span", {
@@ -9629,7 +9629,7 @@ const Inbox = ({
   const InboxObjectInSessionStorage = Digit.SessionStorage.get("NDC.INBOX");
   const onSearchFormReset = setSearchFormValue => {
     setSearchFormValue("sourceRefId", null);
-    setSearchFormValue("uuid", null);
+    setSearchFormValue("applicationNo", null);
     setSearchFormValue("mobileNumber", null);
     dispatch({
       action: "mutateSearchForm",
@@ -10066,7 +10066,7 @@ const SearchApplicationMobileView = ({
     ...props
   }), [currentlyActiveMobileModal]);
   if (isLoading) {
-    return /*#__PURE__*/React.createElement(Loader, null);
+    return /*#__PURE__*/React.createElement(Loader$1, null);
   }
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "searchBox"
@@ -10156,7 +10156,7 @@ const SearchApplicationDesktopView = ({
   }, [getValues("offset"), getValues("limit")]);
   const TableComponent = () => {
     if (isLoading) {
-      return /*#__PURE__*/React.createElement(Loader, null);
+      return /*#__PURE__*/React.createElement(Loader$1, null);
     } else {
       var _data$, _data$2;
       return data !== null && data !== void 0 && (_data$ = data[0]) !== null && _data$ !== void 0 && _data$.display ? /*#__PURE__*/React.createElement(Card, {
@@ -10389,7 +10389,7 @@ const PropertyDetailsForm = ({
     label: t(showToast.label),
     onClose: closeToast,
     isDleteBtn: "true"
-  }), isLoading && /*#__PURE__*/React.createElement(Loader, null));
+  }), isLoading && /*#__PURE__*/React.createElement(Loader$1, null));
 };
 
 var b = "function" === typeof Symbol && Symbol.for,
@@ -11609,7 +11609,7 @@ const PropertyDetailsFormUser = ({
     label: t(showToast.label),
     onClose: closeToast,
     isDleteBtn: "true"
-  }), isLoading && /*#__PURE__*/React.createElement(Loader, null));
+  }), isLoading && /*#__PURE__*/React.createElement(Loader$1, null));
 };
 
 const PropertyDetailsStep2 = ({
@@ -11727,7 +11727,7 @@ const NewNDCStepForm = () => {
     isLoading,
     data: applicationDetails
   } = Digit.Hooks.ndc.useSearchEmployeeApplication({
-    uuid: id
+    applicationNo: id
   }, tenantId);
   useEffect(() => {
     console.log("applicationDetails", applicationDetails);
@@ -11769,6 +11769,57 @@ const NewNDCStepForm = () => {
   }));
 };
 
+const Loader = ({
+  page: _page = false
+}) => {
+  const baseStyle = {
+    display: "flex",
+    justifyContent: "center",
+    alignItems: "center"
+  };
+  const pageStyle = {
+    ...baseStyle,
+    position: "fixed",
+    top: 0,
+    left: 0,
+    width: "100vw",
+    height: "100vh",
+    background: "rgba(255,255,255,0.6)",
+    backdropFilter: "blur(4px)",
+    zIndex: 9999
+  };
+  const moduleStyle = {
+    ...baseStyle,
+    minHeight: "100px",
+    width: "100%",
+    position: "relative"
+  };
+  const spinnerStyle = {
+    width: "64px",
+    height: "64px",
+    border: "8px solid #1976d2",
+    borderTop: "8px solid transparent",
+    borderRadius: "50%",
+    animation: "spin 1.2s linear infinite"
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    style: _page ? pageStyle : moduleStyle
+  }, /*#__PURE__*/React.createElement("div", {
+    style: spinnerStyle
+  }), /*#__PURE__*/React.createElement("style", null, `
+          @keyframes spin {
+            0% { transform: rotate(0deg); }
+            100% { transform: rotate(360deg); }
+          }
+        `));
+};
+Loader.propTypes = {
+  page: propTypes.bool
+};
+Loader.defaultProps = {
+  page: false
+};
+
 const NewNDCStepFormOne = ({
   config,
   onGoNext,
@@ -11781,6 +11832,7 @@ const NewNDCStepFormOne = ({
   const user = Digit.UserService.getUser();
   const id = window.location.pathname.split("/").pop();
   const currentStepData = useSelector(state => state.ndc.NDCForm.formData && state.ndc.NDCForm.formData[config.key] ? state.ndc.NDCForm.formData[config.key] : {});
+  const [getLoader, setLoader] = useState(false);
   const checkFormData = useSelector(state => state.ndc.NDCForm.formData || {});
   const checkFormDatass = useSelector(state => state.ndc.NDCForm || {});
   const tenantId = window.localStorage.getItem("CITIZEN.CITY");
@@ -11798,13 +11850,14 @@ const NewNDCStepFormOne = ({
     console.log("checkFormData", checkFormData);
     const isRealId = id && id.startsWith("NDC-");
     console.log("isRealId", isRealId);
-    if (checkFormData !== null && checkFormData !== void 0 && (_checkFormData$apiDat = checkFormData.apiData) !== null && _checkFormData$apiDat !== void 0 && (_checkFormData$apiDat2 = _checkFormData$apiDat.Applications) !== null && _checkFormData$apiDat2 !== void 0 && (_checkFormData$apiDat3 = _checkFormData$apiDat2[0]) !== null && _checkFormData$apiDat3 !== void 0 && _checkFormData$apiDat3.uuid || checkFormData !== null && checkFormData !== void 0 && (_checkFormData$respon = checkFormData.responseData) !== null && _checkFormData$respon !== void 0 && (_checkFormData$respon2 = _checkFormData$respon[0]) !== null && _checkFormData$respon2 !== void 0 && _checkFormData$respon2.uuid || isRealId) {
+    if (checkFormData !== null && checkFormData !== void 0 && (_checkFormData$apiDat = checkFormData.apiData) !== null && _checkFormData$apiDat !== void 0 && (_checkFormData$apiDat2 = _checkFormData$apiDat.Applications) !== null && _checkFormData$apiDat2 !== void 0 && (_checkFormData$apiDat3 = _checkFormData$apiDat2[0]) !== null && _checkFormData$apiDat3 !== void 0 && _checkFormData$apiDat3.applicationNo || checkFormData !== null && checkFormData !== void 0 && (_checkFormData$respon = checkFormData.responseData) !== null && _checkFormData$respon !== void 0 && (_checkFormData$respon2 = _checkFormData$respon[0]) !== null && _checkFormData$respon2 !== void 0 && _checkFormData$respon2.applicationNo || isRealId) {
       updateApplication(data);
       console.log("here bab");
     } else createApplication(data);
   }
   const createApplication = async data => {
-    var _Digit$UserService$ge, _user$info, _user$info2, _data$PropertyDetails, _user$info3, _user$info4, _data$PropertyDetails2, _data$PropertyDetails4, _data$PropertyDetails6, _data$PropertyDetails7, _data$NDCReason, _response$ResponseInf;
+    var _Digit$UserService$ge, _user$info, _user$info2, _data$PropertyDetails, _user$info3, _user$info4, _data$PropertyDetails2, _data$PropertyDetails4, _data$PropertyDetails6, _data$PropertyDetails7, _data$NDCReason;
+    setLoader(true);
     const applicant = ((_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.info) || {};
     const applicantId = applicant === null || applicant === void 0 ? void 0 : applicant.uuid;
     const owners = [{
@@ -11874,22 +11927,28 @@ const NewNDCStepFormOne = ({
         }
       }]
     };
-    const response = await Digit.NDCService.NDCcreate({
-      tenantId,
-      details: payload
-    });
-    if ((response === null || response === void 0 ? void 0 : (_response$ResponseInf = response.ResponseInfo) === null || _response$ResponseInf === void 0 ? void 0 : _response$ResponseInf.status) === "successful") {
-      dispatch(updateNDCForm("apiData", response));
-      onGoNext();
-      return {
-        isSuccess: true,
-        response
-      };
-    } else {
-      return {
-        isSuccess: false,
-        response
-      };
+    try {
+      var _response$ResponseInf;
+      const response = await Digit.NDCService.NDCcreate({
+        tenantId,
+        details: payload
+      });
+      setLoader(false);
+      if ((response === null || response === void 0 ? void 0 : (_response$ResponseInf = response.ResponseInfo) === null || _response$ResponseInf === void 0 ? void 0 : _response$ResponseInf.status) === "successful") {
+        dispatch(updateNDCForm("apiData", response));
+        onGoNext();
+        return {
+          isSuccess: true,
+          response
+        };
+      } else {
+        return {
+          isSuccess: false,
+          response
+        };
+      }
+    } catch (error) {
+      setLoader(false);
     }
   };
   const updateApplication = async data => {
@@ -12069,6 +12128,8 @@ const NewNDCStepFormOne = ({
     label: t(`${config.texts.submitBarLabel}`),
     currentStep: config.currStepNumber,
     onBackClick: onGoBack
+  }), getLoader && /*#__PURE__*/React.createElement(Loader, {
+    page: true
   }), showToast && /*#__PURE__*/React.createElement(Toast, {
     isDleteBtn: true,
     error: true,
@@ -12141,7 +12202,7 @@ function SelectNDCReason({
     }
   }, [apiDataCheck, ndcReasonOptions]);
   if (isLoading) {
-    return /*#__PURE__*/React.createElement(Loader, null);
+    return /*#__PURE__*/React.createElement(Loader$1, null);
   }
   const errorStyle = {
     width: "70%",
@@ -12593,7 +12654,7 @@ const PropertyDetailsForm$1 = ({
     }
   }, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller ndc_card_labels"
-  }, `${t("NDC_WATER_CONNECTION")}`), waterConnectionLoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement("div", {
+  }, `${t("NDC_WATER_CONNECTION")}`), waterConnectionLoading ? /*#__PURE__*/React.createElement(Loader$1, null) : /*#__PURE__*/React.createElement("div", {
     className: "field",
     style: {
       display: "flex",
@@ -12637,7 +12698,7 @@ const PropertyDetailsForm$1 = ({
         disabled: !item.isEdit,
         onBlur: props.onBlur
       })
-    }), item.isLoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement("div", {
+    }), item.isLoading ? /*#__PURE__*/React.createElement(Loader$1, null) : /*#__PURE__*/React.createElement("div", {
       style: {
         display: "flex",
         alignItems: "center",
@@ -12701,7 +12762,7 @@ const PropertyDetailsForm$1 = ({
     }
   }, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller ndc_card_labels"
-  }, `${t("NDC_SEWERAGE_CONNECTION")} `), sewerageConnectionLoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement("div", {
+  }, `${t("NDC_SEWERAGE_CONNECTION")} `), sewerageConnectionLoading ? /*#__PURE__*/React.createElement(Loader$1, null) : /*#__PURE__*/React.createElement("div", {
     className: "field",
     style: {
       display: "flex",
@@ -12745,7 +12806,7 @@ const PropertyDetailsForm$1 = ({
         disabled: !item.isEdit,
         onBlur: field.onBlur
       })
-    }), item.isLoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement("div", {
+    }), item.isLoading ? /*#__PURE__*/React.createElement(Loader$1, null) : /*#__PURE__*/React.createElement("div", {
       style: {
         display: "flex",
         alignItems: "center",
@@ -12968,6 +13029,7 @@ const PropertySearchNSummary = ({
   const search = useLocation().search;
   const urlPropertyId = new URLSearchParams(search).get("propertyId");
   const isfirstRender = useRef(true);
+  const [getLoader, setLoader] = useState(false);
   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");
   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) || "");
@@ -13155,6 +13217,7 @@ const PropertySearchNSummary = ({
     });
   }
   async function fetchBill() {
+    setLoader(true);
     try {
       var _formData$cpt0, _result$Bill;
       const result = await Digit.PaymentService.fetchBill(tenantId, {
@@ -13205,7 +13268,9 @@ const PropertySearchNSummary = ({
         setNoDue(true);
         setCheckStats(false);
       }
+      setLoader(false);
     } catch (error) {
+      setLoader(false);
       setShowToast({
         error: true,
         label: t("NDC_MESSAGE_FETCH_FAILED")
@@ -13227,7 +13292,7 @@ const PropertySearchNSummary = ({
       return () => clearTimeout(timer);
     }
   }, [showToast]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, isLoading && /*#__PURE__*/React.createElement(Loader, null), /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: "16px"
     }
@@ -13307,7 +13372,9 @@ const PropertySearchNSummary = ({
     onClose: () => {
       setShowToast(null);
     }
-  })));
+  })), (isLoading || getLoader) && /*#__PURE__*/React.createElement(Loader, {
+    page: true
+  }));
 };
 
 const SelectNDCDocuments = ({
@@ -13357,7 +13424,7 @@ const SelectNDCDocuments = ({
     goNext();
   }, [documents]);
   if (isLoading) {
-    return /*#__PURE__*/React.createElement(Loader, null);
+    return /*#__PURE__*/React.createElement(Loader$1, null);
   }
   return /*#__PURE__*/React.createElement("div", null, ndcDocuments === null || ndcDocuments === void 0 ? void 0 : ndcDocuments.map((document, index) => {
     return /*#__PURE__*/React.createElement(SelectDocument, {
@@ -13498,7 +13565,7 @@ const NewNDCStepFormTwo = ({
     data: applicationDetails,
     refetch
   } = Digit.Hooks.ndc.useSearchEmployeeApplication({
-    uuid: id
+    applicationNo: id
   }, tenantId);
   useEffect(() => {
     if (applicationDetails !== null && applicationDetails !== void 0 && applicationDetails.Applications.length) {
@@ -13623,7 +13690,7 @@ const NDCSummary = ({
   goNext,
   onGoBack
 }) => {
-  var _formData$DocummentDe, _formData$DocummentDe2, _formData$apiData, _formData$apiData$App, _formData$apiData$App2, _formData$responseDat, _formData$responseDat2, _user$info, _user$info$roles, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _formData$NDCDetails, _formData$NDCDetails$, _formData$NDCDetails2, _formData$NDCDetails3, _formData$NDCDetails4, _formData$NDCDetails5, _formData$NDCDetails6, _formData$NDCDetails7, _formData$NDCDetails8, _formData$NDCDetails9, _formData$NDCDetails0, _formData$NDCDetails1, _formData$NDCDetails10, _formData$NDCDetails11, _formData$NDCDetails12, _formData$NDCDetails13, _formData$NDCDetails14, _formData$NDCDetails15, _formData$NDCDetails16, _formData$NDCDetails17, _formData$NDCDetails18, _formData$NDCDetails19, _formData$NDCDetails20, _formData$NDCDetails21, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9;
+  var _formData$DocummentDe, _formData$DocummentDe2, _formData$apiData, _formData$apiData$App, _formData$apiData$App2, _formData$responseDat, _formData$responseDat2, _user$info, _user$info$roles, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _formData$NDCDetails, _formData$NDCDetails$, _formData$NDCDetails2, _formData$NDCDetails3, _formData$NDCDetails4, _formData$NDCDetails5, _formData$NDCDetails6, _formData$NDCDetails7, _formData$NDCDetails8, _formData$NDCDetails9, _formData$NDCDetails0, _formData$NDCDetails1, _formData$NDCDetails10, _formData$NDCDetails11, _formData$NDCDetails12, _formData$NDCDetails13, _formData$NDCDetails14, _formData$NDCDetails15, _formData$NDCDetails16, _formData$NDCDetails17, _formData$NDCDetails18, _formData$NDCDetails19, _formData$NDCDetails20, _formData$NDCDetails21, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8;
   const {
     pathname: url
   } = useLocation();
@@ -13635,9 +13702,8 @@ const NDCSummary = ({
   const dispatch = useDispatch();
   const mutateScreen = url.includes("/property-mutate/");
   let user = Digit.UserService.getUser();
-  console.log("formData", formData);
   let docs = formData === null || formData === void 0 ? void 0 : (_formData$DocummentDe = formData.DocummentDetails) === null || _formData$DocummentDe === void 0 ? void 0 : (_formData$DocummentDe2 = _formData$DocummentDe.documents) === null || _formData$DocummentDe2 === void 0 ? void 0 : _formData$DocummentDe2.documents;
-  const appId = (formData === null || formData === void 0 ? void 0 : (_formData$apiData = formData.apiData) === null || _formData$apiData === void 0 ? void 0 : (_formData$apiData$App = _formData$apiData.Applications) === null || _formData$apiData$App === void 0 ? void 0 : (_formData$apiData$App2 = _formData$apiData$App[0]) === null || _formData$apiData$App2 === void 0 ? void 0 : _formData$apiData$App2.uuid) || (formData === null || formData === void 0 ? void 0 : (_formData$responseDat = formData.responseData) === null || _formData$responseDat === void 0 ? void 0 : (_formData$responseDat2 = _formData$responseDat[0]) === null || _formData$responseDat2 === void 0 ? void 0 : _formData$responseDat2.uuid);
+  const appId = (formData === null || formData === void 0 ? void 0 : (_formData$apiData = formData.apiData) === null || _formData$apiData === void 0 ? void 0 : (_formData$apiData$App = _formData$apiData.Applications) === null || _formData$apiData$App === void 0 ? void 0 : (_formData$apiData$App2 = _formData$apiData$App[0]) === null || _formData$apiData$App2 === void 0 ? void 0 : _formData$apiData$App2.applicationNo) || (formData === null || formData === void 0 ? void 0 : (_formData$responseDat = formData.responseData) === null || _formData$responseDat === void 0 ? void 0 : (_formData$responseDat2 = _formData$responseDat[0]) === null || _formData$responseDat2 === void 0 ? void 0 : _formData$responseDat2.applicationNo);
   const tenantId = window.location.href.includes("citizen") ? window.localStorage.getItem("CITIZEN.CITY") : window.localStorage.getItem("Employee.tenant-id");
   const isCitizen = window.location.href.includes("citizen");
   const [getData, setData] = useState();
@@ -13647,7 +13713,7 @@ const NDCSummary = ({
   };
   Digit.Hooks.useClickOutside(menuRef, closeMenu, displayMenu);
   const fetchCalculations = async () => {
-    var _response$Calculation, _response$Calculation2, _response$Calculation3;
+    var _response$Calculation;
     const payload = {
       CalculationCriteria: [{
         applicationNumber: appId,
@@ -13661,8 +13727,7 @@ const NDCSummary = ({
       },
       details: payload
     });
-    console.log("response", response === null || response === void 0 ? void 0 : (_response$Calculation = response.Calculation) === null || _response$Calculation === void 0 ? void 0 : (_response$Calculation2 = _response$Calculation[0]) === null || _response$Calculation2 === void 0 ? void 0 : _response$Calculation2.totalAmount);
-    setData(response === null || response === void 0 ? void 0 : (_response$Calculation3 = response.Calculation) === null || _response$Calculation3 === void 0 ? void 0 : _response$Calculation3[0]);
+    setData(response === null || response === void 0 ? void 0 : (_response$Calculation = response.Calculation) === null || _response$Calculation === void 0 ? void 0 : _response$Calculation[0]);
   };
   useEffect(() => {
     fetchCalculations();
@@ -13687,8 +13752,6 @@ const NDCSummary = ({
   function onActionSelect(action) {
     goNext(action);
   }
-  console.log("workflowDetails", workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data6 = workflowDetails.data) === null || _workflowDetails$data6 === void 0 ? void 0 : _workflowDetails$data6.nextActions);
-  console.log("actions", actions);
   const pageStyle = {
     padding: "2rem",
     backgroundColor: "#f9f9f9",
@@ -13760,15 +13823,23 @@ const NDCSummary = ({
     style: sectionStyle
   }, (docs === null || docs === void 0 ? void 0 : docs.length) > 0 ? /*#__PURE__*/React.createElement("div", {
     style: documentsContainerStyle
-  }, docs === null || docs === void 0 ? void 0 : docs.map((doc, index) => /*#__PURE__*/React.createElement("div", {
-    key: index,
-    style: documentCardStyle
-  }, /*#__PURE__*/React.createElement(NDCDocument$1, {
-    value: docs,
-    Code: doc === null || doc === void 0 ? void 0 : doc.documentType,
-    index: index,
-    formData: formData
-  })))) : /*#__PURE__*/React.createElement("div", null, t("TL_NO_DOCUMENTS_MSG"))), /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar$1, {
+  }, docs === null || docs === void 0 ? void 0 : docs.map((doc, index) => {
+    var _doc$documentType;
+    return /*#__PURE__*/React.createElement("div", {
+      key: index,
+      style: documentCardStyle
+    }, /*#__PURE__*/React.createElement(NDCDocument$1, {
+      value: docs,
+      Code: doc === null || doc === void 0 ? void 0 : doc.documentType,
+      index: index,
+      formData: formData
+    }), /*#__PURE__*/React.createElement(CardSectionHeader, {
+      style: {
+        marginTop: "10px",
+        fontSize: "15px"
+      }
+    }, t(`NDC_${doc === null || doc === void 0 ? void 0 : (_doc$documentType = doc.documentType) === null || _doc$documentType === void 0 ? void 0 : _doc$documentType.replace(/\./g, "_")}_LABEL`)));
+  })) : /*#__PURE__*/React.createElement("div", null, t("TL_NO_DOCUMENTS_MSG"))), /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar$1, {
     style: {
       background: " white",
       color: "black",
@@ -13777,7 +13848,7 @@ const NDCSummary = ({
     },
     label: "Back",
     onSubmit: onGoBack
-  }), displayMenu && (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data7 = workflowDetails.data) !== null && _workflowDetails$data7 !== void 0 && (_workflowDetails$data8 = _workflowDetails$data7.actionState) !== null && _workflowDetails$data8 !== void 0 && _workflowDetails$data8.nextActions || workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data9 = workflowDetails.data) !== null && _workflowDetails$data9 !== void 0 && _workflowDetails$data9.nextActions) ? /*#__PURE__*/React.createElement(Menu, {
+  }), displayMenu && (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data6 = workflowDetails.data) !== null && _workflowDetails$data6 !== void 0 && (_workflowDetails$data7 = _workflowDetails$data6.actionState) !== null && _workflowDetails$data7 !== void 0 && _workflowDetails$data7.nextActions || workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data8 = workflowDetails.data) !== null && _workflowDetails$data8 !== void 0 && _workflowDetails$data8.nextActions) ? /*#__PURE__*/React.createElement(Menu, {
     localeKeyPrefix: `WF_EMPLOYEE_${"NDC"}`,
     options: actions,
     optionKey: "action",
@@ -13807,7 +13878,7 @@ const NDCNewFormSummaryStepThreeCitizen = ({
       const res = await onSubmit(formData, actionStatus);
       if (res !== null && res !== void 0 && res.isSuccess) {
         var _res$response, _res$response$Applica, _res$response$Applica2;
-        history.push("/digit-ui/citizen/ndc/response/" + (res === null || res === void 0 ? void 0 : (_res$response = res.response) === null || _res$response === void 0 ? void 0 : (_res$response$Applica = _res$response.Applications) === null || _res$response$Applica === void 0 ? void 0 : (_res$response$Applica2 = _res$response$Applica[0]) === null || _res$response$Applica2 === void 0 ? void 0 : _res$response$Applica2.uuid));
+        history.push("/digit-ui/citizen/ndc/response/" + (res === null || res === void 0 ? void 0 : (_res$response = res.response) === null || _res$response === void 0 ? void 0 : (_res$response$Applica = _res$response.Applications) === null || _res$response$Applica === void 0 ? void 0 : (_res$response$Applica2 = _res$response$Applica[0]) === null || _res$response$Applica2 === void 0 ? void 0 : _res$response$Applica2.applicationNo));
       } else {
         console.error("Submission failed, not moving to next step.", res === null || res === void 0 ? void 0 : res.response);
       }
@@ -13841,7 +13912,7 @@ const NDCNewFormSummaryStepThreeCitizen = ({
       updatedApplication.Documents.push({
         uuid: doc === null || doc === void 0 ? void 0 : doc.documentUid,
         documentType: doc === null || doc === void 0 ? void 0 : doc.documentType,
-        documentAttachment: doc === null || doc === void 0 ? void 0 : doc.fileStoreId
+        documentAttachment: doc === null || doc === void 0 ? void 0 : doc.filestoreId
       });
     });
     const payload = {
@@ -13854,7 +13925,7 @@ const NDCNewFormSummaryStepThreeCitizen = ({
     const finalPayload = mapToNDCPayload(data, actionStatus);
     const response = await Digit.NDCService.NDCUpdate({
       tenantId,
-      details: finalPayload
+      finalPayload
     });
     dispatch(resetNDCForm());
     if ((response === null || response === void 0 ? void 0 : (_response$ResponseInf = response.ResponseInfo) === null || _response$ResponseInf === void 0 ? void 0 : _response$ResponseInf.status) === "successful") {
@@ -14024,7 +14095,7 @@ const PayWSBillModal = ({
       width: "90%",
       marginTop: "5px"
     }
-  }, isLoading ? /*#__PURE__*/React.createElement(Loader, null) : isError ? /*#__PURE__*/React.createElement("p", {
+  }, isLoading ? /*#__PURE__*/React.createElement(Loader$1, null) : isError ? /*#__PURE__*/React.createElement("p", {
     style: {
       color: "red",
       padding: "1rem"
@@ -14170,7 +14241,7 @@ const NewNDCStepForm$1 = () => {
     isLoading,
     data: applicationDetails
   } = Digit.Hooks.ndc.useSearchEmployeeApplication({
-    uuid: id
+    applicationNo: id
   }, tenantId);
   useEffect(() => {
     if (applicationDetails !== null && applicationDetails !== void 0 && applicationDetails.Applications.length) {
@@ -14235,7 +14306,7 @@ const NewNDCStepFormOne$1 = ({
       }, 3000);
       return;
     }
-    if (checkFormData !== null && checkFormData !== void 0 && (_checkFormData$apiDat = checkFormData.apiData) !== null && _checkFormData$apiDat !== void 0 && (_checkFormData$apiDat2 = _checkFormData$apiDat.Applications) !== null && _checkFormData$apiDat2 !== void 0 && (_checkFormData$apiDat3 = _checkFormData$apiDat2[0]) !== null && _checkFormData$apiDat3 !== void 0 && _checkFormData$apiDat3.uuid || checkFormData !== null && checkFormData !== void 0 && (_checkFormData$respon = checkFormData.responseData) !== null && _checkFormData$respon !== void 0 && (_checkFormData$respon2 = _checkFormData$respon[0]) !== null && _checkFormData$respon2 !== void 0 && _checkFormData$respon2.uuid) {
+    if (checkFormData !== null && checkFormData !== void 0 && (_checkFormData$apiDat = checkFormData.apiData) !== null && _checkFormData$apiDat !== void 0 && (_checkFormData$apiDat2 = _checkFormData$apiDat.Applications) !== null && _checkFormData$apiDat2 !== void 0 && (_checkFormData$apiDat3 = _checkFormData$apiDat2[0]) !== null && _checkFormData$apiDat3 !== void 0 && _checkFormData$apiDat3.applicationNo || checkFormData !== null && checkFormData !== void 0 && (_checkFormData$respon = checkFormData.responseData) !== null && _checkFormData$respon !== void 0 && (_checkFormData$respon2 = _checkFormData$respon[0]) !== null && _checkFormData$respon2 !== void 0 && _checkFormData$respon2.applicationNo) {
       onGoNext();
     } else createApplication(data);
     onGoNext();
@@ -14510,7 +14581,7 @@ const NDCNewFormSummaryStepThreeEmployee = ({
       const res = await onSubmit(formData, actionStatus);
       if (res !== null && res !== void 0 && res.isSuccess) {
         var _res$response, _res$response$Applica, _res$response$Applica2;
-        history.push("/digit-ui/employee/ndc/response/" + (res === null || res === void 0 ? void 0 : (_res$response = res.response) === null || _res$response === void 0 ? void 0 : (_res$response$Applica = _res$response.Applications) === null || _res$response$Applica === void 0 ? void 0 : (_res$response$Applica2 = _res$response$Applica[0]) === null || _res$response$Applica2 === void 0 ? void 0 : _res$response$Applica2.uuid));
+        history.push("/digit-ui/employee/ndc/response/" + (res === null || res === void 0 ? void 0 : (_res$response = res.response) === null || _res$response === void 0 ? void 0 : (_res$response$Applica = _res$response.Applications) === null || _res$response$Applica === void 0 ? void 0 : (_res$response$Applica2 = _res$response$Applica[0]) === null || _res$response$Applica2 === void 0 ? void 0 : _res$response$Applica2.applicationNo));
       } else {
         console.error("Submission failed, not moving to next step.", res === null || res === void 0 ? void 0 : res.response);
       }
@@ -14587,43 +14658,42 @@ const NDCNewFormSummaryStepThreeEmployee = ({
 const MyApplications = ({
   view
 }) => {
-  var _Digit$UserService$ge, _data$data;
+  var _Digit$UserService$ge;
   const {
     t
   } = useTranslation();
-  const history = useHistory();
   const userInfo = ((_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.info) || {};
   const tenantId = window.localStorage.getItem("CITIZEN.CITY");
-  console.log("userInfo========", userInfo);
+  const itemsPerPage = 5;
   const {
     isLoading,
-    data,
-    isError,
-    error
+    data
   } = Digit.Hooks.ndc.useSearchApplication({
     mobileNumber: userInfo.mobileNumber
   }, tenantId);
-  console.log("data", data);
+  const [currentPage, setCurrentPage] = useState(1);
   if (isLoading) {
-    return /*#__PURE__*/React.createElement(Loader, null);
-  }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Header, null, `${t("TL_MY_APPLICATIONS_HEADER")}`), data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.map((application, index) => {
+    return /*#__PURE__*/React.createElement(Loader$1, null);
+  }
+  const applicationsList = (data === null || data === void 0 ? void 0 : data.data) || [];
+  const totalPages = Math.ceil(applicationsList.length / itemsPerPage);
+  const indexOfLastItem = currentPage * itemsPerPage;
+  const indexOfFirstItem = indexOfLastItem - itemsPerPage;
+  const currentApplications = applicationsList.slice(indexOfFirstItem, indexOfLastItem);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Header, null, t("TL_MY_APPLICATIONS_HEADER")), currentApplications.map((application, index) => {
     var _application$Applicat, _application$Applicat2, _application$Applicat3, _application$Applicat4;
     const filteredApplication = Object.fromEntries(Object.entries(application).filter(([key]) => key !== "Applications"));
-    console.log("application?.Applications?.applicationStatus", filteredApplication);
     return /*#__PURE__*/React.createElement("div", {
       key: `card-${index}`
     }, /*#__PURE__*/React.createElement(Card, null, Object.keys(filteredApplication).filter(key => filteredApplication[key] !== null).map(item => /*#__PURE__*/React.createElement(KeyNote, {
       keyValue: t(item),
       note: t(filteredApplication[item])
-    })), (application === null || application === void 0 ? void 0 : (_application$Applicat = application.Applications) === null || _application$Applicat === void 0 ? void 0 : _application$Applicat.applicationStatus) != "PENDINGPAYMENT" && /*#__PURE__*/React.createElement(Link, {
-      to: `/digit-ui/citizen/ndc/search/application-overview/${application === null || application === void 0 ? void 0 : (_application$Applicat2 = application.Applications) === null || _application$Applicat2 === void 0 ? void 0 : _application$Applicat2.uuid}`
+    })), (application === null || application === void 0 ? void 0 : (_application$Applicat = application.Applications) === null || _application$Applicat === void 0 ? void 0 : _application$Applicat.applicationStatus) !== "PENDINGPAYMENT" && /*#__PURE__*/React.createElement(Link, {
+      to: `/digit-ui/citizen/ndc/search/application-overview/${application === null || application === void 0 ? void 0 : (_application$Applicat2 = application.Applications) === null || _application$Applicat2 === void 0 ? void 0 : _application$Applicat2.applicationNo}`
     }, /*#__PURE__*/React.createElement(SubmitBar$1, {
       label: t("CS_VIEW_DETAILS")
     })), (application === null || application === void 0 ? void 0 : (_application$Applicat3 = application.Applications) === null || _application$Applicat3 === void 0 ? void 0 : _application$Applicat3.applicationStatus) === "PENDINGPAYMENT" && /*#__PURE__*/React.createElement(Link, {
-      to: {
-        pathname: `/digit-ui/citizen/payment/collect/NDC/${application === null || application === void 0 ? void 0 : (_application$Applicat4 = application.Applications) === null || _application$Applicat4 === void 0 ? void 0 : _application$Applicat4.uuid}/${tenantId}?tenantId=${tenantId}`
-      }
+      to: `/digit-ui/citizen/payment/collect/NDC/${application === null || application === void 0 ? void 0 : (_application$Applicat4 = application.Applications) === null || _application$Applicat4 === void 0 ? void 0 : _application$Applicat4.applicationNo}/${tenantId}?tenantId=${tenantId}`
     }, /*#__PURE__*/React.createElement("div", {
       style: {
         marginTop: "10px"
@@ -14631,7 +14701,44 @@ const MyApplications = ({
     }, /*#__PURE__*/React.createElement(SubmitBar$1, {
       label: t("CS_APPLICATION_DETAILS_MAKE_PAYMENT")
     })))));
-  }));
+  }), !applicationsList.length && /*#__PURE__*/React.createElement("p", {
+    style: {
+      marginLeft: "16px",
+      marginTop: "16px"
+    }
+  }, t("PTR_NO_APPLICATION_FOUND_MSG")), applicationsList.length > itemsPerPage && /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "center",
+      gap: "16px",
+      marginTop: "20px"
+    }
+  }, /*#__PURE__*/React.createElement("button", {
+    disabled: currentPage === 1,
+    onClick: () => setCurrentPage(prev => prev - 1),
+    style: {
+      cursor: currentPage === 1 ? "not-allowed" : "pointer"
+    }
+  }, "\u2190 Prev"), /*#__PURE__*/React.createElement("span", null, "Page ", currentPage, " of ", totalPages), /*#__PURE__*/React.createElement("button", {
+    disabled: currentPage === totalPages,
+    onClick: () => setCurrentPage(prev => prev + 1),
+    style: {
+      cursor: currentPage === totalPages ? "not-allowed" : "pointer"
+    }
+  }, "Next \u2192")), /*#__PURE__*/React.createElement("p", {
+    style: {
+      marginLeft: "16px",
+      marginTop: "16px"
+    }
+  }, t("PTR_TEXT_NOT_ABLE_TO_FIND_THE_APPLICATION"), " ", /*#__PURE__*/React.createElement("span", {
+    className: "link",
+    style: {
+      display: "block"
+    }
+  }, /*#__PURE__*/React.createElement(Link, {
+    to: "/digit-ui/citizen/ndc/new-application"
+  }, t("NDC_COMMON_CLICK_HERE_TO_REGISTER_NEW_APPLICATION")))));
 };
 
 const NDCResponseCitizen = props => {
@@ -14739,7 +14846,7 @@ const NDCModule = ({
   });
   Digit.SessionStorage.set("NOC_TENANTS", tenants);
   if (isLoading) {
-    return /*#__PURE__*/React.createElement(Loader, null);
+    return /*#__PURE__*/React.createElement(Loader$1, null);
   }
   if (userType === "citizen") {
     return /*#__PURE__*/React.createElement(App, null);