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

package/dist/index.js

@@ -1000,7 +1000,7 @@ const CloseBtn = props => {
   }, /*#__PURE__*/React__default.createElement(Close, null));
 };
 const NDCModal = _ref => {
-  var _action$assigneeRoles, _action$assigneeRoles2;
+  var _action$state;
   let {
     t,
     action,
@@ -1031,12 +1031,14 @@ const NDCModal = _ref => {
   const [error, setError] = React.useState(null);
   const [financialYears, setFinancialYears] = React.useState([]);
   const [selectedFinancialYear, setSelectedFinancialYear] = React.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
   }, {
@@ -1272,7 +1274,7 @@ const ApplicationOverview = () => {
     isLoading,
     data: applicationDetails
   } = Digit.Hooks.ndc.useSearchEmployeeApplication({
-    uuid: id
+    applicationNo: id
   }, tenantId);
   const workflowDetails = Digit.Hooks.useWorkflowDetails({
     tenantId: tenantId,
@@ -1280,6 +1282,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;
@@ -1330,6 +1333,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] = React.useState(false);
   const [selectedAction, setSelectedAction] = React.useState(null);
   const [showModal, setShowModal] = React.useState(false);
@@ -1364,7 +1368,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 => {
@@ -1393,6 +1397,7 @@ const ApplicationOverview = () => {
   }, [applicationDetails]);
   function onActionSelect(action) {
     var _displayData$applican;
+    console.log("action====???", action);
     const payload = {
       Licenses: [action]
     };
@@ -1466,11 +1471,8 @@ const ApplicationOverview = () => {
           setShowModal(false);
         });
       }, function () {
-        setShowToast({
-          key: "error",
-          message: "Something went wrong"
-        });
-        setError("Something went wrong");
+        setErrorOne("Something went wrong");
+        setShowErrorToastt(true);
       });
       return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
     } catch (e) {
@@ -1652,7 +1654,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__default.createElement(NDCModal, {
@@ -8993,19 +8995,19 @@ const capitalize = text => text.substr(0, 1).toUpperCase() + text.substr(1);
 const ulbCamel = ulb => ulb.toLowerCase().split(" ").map(capitalize).join(" ");
 const getAcknowledgementData = function (application, tenantInfo, t) {
   try {
-    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 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 ulbName = (tenantInfo === null || tenantInfo === void 0 ? void 0 : tenantInfo.name) || (appData === null || appData === void 0 ? void 0 : appData.tenantId) || "NA";
     const duesAmount = (add === null || add === void 0 ? void 0 : add.duesAmount) || (appData === null || appData === void 0 ? void 0 : (_appData$additionalDe = appData.additionalDetails) === null || _appData$additionalDe === void 0 ? void 0 : _appData$additionalDe.duesAmount) || "0";
-    const certificateBody = t("NDC_MSG_INTRO") + "\n\n" + t("NDC_MSG_APPLICATION_LABEL") + ": " + applicationNumber + "\n\n" + t("NDC_MSG_PROPERTY_LABEL") + ": " + propertyId + "  " + t("NDC_MSG_PROPERTY_TYPE_LABEL") + " " + propertyType + "\n\n" + t("NDC_MSG_APPLICANT_LABEL") + ": " + applicantName + " " + t("NDC_MSG_FOR_LAND") + " " + address + "\n\n" + t("NDC_MSG_FALLING_CLAUSE_PART1") + " " + t("NDC_MSG_FALLING_CLAUSE_PART2") + " " + ulbName + " " + t("NDC_MSG_AFTER_RECOVERY") + " " + duesAmount + " " + t("NDC_MSG_DUES_LIST") + "\n\n" + t("NDC_MSG_DECLARATION_TITLE") + "\n" + t("NDC_MSG_DECL_A") + "\n" + t("NDC_MSG_DECL_B") + "\n" + t("NDC_MSG_DECL_C") + "\n" + t("NDC_MSG_DECL_D") + "\n" + t("NDC_MSG_DECL_E") + "\n\n" + t("NDC_MSG_DISCLAIMER_TITLE") + "\n" + t("NDC_MSG_DISCLAIMER_BODY") + "\n\n" + t("NDC_MSG_NOTE") + " " + t("NDC_MSG_VERIFICATION_LINK_LABEL");
+    const certificateBody = t("NDC_MSG_INTRO") + "\n\n" + t("NDC_MSG_APPLICATION_LABEL") + ": " + applicationNumber + "\n\n" + t("NDC_MSG_PROPERTY_LABEL") + ": " + propertyId + "  " + t("NDC_MSG_PROPERTY_TYPE_LABEL") + " " + propertyType + "\n\n" + 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") + "\n\n" + t("NDC_MSG_DECLARATION_TITLE") + "\n" + t("NDC_MSG_DECL_A") + "\n" + t("NDC_MSG_DECL_B") + "\n" + t("NDC_MSG_DECL_C") + "\n" + t("NDC_MSG_DECL_D") + "\n" + t("NDC_MSG_DECL_E") + "\n\n" + t("NDC_MSG_DISCLAIMER_TITLE") + "\n" + t("NDC_MSG_DISCLAIMER_BODY") + "\n\n" + t("NDC_MSG_NOTE") + " " + t("NDC_MSG_VERIFICATION_LINK_LABEL");
     return Promise.resolve({
       t,
       tenantId: tenantInfo === null || tenantInfo === void 0 ? void 0 : tenantInfo.code,
@@ -9085,7 +9087,7 @@ const CitizenApplicationOverview = () => {
     isLoading,
     data: applicationDetails
   } = Digit.Hooks.ndc.useSearchEmployeeApplication({
-    uuid: id
+    applicationNo: id
   }, tenantId);
   const workflowDetails = Digit.Hooks.useWorkflowDetails({
     tenantId: tenantId,
@@ -9127,7 +9129,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 => {
@@ -9219,7 +9221,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__default.createElement(digitUiReactComponents.Card, {
@@ -9424,7 +9426,7 @@ const SearchFormFieldsComponents = _ref => {
         textAlign: "start"
       }
     }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SearchField, null, /*#__PURE__*/React__default.createElement("label", null, t("NOC_HOME_SEARCH_RESULTS_APP_NO_LABEL")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
-      name: "uuid",
+      name: "applicationNo",
       inputRef: registerRef({})
     })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.SearchField, null, /*#__PURE__*/React__default.createElement("label", null, t("CORE_COMMON_PHONE_NUMBER")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
       name: "mobileNumber",
@@ -9437,7 +9439,7 @@ const SearchFormFieldsComponents = _ref => {
     }, searchFieldComponents)))));
   }
   return /*#__PURE__*/React__default.createElement(React.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SearchField, null, /*#__PURE__*/React__default.createElement("label", null, t("NOC_APPLICATION_NUMBER_LABEL")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
-    name: "uuid",
+    name: "applicationNo",
     inputRef: registerRef({})
   })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.SearchField, null, /*#__PURE__*/React__default.createElement("label", null, t("NOC_BPA_APPLICATION_NUMBER_LABEL")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
     name: "sourceRefId",
@@ -9539,6 +9541,7 @@ const useInboxTableConfig = _ref => {
         let {
           row
         } = _ref2;
+        console.log("row", row);
         return /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
           to: parentRoute + "/inbox/application-overview/" + ((_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.applicationId)
         }, /*#__PURE__*/React__default.createElement("span", {
@@ -9731,7 +9734,7 @@ const Inbox = _ref => {
   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",
@@ -11842,7 +11845,7 @@ const NewNDCStepForm = () => {
     isLoading,
     data: applicationDetails
   } = Digit.Hooks.ndc.useSearchEmployeeApplication({
-    uuid: id
+    applicationNo: id
   }, tenantId);
   React.useEffect(() => {
     console.log("applicationDetails", applicationDetails);
@@ -11884,6 +11887,51 @@ const NewNDCStepForm = () => {
   }));
 };
 
+const Loader = _ref => {
+  let {
+    page = false
+  } = _ref;
+  const baseStyle = {
+    display: "flex",
+    justifyContent: "center",
+    alignItems: "center"
+  };
+  const pageStyle = _extends({}, 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 = _extends({}, 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__default.createElement("div", {
+    style: page ? pageStyle : moduleStyle
+  }, /*#__PURE__*/React__default.createElement("div", {
+    style: spinnerStyle
+  }), /*#__PURE__*/React__default.createElement("style", null, "\n          @keyframes spin {\n            0% { transform: rotate(0deg); }\n            100% { transform: rotate(360deg); }\n          }\n        "));
+};
+Loader.propTypes = {
+  page: propTypes.bool
+};
+Loader.defaultProps = {
+  page: false
+};
+
 const NewNDCStepFormOne = _ref => {
   let {
     config,
@@ -11897,6 +11945,7 @@ const NewNDCStepFormOne = _ref => {
   const user = Digit.UserService.getUser();
   const id = window.location.pathname.split("/").pop();
   const currentStepData = reactRedux.useSelector(state => state.ndc.NDCForm.formData && state.ndc.NDCForm.formData[config.key] ? state.ndc.NDCForm.formData[config.key] : {});
+  const [getLoader, setLoader] = React.useState(false);
   const checkFormData = reactRedux.useSelector(state => state.ndc.NDCForm.formData || {});
   const checkFormDatass = reactRedux.useSelector(state => state.ndc.NDCForm || {});
   const tenantId = window.localStorage.getItem("CITIZEN.CITY");
@@ -11914,7 +11963,7 @@ const NewNDCStepFormOne = _ref => {
     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);
@@ -11922,6 +11971,7 @@ const NewNDCStepFormOne = _ref => {
   const createApplication = function (data) {
     try {
       var _Digit$UserService$ge, _data$cpt, _data$cpt$details, _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 auditDetails = data === null || data === void 0 ? void 0 : (_data$cpt = data.cpt) === null || _data$cpt === void 0 ? void 0 : (_data$cpt$details = _data$cpt.details) === null || _data$cpt$details === void 0 ? void 0 : _data$cpt$details.auditDetails;
       const applicantId = applicant === null || applicant === void 0 ? void 0 : applicant.uuid;
@@ -11992,32 +12042,37 @@ const NewNDCStepFormOne = _ref => {
           }
         }]
       };
-      return Promise.resolve(Digit.NDCService.NDCcreate({
-        tenantId,
-        details: payload
-      })).then(function (response) {
-        var _response$ResponseInf;
-        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
-          };
-        }
-      });
+      return Promise.resolve(_catch(function () {
+        return Promise.resolve(Digit.NDCService.NDCcreate({
+          tenantId,
+          details: payload
+        })).then(function (response) {
+          var _response$ResponseInf;
+          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
+            };
+          }
+        });
+      }, function () {
+        setLoader(false);
+      }));
     } catch (e) {
       return Promise.reject(e);
     }
   };
   const updateApplication = function (data) {
     try {
-      var _Digit$UserService$ge2, _data$cpt6, _data$cpt6$details, _user$info5, _user$info6, _data$PropertyDetails1, _user$info7, _user$info8, _checkFormData$respon3, _checkFormData$respon4, _checkFormData$respon5, _data$NDCReason2, _data$cpt1, _data$cpt1$details;
+      var _Digit$UserService$ge2, _data$cpt6, _data$cpt6$details, _user$info5, _user$info6, _data$PropertyDetails1, _user$info7, _user$info8, _checkFormData$respon3, _checkFormData$respon4, _checkFormData$respon5, _data$NDCReason2, _data$cpt1, _data$cpt1$details, _checkFormData$respon6, _checkFormData$respon7;
       const applicant = ((_Digit$UserService$ge2 = Digit.UserService.getUser()) === null || _Digit$UserService$ge2 === void 0 ? void 0 : _Digit$UserService$ge2.info) || {};
       const auditDetails = data === null || data === void 0 ? void 0 : (_data$cpt6 = data.cpt) === null || _data$cpt6 === void 0 ? void 0 : (_data$cpt6$details = _data$cpt6.details) === null || _data$cpt6$details === void 0 ? void 0 : _data$cpt6$details.auditDetails;
       const applicantId = applicant === null || applicant === void 0 ? void 0 : applicant.uuid;
@@ -12091,7 +12146,8 @@ const NewNDCStepFormOne = _ref => {
           active: true,
           reason: data === null || data === void 0 ? void 0 : (_data$NDCReason2 = data.NDCReason) === null || _data$NDCReason2 === void 0 ? void 0 : _data$NDCReason2.code,
           auditDetails: data === null || data === void 0 ? void 0 : (_data$cpt1 = data.cpt) === null || _data$cpt1 === void 0 ? void 0 : (_data$cpt1$details = _data$cpt1.details) === null || _data$cpt1$details === void 0 ? void 0 : _data$cpt1$details.auditDetails,
-          uuid: id,
+          applicationNo: id,
+          uuid: checkFormData === null || checkFormData === void 0 ? void 0 : (_checkFormData$respon6 = checkFormData.responseData) === null || _checkFormData$respon6 === void 0 ? void 0 : (_checkFormData$respon7 = _checkFormData$respon6[0]) === null || _checkFormData$respon7 === void 0 ? void 0 : _checkFormData$respon7.uuid,
           workflow: {
             action: "DRAFT"
           }
@@ -12199,6 +12255,8 @@ const NewNDCStepFormOne = _ref => {
     label: t("" + config.texts.submitBarLabel),
     currentStep: config.currStepNumber,
     onBackClick: onGoBack
+  }), getLoader && /*#__PURE__*/React__default.createElement(Loader, {
+    page: true
   }), showToast && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Toast, {
     isDleteBtn: true,
     error: true,
@@ -13044,6 +13102,7 @@ const PropertySearchNSummary = _ref => {
   var _apiDataCheck$, _apiDataCheck$$NdcDet, _formData$cpt, _formData$cpt2, _propertyDetails$Prop3, _apiDataCheck$2, _formData$cpt11, _formData$cpt11$dues;
   const fetchBill = function () {
     try {
+      setLoader(true);
       const _temp = _catch(function () {
         var _formData$cpt13;
         return Promise.resolve(Digit.PaymentService.fetchBill(tenantId, {
@@ -13095,8 +13154,10 @@ const PropertySearchNSummary = _ref => {
             setNoDue(true);
             setCheckStats(false);
           }
+          setLoader(false);
         });
       }, function () {
+        setLoader(false);
         setShowToast({
           error: true,
           label: t("NDC_MESSAGE_FETCH_FAILED")
@@ -13131,6 +13192,7 @@ const PropertySearchNSummary = _ref => {
   const search = reactRouterDom.useLocation().search;
   const urlPropertyId = new URLSearchParams(search).get("propertyId");
   const isfirstRender = React.useRef(true);
+  const [getLoader, setLoader] = React.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] = React.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] = React.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) || "");
@@ -13324,7 +13386,7 @@ const PropertySearchNSummary = _ref => {
       return () => clearTimeout(timer);
     }
   }, [showToast]);
-  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, isLoading && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null), /*#__PURE__*/React__default.createElement("div", {
+  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
     style: {
       marginBottom: "16px"
     }
@@ -13404,7 +13466,9 @@ const PropertySearchNSummary = _ref => {
     onClose: () => {
       setShowToast(null);
     }
-  })));
+  })), (isLoading || getLoader) && /*#__PURE__*/React__default.createElement(Loader, {
+    page: true
+  }));
 };
 
 const SelectNDCDocuments = _ref => {
@@ -13455,7 +13519,7 @@ const SelectNDCDocuments = _ref => {
     goNext();
   }, [documents]);
   if (isLoading) {
-    return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
+    return /*#__PURE__*/React__default.createElement(Loader, null);
   }
   return /*#__PURE__*/React__default.createElement("div", null, ndcDocuments === null || ndcDocuments === void 0 ? void 0 : ndcDocuments.map((document, index) => {
     return /*#__PURE__*/React__default.createElement(SelectDocument, {
@@ -13496,6 +13560,7 @@ function SelectDocument(_ref2) {
     return item === null || item === void 0 ? void 0 : (_item$documentType = item.documentType) === null || _item$documentType === void 0 ? void 0 : _item$documentType.includes(doc === null || doc === void 0 ? void 0 : doc.code);
   })[0];
   const tenantId = Digit.ULBService.getCurrentTenantId();
+  const [getLoader, setLoader] = React.useState(false);
   const [file, setFile] = React.useState(null);
   const [uploadedFile, setUploadedFile] = React.useState(() => (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.fileStoreId) || null);
   function selectfile(e) {
@@ -13530,9 +13595,11 @@ function SelectDocument(_ref2) {
         setError(null);
         const _temp3 = function () {
           if (file) {
+            setLoader(true);
             const _temp2 = function () {
               if (file.size >= 5242880) {
                 setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
+                setLoader(false);
                 if (!formState.errors[config.key]) setFormError(config.key, {
                   type: doc === null || doc === void 0 ? void 0 : doc.code
                 });
@@ -13541,6 +13608,7 @@ function SelectDocument(_ref2) {
                   setUploadedFile(null);
                   return Promise.resolve(Digit.UploadServices.Filestorage("PT", file, Digit.ULBService.getStateId())).then(function (response) {
                     var _response$data, _response$data$files;
+                    setLoader(false);
                     if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
                       var _response$data2, _response$data2$files;
                       setUploadedFile(response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$files = _response$data2.files[0]) === null || _response$data2$files === void 0 ? void 0 : _response$data2$files.fileStoreId);
@@ -13549,6 +13617,7 @@ function SelectDocument(_ref2) {
                     }
                   });
                 }, function () {
+                  setLoader(false);
                   setError(t("CS_FILE_UPLOAD_ERROR"));
                 });
                 if (_temp && _temp.then) return _temp.then(function () {});
@@ -13582,7 +13651,9 @@ function SelectDocument(_ref2) {
       width: "100%"
     },
     accept: "image/*,.pdf"
-  }))));
+  }))), getLoader && /*#__PURE__*/React__default.createElement(Loader, {
+    page: true
+  }));
 }
 
 const NewNDCStepFormTwo = _ref => {
@@ -13610,7 +13681,7 @@ const NewNDCStepFormTwo = _ref => {
     data: applicationDetails,
     refetch
   } = Digit.Hooks.ndc.useSearchEmployeeApplication({
-    uuid: id
+    applicationNo: id
   }, tenantId);
   React.useEffect(() => {
     if (applicationDetails !== null && applicationDetails !== void 0 && applicationDetails.Applications.length) {
@@ -13736,7 +13807,7 @@ const NewNDCStepFormTwo = _ref => {
 };
 
 const NDCSummary = _ref => {
-  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;
   let {
     formData,
     goNext,
@@ -13753,9 +13824,8 @@ const NDCSummary = _ref => {
   const dispatch = reactRedux.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] = React.useState();
@@ -13779,9 +13849,8 @@ const NDCSummary = _ref => {
         },
         details: payload
       })).then(function (response) {
-        var _response$Calculation, _response$Calculation2, _response$Calculation3;
-        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]);
+        var _response$Calculation;
+        setData(response === null || response === void 0 ? void 0 : (_response$Calculation = response.Calculation) === null || _response$Calculation === void 0 ? void 0 : _response$Calculation[0]);
       });
     } catch (e) {
       return Promise.reject(e);
@@ -13810,8 +13879,6 @@ const NDCSummary = _ref => {
   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",
@@ -13883,15 +13950,23 @@ const NDCSummary = _ref => {
     style: sectionStyle
   }, (docs === null || docs === void 0 ? void 0 : docs.length) > 0 ? /*#__PURE__*/React__default.createElement("div", {
     style: documentsContainerStyle
-  }, docs === null || docs === void 0 ? void 0 : docs.map((doc, index) => /*#__PURE__*/React__default.createElement("div", {
-    key: index,
-    style: documentCardStyle
-  }, /*#__PURE__*/React__default.createElement(NDCDocument$1, {
-    value: docs,
-    Code: doc === null || doc === void 0 ? void 0 : doc.documentType,
-    index: index,
-    formData: formData
-  })))) : /*#__PURE__*/React__default.createElement("div", null, t("TL_NO_DOCUMENTS_MSG"))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.ActionBar, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
+  }, docs === null || docs === void 0 ? void 0 : docs.map((doc, index) => {
+    var _doc$documentType;
+    return /*#__PURE__*/React__default.createElement("div", {
+      key: index,
+      style: documentCardStyle
+    }, /*#__PURE__*/React__default.createElement(NDCDocument$1, {
+      value: docs,
+      Code: doc === null || doc === void 0 ? void 0 : doc.documentType,
+      index: index,
+      formData: formData
+    }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.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__default.createElement("div", null, t("TL_NO_DOCUMENTS_MSG"))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.ActionBar, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
     style: {
       background: " white",
       color: "black",
@@ -13900,7 +13975,7 @@ const NDCSummary = _ref => {
     },
     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__default.createElement(digitUiReactComponents.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__default.createElement(digitUiReactComponents.Menu, {
     localeKeyPrefix: "WF_EMPLOYEE_" + "NDC",
     options: actions,
     optionKey: "action",
@@ -13925,14 +14000,16 @@ const NDCNewFormSummaryStepThreeCitizen = _ref => {
   const tenantId = window.localStorage.getItem("CITIZEN.CITY");
   const user = Digit.UserService.getUser();
   const formData = reactRedux.useSelector(state => state.ndc.NDCForm.formData || {});
+  console.log("formData 4th step", formData);
   const goNext = function (action) {
     try {
       const actionStatus = action === null || action === void 0 ? void 0 : action.action;
+      console.log("actionStatus", actionStatus);
       const _temp = _catch(function () {
         return Promise.resolve(onSubmit(formData, actionStatus)).then(function (res) {
           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);
           }
@@ -13948,7 +14025,7 @@ const NDCNewFormSummaryStepThreeCitizen = _ref => {
   function mapToNDCPayload(inputData, actionStatus) {
     var _Digit$UserService$ge, _user$info, _user$info2, _formData$NDCDetails, _formData$NDCDetails$, _user$info3, _user$info4, _formData$responseDat, _formData$apiData, _formData$apiData$App, _inputData$DocummentD, _inputData$DocummentD2;
     const applicant = ((_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.info) || {};
-    console.log("formData mobile number", formData);
+    console.log("inputData", inputData);
     const owners = [{
       name: user === null || user === void 0 ? void 0 : (_user$info = user.info) === null || _user$info === void 0 ? void 0 : _user$info.name,
       mobileNumber: user === null || user === void 0 ? void 0 : (_user$info2 = user.info) === null || _user$info2 === void 0 ? void 0 : _user$info2.mobileNumber,
@@ -13957,6 +14034,7 @@ const NDCNewFormSummaryStepThreeCitizen = _ref => {
       type: user === null || user === void 0 ? void 0 : (_user$info4 = user.info) === null || _user$info4 === void 0 ? void 0 : _user$info4.type
     }];
     const baseApplication = (formData === null || formData === void 0 ? void 0 : (_formData$responseDat = formData.responseData) === null || _formData$responseDat === void 0 ? void 0 : _formData$responseDat[0]) || (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$App[0]) || {};
+    console.log("baseApplication", baseApplication);
     const updatedApplication = _extends({}, baseApplication, {
       workflow: _extends({}, baseApplication === null || baseApplication === void 0 ? void 0 : baseApplication.workflow, {
         action: actionStatus
@@ -13969,17 +14047,19 @@ const NDCNewFormSummaryStepThreeCitizen = _ref => {
       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 = {
       Applications: [updatedApplication]
     };
+    console.log("updatedApplication", updatedApplication);
     return payload;
   }
   const onSubmit = function (data, actionStatus) {
     try {
       const finalPayload = mapToNDCPayload(data, actionStatus);
+      console.log("finalPayload", finalPayload);
       return Promise.resolve(Digit.NDCService.NDCUpdate({
         tenantId,
         details: finalPayload
@@ -14306,7 +14386,7 @@ const NewNDCStepForm$1 = () => {
     isLoading,
     data: applicationDetails
   } = Digit.Hooks.ndc.useSearchEmployeeApplication({
-    uuid: id
+    applicationNo: id
   }, tenantId);
   React.useEffect(() => {
     if (applicationDetails !== null && applicationDetails !== void 0 && applicationDetails.Applications.length) {
@@ -14372,7 +14452,7 @@ const NewNDCStepFormOne$1 = _ref => {
       }, 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();
@@ -14657,7 +14737,7 @@ const NDCNewFormSummaryStepThreeEmployee = _ref => {
         return Promise.resolve(onSubmit(formData, actionStatus)).then(function (res) {
           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);
           }
@@ -14740,46 +14820,45 @@ const NDCNewFormSummaryStepThreeEmployee = _ref => {
 };
 
 const MyApplications = _ref => {
-  var _Digit$UserService$ge, _data$data;
+  var _Digit$UserService$ge;
   const {
     t
   } = reactI18next.useTranslation();
-  const history = reactRouterDom.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] = React.useState(1);
   if (isLoading) {
     return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
   }
-  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.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) => {
+  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__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.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(_ref2 => {
       let [key] = _ref2;
       return key !== "Applications";
     }));
-    console.log("application?.Applications?.applicationStatus", filteredApplication);
     return /*#__PURE__*/React__default.createElement("div", {
       key: "card-" + index
     }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, null, Object.keys(filteredApplication).filter(key => filteredApplication[key] !== null).map(item => /*#__PURE__*/React__default.createElement(digitUiReactComponents.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__default.createElement(reactRouterDom.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__default.createElement(reactRouterDom.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__default.createElement(digitUiReactComponents.SubmitBar, {
       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__default.createElement(reactRouterDom.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__default.createElement("div", {
       style: {
         marginTop: "10px"
@@ -14787,7 +14866,44 @@ const MyApplications = _ref => {
     }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
       label: t("CS_APPLICATION_DETAILS_MAKE_PAYMENT")
     })))));
-  }));
+  }), !applicationsList.length && /*#__PURE__*/React__default.createElement("p", {
+    style: {
+      marginLeft: "16px",
+      marginTop: "16px"
+    }
+  }, t("PTR_NO_APPLICATION_FOUND_MSG")), applicationsList.length > itemsPerPage && /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "center",
+      gap: "16px",
+      marginTop: "20px"
+    }
+  }, /*#__PURE__*/React__default.createElement("button", {
+    disabled: currentPage === 1,
+    onClick: () => setCurrentPage(prev => prev - 1),
+    style: {
+      cursor: currentPage === 1 ? "not-allowed" : "pointer"
+    }
+  }, "\u2190 Prev"), /*#__PURE__*/React__default.createElement("span", null, "Page ", currentPage, " of ", totalPages), /*#__PURE__*/React__default.createElement("button", {
+    disabled: currentPage === totalPages,
+    onClick: () => setCurrentPage(prev => prev + 1),
+    style: {
+      cursor: currentPage === totalPages ? "not-allowed" : "pointer"
+    }
+  }, "Next \u2192")), /*#__PURE__*/React__default.createElement("p", {
+    style: {
+      marginLeft: "16px",
+      marginTop: "16px"
+    }
+  }, t("PTR_TEXT_NOT_ABLE_TO_FIND_THE_APPLICATION"), " ", /*#__PURE__*/React__default.createElement("span", {
+    className: "link",
+    style: {
+      display: "block"
+    }
+  }, /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
+    to: "/digit-ui/citizen/ndc/new-application"
+  }, t("NDC_COMMON_CLICK_HERE_TO_REGISTER_NEW_APPLICATION")))));
 };
 
 const NDCResponseCitizen = props => {