@mseva/digit-ui-module-ndc 1.0.72-dev.1.1 → 1.0.72-dev.1.11

package/dist/index.modern.js

@@ -1,9 +1,9 @@
-import { Card, Banner, ActionBar, SubmitBar as SubmitBar$1, PrivateRoute, BreadCrumb, AppContainer, Dropdown, UploadFile, Modal, FormComposer, Toast, Loader as Loader$1, LinkButton, CardSubHeader, StatusTable, Row, TextInput, CardLabel, FilterFormField, RadioButtons, Menu, EmployeeModuleCard, SearchField, ComplaintIcon, InboxComposer, FilterForm, Table, MobileNumber, CardLabelError, SearchAction, PopUp, DetailsCard, SearchForm, CloseSvg, CardHeader, LabelFieldPair, DeleteIcon, Header, KeyNote } from '@mseva/digit-ui-react-components';
+import { Card, Banner, ActionBar, SubmitBar as SubmitBar$1, PrivateRoute, BreadCrumb, AppContainer, Dropdown, UploadFile, Modal, FormComposer, Toast, Loader as Loader$1, MultiLink, CardSubHeader, StatusTable, Row, TextInput, CardLabel, FilterFormField, RadioButtons, Menu, 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 React, { Fragment as Fragment$1, useState, useEffect, useMemo, useRef, useReducer, useCallback, forwardRef } from 'react';
 import { useHistory, useLocation, Switch, Route, useRouteMatch, useParams, Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
-import { useForm, Controller, useController, useFormContext, FormProvider, useFieldArray } from 'react-hook-form';
+import { useForm, Controller, useFormContext, FormProvider, useFieldArray } from 'react-hook-form';
 import 'react-query';
 import { combineReducers } from 'redux';
 
@@ -2153,7 +2153,9 @@ function NewApplicationTimeline({
   workflowDetails,
   t,
   tenantId = Digit.ULBService.getCurrentTenantId(),
-  timeObj
+  timeObj,
+  empUserName = null,
+  handleSetEmpDesignation = () => {}
 }) {
   var _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _employeeData$data, _employeeData$data$Em;
   const {
@@ -2228,6 +2230,9 @@ function NewApplicationTimeline({
     const translationKey = `COMMON_MASTERS_DESIGNATION_${assignment === null || assignment === void 0 ? void 0 : assignment.designation}`;
     deptMap[emp === null || emp === void 0 ? void 0 : emp.code] = translationKey;
   });
+  if (employeeData && empUserName) {
+    handleSetEmpDesignation(t(deptMap[empUserName]));
+  }
   if (isLoading) return /*#__PURE__*/React.createElement(Loader$1, null);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "custom-timeline-container"
@@ -2258,7 +2263,7 @@ function NewApplicationTimeline({
   }))), /*#__PURE__*/React.createElement("div", {
     className: "custom-timeline-entries"
   }, sortedData === null || sortedData === void 0 ? void 0 : sortedData.map((item, index) => {
-    var _item$auditDetails, _item$auditDetails2, _item$assigner2, _item$assigner3, _item$assigner4, _item$assigner5, _item$assigner6, _item$wfComment, _item$wfComment2, _item$wfComment3, _item$assignes, _item$assignes$, _item$assignes$2, _item$assignes$3, _item$wfDocuments, _item$wfDocuments2;
+    var _item$auditDetails, _item$auditDetails2, _item$assigner2, _item$assigner3, _item$assigner4, _item$wfComment, _item$wfComment2, _item$wfComment3, _item$assignes, _item$assignes$, _item$assignes$2, _item$assignes$3, _item$wfDocuments, _item$wfDocuments2;
     return /*#__PURE__*/React.createElement("div", {
       key: index,
       className: "custom-timeline-entry"
@@ -2295,13 +2300,9 @@ function NewApplicationTimeline({
       className: "custom-officer-info"
     }, /*#__PURE__*/React.createElement("div", {
       className: "custom-officer-name"
-    }, (item === null || item === void 0 ? void 0 : (_item$assigner2 = item.assigner) === null || _item$assigner2 === void 0 ? void 0 : _item$assigner2.name) || t("CS_COMMON_NA"), deptMap[item === null || item === void 0 ? void 0 : (_item$assigner3 = item.assigner) === null || _item$assigner3 === void 0 ? void 0 : _item$assigner3.userName] && /*#__PURE__*/React.createElement("span", {
+    }, (item === null || item === void 0 ? void 0 : (_item$assigner2 = item.assigner) === null || _item$assigner2 === void 0 ? void 0 : _item$assigner2.name) || t("CS_COMMON_NA")), deptMap[item === null || item === void 0 ? void 0 : (_item$assigner3 = item.assigner) === null || _item$assigner3 === void 0 ? void 0 : _item$assigner3.userName] && /*#__PURE__*/React.createElement("div", {
       className: "custom-officer-name"
-    }, "- ", t(deptMap[item === null || item === void 0 ? void 0 : (_item$assigner4 = item.assigner) === null || _item$assigner4 === void 0 ? void 0 : _item$assigner4.userName]))), (item === null || item === void 0 ? void 0 : (_item$assigner5 = item.assigner) === null || _item$assigner5 === void 0 ? void 0 : _item$assigner5.emailId) && /*#__PURE__*/React.createElement("div", {
-      className: "custom-officer-email"
-    }, /*#__PURE__*/React.createElement("span", {
-      className: "custom-email-label"
-    }, t("Email")), " ", item === null || item === void 0 ? void 0 : (_item$assigner6 = item.assigner) === null || _item$assigner6 === void 0 ? void 0 : _item$assigner6.emailId))), /*#__PURE__*/React.createElement("div", {
+    }, t(deptMap[item === null || item === void 0 ? void 0 : (_item$assigner4 = item.assigner) === null || _item$assigner4 === void 0 ? void 0 : _item$assigner4.userName])))), /*#__PURE__*/React.createElement("div", {
       className: "custom-card-column custom-card-column-mid"
     }, (item === null || item === void 0 ? void 0 : item.sla) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("h3", {
       className: "custom-action-title"
@@ -2369,7 +2370,7 @@ const getReadableCity = (tenantId = "") => {
   return cityMap[key] || capitalize(key);
 };
 const capitalize = text => (text === null || text === void 0 ? void 0 : text.charAt(0).toUpperCase()) + (text === null || text === void 0 ? void 0 : text.slice(1));
-const getAcknowledgementData = async (application, formattedAddress, tenantInfo, t, approver, ulbType, empData) => {
+const getAcknowledgementData = async (application, formattedAddress, tenantInfo, t, approver, ulbType, empData, approverStatement) => {
   var _application$Applicat, _appData$owners, _appData$NdcDetails, _appData$auditDetails, _appData$auditDetails2, _empData$officer, _appData$NdcDetails2, _appData$NdcDetails3, _appData$NdcDetails3$, _appData$NdcDetails3$2, _appData$NdcDetails4, _appData$NdcDetails4$, _appData$NdcDetails4$2, _appData$owners2, _appData$owners2$;
   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]) || {};
@@ -2530,6 +2531,7 @@ const getAcknowledgementData = async (application, formattedAddress, tenantInfo,
     approvalDate,
     approver,
     designation,
+    approverStatement,
     ulbType,
     tenantId: appData === null || appData === void 0 ? void 0 : appData.tenantId,
     name: ` No Dues Certificate `,
@@ -2551,7 +2553,7 @@ const availableOptions = [{
   name: "No"
 }];
 const ApplicationOverview = () => {
-  var _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _user, _user$info, _user$info$roles, _user2, _user2$info, _user2$info$roles$fin, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetailsTemp$, _workflowDetailsTemp$2, _applicationDetails$A5, _applicationDetails$A6, _propertyDetailsFetch3, _applicationDetails$A7, _applicationDetails$A8, _Object$entries, _displayData$NdcDetai2, _displayData$Document, _applicationDetails$A21, _applicationDetails$A22, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _applicationDetails$A23, _applicationDetails$A24, _workflowDetails$data12;
+  var _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _applicationDetails$A2, _applicationDetails$A3, _applicationDetails$A4, _applicationDetails$A5, _user, _user$info, _user$info$roles, _user2, _user2$info, _user2$info$roles$fin, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetailsTemp$, _workflowDetailsTemp$2, _applicationDetails$A10, _applicationDetails$A11, _propertyDetailsFetch3, _Object$entries, _displayData$NdcDetai2, _displayData$Document, _applicationDetails$A26, _applicationDetails$A27, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _applicationDetails$A28, _applicationDetails$A29, _workflowDetails$data12;
   const {
     id
   } = useParams();
@@ -2584,6 +2586,8 @@ const ApplicationOverview = () => {
   const [showModal, setShowModal] = useState(false);
   const [getPropertyId, setPropertyId] = useState(null);
   const [approver, setApprover] = useState(null);
+  const [approverStatement, setApproverStatement] = useState(null);
+  const [showOptions, setShowOptions] = useState(false);
   const handleMarkPending = (consumerCode, value, index) => {
     setMarkedPending(prev => {
       const updated = {
@@ -2662,6 +2666,68 @@ const ApplicationOverview = () => {
   const empData = EmployeeData(tenantId, approver);
   console.log("approver for ndc", approver);
   console.log("officerData", empData);
+  const {
+    data: reciept_data,
+    isLoading: recieptDataLoading
+  } = Digit.Hooks.useRecieptSearch({
+    tenantId: tenantId,
+    businessService: "NDC",
+    consumerCodes: id,
+    isEmployee: false
+  }, {
+    enabled: id ? true : false
+  });
+  async function getRecieptSearch({
+    tenantId,
+    payments,
+    ...params
+  }) {
+    setLoader(true);
+    try {
+      var _applicationDetails$A, _response;
+      let response = null;
+      let application = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A = applicationDetails.Applications) === null || _applicationDetails$A === void 0 ? void 0 : _applicationDetails$A[0];
+      if (payments !== null && payments !== void 0 && payments.fileStoreId) {
+        response = {
+          filestoreIds: [payments === null || payments === void 0 ? void 0 : payments.fileStoreId]
+        };
+      } else {
+        response = await Digit.PaymentService.generatePdf(tenantId, {
+          Payments: [{
+            ...(payments || {}),
+            ...application
+          }]
+        }, "ndc-receipt");
+      }
+      const fileStore = await Digit.PaymentService.printReciept(tenantId, {
+        fileStoreIds: response.filestoreIds[0]
+      });
+      window.open(fileStore[(_response = response) === null || _response === void 0 ? void 0 : _response.filestoreIds[0]], "_blank");
+      setLoader(false);
+    } catch (error) {
+      console.error(error);
+      setLoader(false);
+    }
+  }
+  const dowloadOptions = [];
+  if ((applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A2 = applicationDetails.Applications) === null || _applicationDetails$A2 === void 0 ? void 0 : (_applicationDetails$A3 = _applicationDetails$A2[0]) === null || _applicationDetails$A3 === void 0 ? void 0 : _applicationDetails$A3.applicationStatus) === "APPROVED" || (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A4 = applicationDetails.Applications) === null || _applicationDetails$A4 === void 0 ? void 0 : (_applicationDetails$A5 = _applicationDetails$A4[0]) === null || _applicationDetails$A5 === void 0 ? void 0 : _applicationDetails$A5.applicationStatus) === "REJECTED") {
+    dowloadOptions.push({
+      label: t("DOWNLOAD_CERTIFICATE"),
+      onClick: () => handleDownloadPdf()
+    });
+    if (reciept_data && (reciept_data === null || reciept_data === void 0 ? void 0 : reciept_data.Payments.length) > 0 && !recieptDataLoading) {
+      dowloadOptions.push({
+        label: t("PTR_FEE_RECIEPT"),
+        onClick: () => {
+          var _reciept_data$Payment;
+          return getRecieptSearch({
+            tenantId: reciept_data === null || reciept_data === void 0 ? void 0 : (_reciept_data$Payment = reciept_data.Payments[0]) === null || _reciept_data$Payment === void 0 ? void 0 : _reciept_data$Payment.tenantId,
+            payments: reciept_data === null || reciept_data === void 0 ? void 0 : reciept_data.Payments[0]
+          });
+        }
+      });
+    }
+  }
   let user = Digit.UserService.getUser();
   const menuRef = useRef();
   if (window.location.href.includes("/obps") || window.location.href.includes("/noc")) {
@@ -2704,8 +2770,8 @@ const ApplicationOverview = () => {
     });
   };
   useEffect(() => {
-    var _applicationDetails$A;
-    const ndcObject = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A = applicationDetails.Applications) === null || _applicationDetails$A === void 0 ? void 0 : _applicationDetails$A[0];
+    var _applicationDetails$A6;
+    const ndcObject = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A6 = applicationDetails.Applications) === null || _applicationDetails$A6 === void 0 ? void 0 : _applicationDetails$A6[0];
     if (ndcObject) {
       var _ndcObject$owners, _ndcObject$owners$, _ndcObject$owners2, _ndcObject$owners2$, _ndcObject$owners3, _ndcObject$owners3$, _ndcObject$NdcDetails, _ndcObject$NdcDetails2, _ndcObject$NdcDetails3, _removeDuplicatesByUU;
       const applicantData = {
@@ -2757,7 +2823,7 @@ const ApplicationOverview = () => {
       const ulbType = tenantInfo === null || tenantInfo === void 0 ? void 0 : (_tenantInfo$city = tenantInfo.city) === null || _tenantInfo$city === void 0 ? void 0 : _tenantInfo$city.ulbType;
       let acknowledgementData;
       if (empData) {
-        acknowledgementData = await getAcknowledgementData(Property, formattedAddress, tenantInfo, t, approver, ulbType, empData);
+        acknowledgementData = await getAcknowledgementData(Property, formattedAddress, tenantInfo, t, approver, ulbType, empData, approverStatement);
       }
       console.log("acknowledgementData", acknowledgementData);
       setTimeout(() => {
@@ -2770,18 +2836,18 @@ const ApplicationOverview = () => {
     }
   };
   function onActionSelect(action) {
-    var _action$state, _applicationDetails$A3, _applicationDetails$A4, _action$state2, _action$state2$action, _filterNexState$, _filterRoles$, _displayData$applican;
-    console.log("action====???", action === null || action === void 0 ? void 0 : (_action$state = action.state) === null || _action$state === void 0 ? void 0 : _action$state.actions);
-    const ndcDetails = (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A3 = applicationDetails.Applications) === null || _applicationDetails$A3 === void 0 ? void 0 : (_applicationDetails$A4 = _applicationDetails$A3[0]) === null || _applicationDetails$A4 === void 0 ? void 0 : _applicationDetails$A4.NdcDetails) || [];
+    var _action$state, _applicationDetails$A8, _applicationDetails$A9, _action$state2, _action$state2$action, _filterNexState$, _filterRoles$, _displayData$applican;
+    console.log("action====||?", action === null || action === void 0 ? void 0 : (_action$state = action.state) === null || _action$state === void 0 ? void 0 : _action$state.actions);
+    const ndcDetails = (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A8 = applicationDetails.Applications) === null || _applicationDetails$A8 === void 0 ? void 0 : (_applicationDetails$A9 = _applicationDetails$A8[0]) === null || _applicationDetails$A9 === void 0 ? void 0 : _applicationDetails$A9.NdcDetails) || [];
     const hasDuePending = ndcDetails === null || ndcDetails === void 0 ? void 0 : ndcDetails.some(item => item.isDuePending === true);
     console.log("hasDuePending", hasDuePending);
     const filterNexState = action === null || action === void 0 ? void 0 : (_action$state2 = action.state) === null || _action$state2 === void 0 ? void 0 : (_action$state2$action = _action$state2.actions) === null || _action$state2$action === void 0 ? void 0 : _action$state2$action.filter(item => item.action == (action === null || action === void 0 ? void 0 : action.action));
-    console.log("filterNexState====???", (_filterNexState$ = filterNexState[0]) === null || _filterNexState$ === void 0 ? void 0 : _filterNexState$.nextState);
+    console.log("filterNexState====||?", (_filterNexState$ = filterNexState[0]) === null || _filterNexState$ === void 0 ? void 0 : _filterNexState$.nextState);
     const filterRoles = getWorkflowService === null || getWorkflowService === void 0 ? void 0 : getWorkflowService.filter(item => {
       var _filterNexState$2;
       return (item === null || item === void 0 ? void 0 : item.uuid) == ((_filterNexState$2 = filterNexState[0]) === null || _filterNexState$2 === void 0 ? void 0 : _filterNexState$2.nextState);
     });
-    console.log("filterRoles====???", filterRoles);
+    console.log("filterRoles====||?", filterRoles);
     console.log("action test", action === null || action === void 0 ? void 0 : action.action);
     const checkactionApp = (action === null || action === void 0 ? void 0 : action.action) == "APPROVE";
     console.log("filterRoles && checkactionApp", filterRoles && checkactionApp, checkactionApp, filterRoles);
@@ -2817,7 +2883,7 @@ const ApplicationOverview = () => {
         const isPending = markedPending[detail.consumerCode];
         return {
           ...detail,
-          isDuePending: isPending ?? detail.isDuePending ?? false,
+          isDuePending: isPending || detail.isDuePending || false,
           dueAmount: isPending === false ? 0 : (amounts === null || amounts === void 0 ? void 0 : amounts[detail.consumerCode]) !== undefined ? Number(amounts[detail.consumerCode]) : (detail === null || detail === void 0 ? void 0 : detail.dueAmount) || 0
         };
       }),
@@ -2873,10 +2939,11 @@ const ApplicationOverview = () => {
   };
   useEffect(() => {
     if (workflowDetails) {
-      var _workflowDetails$data9, _workflowDetails$data0, _approveInstance$assi;
-      console.log("workflowDetails here", workflowDetails);
-      const approveInstance = workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data9 = workflowDetails.data) === null || _workflowDetails$data9 === void 0 ? void 0 : (_workflowDetails$data0 = _workflowDetails$data9.processInstances) === null || _workflowDetails$data0 === void 0 ? void 0 : _workflowDetails$data0.find(pi => (pi === null || pi === void 0 ? void 0 : pi.action) === "APPROVE");
+      var _workflowDetails$data9, _workflowDetails$data0, _approveInstance$assi, _applicationDetails$A0, _applicationDetails$A1;
+      const approveInstance = workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data9 = workflowDetails.data) === null || _workflowDetails$data9 === void 0 ? void 0 : (_workflowDetails$data0 = _workflowDetails$data9.processInstances) === null || _workflowDetails$data0 === void 0 ? void 0 : _workflowDetails$data0.find(pi => (pi === null || pi === void 0 ? void 0 : pi.action) === "APPROVE" || (pi === null || pi === void 0 ? void 0 : pi.action) === "REJECT");
       const name = (approveInstance === null || approveInstance === void 0 ? void 0 : (_approveInstance$assi = approveInstance.assigner) === null || _approveInstance$assi === void 0 ? void 0 : _approveInstance$assi.name) || "NA";
+      const status = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A0 = applicationDetails.Applications) === null || _applicationDetails$A0 === void 0 ? void 0 : (_applicationDetails$A1 = _applicationDetails$A0[0]) === null || _applicationDetails$A1 === void 0 ? void 0 : _applicationDetails$A1.applicationStatus;
+      setApproverStatement(status ? `${t(status)} By` : "");
       setApprover(name);
     }
   }, [workflowDetails]);
@@ -2911,7 +2978,7 @@ const ApplicationOverview = () => {
     enabled: getPropertyId ? true : false,
     privacy: Digit.Utils.getPrivacyObject()
   });
-  console.log("applicationDetails", applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A5 = applicationDetails.Applications) === null || _applicationDetails$A5 === void 0 ? void 0 : (_applicationDetails$A6 = _applicationDetails$A5[0]) === null || _applicationDetails$A6 === void 0 ? void 0 : _applicationDetails$A6.NdcDetails);
+  console.log("applicationDetails", applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A10 = applicationDetails.Applications) === null || _applicationDetails$A10 === void 0 ? void 0 : (_applicationDetails$A11 = _applicationDetails$A10[0]) === null || _applicationDetails$A11 === void 0 ? void 0 : _applicationDetails$A11.NdcDetails);
   useEffect(() => {
     const handleClickOutside = event => {
       if (toastRef.current && !toastRef.current.contains(event.target)) {
@@ -2931,7 +2998,7 @@ const ApplicationOverview = () => {
     address = propertyDetailsFetch.Properties[0].address;
     formattedAddress = [(_address = address) === null || _address === void 0 ? void 0 : _address.doorNo, (_address2 = address) === null || _address2 === void 0 ? void 0 : _address2.buildingName, (_address3 = address) === null || _address3 === void 0 ? void 0 : _address3.street, (_address4 = address) === null || _address4 === void 0 ? void 0 : (_address4$locality = _address4.locality) === null || _address4$locality === void 0 ? void 0 : _address4$locality.name, (_address5 = address) === null || _address5 === void 0 ? void 0 : _address5.city].filter(Boolean).join(", ");
   }
-  if (isLoading || isDetailsLoading) {
+  if (isLoading || isDetailsLoading || recieptDataLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
   return /*#__PURE__*/React.createElement("div", {
@@ -2943,16 +3010,19 @@ const ApplicationOverview = () => {
       alignItems: "center",
       padding: "16px"
     }
-  }, isCemp && (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.applicationStatus) === "APPROVED" && /*#__PURE__*/React.createElement(LinkButton, {
-    className: "downLoadButton",
-    label: t("DOWNLOAD_CERTIFICATE"),
-    onClick: handleDownloadPdf
-  })), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, null, t("NDC_APPLICATION_DETAILS_OVERVIEW")), /*#__PURE__*/React.createElement(StatusTable, null, (displayData === null || displayData === void 0 ? void 0 : displayData.applicantData) && ((_Object$entries = Object.entries(displayData === null || displayData === void 0 ? void 0 : displayData.applicantData)) === null || _Object$entries === void 0 ? void 0 : _Object$entries.map(([key, value]) => /*#__PURE__*/React.createElement(Row, {
+  }, isCemp && /*#__PURE__*/React.createElement("div", {
+    className: "cardHeaderWithOptions ral-app-details-header"
+  }, getLoader && /*#__PURE__*/React.createElement(Loader, null), dowloadOptions && dowloadOptions.length > 0 && /*#__PURE__*/React.createElement(MultiLink, {
+    className: "multilinkWrapper",
+    onHeadClick: () => setShowOptions(!showOptions),
+    displayOptions: showOptions,
+    options: dowloadOptions
+  }))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, null, t("NDC_APPLICATION_DETAILS_OVERVIEW")), /*#__PURE__*/React.createElement(StatusTable, null, (displayData === null || displayData === void 0 ? void 0 : displayData.applicantData) && ((_Object$entries = Object.entries(displayData === null || displayData === void 0 ? void 0 : displayData.applicantData)) === null || _Object$entries === void 0 ? void 0 : _Object$entries.map(([key, value]) => /*#__PURE__*/React.createElement(Row, {
     key: key,
     label: t(`${key === null || key === void 0 ? void 0 : key.toUpperCase()}`),
     text: Array.isArray(value) ? value.map(item => typeof item === "object" ? t((item === null || item === void 0 ? void 0 : item.code) || "N/A") : t(item || "N/A")).join(", ") : typeof value === "object" ? t((value === null || value === void 0 ? void 0 : value.code) || "N/A") : t(value || "N/A")
   }))))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, null, t("NDC_APPLICATION_NDC_DETAILS_OVERVIEW")), displayData === null || displayData === void 0 ? void 0 : (_displayData$NdcDetai2 = displayData.NdcDetails) === null || _displayData$NdcDetai2 === void 0 ? void 0 : _displayData$NdcDetai2.map((detail, index) => {
-    var _applicationDetails$A9, _applicationDetails$A0, _applicationDetails$A1, _applicationDetails$A10, _applicationDetails$A11, _applicationDetails$A12, _applicationDetails$A13, _applicationDetails$A14, _applicationDetails$A15, _propertyDetailsFetch4, _propertyDetailsFetch5, _propertyDetailsFetch6, _propertyDetailsFetch7, _propertyDetailsFetch8, _propertyDetailsFetch9, _propertyDetailsFetch0, _propertyDetailsFetch1, _propertyDetailsFetch10, _propertyDetailsFetch11, _propertyDetailsFetch12, _propertyDetailsFetch13, _propertyDetailsFetch14, _propertyDetailsFetch15, _propertyDetailsFetch16, _propertyDetailsFetch17, _propertyDetailsFetch18, _propertyDetailsFetch19, _propertyDetailsFetch20, _propertyDetailsFetch21, _applicationDetails$A16, _applicationDetails$A17, _applicationDetails$A18, _applicationDetails$A19, _applicationDetails$A20;
+    var _applicationDetails$A12, _applicationDetails$A13, _applicationDetails$A14, _applicationDetails$A15, _applicationDetails$A16, _applicationDetails$A17, _applicationDetails$A18, _applicationDetails$A19, _applicationDetails$A20, _propertyDetailsFetch4, _propertyDetailsFetch5, _propertyDetailsFetch6, _propertyDetailsFetch7, _propertyDetailsFetch8, _propertyDetailsFetch9, _propertyDetailsFetch0, _propertyDetailsFetch1, _propertyDetailsFetch10, _propertyDetailsFetch11, _propertyDetailsFetch12, _propertyDetailsFetch13, _propertyDetailsFetch14, _propertyDetailsFetch15, _propertyDetailsFetch16, _propertyDetailsFetch17, _propertyDetailsFetch18, _propertyDetailsFetch19, _propertyDetailsFetch20, _propertyDetailsFetch21, _applicationDetails$A21, _applicationDetails$A22, _applicationDetails$A23, _applicationDetails$A24, _applicationDetails$A25;
     const isPT = (detail === null || detail === void 0 ? void 0 : detail.businessService) === "NDC_PROPERTY_TAX";
     const isSW = (detail === null || detail === void 0 ? void 0 : detail.businessService) === "NDC_SEWERAGE_SERVICE_CONNECTION";
     const isWS = (detail === null || detail === void 0 ? void 0 : detail.businessService) === "NDC_WATER_SERVICE_CONNECTION";
@@ -2980,14 +3050,14 @@ const ApplicationOverview = () => {
         backgroundColor: isRed ? "red" : "none"
       },
       label: t("NDC_DUE_AMOUNT"),
-      text: (markedPending[detail.consumerCode] === false ? "0" : (amounts === null || amounts === void 0 ? void 0 : amounts[detail.consumerCode]) ?? (detail === null || detail === void 0 ? void 0 : detail.dueAmount) ?? 0).toString()
+      text: (markedPending[detail.consumerCode] === false ? "0" : (amounts === null || amounts === void 0 ? void 0 : amounts[detail.consumerCode]) || (detail === null || detail === void 0 ? void 0 : detail.dueAmount) || 0).toString()
     })), canRaiseFlag && isMarked && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Row, {
       label: "Due Amount",
       text: /*#__PURE__*/React.createElement(Controller, {
         key: index,
         control: control,
         name: `amount[${index}]`,
-        defaultValue: markedPending[detail.consumerCode] === false ? 0 : (amounts === null || amounts === void 0 ? void 0 : amounts[detail.consumerCode]) ?? (detail === null || detail === void 0 ? void 0 : detail.dueAmount) ?? 0,
+        defaultValue: markedPending[detail.consumerCode] === false ? 0 : (amounts === null || amounts === void 0 ? void 0 : amounts[detail.consumerCode]) || (detail === null || detail === void 0 ? void 0 : detail.dueAmount) || 0,
         render: props => /*#__PURE__*/React.createElement(TextInput, {
           type: "number",
           value: props.value,
@@ -3011,7 +3081,7 @@ const ApplicationOverview = () => {
       text: t(detail.propertyType) || detail.propertyType
     }), isPT && (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : propertyDetailsFetch.Properties) && /*#__PURE__*/React.createElement(Fragment$1, null, /*#__PURE__*/React.createElement(Row, {
       label: t("CHB_DISCOUNT_REASON"),
-      text: t(`${(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.reason) == "OTHERS" ? applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A1 = applicationDetails.Applications) === null || _applicationDetails$A1 === void 0 ? void 0 : (_applicationDetails$A10 = _applicationDetails$A1[0]) === null || _applicationDetails$A10 === void 0 ? void 0 : (_applicationDetails$A11 = _applicationDetails$A10.NdcDetails) === null || _applicationDetails$A11 === void 0 ? void 0 : (_applicationDetails$A12 = _applicationDetails$A11.find(item => (item === null || item === void 0 ? void 0 : item.businessService) === "PT")) === null || _applicationDetails$A12 === void 0 ? void 0 : (_applicationDetails$A13 = _applicationDetails$A12.additionalDetails) === null || _applicationDetails$A13 === void 0 ? void 0 : _applicationDetails$A13.reason : applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A14 = applicationDetails.Applications) === null || _applicationDetails$A14 === void 0 ? void 0 : (_applicationDetails$A15 = _applicationDetails$A14[0]) === null || _applicationDetails$A15 === void 0 ? void 0 : _applicationDetails$A15.reason}`)
+      text: t(`${(applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A12 = applicationDetails.Applications) === null || _applicationDetails$A12 === void 0 ? void 0 : (_applicationDetails$A13 = _applicationDetails$A12[0]) === null || _applicationDetails$A13 === void 0 ? void 0 : _applicationDetails$A13.reason) == "OTHERS" ? applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A14 = applicationDetails.Applications) === null || _applicationDetails$A14 === void 0 ? void 0 : (_applicationDetails$A15 = _applicationDetails$A14[0]) === null || _applicationDetails$A15 === void 0 ? void 0 : (_applicationDetails$A16 = _applicationDetails$A15.NdcDetails) === null || _applicationDetails$A16 === void 0 ? void 0 : (_applicationDetails$A17 = _applicationDetails$A16.find(item => (item === null || item === void 0 ? void 0 : item.businessService) === "PT")) === null || _applicationDetails$A17 === void 0 ? void 0 : (_applicationDetails$A18 = _applicationDetails$A17.additionalDetails) === null || _applicationDetails$A18 === void 0 ? void 0 : _applicationDetails$A18.reason : applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A19 = applicationDetails.Applications) === null || _applicationDetails$A19 === void 0 ? void 0 : (_applicationDetails$A20 = _applicationDetails$A19[0]) === null || _applicationDetails$A20 === void 0 ? void 0 : _applicationDetails$A20.reason}`)
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("City"),
       text: propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch4 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch4 === void 0 ? void 0 : (_propertyDetailsFetch5 = _propertyDetailsFetch4[0]) === null || _propertyDetailsFetch5 === void 0 ? void 0 : (_propertyDetailsFetch6 = _propertyDetailsFetch5.address) === null || _propertyDetailsFetch6 === void 0 ? void 0 : _propertyDetailsFetch6.city
@@ -3035,7 +3105,7 @@ const ApplicationOverview = () => {
       text: propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch19 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch19 === void 0 ? void 0 : (_propertyDetailsFetch20 = _propertyDetailsFetch19[0]) === null || _propertyDetailsFetch20 === void 0 ? void 0 : (_propertyDetailsFetch21 = _propertyDetailsFetch20.additionalDetails) === null || _propertyDetailsFetch21 === void 0 ? void 0 : _propertyDetailsFetch21.yearConstruction
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("Remarks"),
-      text: (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A16 = applicationDetails.Applications) === null || _applicationDetails$A16 === void 0 ? void 0 : (_applicationDetails$A17 = _applicationDetails$A16[0]) === null || _applicationDetails$A17 === void 0 ? void 0 : (_applicationDetails$A18 = _applicationDetails$A17.NdcDetails) === null || _applicationDetails$A18 === void 0 ? void 0 : (_applicationDetails$A19 = _applicationDetails$A18.find(item => (item === null || item === void 0 ? void 0 : item.businessService) === "PT")) === null || _applicationDetails$A19 === void 0 ? void 0 : (_applicationDetails$A20 = _applicationDetails$A19.additionalDetails) === null || _applicationDetails$A20 === void 0 ? void 0 : _applicationDetails$A20.remarks) || "N/A"
+      text: (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A21 = applicationDetails.Applications) === null || _applicationDetails$A21 === void 0 ? void 0 : (_applicationDetails$A22 = _applicationDetails$A21[0]) === null || _applicationDetails$A22 === void 0 ? void 0 : (_applicationDetails$A23 = _applicationDetails$A22.NdcDetails) === null || _applicationDetails$A23 === void 0 ? void 0 : (_applicationDetails$A24 = _applicationDetails$A23.find(item => (item === null || item === void 0 ? void 0 : item.businessService) === "PT")) === null || _applicationDetails$A24 === void 0 ? void 0 : (_applicationDetails$A25 = _applicationDetails$A24.additionalDetails) === null || _applicationDetails$A25 === void 0 ? void 0 : _applicationDetails$A25.remarks) || "N/A"
     }))), canRaiseFlag && /*#__PURE__*/React.createElement("div", {
       className: "mychallan-custom"
     }, /*#__PURE__*/React.createElement(CardLabel, {
@@ -3063,7 +3133,7 @@ const ApplicationOverview = () => {
   }) : /*#__PURE__*/React.createElement("div", null, t("TL_NO_DOCUMENTS_MSG")))), /*#__PURE__*/React.createElement(NewApplicationTimeline, {
     workflowDetails: workflowDetails,
     t: t
-  }), (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A21 = applicationDetails.Applications) === null || _applicationDetails$A21 === void 0 ? void 0 : (_applicationDetails$A22 = _applicationDetails$A21[0]) === null || _applicationDetails$A22 === void 0 ? void 0 : _applicationDetails$A22.applicationStatus) !== "INITIATED" && (actions === null || actions === void 0 ? void 0 : actions.length) > 0 && /*#__PURE__*/React.createElement(ActionBar, null, displayMenu && (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data1 = workflowDetails.data) !== null && _workflowDetails$data1 !== void 0 && (_workflowDetails$data10 = _workflowDetails$data1.actionState) !== null && _workflowDetails$data10 !== void 0 && _workflowDetails$data10.nextActions || workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data11 = workflowDetails.data) !== null && _workflowDetails$data11 !== void 0 && _workflowDetails$data11.nextActions) ? /*#__PURE__*/React.createElement(Menu, {
+  }), (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A26 = applicationDetails.Applications) === null || _applicationDetails$A26 === void 0 ? void 0 : (_applicationDetails$A27 = _applicationDetails$A26[0]) === null || _applicationDetails$A27 === void 0 ? void 0 : _applicationDetails$A27.applicationStatus) !== "INITIATED" && (actions === null || actions === void 0 ? void 0 : actions.length) > 0 && /*#__PURE__*/React.createElement(ActionBar, null, displayMenu && (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data1 = workflowDetails.data) !== null && _workflowDetails$data1 !== void 0 && (_workflowDetails$data10 = _workflowDetails$data1.actionState) !== null && _workflowDetails$data10 !== void 0 && _workflowDetails$data10.nextActions || workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data11 = workflowDetails.data) !== null && _workflowDetails$data11 !== void 0 && _workflowDetails$data11.nextActions) ? /*#__PURE__*/React.createElement(Menu, {
     localeKeyPrefix: `WF_EDITRENEWAL`,
     options: actions,
     optionKey: "action",
@@ -3073,11 +3143,11 @@ const ApplicationOverview = () => {
     ref: menuRef,
     label: t("WF_TAKE_ACTION"),
     onSubmit: () => setDisplayMenu(!displayMenu)
-  })), (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A23 = applicationDetails.Applications) === null || _applicationDetails$A23 === void 0 ? void 0 : (_applicationDetails$A24 = _applicationDetails$A23[0]) === null || _applicationDetails$A24 === void 0 ? void 0 : _applicationDetails$A24.applicationStatus) == "INITIATED" && /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar$1, {
+  })), (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A28 = applicationDetails.Applications) === null || _applicationDetails$A28 === void 0 ? void 0 : (_applicationDetails$A29 = _applicationDetails$A28[0]) === null || _applicationDetails$A29 === void 0 ? void 0 : _applicationDetails$A29.applicationStatus) == "INITIATED" && /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar$1, {
     label: t("COMMON_EDIT"),
     onSubmit: () => {
-      var _applicationDetails$A25, _applicationDetails$A26;
-      const id = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A25 = applicationDetails.Applications) === null || _applicationDetails$A25 === void 0 ? void 0 : (_applicationDetails$A26 = _applicationDetails$A25[0]) === null || _applicationDetails$A26 === void 0 ? void 0 : _applicationDetails$A26.applicationNo;
+      var _applicationDetails$A30, _applicationDetails$A31;
+      const id = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A30 = applicationDetails.Applications) === null || _applicationDetails$A30 === void 0 ? void 0 : (_applicationDetails$A31 = _applicationDetails$A30[0]) === null || _applicationDetails$A31 === void 0 ? void 0 : _applicationDetails$A31.applicationNo;
       history.push(`/digit-ui/employee/ndc/create/${id}`);
     }
   })), showModal ? /*#__PURE__*/React.createElement(NDCModal, {
@@ -10420,7 +10490,7 @@ var lodash = createCommonjsModule(function (module, exports) {
 });
 
 const CitizenApplicationOverview = () => {
-  var _user, _user$info, _user$info$roles, _propertyDetailsFetch3, _propertyDetailsFetch4, _propertyDetailsFetch5, _ownerForName$map, _ownerForName$map$fil, _applicationDetails$A3, _applicationDetails$A4, _applicationDetails$A5, _applicationDetails$A6, _applicationDetails$A7, _applicationDetails$A8, _applicationDetails$A9, _Object$entries, _Object$entries$filte, _displayData$NdcDetai2, _displayData$Document;
+  var _applicationDetails$A4, _applicationDetails$A5, _applicationDetails$A6, _applicationDetails$A7, _user, _user$info, _user$info$roles, _propertyDetailsFetch3, _propertyDetailsFetch4, _propertyDetailsFetch5, _ownerForName$map, _ownerForName$map$fil, _applicationDetails$A0, _applicationDetails$A1, _applicationDetails$A10, _applicationDetails$A11, _applicationDetails$A12, _Object$entries, _Object$entries$filte, _displayData$NdcDetai2, _displayData$Document;
   const {
     id
   } = useParams();
@@ -10433,6 +10503,8 @@ const CitizenApplicationOverview = () => {
   const [appDetails, setAppDetails] = useState({});
   const [showToast, setShowToast] = useState(null);
   const [approver, setApprover] = useState(null);
+  const [approverStatement, setApproverStatement] = useState(null);
+  const [showOptions, setShowOptions] = useState(false);
   const [ndcDatils, setNdcDetails] = useState([]);
   const [displayData, setDisplayData] = useState({});
   const [getLoader, setLoader] = useState(false);
@@ -10455,10 +10527,11 @@ const CitizenApplicationOverview = () => {
   });
   useEffect(() => {
     if (workflowDetails) {
-      var _workflowDetails$data, _workflowDetails$data2, _approveInstance$assi;
-      console.log("workflowDetails here", workflowDetails);
-      const approveInstance = workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : (_workflowDetails$data2 = _workflowDetails$data.processInstances) === null || _workflowDetails$data2 === void 0 ? void 0 : _workflowDetails$data2.find(pi => (pi === null || pi === void 0 ? void 0 : pi.action) === "APPROVE");
+      var _workflowDetails$data, _workflowDetails$data2, _approveInstance$assi, _applicationDetails$A, _applicationDetails$A2;
+      const approveInstance = workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : (_workflowDetails$data2 = _workflowDetails$data.processInstances) === null || _workflowDetails$data2 === void 0 ? void 0 : _workflowDetails$data2.find(pi => (pi === null || pi === void 0 ? void 0 : pi.action) === "APPROVE" || (pi === null || pi === void 0 ? void 0 : pi.action) === "REJECT");
       const name = (approveInstance === null || approveInstance === void 0 ? void 0 : (_approveInstance$assi = approveInstance.assigner) === null || _approveInstance$assi === void 0 ? void 0 : _approveInstance$assi.name) || "NA";
+      const status = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A = applicationDetails.Applications) === null || _applicationDetails$A === void 0 ? void 0 : (_applicationDetails$A2 = _applicationDetails$A[0]) === null || _applicationDetails$A2 === void 0 ? void 0 : _applicationDetails$A2.applicationStatus;
+      setApproverStatement(status ? `${t(status)} By` : "");
       setApprover(name);
     }
   }, [workflowDetails]);
@@ -10478,6 +10551,68 @@ const CitizenApplicationOverview = () => {
     const userInfo = userInfos ? JSON.parse(userInfos) : {};
     user = userInfo === null || userInfo === void 0 ? void 0 : userInfo.value;
   }
+  const {
+    data: reciept_data,
+    isLoading: recieptDataLoading
+  } = Digit.Hooks.useRecieptSearch({
+    tenantId: tenantId,
+    businessService: "NDC",
+    consumerCodes: id,
+    isEmployee: false
+  }, {
+    enabled: id ? true : false
+  });
+  async function getRecieptSearch({
+    tenantId,
+    payments,
+    ...params
+  }) {
+    setLoader(true);
+    try {
+      var _applicationDetails$A3, _response;
+      let response = null;
+      let application = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A3 = applicationDetails.Applications) === null || _applicationDetails$A3 === void 0 ? void 0 : _applicationDetails$A3[0];
+      if (payments !== null && payments !== void 0 && payments.fileStoreId) {
+        response = {
+          filestoreIds: [payments === null || payments === void 0 ? void 0 : payments.fileStoreId]
+        };
+      } else {
+        response = await Digit.PaymentService.generatePdf(tenantId, {
+          Payments: [{
+            ...(payments || {}),
+            ...application
+          }]
+        }, "ndc-receipt");
+      }
+      const fileStore = await Digit.PaymentService.printReciept(tenantId, {
+        fileStoreIds: response.filestoreIds[0]
+      });
+      window.open(fileStore[(_response = response) === null || _response === void 0 ? void 0 : _response.filestoreIds[0]], "_blank");
+      setLoader(false);
+    } catch (error) {
+      console.error(error);
+      setLoader(false);
+    }
+  }
+  const dowloadOptions = [];
+  if ((applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A4 = applicationDetails.Applications) === null || _applicationDetails$A4 === void 0 ? void 0 : (_applicationDetails$A5 = _applicationDetails$A4[0]) === null || _applicationDetails$A5 === void 0 ? void 0 : _applicationDetails$A5.applicationStatus) === "APPROVED" || (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A6 = applicationDetails.Applications) === null || _applicationDetails$A6 === void 0 ? void 0 : (_applicationDetails$A7 = _applicationDetails$A6[0]) === null || _applicationDetails$A7 === void 0 ? void 0 : _applicationDetails$A7.applicationStatus) === "REJECTED") {
+    dowloadOptions.push({
+      label: t("DOWNLOAD_CERTIFICATE"),
+      onClick: () => handleDownloadPdf()
+    });
+  }
+  if (reciept_data && (reciept_data === null || reciept_data === void 0 ? void 0 : reciept_data.Payments.length) > 0 && !recieptDataLoading) {
+    dowloadOptions.push({
+      label: t("PTR_FEE_RECIEPT"),
+      onClick: () => {
+        var _reciept_data$Payment;
+        return getRecieptSearch({
+          tenantId: reciept_data === null || reciept_data === void 0 ? void 0 : (_reciept_data$Payment = reciept_data.Payments[0]) === null || _reciept_data$Payment === void 0 ? void 0 : _reciept_data$Payment.tenantId,
+          payments: reciept_data === null || reciept_data === void 0 ? void 0 : reciept_data.Payments[0]
+        });
+      }
+    });
+  }
   const userRoles = (_user = user) === null || _user === void 0 ? void 0 : (_user$info = _user.info) === null || _user$info === void 0 ? void 0 : (_user$info$roles = _user$info.roles) === null || _user$info$roles === void 0 ? void 0 : _user$info$roles.map(e => e.code);
   const removeDuplicatesByUUID = arr => {
     const seen = new Set();
@@ -10491,8 +10626,8 @@ const CitizenApplicationOverview = () => {
     });
   };
   useEffect(() => {
-    var _applicationDetails$A;
-    const ndcObject = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A = applicationDetails.Applications) === null || _applicationDetails$A === void 0 ? void 0 : _applicationDetails$A[0];
+    var _applicationDetails$A8;
+    const ndcObject = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A8 = applicationDetails.Applications) === null || _applicationDetails$A8 === void 0 ? void 0 : _applicationDetails$A8[0];
     console.log("ndcObject", ndcObject);
     if (ndcObject) {
       var _ndcObject$owners, _ndcObject$owners2, _removeDuplicatesByUU;
@@ -10551,7 +10686,7 @@ const CitizenApplicationOverview = () => {
       const ulbType = tenantInfo === null || tenantInfo === void 0 ? void 0 : (_tenantInfo$city = tenantInfo.city) === null || _tenantInfo$city === void 0 ? void 0 : _tenantInfo$city.ulbType;
       let acknowledgementData;
       if (empData) {
-        acknowledgementData = await getAcknowledgementData(Property, formattedAddress, tenantInfo, t, approver, ulbType, empData);
+        acknowledgementData = await getAcknowledgementData(Property, formattedAddress, tenantInfo, t, approver, ulbType, empData, approverStatement);
       }
       console.log("acknowledgementData", acknowledgementData);
       setTimeout(() => {
@@ -10597,14 +10732,14 @@ const CitizenApplicationOverview = () => {
     address = propertyDetailsFetch.Properties[0].address;
     formattedAddress = [(_address = address) === null || _address === void 0 ? void 0 : _address.doorNo, (_address2 = address) === null || _address2 === void 0 ? void 0 : _address2.buildingName, (_address3 = address) === null || _address3 === void 0 ? void 0 : _address3.street, (_address4 = address) === null || _address4 === void 0 ? void 0 : (_address4$locality = _address4.locality) === null || _address4$locality === void 0 ? void 0 : _address4$locality.name, (_address5 = address) === null || _address5 === void 0 ? void 0 : _address5.city].filter(Boolean).join(", ");
   }
-  if (isLoading || isDetailsLoading) {
+  if (isLoading || isDetailsLoading || recieptDataLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
   console.log("propertyDetailsFetch", propertyDetailsFetch);
   console.log("displayData?.applicantData", displayData);
   const ownerForName = (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch4 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch4 === void 0 ? void 0 : (_propertyDetailsFetch5 = _propertyDetailsFetch4[0]) === null || _propertyDetailsFetch5 === void 0 ? void 0 : _propertyDetailsFetch5.owners) || [];
   const ownerNames = ownerForName === null || ownerForName === void 0 ? void 0 : (_ownerForName$map = ownerForName.map(owner => owner === null || owner === void 0 ? void 0 : owner.name)) === null || _ownerForName$map === void 0 ? void 0 : (_ownerForName$map$fil = _ownerForName$map.filter(Boolean)) === null || _ownerForName$map$fil === void 0 ? void 0 : _ownerForName$map$fil.join(", ");
-  console.log("applicationDetails?.[0]", applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A3 = applicationDetails.Applications) === null || _applicationDetails$A3 === void 0 ? void 0 : _applicationDetails$A3[0]);
+  console.log("applicationDetails?.[0]", applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A0 = applicationDetails.Applications) === null || _applicationDetails$A0 === void 0 ? void 0 : _applicationDetails$A0[0]);
   return /*#__PURE__*/React.createElement("div", {
     className: "employee-main-application-details"
   }, /*#__PURE__*/React.createElement("div", {
@@ -10616,15 +10751,18 @@ const CitizenApplicationOverview = () => {
       alignItems: "center",
       padding: "16px"
     }
-  }, (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A4 = applicationDetails.Applications) === null || _applicationDetails$A4 === void 0 ? void 0 : (_applicationDetails$A5 = _applicationDetails$A4[0]) === null || _applicationDetails$A5 === void 0 ? void 0 : _applicationDetails$A5.applicationStatus) === "APPROVED" && /*#__PURE__*/React.createElement(LinkButton, {
-    className: "downLoadButton",
-    label: t("DOWNLOAD_CERTIFICATE"),
-    onClick: handleDownloadPdf
-  })), ((applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A6 = applicationDetails.Applications) === null || _applicationDetails$A6 === void 0 ? void 0 : (_applicationDetails$A7 = _applicationDetails$A6[0]) === null || _applicationDetails$A7 === void 0 ? void 0 : _applicationDetails$A7.applicationStatus) == "INITIATED" || (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A8 = applicationDetails.Applications) === null || _applicationDetails$A8 === void 0 ? void 0 : (_applicationDetails$A9 = _applicationDetails$A8[0]) === null || _applicationDetails$A9 === void 0 ? void 0 : _applicationDetails$A9.applicationStatus) == "CITIZENACTIONREQUIRED") && /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar$1, {
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "cardHeaderWithOptions ral-app-details-header"
+  }, getLoader && /*#__PURE__*/React.createElement(Loader, null), dowloadOptions && dowloadOptions.length > 0 && /*#__PURE__*/React.createElement(MultiLink, {
+    className: "multilinkWrapper",
+    onHeadClick: () => setShowOptions(!showOptions),
+    displayOptions: showOptions,
+    options: dowloadOptions
+  }))), ((applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A1 = applicationDetails.Applications) === null || _applicationDetails$A1 === void 0 ? void 0 : (_applicationDetails$A10 = _applicationDetails$A1[0]) === null || _applicationDetails$A10 === void 0 ? void 0 : _applicationDetails$A10.applicationStatus) == "INITIATED" || (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A11 = applicationDetails.Applications) === null || _applicationDetails$A11 === void 0 ? void 0 : (_applicationDetails$A12 = _applicationDetails$A11[0]) === null || _applicationDetails$A12 === void 0 ? void 0 : _applicationDetails$A12.applicationStatus) == "CITIZENACTIONREQUIRED") && /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar$1, {
     label: t("COMMON_EDIT"),
     onSubmit: () => {
-      var _applicationDetails$A0, _applicationDetails$A1;
-      const id = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A0 = applicationDetails.Applications) === null || _applicationDetails$A0 === void 0 ? void 0 : (_applicationDetails$A1 = _applicationDetails$A0[0]) === null || _applicationDetails$A1 === void 0 ? void 0 : _applicationDetails$A1.applicationNo;
+      var _applicationDetails$A13, _applicationDetails$A14;
+      const id = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A13 = applicationDetails.Applications) === null || _applicationDetails$A13 === void 0 ? void 0 : (_applicationDetails$A14 = _applicationDetails$A13[0]) === null || _applicationDetails$A14 === void 0 ? void 0 : _applicationDetails$A14.applicationNo;
       history.push(`/digit-ui/citizen/ndc/new-application/${id}`);
     }
   }))), /*#__PURE__*/React.createElement(Card, {
@@ -10643,7 +10781,7 @@ const CitizenApplicationOverview = () => {
   }, /*#__PURE__*/React.createElement(CardSubHeader, {
     className: "ndc_label"
   }, t("NDC_APPLICATION_NDC_DETAILS_OVERVIEW")), displayData === null || displayData === void 0 ? void 0 : (_displayData$NdcDetai2 = displayData.NdcDetails) === null || _displayData$NdcDetai2 === void 0 ? void 0 : _displayData$NdcDetai2.map((detail, index) => {
-    var _detail$dueAmount, _applicationDetails$A10, _applicationDetails$A11, _applicationDetails$A12, _applicationDetails$A13, _applicationDetails$A14, _applicationDetails$A15, _applicationDetails$A16, _applicationDetails$A17, _applicationDetails$A18, _propertyDetailsFetch6, _propertyDetailsFetch7, _propertyDetailsFetch8, _propertyDetailsFetch9, _propertyDetailsFetch0, _propertyDetailsFetch1, _propertyDetailsFetch10, _propertyDetailsFetch11, _propertyDetailsFetch12, _propertyDetailsFetch13, _propertyDetailsFetch14, _propertyDetailsFetch15, _propertyDetailsFetch16, _propertyDetailsFetch17, _propertyDetailsFetch18, _propertyDetailsFetch19, _propertyDetailsFetch20, _propertyDetailsFetch21, _propertyDetailsFetch22, _propertyDetailsFetch23, _applicationDetails$A19, _applicationDetails$A20, _applicationDetails$A21, _applicationDetails$A22, _applicationDetails$A23;
+    var _detail$dueAmount, _applicationDetails$A15, _applicationDetails$A16, _applicationDetails$A17, _applicationDetails$A18, _applicationDetails$A19, _applicationDetails$A20, _applicationDetails$A21, _applicationDetails$A22, _applicationDetails$A23, _propertyDetailsFetch6, _propertyDetailsFetch7, _propertyDetailsFetch8, _propertyDetailsFetch9, _propertyDetailsFetch0, _propertyDetailsFetch1, _propertyDetailsFetch10, _propertyDetailsFetch11, _propertyDetailsFetch12, _propertyDetailsFetch13, _propertyDetailsFetch14, _propertyDetailsFetch15, _propertyDetailsFetch16, _propertyDetailsFetch17, _propertyDetailsFetch18, _propertyDetailsFetch19, _propertyDetailsFetch20, _propertyDetailsFetch21, _propertyDetailsFetch22, _propertyDetailsFetch23, _applicationDetails$A24, _applicationDetails$A25, _applicationDetails$A26, _applicationDetails$A27, _applicationDetails$A28;
     console.log("detail", detail);
     const isRed = detail.dueAmount > 0;
     return /*#__PURE__*/React.createElement("div", {
@@ -10673,7 +10811,7 @@ const CitizenApplicationOverview = () => {
       text: t(detail.propertyType) || detail.propertyType
     }), (detail === null || detail === void 0 ? void 0 : detail.businessService) == "NDC_PROPERTY_TAX" && (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : propertyDetailsFetch.Properties) && /*#__PURE__*/React.createElement(Fragment$1, null, /*#__PURE__*/React.createElement(Row, {
       label: t("CHB_DISCOUNT_REASON"),
-      text: t(`${(applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A10 = applicationDetails.Applications) === null || _applicationDetails$A10 === void 0 ? void 0 : (_applicationDetails$A11 = _applicationDetails$A10[0]) === null || _applicationDetails$A11 === void 0 ? void 0 : _applicationDetails$A11.reason) === "OTHERS" ? applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A12 = applicationDetails.Applications) === null || _applicationDetails$A12 === void 0 ? void 0 : (_applicationDetails$A13 = _applicationDetails$A12[0]) === null || _applicationDetails$A13 === void 0 ? void 0 : (_applicationDetails$A14 = _applicationDetails$A13.NdcDetails) === null || _applicationDetails$A14 === void 0 ? void 0 : (_applicationDetails$A15 = _applicationDetails$A14.find(item => (item === null || item === void 0 ? void 0 : item.businessService) === "PT")) === null || _applicationDetails$A15 === void 0 ? void 0 : (_applicationDetails$A16 = _applicationDetails$A15.additionalDetails) === null || _applicationDetails$A16 === void 0 ? void 0 : _applicationDetails$A16.reason : applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A17 = applicationDetails.Applications) === null || _applicationDetails$A17 === void 0 ? void 0 : (_applicationDetails$A18 = _applicationDetails$A17[0]) === null || _applicationDetails$A18 === void 0 ? void 0 : _applicationDetails$A18.reason}`)
+      text: t(`${(applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A15 = applicationDetails.Applications) === null || _applicationDetails$A15 === void 0 ? void 0 : (_applicationDetails$A16 = _applicationDetails$A15[0]) === null || _applicationDetails$A16 === void 0 ? void 0 : _applicationDetails$A16.reason) === "OTHERS" ? applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A17 = applicationDetails.Applications) === null || _applicationDetails$A17 === void 0 ? void 0 : (_applicationDetails$A18 = _applicationDetails$A17[0]) === null || _applicationDetails$A18 === void 0 ? void 0 : (_applicationDetails$A19 = _applicationDetails$A18.NdcDetails) === null || _applicationDetails$A19 === void 0 ? void 0 : (_applicationDetails$A20 = _applicationDetails$A19.find(item => (item === null || item === void 0 ? void 0 : item.businessService) === "PT")) === null || _applicationDetails$A20 === void 0 ? void 0 : (_applicationDetails$A21 = _applicationDetails$A20.additionalDetails) === null || _applicationDetails$A21 === void 0 ? void 0 : _applicationDetails$A21.reason : applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A22 = applicationDetails.Applications) === null || _applicationDetails$A22 === void 0 ? void 0 : (_applicationDetails$A23 = _applicationDetails$A22[0]) === null || _applicationDetails$A23 === void 0 ? void 0 : _applicationDetails$A23.reason}`)
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("City"),
       text: (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch6 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch6 === void 0 ? void 0 : (_propertyDetailsFetch7 = _propertyDetailsFetch6[0]) === null || _propertyDetailsFetch7 === void 0 ? void 0 : (_propertyDetailsFetch8 = _propertyDetailsFetch7.address) === null || _propertyDetailsFetch8 === void 0 ? void 0 : _propertyDetailsFetch8.city) || "N/A"
@@ -10697,7 +10835,7 @@ const CitizenApplicationOverview = () => {
       text: propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch21 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch21 === void 0 ? void 0 : (_propertyDetailsFetch22 = _propertyDetailsFetch21[0]) === null || _propertyDetailsFetch22 === void 0 ? void 0 : (_propertyDetailsFetch23 = _propertyDetailsFetch22.additionalDetails) === null || _propertyDetailsFetch23 === void 0 ? void 0 : _propertyDetailsFetch23.yearConstruction
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("Remarks"),
-      text: (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A19 = applicationDetails.Applications) === null || _applicationDetails$A19 === void 0 ? void 0 : (_applicationDetails$A20 = _applicationDetails$A19[0]) === null || _applicationDetails$A20 === void 0 ? void 0 : (_applicationDetails$A21 = _applicationDetails$A20.NdcDetails) === null || _applicationDetails$A21 === void 0 ? void 0 : (_applicationDetails$A22 = _applicationDetails$A21.find(item => (item === null || item === void 0 ? void 0 : item.businessService) === "PT")) === null || _applicationDetails$A22 === void 0 ? void 0 : (_applicationDetails$A23 = _applicationDetails$A22.additionalDetails) === null || _applicationDetails$A23 === void 0 ? void 0 : _applicationDetails$A23.remarks) || "N/A"
+      text: (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A24 = applicationDetails.Applications) === null || _applicationDetails$A24 === void 0 ? void 0 : (_applicationDetails$A25 = _applicationDetails$A24[0]) === null || _applicationDetails$A25 === void 0 ? void 0 : (_applicationDetails$A26 = _applicationDetails$A25.NdcDetails) === null || _applicationDetails$A26 === void 0 ? void 0 : (_applicationDetails$A27 = _applicationDetails$A26.find(item => (item === null || item === void 0 ? void 0 : item.businessService) === "PT")) === null || _applicationDetails$A27 === void 0 ? void 0 : (_applicationDetails$A28 = _applicationDetails$A27.additionalDetails) === null || _applicationDetails$A28 === void 0 ? void 0 : _applicationDetails$A28.remarks) || "N/A"
     }))));
   })), /*#__PURE__*/React.createElement(Card, {
     className: "ndc_card_main"
@@ -10808,7 +10946,7 @@ function _extends() {
   }, _extends.apply(null, arguments);
 }
 
-const NewSearchFormFieldsComponent = ({
+const SearchFormFieldsComponents = ({
   registerRef,
   searchFormState,
   searchFieldComponents
@@ -10817,6 +10955,7 @@ const NewSearchFormFieldsComponent = ({
     t
   } = useTranslation();
   const isMobile = window.Digit.Utils.browser.isMobile();
+  console.log("searchFieldComponents", searchFieldComponents);
   if (!isMobile) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       className: "search-container ndc-search-container-custom"
@@ -10834,7 +10973,7 @@ const NewSearchFormFieldsComponent = ({
       className: "search-action-wrapper ndc-search-action-wrapper"
     }, searchFieldComponents)))));
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SearchField, null, /*#__PURE__*/React.createElement("label", null, t("NOC_HOME_SEARCH_RESULTS_APP_NO_LABEL")), /*#__PURE__*/React.createElement(TextInput, {
+  return /*#__PURE__*/React.createElement(Fragment$1, null, /*#__PURE__*/React.createElement(SearchField, null, /*#__PURE__*/React.createElement("label", null, t("NOC_HOME_SEARCH_RESULTS_APP_NO_LABEL")), /*#__PURE__*/React.createElement(TextInput, {
     name: "applicationNo",
     inputRef: registerRef({})
   })), /*#__PURE__*/React.createElement(SearchField, null, /*#__PURE__*/React.createElement("label", null, t("CORE_COMMON_PHONE_NUMBER")), /*#__PURE__*/React.createElement(TextInput, {
@@ -10843,7 +10982,7 @@ const NewSearchFormFieldsComponent = ({
   })));
 };
 
-const NewFilterFormFieldsComponent = ({
+const FilterFormFieldsComponent = ({
   statuses,
   controlFilterForm,
   applicationTypesOfBPA,
@@ -10852,7 +10991,15 @@ const NewFilterFormFieldsComponent = ({
   const {
     t
   } = useTranslation();
-  const [showAllStatuses, setShowAllStatuses] = useState(false);
+  const tenantId = Digit.ULBService.getStateId();
+  const [tlfilters, setTLFilters] = useState({
+    applicationStatus: []
+  });
+  useEffect(() => {
+    if (tlfilters) {
+      handleFilter(tlfilters);
+    }
+  }, [tlfilters]);
   const availableOptions = [{
     code: "ASSIGNED_TO_ME",
     name: `${t("ES_INBOX_ASSIGNED_TO_ME")}`
@@ -10864,128 +11011,43 @@ const NewFilterFormFieldsComponent = ({
     type.name = t(`WF_BPA_${type.code}`);
     type.i18nKey = t(`WF_BPA_${type.code}`);
   });
-  const getVariantFromCode = code => {
-    const value = String(code || "").toLowerCase();
-    if (value.includes("approved")) return "success";
-    if (value.includes("rejected")) return "danger";
-    if (value.includes("pending")) return "warning";
-    if (value.includes("inbox")) return "primary";
-    if (value.includes("assigned")) return "primary";
-    return "info";
-  };
-  const colorVariants = ["primary", "success", "warning", "danger", "info", "indigo", "teal", "pink", "amber", "slate"];
-  const getVariantByIndex = (index, fallback) => colorVariants[index % colorVariants.length] || fallback;
-  const {
-    field: assigneeField
-  } = useController({
+  return /*#__PURE__*/React.createElement(Fragment$1, null, /*#__PURE__*/React.createElement(FilterFormField, null, /*#__PURE__*/React.createElement(Controller, {
     name: "assignee",
-    control: controlFilterForm
-  });
-  const {
-    field: statusField
-  } = useController({
+    control: controlFilterForm,
+    render: props => /*#__PURE__*/React.createElement(RadioButtons, {
+      onSelect: e => {
+        props.onChange(e.code);
+      },
+      selectedOption: availableOptions.filter(option => option.code === props.value)[0],
+      optionsKey: "name",
+      options: availableOptions
+    })
+  })), /*#__PURE__*/React.createElement(FilterFormField, null, /*#__PURE__*/React.createElement(Controller, {
     name: "applicationStatus",
     control: controlFilterForm,
-    defaultValue: []
-  });
-  const statusValues = Array.isArray(statusField.value) ? statusField.value : [];
-  const toggleStatus = statusCode => {
-    let newStatusValues;
-    if (statusValues.includes(statusCode)) {
-      newStatusValues = statusValues.filter(code => code !== statusCode);
-    } else {
-      newStatusValues = [...statusValues, statusCode];
-    }
-    statusField.onChange(newStatusValues);
-    if (typeof handleFilter === "function") {
-      handleFilter({
-        applicationStatus: newStatusValues.map(code => ({
-          code
-        }))
-      });
-    }
-  };
-  const cards = [...availableOptions.map(option => ({
-    key: option.code,
-    type: "assignee",
-    label: option.name,
-    subtitle: t("ES_INBOX_ASSIGNED"),
-    count: null,
-    code: option.code,
-    icon: "⌂"
-  })), ...(statuses || []).map(status => ({
-    key: status.applicationstatus,
-    type: "status",
-    label: t(status.applicationstatus),
-    subtitle: null,
-    count: status.totalCount ?? status.count ?? status.noOfRecords ?? status.totalRecords ?? status.applicationCount ?? 0,
-    code: status.applicationstatus,
-    icon: "◎"
-  }))];
-  const visibleCards = showAllStatuses ? cards : cards.slice(0, 6);
-  return /*#__PURE__*/React.createElement("div", {
-    className: "ndc-new-inbox-filter-card",
-    style: {
-      marginTop: 16,
-      marginBottom: 16
-    }
-  }, /*#__PURE__*/React.createElement(FilterFormField, null, /*#__PURE__*/React.createElement("div", {
-    className: "ndc-new-filter-status-wrapper"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "ndc-new-filter-status-grid ndc-new-filter-card-grid"
-  }, visibleCards.map((card, index) => {
-    const isActive = card.type === "assignee" ? assigneeField.value === card.code : statusValues.includes(card.code);
-    const variant = getVariantByIndex(index, getVariantFromCode(card.code));
-    return /*#__PURE__*/React.createElement("button", {
-      key: card.key,
-      type: "button",
-      className: `ndc-new-filter-status-card ndc-new-filter-option-card ndc-new-filter-card ${variant} ${isActive ? "active" : ""}`,
-      onClick: () => {
-        if (card.type === "assignee") {
-          assigneeField.onChange(card.code);
-          if (typeof handleFilter === "function") {
-            handleFilter({
-              assignee: card.code,
-              applicationStatus: statusValues.map(code => ({
-                code
-              }))
-            });
-          }
+    defaultValue: [],
+    render: props => {
+      const toggleStatus = statusCode => {
+        console.log(statusCode, "statusCode");
+        if (props.value.includes(statusCode)) {
+          props.onChange(props.value.filter(code => code !== statusCode));
         } else {
-          toggleStatus(card.code);
-        }
-      }
-    }, isActive ? /*#__PURE__*/React.createElement("span", {
-      className: "ndc-new-filter-card-check",
-      "aria-hidden": "true"
-    }, "\u2713") : null, /*#__PURE__*/React.createElement("div", {
-      className: "ndc-new-filter-status-title ndc-new-filter-option-title"
-    }, card.label), card.subtitle ? /*#__PURE__*/React.createElement("div", {
-      className: "ndc-new-filter-option-subtitle"
-    }, card.subtitle) : /*#__PURE__*/React.createElement("div", {
-      className: "ndc-new-filter-status-count"
-    }, card.count !== null && card.count !== undefined ? card.count : ""), /*#__PURE__*/React.createElement("span", {
-      className: "ndc-new-filter-card-icon",
-      "aria-hidden": "true"
-    }, /*#__PURE__*/React.createElement("span", null, card.icon)));
-  })), cards.length > 6 ? /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: "flex",
-      justifyContent: "center",
-      marginTop: 8
+          props.onChange([...props.value, statusCode]);
+        }
+      };
+      return /*#__PURE__*/React.createElement(Fragment$1, null, statuses === null || statuses === void 0 ? void 0 : statuses.map((status, index) => /*#__PURE__*/React.createElement(CheckBox, {
+        key: status.applicationstatus,
+        label: `${t(status.applicationstatus)} - ${status.count}`,
+        value: status.applicationstatus,
+        checked: props.value.includes(status.applicationstatus),
+        onChange: () => toggleStatus(status.applicationstatus),
+        index: index
+      })));
     }
-  }, /*#__PURE__*/React.createElement("button", {
-    type: "button",
-    className: "ndc-new-filter-show-more",
-    onClick: () => setShowAllStatuses(prev => !prev),
-    "aria-label": showAllStatuses ? t("ES_COMMON_SHOW_LESS") : t("ES_COMMON_SHOW_MORE")
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "ndc-new-filter-show-more-icon",
-    "aria-hidden": "true"
-  }, showAllStatuses ? "▲" : "▼"))) : null)));
+  })));
 };
 
-const useNewInboxTableConfig = ({
+const useInboxTableConfig = ({
   parentRoute,
   onPageSizeChange,
   formState,
@@ -10998,87 +11060,33 @@ const useNewInboxTableConfig = ({
   const {
     t
   } = useTranslation();
-  const getStatusClass = status => {
-    const value = String(status || "").toLowerCase();
-    if (value.includes("approved")) return "approved";
-    if (value.includes("rejected")) return "rejected";
-    if (value.includes("forward")) return "forwarded";
-    if (value.includes("process")) return "in-progress";
-    if (value.includes("pending")) return "pending";
-    if (value.includes("new")) return "new";
-    return "default";
-  };
-  const renderStatusIcon = statusClass => {
-    switch (statusClass) {
-      case "approved":
-        return /*#__PURE__*/React.createElement("svg", {
-          viewBox: "0 0 24 24",
-          width: "14",
-          height: "14",
-          fill: "none",
-          stroke: "currentColor",
-          strokeWidth: "2"
-        }, /*#__PURE__*/React.createElement("path", {
-          d: "M20 6L9 17l-5-5"
-        }));
-      case "rejected":
-        return /*#__PURE__*/React.createElement("svg", {
-          viewBox: "0 0 24 24",
-          width: "14",
-          height: "14",
-          fill: "none",
-          stroke: "currentColor",
-          strokeWidth: "2"
-        }, /*#__PURE__*/React.createElement("path", {
-          d: "M18 6L6 18"
-        }), /*#__PURE__*/React.createElement("path", {
-          d: "M6 6l12 12"
-        }));
-      case "forwarded":
-        return /*#__PURE__*/React.createElement("svg", {
-          viewBox: "0 0 24 24",
-          width: "14",
-          height: "14",
-          fill: "none",
-          stroke: "currentColor",
-          strokeWidth: "2"
-        }, /*#__PURE__*/React.createElement("path", {
-          d: "M5 12h14"
-        }), /*#__PURE__*/React.createElement("path", {
-          d: "M13 5l7 7-7 7"
-        }));
-      default:
-        return null;
-    }
-  };
+  const GetCell = value => /*#__PURE__*/React.createElement("span", {
+    className: "cell-text styled-cell"
+  }, value);
   const tableColumnConfig = useMemo(() => {
     return [{
       Header: t("NOC_HOME_SEARCH_RESULTS_APP_NO_LABEL"),
-      accessor: "applicationId",
+      accessor: "uuid",
       disableSortBy: true,
-      className: "ndc-new-table-app",
       Cell: ({
         row
       }) => {
-        var _row$original, _row$original2, _row$original3, _row$original4, _row$original5;
-        return /*#__PURE__*/React.createElement("div", {
-          className: "ndc-new-cell-stack"
-        }, /*#__PURE__*/React.createElement(Link, {
-          to: `${parentRoute}/inbox/application-overview/${(_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.applicationId}`,
-          className: "ndc-new-app-link"
-        }, ((_row$original2 = row.original) === null || _row$original2 === void 0 ? void 0 : _row$original2.applicationId) || ((_row$original3 = row.original) === null || _row$original3 === void 0 ? void 0 : _row$original3.applicationNo) || "-"), (_row$original4 = row.original) !== null && _row$original4 !== void 0 && _row$original4.locality ? /*#__PURE__*/React.createElement("div", {
-          className: "ndc-new-cell-secondary"
-        }, (_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : _row$original5.locality) : null);
+        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", {
+          className: "link"
+        }, (_row$original2 = row.original) === null || _row$original2 === void 0 ? void 0 : _row$original2.applicationId)));
       }
     }, {
       Header: t("TL_COMMON_TABLE_COL_APP_DATE"),
-      accessor: "date",
+      accessor: "createdtime",
       Cell: ({
         row
       }) => {
-        var _row$original6, _row$original7;
-        const dateValue = ((_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : _row$original6.date) || ((_row$original7 = row.original) === null || _row$original7 === void 0 ? void 0 : _row$original7.createdTime);
-        return dateValue ? format(new Date(dateValue), "dd/MM/yyyy") : "-";
+        var _row$original3, _row$original4;
+        return (_row$original3 = row.original) !== null && _row$original3 !== void 0 && _row$original3.date ? GetCell(format(new Date((_row$original4 = row.original) === null || _row$original4 === void 0 ? void 0 : _row$original4.date), "dd/MM/yyyy")) : "";
       }
     }, {
       Header: t("PT_COMMON_TABLE_COL_STATUS_LABEL"),
@@ -11086,56 +11094,18 @@ const useNewInboxTableConfig = ({
       Cell: ({
         row
       }) => {
-        var _row$original8, _row$original9;
-        const statusValue = ((_row$original8 = row.original) === null || _row$original8 === void 0 ? void 0 : _row$original8.status) || ((_row$original9 = row.original) === null || _row$original9 === void 0 ? void 0 : _row$original9.applicationStatus) || "-";
-        const statusClass = getStatusClass(statusValue);
-        return /*#__PURE__*/React.createElement("span", {
-          className: `ndc-new-status-pill ${statusClass}`
-        }, renderStatusIcon(statusClass), /*#__PURE__*/React.createElement("span", null, String(statusValue || "-").toLowerCase()));
-      }
-    }, {
-      Header: t("CS_COMMON_ACTION"),
-      accessor: "action",
-      disableSortBy: true,
-      className: "ndc-new-table-action",
-      Cell: ({
-        row
-      }) => {
-        var _row$original0;
-        return /*#__PURE__*/React.createElement("span", {
-          className: "ndc-new-action-group"
-        }, /*#__PURE__*/React.createElement(Link, {
-          to: `${parentRoute}/inbox/application-overview/${(_row$original0 = row.original) === null || _row$original0 === void 0 ? void 0 : _row$original0.applicationId}`,
-          className: "ndc-new-icon ndc-new-icon-link",
-          "aria-label": t("ES_COMMON_VIEW")
-        }, /*#__PURE__*/React.createElement("svg", {
-          viewBox: "0 0 24 24",
-          width: "18",
-          height: "18",
-          fill: "none",
-          stroke: "currentColor",
-          strokeWidth: "2"
-        }, /*#__PURE__*/React.createElement("path", {
-          d: "M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"
-        }), /*#__PURE__*/React.createElement("circle", {
-          cx: "12",
-          cy: "12",
-          r: "3"
-        }))));
+        var _row$original5;
+        return t((_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : _row$original5.status);
       }
     }];
-  }, [parentRoute, t]);
+  });
   return {
-    getCellProps: () => ({
-      style: {
-        padding: "16px 20px",
-        fontSize: "14px"
-      }
-    }),
-    getRowProps: row => {
-      var _row$original1, _row$original10;
+    getCellProps: cellInfo => {
       return {
-        className: `ndc-new-row ${getStatusClass((row === null || row === void 0 ? void 0 : (_row$original1 = row.original) === null || _row$original1 === void 0 ? void 0 : _row$original1.status) || (row === null || row === void 0 ? void 0 : (_row$original10 = row.original) === null || _row$original10 === void 0 ? void 0 : _row$original10.applicationStatus))}`
+        style: {
+          padding: "20px 18px",
+          fontSize: "16px"
+        }
       };
     },
     disableSort: false,
@@ -11190,7 +11160,7 @@ const useNewInboxTableConfig = ({
   };
 };
 
-const useNewInboxMobileCardsData = ({
+const useInboxMobileCardsData = ({
   parentRoute,
   table
 }) => {
@@ -11240,37 +11210,33 @@ const useNewInboxMobileCardsData = ({
   };
 };
 
-const NewNDCInbox = ({
-  parentRoute,
-  tableColumns
+const Inbox = ({
+  parentRoute
 }) => {
-  var _formState$filterForm3, _formState$filterForm4, _formState$filterForm5, _formState$tableForm5, _formState$tableForm6, _formState$tableForm7, _formState$tableForm8, _formState$tableForm9, _formState$tableForm0, _formState$tableForm1;
   const {
     t
   } = useTranslation();
   const tenantId = window.localStorage.getItem("Employee.tenant-id");
-  const [activeStatusTab, setActiveStatusTab] = useState("ALL");
-  const [topBarSearch, setTopBarSearch] = useState("");
-  const businessServices = useMemo(() => businessServiceList(true) || [], []);
-  const searchFormDefaultValues = useMemo(() => ({}), []);
-  const filterFormDefaultValues = useMemo(() => ({
+  const [getFilter, setFilter] = useState();
+  const searchFormDefaultValues = {};
+  const filterFormDefaultValues = {
     moduleName: "ndc-services",
     applicationStatus: [],
     businessService: null,
     locality: [],
     assignee: "ASSIGNED_TO_ALL",
-    businessServiceArray: businessServices
-  }), [businessServices]);
-  const tableOrderFormDefaultValues = useMemo(() => ({
+    businessServiceArray: businessServiceList(true) || []
+  };
+  const tableOrderFormDefaultValues = {
     sortBy: "",
     limit: window.Digit.Utils.browser.isMobile() ? 50 : 10,
     offset: 0,
     sortOrder: "DESC"
-  }), []);
+  };
   function formReducer(state, payload) {
     switch (payload.action) {
       case "mutateSearchForm":
-        Digit.SessionStorage.set("NDC.NEW_INBOX", {
+        Digit.SessionStorage.set("NDC.INBOX", {
           ...state,
           searchForm: payload.data
         });
@@ -11279,7 +11245,7 @@ const NewNDCInbox = ({
           searchForm: payload.data
         };
       case "mutateFilterForm":
-        Digit.SessionStorage.set("NDC.NEW_INBOX", {
+        Digit.SessionStorage.set("NDC.INBOX", {
           ...state,
           filterForm: payload.data
         });
@@ -11288,7 +11254,7 @@ const NewNDCInbox = ({
           filterForm: payload.data
         };
       case "mutateTableForm":
-        Digit.SessionStorage.set("NDC.NEW_INBOX", {
+        Digit.SessionStorage.set("NDC.INBOX", {
           ...state,
           tableForm: payload.data
         });
@@ -11298,7 +11264,7 @@ const NewNDCInbox = ({
         };
     }
   }
-  const InboxObjectInSessionStorage = Digit.SessionStorage.get("NDC.NEW_INBOX");
+  const InboxObjectInSessionStorage = Digit.SessionStorage.get("NDC.INBOX");
   const onSearchFormReset = setSearchFormValue => {
     setSearchFormValue("sourceRefId", null);
     setSearchFormValue("applicationNo", null);
@@ -11309,8 +11275,8 @@ const NewNDCInbox = ({
     });
   };
   const onFilterFormReset = setFilterFormValue => {
-    setFilterFormValue("moduleName", "ndc-services");
-    setFilterFormValue("applicationStatus", []);
+    setFilterFormValue("moduleName", "bpa-services");
+    setFilterFormValue("applicationStatus", "");
     setFilterFormValue("locality", []);
     setFilterFormValue("assignee", "ASSIGNED_TO_ALL");
     setFilterFormValue("applicationType", []);
@@ -11343,26 +11309,6 @@ const NewNDCInbox = ({
       }
     });
   };
-  const onNextPage = () => {
-    var _formState$tableForm, _formState$tableForm2;
-    return dispatch({
-      action: "mutateTableForm",
-      data: {
-        ...formState.tableForm,
-        offset: parseInt((_formState$tableForm = formState.tableForm) === null || _formState$tableForm === void 0 ? void 0 : _formState$tableForm.offset) + parseInt((_formState$tableForm2 = formState.tableForm) === null || _formState$tableForm2 === void 0 ? void 0 : _formState$tableForm2.limit)
-      }
-    });
-  };
-  const onPrevPage = () => {
-    var _formState$tableForm3, _formState$tableForm4;
-    return dispatch({
-      action: "mutateTableForm",
-      data: {
-        ...formState.tableForm,
-        offset: parseInt((_formState$tableForm3 = formState.tableForm) === null || _formState$tableForm3 === void 0 ? void 0 : _formState$tableForm3.offset) - parseInt((_formState$tableForm4 = formState.tableForm) === null || _formState$tableForm4 === void 0 ? void 0 : _formState$tableForm4.limit)
-      }
-    });
-  };
   const onSortingByData = e => {
     if (e.length > 0) {
       const [{
@@ -11399,54 +11345,17 @@ const NewNDCInbox = ({
     data: localitiesForEmployeesCurrentTenant,
     isLoading: loadingLocalitiesForEmployeesCurrentTenant
   } = Digit.Hooks.useBoundaryLocalities(tenantId, "revenue", {}, t);
-  const {
-    register: registerFilterFormField,
-    control: controlFilterForm,
-    handleSubmit: handleFilterFormSubmit,
-    setValue: setFilterFormValue,
-    getValues: getFilterFormValue,
-    reset: resetFilterForm
-  } = useForm({
-    defaultValues: {
-      ...filterFormDefaultValues
-    }
-  });
-  const handleFilter = useCallback(filterData => {
-    var _filterData$applicati, _formState$filterForm, _formState$filterForm2;
-    if (filterData.applicationStatus) {
-      setFilterFormValue("applicationStatus", filterData.applicationStatus.map(item => item.code || item));
-    }
-    if (filterData.assignee) {
-      setFilterFormValue("assignee", filterData.assignee);
-    }
-    dispatch({
-      action: "mutateFilterForm",
-      data: {
-        ...(formState === null || formState === void 0 ? void 0 : formState.filterForm),
-        applicationStatus: ((_filterData$applicati = filterData.applicationStatus) === null || _filterData$applicati === void 0 ? void 0 : _filterData$applicati.map(item => item.code || item)) || (formState === null || formState === void 0 ? void 0 : (_formState$filterForm = formState.filterForm) === null || _formState$filterForm === void 0 ? void 0 : _formState$filterForm.applicationStatus) || [],
-        assignee: filterData.assignee || (formState === null || formState === void 0 ? void 0 : (_formState$filterForm2 = formState.filterForm) === null || _formState$filterForm2 === void 0 ? void 0 : _formState$filterForm2.assignee) || "ASSIGNED_TO_ALL"
-      }
-    });
-  }, [formState === null || formState === void 0 ? void 0 : formState.filterForm, setFilterFormValue]);
-  const prevFilterRef = useRef("");
-  const searchDebounceRef = useRef(null);
-  const hasInitializedFilterForm = useRef(false);
-  useEffect(() => {
-    if (formState !== null && formState !== void 0 && formState.filterForm) {
-      setFilterFormValue("assignee", formState.filterForm.assignee || "ASSIGNED_TO_ALL");
-      setFilterFormValue("applicationStatus", formState.filterForm.applicationStatus || []);
-      setFilterFormValue("moduleName", formState.filterForm.moduleName || "ndc-services");
-    }
-  }, [formState === null || formState === void 0 ? void 0 : (_formState$filterForm3 = formState.filterForm) === null || _formState$filterForm3 === void 0 ? void 0 : _formState$filterForm3.assignee, formState === null || formState === void 0 ? void 0 : (_formState$filterForm4 = formState.filterForm) === null || _formState$filterForm4 === void 0 ? void 0 : _formState$filterForm4.applicationStatus, formState === null || formState === void 0 ? void 0 : (_formState$filterForm5 = formState.filterForm) === null || _formState$filterForm5 === void 0 ? void 0 : _formState$filterForm5.moduleName, setFilterFormValue]);
+  const handleFilter = filterStatus => {
+    setFilter(filterStatus);
+  };
   const {
     isLoading: isInboxLoading,
     data
   } = Digit.Hooks.ndc.useInbox({
     tenantId,
     filters: {
-      filterForm: (formState === null || formState === void 0 ? void 0 : formState.filterForm) || filterFormDefaultValues,
-      searchForm: (formState === null || formState === void 0 ? void 0 : formState.searchForm) || searchFormDefaultValues,
-      tableForm: (formState === null || formState === void 0 ? void 0 : formState.tableForm) || tableOrderFormDefaultValues
+      ...formState,
+      getFilter
     }
   });
   const [table, setTable] = useState([]);
@@ -11472,7 +11381,7 @@ const NewNDCInbox = ({
     registerRef,
     searchFormState,
     searchFieldComponents
-  }) => /*#__PURE__*/React.createElement(NewSearchFormFieldsComponent, {
+  }) => /*#__PURE__*/React.createElement(SearchFormFieldsComponents, {
     registerRef,
     searchFormState,
     searchFieldComponents
@@ -11482,7 +11391,7 @@ const NewNDCInbox = ({
     controlFilterForm,
     setFilterFormValue,
     getFilterFormValue
-  }) => /*#__PURE__*/React.createElement(NewFilterFormFieldsComponent, Object.assign({}, {
+  }) => /*#__PURE__*/React.createElement(FilterFormFieldsComponent, Object.assign({}, {
     statuses,
     isInboxLoading,
     registerRef,
@@ -11535,7 +11444,7 @@ const NewNDCInbox = ({
     resetFilterFormDefaultValues: filterFormDefaultValues,
     onFilterFormReset
   };
-  const propsForInboxTable = useNewInboxTableConfig({
+  const propsForInboxTable = useInboxTableConfig({
     ...{
       parentRoute,
       onPageSizeChange,
@@ -11546,7 +11455,7 @@ const NewNDCInbox = ({
       onSortingByData
     }
   });
-  const propsForInboxMobileCards = useNewInboxMobileCardsData({
+  const propsForInboxMobileCards = useInboxMobileCardsData({
     parentRoute,
     table
   });
@@ -11555,689 +11464,18 @@ const NewNDCInbox = ({
     sortFormDefaultValues: formState === null || formState === void 0 ? void 0 : formState.tableForm,
     onSortFormReset
   };
-  const resolvedTableColumns = tableColumns || (propsForInboxTable === null || propsForInboxTable === void 0 ? void 0 : propsForInboxTable.columns);
-  useEffect(() => {
-    const serialized = JSON.stringify((formState === null || formState === void 0 ? void 0 : formState.filterForm) || {});
-    if (prevFilterRef.current === serialized) return;
-    prevFilterRef.current = serialized;
-  }, [formState]);
-  useEffect(() => {
-    if (searchDebounceRef.current) clearTimeout(searchDebounceRef.current);
-    searchDebounceRef.current = setTimeout(() => {
-      const value = String(topBarSearch || "").trim();
-      const nextSearchForm = value ? {
-        applicationNo: value
-      } : {};
-      dispatch({
-        action: "mutateTableForm",
-        data: {
-          ...tableOrderFormDefaultValues
-        }
-      });
-      dispatch({
-        action: "mutateSearchForm",
-        data: nextSearchForm
-      });
-    }, 400);
-    return () => clearTimeout(searchDebounceRef.current);
-  }, [topBarSearch, tableOrderFormDefaultValues]);
-  const onResetFilterForm = () => {
-    onFilterFormReset(setFilterFormValue);
-  };
-  const normalizeStatus = useCallback(value => String(value || "").replace(/[\s-_]+/g, "").toUpperCase(), []);
-  const onStatusTabClick = useCallback((label, statusCode) => {
-    setActiveStatusTab(statusCode || label);
-    if (label === "CLEAR") {
-      setTopBarSearch("");
-      return;
-    }
-    if (label === "ALL") {
-      setFilterFormValue("applicationStatus", [], {
-        shouldDirty: true,
-        shouldTouch: true
-      });
-      handleFilterFormSubmit(onFilterFormSubmit)();
-      return;
-    }
-    const resolvedCode = statusCode || label;
-    setFilterFormValue("applicationStatus", [resolvedCode], {
-      shouldDirty: true,
-      shouldTouch: true
-    });
-    handleFilterFormSubmit(onFilterFormSubmit)();
-  }, [handleFilterFormSubmit, onFilterFormSubmit, setFilterFormValue]);
-  useEffect(() => {
-    if (hasInitializedFilterForm.current) return;
-    if (resetFilterForm && formState) {
-      resetFilterForm(formState === null || formState === void 0 ? void 0 : formState.filterForm);
-      hasInitializedFilterForm.current = true;
-    }
-  }, [formState, resetFilterForm]);
-  const isMobile = window.Digit.Utils.browser.isMobile();
-  if (isMobile) {
-    return /*#__PURE__*/React.createElement("div", {
-      className: "ndc-new-inbox"
-    }, /*#__PURE__*/React.createElement(InboxComposer, _extends({
-      isInboxLoading,
-      PropsForInboxLinks
-    }, propsForSearchForm, propsForFilterForm, propsForMobileSortForm, {
-      propsForInboxTable,
-      propsForInboxMobileCards,
-      formState
-    })));
-  }
-  return /*#__PURE__*/React.createElement("div", {
-    className: "ndc-new-inbox"
-  }, /*#__PURE__*/React.createElement("style", null, `
-        .ndc-new-inbox {
-          margin-top: 32px;
-          padding: 20px;
-          background: #f8fafc;
-          border-radius: 12px;
-        }
-        .ndc-new-inbox .ndc-new-header {
-          display: flex;
-          align-items: center;
-          gap: 10px;
-          font-size: 24px;
-          font-weight: 700;
-          margin-bottom: 12px;
-        }
-        .ndc-new-inbox .ndc-new-count-pill {
-          display: inline-flex;
-          align-items: center;
-          justify-content: center;
-          min-width: 28px;
-          height: 28px;
-          padding: 0 8px;
-          border-radius: 999px;
-          background: #2563eb;
-          color: #ffffff;
-          font-size: 12px;
-          font-weight: 700;
-        }
-  
-        .ndc-new-inbox .ndc-new-filter-card-grid {
-          display: grid;
-          grid-template-columns: repeat(6, 1fr);
-          gap: 14px;
-        }
-        .ndc-new-inbox .ndc-new-filter-option-card {
-          background: #f8fafc;
-          border: 1px solid #e5e7eb;
-          border-radius: 12px;
-          padding: 16px;
-          min-height: 88px;
-          text-align: left;
-          cursor: pointer;
-          transition: all 0.2s ease;
-          position: relative;
-          overflow: hidden;
-        }
-        .ndc-new-inbox .ndc-new-filter-option-card.active {
-          background: #e0f2fe;
-          border-color: #38bdf8;
-          box-shadow: 0 4px 12px rgba(2, 132, 199, 0.18);
-        }
-        .ndc-new-inbox .ndc-new-filter-option-title {
-          font-weight: 700;
-          font-size: 14px;
-        }
-        .ndc-new-inbox .ndc-new-filter-option-subtitle {
-          font-size: 12px;
-          margin-top: 6px;
-          color: white;
-        }
-        .ndc-new-inbox .ndc-new-filter-status-grid {
-          display: grid;
-          grid-template-columns: repeat(6, 1fr);
-          gap: 14px;
-        }
-        .ndc-new-inbox .ndc-new-filter-status-card {
-          background: #ffffff;
-          border: 1px solid #e5e7eb;
-          border-radius: 12px;
-          padding: 16px;
-          min-height: 88px;
-          text-align: left;
-          cursor: pointer;
-          transition: all 0.2s ease;
-          width: 100%;
-          box-sizing: border-box;
-          position: relative;
-          overflow: hidden;
-        }
-        .ndc-new-inbox .ndc-new-filter-status-card.active {
-          background: #e0f2fe;
-          border-color: #38bdf8;
-          box-shadow: 0 4px 12px rgba(2, 132, 199, 0.18);
-        }
-        .ndc-new-inbox .ndc-new-filter-status-title {
-          font-weight: 700;
-          font-size: 14px;
-        }
-        .ndc-new-inbox .ndc-new-filter-status-count {
-          font-size: 22px;
-          font-weight: 700;
-          margin-top: 8px;
-          color: inherit;
-        }
-        .ndc-new-inbox .ndc-new-filter-card-icon {
-          position: absolute;
-          top: 12px;
-          right: 12px;
-          width: 36px;
-          height: 36px;
-          border-radius: 999px;
-          background: rgba(255, 255, 255, 0.2);
-          display: inline-flex;
-          align-items: center;
-          justify-content: center;
-          color: #ffffff;
-          font-size: 16px;
-        }
-        .ndc-new-inbox .ndc-new-filter-card-check {
-          position: absolute;
-          top: 10px;
-          left: 12px;
-          width: 22px;
-          height: 22px;
-          border-radius: 999px;
-          display: inline-flex;
-          align-items: center;
-          justify-content: center;
-          font-size: 12px;
-          font-weight: 700;
-          background: rgba(255, 255, 255, 0.9);
-          color: #111827;
-          box-shadow: 0 2px 6px rgba(0, 0, 0, 0.15);
-        }
-        .ndc-new-inbox .ndc-new-filter-card {
-          color: #ffffff;
-          border-color: transparent;
-        }
-        .ndc-new-inbox .ndc-new-filter-card.primary {
-          background: #2563eb;
-        }
-        .ndc-new-inbox .ndc-new-filter-card.success {
-          background: #16a34a;
-        }
-        .ndc-new-inbox .ndc-new-filter-card.warning {
-          background: #ea580c;
-        }
-        .ndc-new-inbox .ndc-new-filter-card.info {
-          background: #7c3aed;
-        }
-        .ndc-new-inbox .ndc-new-filter-card.danger {
-          background: #dc2626;
-        }
-        .ndc-new-inbox .ndc-new-filter-card.indigo {
-          background: #4f46e5;
-        }
-        .ndc-new-inbox .ndc-new-filter-card.teal {
-          background: #0f766e;
-        }
-        .ndc-new-inbox .ndc-new-filter-card.pink {
-          background: #db2777;
-        }
-        .ndc-new-inbox .ndc-new-filter-card.amber {
-          background: #d97706;
-        }
-        .ndc-new-inbox .ndc-new-filter-card.slate {
-          background: #475569;
-        }
-        .ndc-new-inbox .ndc-new-filter-card.active {
-          box-shadow: 0 10px 24px rgba(0, 0, 0, 0.18);
-          transform: translateY(-1px);
-        }
-        .ndc-new-inbox .ndc-new-filter-show-more {
-          margin-top: 12px;
-          cursor: pointer;
-          font-weight: 600;
-          font-size: 12px;
-          color: #2563eb;
-          display: inline-flex;
-          align-items: center;
-          gap: 6px;
-          transition: all 0.2s ease;
-        }
-        .ndc-new-inbox .ndc-new-filter-show-more-icon {
-          width: 28px;
-          height: 28px;
-          border-radius: 999px;
-          display: inline-flex;
-          align-items: center;
-          justify-content: center;
-          font-size: 12px;
-          color: #457fff;
-          background: #eff6ff;
-        }
-        .ndc-new-inbox .ndc-new-filter-show-more:hover {
-          background: #eff6ff;
-          border-color: #bfdbfe;
-        }
-        .ndc-new-inbox .ndc-new-layout {
-          display: block;
-        }
-        .ndc-new-inbox .filter-card .heading {
-          display: none;
-        }
-        .ndc-new-inbox .filter-card .submit-bar,
-        .ndc-new-inbox .filter-card button[type="submit"] {
-          display: none;
-        }
-        .ndc-new-inbox .ndc-new-top-filters {
-          margin: 12px 0 16px;
-          background: #ffffff;
-          border: 1px solid #e2e8f0;
-          border-radius: 16px;
-          padding: 18px;
-          box-shadow: 0 6px 18px rgba(15, 23, 42, 0.06);
-        }
-        .ndc-new-inbox .ndc-new-inbox-filter-card {
-          margin: 0;
-        }
-        .ndc-new-inbox .ndc-new-filter-card-grid {
-          grid-template-columns: repeat(6, 1fr);
-        }
-        .ndc-new-inbox .ndc-new-filter-status-grid {
-          grid-template-columns: repeat(6, 1fr);
-        }
-        @media (max-width: 1400px) {
-          .ndc-new-inbox .ndc-new-filter-card-grid,
-          .ndc-new-inbox .ndc-new-filter-status-grid {
-            grid-template-columns: repeat(4, minmax(140px, 1fr));
-          }
-        }
-        @media (max-width: 1100px) {
-          .ndc-new-inbox .ndc-new-filter-card-grid,
-          .ndc-new-inbox .ndc-new-filter-status-grid {
-            grid-template-columns: repeat(3, minmax(140px, 1fr));
-          }
-        }
-        @media (max-width: 900px) {
-          .ndc-new-inbox .ndc-new-filter-card-grid,
-          .ndc-new-inbox .ndc-new-filter-status-grid {
-            grid-template-columns: repeat(2, minmax(140px, 1fr));
-          }
-        }
-        @media (max-width: 640px) {
-          .ndc-new-inbox .ndc-new-filter-card-grid,
-          .ndc-new-inbox .ndc-new-filter-status-grid {
-            grid-template-columns: 1fr;
-          }
-        }
-        .ndc-new-inbox .ndc-new-table-card {
-          margin-top: 16px;
-          background: #ffffff;
-          border: 1px solid #e2e8f0;
-          border-radius: 16px;
-          box-shadow: 0 4px 12px rgba(15, 23, 42, 0.06);
-          overflow: hidden;
-        }
-        .ndc-new-inbox .ndc-new-table-topbar {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          gap: 16px;
-          padding: 16px;
-          border-radius: 16px;
-          border: 1px solid #e2e8f0;
-          background: #ffffff;
-          box-shadow: 0 4px 12px rgba(15, 23, 42, 0.05);
-        }
-        .ndc-new-inbox .ndc-new-tabs {
-          display: flex;
-          gap: 8px;
-          flex-wrap: nowrap;
-          overflow-x: auto;
-          max-width: calc(100% - 280px);
-          padding-bottom: 4px;
-          scrollbar-width: none;
-        }
-        .ndc-new-inbox .ndc-new-tabs::-webkit-scrollbar {
-          width: 0;
-          height: 0;
-        }
-        .ndc-new-inbox .ndc-new-tab {
-          padding: 6px 10px;
-          border-radius: 999px;
-          border: 1px solid #e5e7eb;
-          background: #f8fafc;
-          font-weight: 600;
-          font-size: 11px;
-          cursor: pointer;
-          white-space: nowrap;
-        }
-        .ndc-new-inbox .ndc-new-tab.active {
-          background: #2563eb;
-          color: #ffffff;
-          border-color: #2563eb;
-          box-shadow: 0 6px 14px rgba(37, 99, 235, 0.25);
-        }
-        .ndc-new-inbox .ndc-new-search {
-          display: flex;
-          align-items: center;
-          gap: 8px;
-          padding: 10px 14px;
-          border: 1px solid #e2e8f0;
-          border-radius: 10px;
-          min-width: 260px;
-          background: #f8fafc;
-          color: #6b7280;
-          font-size: 12px;
-        }
-        .ndc-new-inbox .ndc-new-search input {
-          border: none;
-          outline: none;
-          background: transparent;
-          width: 100%;
-          font-size: 12px;
-          color: #111827;
-        }
-        .ndc-new-inbox .ndc-new-table-header {
-          padding: 18px 20px;
-          font-size: 18px;
-          font-weight: 700;
-          border-bottom: 1px solid #e2e8f0;
-        }
-        .ndc-new-inbox .ndc-new-table-wrapper {
-          display: block;
-          overflow-x: auto;
-        }
-        .ndc-new-inbox .ndc-new-table {
-          width: 100%;
-          border-collapse: collapse;
-        }
-        .ndc-new-inbox .ndc-new-table th {
-          text-align: left;
-          font-size: 12px;
-          letter-spacing: 0.08em;
-          color: #6b7280;
-          padding: 14px 20px;
-          background: #f8fafc;
-          border-bottom: 1px solid #e2e8f0;
-        }
-        .ndc-new-inbox .ndc-new-table td {
-          padding: 16px 20px;
-          border-bottom: 1px solid #eef2f7;
-          font-size: 14px;
-          color: #334155;
-        }
-        .ndc-new-inbox .ndc-new-cell-stack {
-          display: flex;
-          flex-direction: column;
-          gap: 4px;
-        }
-        .ndc-new-inbox .ndc-new-cell-primary {
-          font-weight: 600;
-          color: #111827;
-        }
-        .ndc-new-inbox .ndc-new-cell-secondary {
-          font-size: 12px;
-          color: #64748b;
-        }
-        .ndc-new-inbox .ndc-new-row.pending {
-          background: #fff7ed;
-        }
-        .ndc-new-inbox .ndc-new-row.rejected {
-          background: #fef2f2;
-        }
-        .ndc-new-inbox .ndc-new-row.approved {
-          background: #f0fdf4;
-        }
-        .ndc-new-inbox .ndc-new-table-app {
-          font-weight: 600;
-          color: #111827;
-        }
-        .ndc-new-inbox .ndc-new-table-action {
-          text-align: left;
-          white-space: nowrap;
-        }
-        .ndc-new-inbox .ndc-new-status-pill {
-          display: inline-flex;
-          align-items: center;
-          gap: 6px;
-          padding: 4px 10px;
-          border-radius: 999px;
-          font-size: 12px;
-          font-weight: 600;
-          background: #e2e8f0;
-          color: #111827;
-          border: 1px solid transparent;
-        }
-        .ndc-new-inbox .ndc-new-status-pill.approved {
-          background: #f0fdf4;
-          color: #15803d;
-          border-color: #86efac;
-        }
-        .ndc-new-inbox .ndc-new-status-pill.rejected {
-          background: #fef2f2;
-          color: #b91c1c;
-          border-color: #fecaca;
-        }
-        .ndc-new-inbox .ndc-new-status-pill.forwarded {
-          background: #eff6ff;
-          color: #1d4ed8;
-          border-color: #bfdbfe;
-        }
-        .ndc-new-inbox .ndc-new-status-pill.in-progress {
-          background: #dbeafe;
-          color: #1d4ed8;
-        }
-        .ndc-new-inbox .ndc-new-status-pill.pending {
-          background: #ffedd5;
-          color: #c2410c;
-        }
-        .ndc-new-inbox .ndc-new-status-pill.new {
-          background: #f3f4f6;
-          color: #111827;
-        }
-        .ndc-new-inbox .ndc-new-icon {
-          display: inline-flex;
-          align-items: center;
-          justify-content: center;
-          width: 28px;
-          height: 28px;
-          margin-left: 8px;
-          border-radius: 50%;
-          border: 1px solid #e5e7eb;
-          color: #94a3b8;
-        }
-        .ndc-new-inbox .ndc-new-action-group {
-          display: inline-flex;
-          align-items: center;
-          gap: 8px;
-        }
-        .ndc-new-inbox .ndc-new-icon-link {
-          text-decoration: none;
-        }
-        .ndc-new-inbox .ndc-new-app-link {
-          color: #2563eb;
-          text-decoration: none;
-        }
-        .ndc-new-inbox .ndc-new-app-link:hover {
-          text-decoration: underline;
-        }
-        .ndc-new-inbox .ndc-new-pagination {
-          display: flex;
-          align-items: center;
-          justify-content: flex-end;
-          gap: 12px;
-          padding: 12px 20px 18px;
-          border-top: 1px solid #eef2f7;
-          font-size: 12px;
-          color: #6b7280;
-        }
-        .ndc-new-inbox .ndc-new-pagination button {
-          border: 1px solid #e5e7eb;
-          background: #ffffff;
-          border-radius: 8px;
-          padding: 4px 8px;
-          cursor: pointer;
-        }
-        .ndc-new-inbox .ndc-new-pagination button:disabled {
-          opacity: 0.5;
-          cursor: not-allowed;
-        }
-        .ndc-new-inbox .ndc-new-pagination select {
-          border: 1px solid #e5e7eb;
-          border-radius: 8px;
-          padding: 4px 8px;
-          background: #ffffff;
-        }
-        @media (max-width: 768px) {
-          .ndc-new-inbox .ndc-new-top-filters {
-            padding: 0;
-          }
-          .ndc-new-inbox .ndc-new-table-topbar {
-            flex-wrap: wrap;
-          }
-          .ndc-new-inbox .ndc-new-tabs {
-            max-width: 100%;
-            overflow-x: visible;
-            flex-wrap: wrap;
-          }
-          .ndc-new-inbox .ndc-new-search {
-            width: 100%;
-            min-width: 0;
-          }
-          .ndc-new-inbox .ndc-new-table-header {
-            font-size: 16px;
-            padding: 14px 16px;
-          }
-          .ndc-new-inbox .ndc-new-table th,
-          .ndc-new-inbox .ndc-new-table td {
-            padding: 12px 14px;
-            font-size: 12px;
-          }
-          .ndc-new-inbox .ndc-new-status-pill {
-            font-size: 11px;
-            padding: 3px 8px;
-          }
-        }
-        .ndc-new-inbox .ndc-new-tab-count {
-          margin-left: 6px;
-          padding: 2px 6px;
-          border-radius: 999px;
-          background: #e2e8f0;
-          color: #475569;
-          font-size: 11px;
-          font-weight: 700;
-        }
-        .ndc-new-inbox .ndc-new-tab.active .ndc-new-tab-count {
-          background: rgba(255, 255, 255, 0.2);
-          color: #ffffff;
-        }
-      `), /*#__PURE__*/React.createElement("div", {
-    className: "ndc-new-header"
-  }, /*#__PURE__*/React.createElement("span", null, t("NDC Inbox")), totalCount ? /*#__PURE__*/React.createElement("span", {
-    className: "ndc-new-count-pill"
+  return /*#__PURE__*/React.createElement(Fragment$1, null, /*#__PURE__*/React.createElement(Header, null, t("ES_COMMON_INBOX"), totalCount ? /*#__PURE__*/React.createElement("p", {
+    className: "inbox-count"
   }, totalCount) : null), /*#__PURE__*/React.createElement("div", {
-    className: "ndc-new-layout"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "ndc-new-top-filters"
-  }, /*#__PURE__*/React.createElement(FilterForm, {
-    onSubmit: onFilterFormSubmit,
-    handleSubmit: handleFilterFormSubmit,
-    id: "filter-form",
-    onResetFilterForm: onResetFilterForm
-  }, /*#__PURE__*/React.createElement(NewFilterFormFieldsComponent, Object.assign({
-    registerRef: registerFilterFormField
-  }, {
-    controlFilterForm,
-    handleFilterFormSubmit,
-    setFilterFormValue,
-    getFilterFormValue,
-    statuses
-  }, {
-    handleFilter: handleFilter
-  })))), /*#__PURE__*/React.createElement("div", {
-    className: "ndc-new-table-topbar"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "ndc-new-tabs"
-  }, /*#__PURE__*/React.createElement("button", {
-    type: "button",
-    className: `ndc-new-tab ${activeStatusTab === "ALL" ? "active" : ""}`,
-    onClick: () => onStatusTabClick("ALL")
-  }, t("ALL"), /*#__PURE__*/React.createElement("span", {
-    className: "ndc-new-tab-count"
-  }, totalCount || 0)), (statuses || []).map(status => /*#__PURE__*/React.createElement("button", {
-    key: status === null || status === void 0 ? void 0 : status.applicationstatus,
-    type: "button",
-    className: `ndc-new-tab ${activeStatusTab === (status === null || status === void 0 ? void 0 : status.applicationstatus) ? "active" : ""}`,
-    onClick: () => onStatusTabClick(status === null || status === void 0 ? void 0 : status.applicationstatus, status === null || status === void 0 ? void 0 : status.applicationstatus)
-  }, t(status === null || status === void 0 ? void 0 : status.applicationstatus), /*#__PURE__*/React.createElement("span", {
-    className: "ndc-new-tab-count"
-  }, (status === null || status === void 0 ? void 0 : status.count) ?? 0))), /*#__PURE__*/React.createElement("button", {
-    type: "button",
-    className: `ndc-new-tab ${activeStatusTab === "CLEAR" ? "active" : ""}`,
-    onClick: () => onStatusTabClick("CLEAR")
-  }, t("CLEAR"))), /*#__PURE__*/React.createElement("div", {
-    className: "ndc-new-search"
-  }, /*#__PURE__*/React.createElement("span", {
-    "aria-hidden": "true"
-  }, /*#__PURE__*/React.createElement("svg", {
-    width: "16",
-    height: "16",
-    viewBox: "0 0 24 24",
-    fill: "none",
-    xmlns: "http://www.w3.org/2000/svg"
-  }, /*#__PURE__*/React.createElement("circle", {
-    cx: "11",
-    cy: "11",
-    r: "7",
-    stroke: "#6B7280",
-    strokeWidth: "2"
-  }), /*#__PURE__*/React.createElement("line", {
-    x1: "16.65",
-    y1: "16.65",
-    x2: "21",
-    y2: "21",
-    stroke: "#6B7280",
-    strokeWidth: "2",
-    strokeLinecap: "round"
-  }))), /*#__PURE__*/React.createElement("input", {
-    type: "text",
-    value: topBarSearch,
-    onChange: e => setTopBarSearch(e.target.value),
-    placeholder: "Search by application no..."
-  }))), isInboxLoading ? /*#__PURE__*/React.createElement(Loader$1, null) : (table === null || table === void 0 ? void 0 : table.length) < 1 ? /*#__PURE__*/React.createElement(Card, {
-    className: "margin-unset text-align-center"
-  }, t("CS_MYAPPLICATIONS_NO_APPLICATION")) : /*#__PURE__*/React.createElement("div", {
-    className: "ndc-new-table-card"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "ndc-new-table-header"
-  }, t("Assigned Applications")), /*#__PURE__*/React.createElement(Table, Object.assign({
-    className: "ndc-new-table",
-    customTableWrapperClassName: "ndc-new-table-wrapper",
-    isPaginationRequired: false
-  }, propsForInboxTable, {
-    columns: resolvedTableColumns,
-    getRowProps: propsForInboxTable === null || propsForInboxTable === void 0 ? void 0 : propsForInboxTable.getRowProps
-  }))), totalCount > 0 ? /*#__PURE__*/React.createElement("div", {
-    className: "ndc-new-pagination"
-  }, t("CS_COMMON_ROWS_PER_PAGE"), ":", /*#__PURE__*/React.createElement("select", {
-    value: (_formState$tableForm5 = formState.tableForm) === null || _formState$tableForm5 === void 0 ? void 0 : _formState$tableForm5.limit,
-    onChange: onPageSizeChange
-  }, [10, 20, 30, 40, 50].map(pageSize => /*#__PURE__*/React.createElement("option", {
-    key: pageSize,
-    value: pageSize
-  }, pageSize))), /*#__PURE__*/React.createElement("span", null, ((_formState$tableForm6 = formState.tableForm) === null || _formState$tableForm6 === void 0 ? void 0 : _formState$tableForm6.offset) + 1, "-", Math.min(((_formState$tableForm7 = formState.tableForm) === null || _formState$tableForm7 === void 0 ? void 0 : _formState$tableForm7.offset) + ((_formState$tableForm8 = formState.tableForm) === null || _formState$tableForm8 === void 0 ? void 0 : _formState$tableForm8.limit), totalCount), " of ", totalCount), /*#__PURE__*/React.createElement("button", {
-    onClick: onPrevPage,
-    disabled: ((_formState$tableForm9 = formState.tableForm) === null || _formState$tableForm9 === void 0 ? void 0 : _formState$tableForm9.offset) <= 0
-  }, "\u2039"), /*#__PURE__*/React.createElement("button", {
-    onClick: onNextPage,
-    disabled: ((_formState$tableForm0 = formState.tableForm) === null || _formState$tableForm0 === void 0 ? void 0 : _formState$tableForm0.offset) + ((_formState$tableForm1 = formState.tableForm) === null || _formState$tableForm1 === void 0 ? void 0 : _formState$tableForm1.limit) >= totalCount
-  }, "\u203A")) : null));
-};
-
-const Inbox = ({
-  parentRoute
-}) => {
-  return /*#__PURE__*/React.createElement(NewNDCInbox, {
-    parentRoute: parentRoute
-  });
+    className: "NDCSection"
+  }, /*#__PURE__*/React.createElement(InboxComposer, _extends({
+    isInboxLoading,
+    PropsForInboxLinks
+  }, propsForSearchForm, propsForFilterForm, propsForMobileSortForm, {
+    propsForInboxTable,
+    propsForInboxMobileCards,
+    formState
+  }))));
 };
 
 const SearchFormFieldsComponent = props => {
@@ -13260,28 +12498,26 @@ const NewNDCStepFormOne = ({
     } else createApplication(data);
   }
   const createApplication = async data => {
-    var _Digit$UserService$ge, _data$cpt, _data$cpt$details, _ref, _data$PropertyDetails5, _ref2, _data$PropertyDetails7, _data$PropertyDetails9, _data$PropertyDetails0, _data$NDCReason2;
+    var _Digit$UserService$ge, _data$cpt, _data$cpt$details, _data$cpt2, _data$cpt2$details, _ref, _data$PropertyDetails5, _ref2, _data$PropertyDetails7, _data$PropertyDetails9, _data$PropertyDetails0, _data$NDCReason2;
     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 = ((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.owners) || []).map(({
-      status,
-      ...rest
-    }) => {
-      var _rest$name, _rest$name$trim, _data$PropertyDetails, _data$PropertyDetails2, _data$PropertyDetails3;
-      if ((rest === null || rest === void 0 ? void 0 : (_rest$name = rest.name) === null || _rest$name === void 0 ? void 0 : (_rest$name$trim = _rest$name.trim()) === null || _rest$name$trim === void 0 ? void 0 : _rest$name$trim.toLowerCase()) === (data === null || data === void 0 ? void 0 : (_data$PropertyDetails = data.PropertyDetails) === null || _data$PropertyDetails === void 0 ? void 0 : (_data$PropertyDetails2 = _data$PropertyDetails.firstName) === null || _data$PropertyDetails2 === void 0 ? void 0 : (_data$PropertyDetails3 = _data$PropertyDetails2.trim()) === null || _data$PropertyDetails3 === void 0 ? void 0 : _data$PropertyDetails3.toLowerCase())) {
+    console.log("data?.cpt?.details?.owners", 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.owners);
+    const owners = ((data === null || data === void 0 ? void 0 : (_data$cpt2 = data.cpt) === null || _data$cpt2 === void 0 ? void 0 : (_data$cpt2$details = _data$cpt2.details) === null || _data$cpt2$details === void 0 ? void 0 : _data$cpt2$details.owners) || []).map(owner => {
+      var _newOwner$name, _newOwner$name$trim, _data$PropertyDetails, _data$PropertyDetails2, _data$PropertyDetails3;
+      const newOwner = JSON.parse(JSON.stringify(owner));
+      delete newOwner.status;
+      if ((newOwner === null || newOwner === void 0 ? void 0 : (_newOwner$name = newOwner.name) === null || _newOwner$name === void 0 ? void 0 : (_newOwner$name$trim = _newOwner$name.trim()) === null || _newOwner$name$trim === void 0 ? void 0 : _newOwner$name$trim.toLowerCase()) === (data === null || data === void 0 ? void 0 : (_data$PropertyDetails = data.PropertyDetails) === null || _data$PropertyDetails === void 0 ? void 0 : (_data$PropertyDetails2 = _data$PropertyDetails.firstName) === null || _data$PropertyDetails2 === void 0 ? void 0 : (_data$PropertyDetails3 = _data$PropertyDetails2.trim()) === null || _data$PropertyDetails3 === void 0 ? void 0 : _data$PropertyDetails3.toLowerCase())) {
         var _data$PropertyDetails4;
-        return {
-          ...rest,
-          emailId: data === null || data === void 0 ? void 0 : (_data$PropertyDetails4 = data.PropertyDetails) === null || _data$PropertyDetails4 === void 0 ? void 0 : _data$PropertyDetails4.email,
-          isPrimaryOwner: true
-        };
+        newOwner.emailId = data === null || data === void 0 ? void 0 : (_data$PropertyDetails4 = data.PropertyDetails) === null || _data$PropertyDetails4 === void 0 ? void 0 : _data$PropertyDetails4.email;
+        newOwner.isPrimaryOwner = true;
       }
-      return rest;
+      return newOwner;
     });
+    console.log("owners??==", owners);
     console.log("checkData==", data);
     const ndcDetails = [];
     (_ref = (data === null || data === void 0 ? void 0 : (_data$PropertyDetails5 = data.PropertyDetails) === null || _data$PropertyDetails5 === void 0 ? void 0 : _data$PropertyDetails5.waterConnection) || []) === null || _ref === void 0 ? void 0 : _ref.forEach(wc => {
-      var _wc$billData, _data$PropertyDetails6, _data$cpt2, _data$cpt2$details, _wc$billData2, _wc$billData3;
+      var _wc$billData, _data$PropertyDetails6, _data$cpt3, _data$cpt3$details, _wc$billData2, _wc$billData3;
       ndcDetails.push({
         uuid: wc === null || wc === void 0 ? void 0 : (_wc$billData = wc.billData) === null || _wc$billData === void 0 ? void 0 : _wc$billData.id,
         applicantId: applicantId,
@@ -13289,14 +12525,14 @@ const NewNDCStepFormOne = ({
         consumerCode: wc === null || wc === void 0 ? void 0 : wc.connectionNo,
         additionalDetails: {
           propertyAddress: data === null || data === void 0 ? void 0 : (_data$PropertyDetails6 = data.PropertyDetails) === null || _data$PropertyDetails6 === void 0 ? void 0 : _data$PropertyDetails6.address,
-          propertyType: data === null || data === void 0 ? void 0 : (_data$cpt2 = data.cpt) === null || _data$cpt2 === void 0 ? void 0 : (_data$cpt2$details = _data$cpt2.details) === null || _data$cpt2$details === void 0 ? void 0 : _data$cpt2$details.usageCategory
+          propertyType: data === null || data === void 0 ? void 0 : (_data$cpt3 = data.cpt) === null || _data$cpt3 === void 0 ? void 0 : (_data$cpt3$details = _data$cpt3.details) === null || _data$cpt3$details === void 0 ? void 0 : _data$cpt3$details.usageCategory
         },
         dueAmount: (wc === null || wc === void 0 ? void 0 : (_wc$billData2 = wc.billData) === null || _wc$billData2 === void 0 ? void 0 : _wc$billData2.totalAmount) || 0,
         status: wc === null || wc === void 0 ? void 0 : (_wc$billData3 = wc.billData) === null || _wc$billData3 === void 0 ? void 0 : _wc$billData3.status
       });
     });
     (_ref2 = (data === null || data === void 0 ? void 0 : (_data$PropertyDetails7 = data.PropertyDetails) === null || _data$PropertyDetails7 === void 0 ? void 0 : _data$PropertyDetails7.sewerageConnection) || []) === null || _ref2 === void 0 ? void 0 : _ref2.forEach(sc => {
-      var _sc$billData, _data$PropertyDetails8, _data$cpt3, _data$cpt3$details, _sc$billData2, _sc$billData3;
+      var _sc$billData, _data$PropertyDetails8, _data$cpt4, _data$cpt4$details, _sc$billData2, _sc$billData3;
       ndcDetails.push({
         uuid: sc === null || sc === void 0 ? void 0 : (_sc$billData = sc.billData) === null || _sc$billData === void 0 ? void 0 : _sc$billData.id,
         applicantId: applicantId,
@@ -13304,23 +12540,23 @@ const NewNDCStepFormOne = ({
         consumerCode: sc === null || sc === void 0 ? void 0 : sc.connectionNo,
         additionalDetails: {
           propertyAddress: data === null || data === void 0 ? void 0 : (_data$PropertyDetails8 = data.PropertyDetails) === null || _data$PropertyDetails8 === void 0 ? void 0 : _data$PropertyDetails8.address,
-          propertyType: data === null || data === void 0 ? void 0 : (_data$cpt3 = data.cpt) === null || _data$cpt3 === void 0 ? void 0 : (_data$cpt3$details = _data$cpt3.details) === null || _data$cpt3$details === void 0 ? void 0 : _data$cpt3$details.usageCategory
+          propertyType: data === null || data === void 0 ? void 0 : (_data$cpt4 = data.cpt) === null || _data$cpt4 === void 0 ? void 0 : (_data$cpt4$details = _data$cpt4.details) === null || _data$cpt4$details === void 0 ? void 0 : _data$cpt4$details.usageCategory
         },
         dueAmount: (sc === null || sc === void 0 ? void 0 : (_sc$billData2 = sc.billData) === null || _sc$billData2 === void 0 ? void 0 : _sc$billData2.totalAmount) || 0,
         status: sc === null || sc === void 0 ? void 0 : (_sc$billData3 = sc.billData) === null || _sc$billData3 === void 0 ? void 0 : _sc$billData3.status
       });
     });
     if (data !== null && data !== void 0 && (_data$PropertyDetails9 = data.PropertyDetails) !== null && _data$PropertyDetails9 !== void 0 && (_data$PropertyDetails0 = _data$PropertyDetails9.propertyBillData) !== null && _data$PropertyDetails0 !== void 0 && _data$PropertyDetails0.billData) {
-      var _data$PropertyDetails1, _data$PropertyDetails10, _data$cpt4, _data$PropertyDetails11, _data$cpt5, _data$cpt5$details, _data$NDCReason, _data$PropertyDetails12;
+      var _data$PropertyDetails1, _data$PropertyDetails10, _data$cpt5, _data$PropertyDetails11, _data$cpt6, _data$cpt6$details, _data$NDCReason, _data$PropertyDetails12;
       const billData = data === null || data === void 0 ? void 0 : (_data$PropertyDetails1 = data.PropertyDetails) === null || _data$PropertyDetails1 === void 0 ? void 0 : (_data$PropertyDetails10 = _data$PropertyDetails1.propertyBillData) === null || _data$PropertyDetails10 === void 0 ? void 0 : _data$PropertyDetails10.billData;
       ndcDetails.push({
         uuid: billData === null || billData === void 0 ? void 0 : billData.id,
         applicantId: applicantId,
         businessService: "PT",
-        consumerCode: data === null || data === void 0 ? void 0 : (_data$cpt4 = data.cpt) === null || _data$cpt4 === void 0 ? void 0 : _data$cpt4.id,
+        consumerCode: data === null || data === void 0 ? void 0 : (_data$cpt5 = data.cpt) === null || _data$cpt5 === void 0 ? void 0 : _data$cpt5.id,
         additionalDetails: {
           propertyAddress: data === null || data === void 0 ? void 0 : (_data$PropertyDetails11 = data.PropertyDetails) === null || _data$PropertyDetails11 === void 0 ? void 0 : _data$PropertyDetails11.address,
-          propertyType: data === null || data === void 0 ? void 0 : (_data$cpt5 = data.cpt) === null || _data$cpt5 === void 0 ? void 0 : (_data$cpt5$details = _data$cpt5.details) === null || _data$cpt5$details === void 0 ? void 0 : _data$cpt5$details.usageCategory,
+          propertyType: 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.usageCategory,
           reason: data === null || data === void 0 ? void 0 : (_data$NDCReason = data.NDCReason) === null || _data$NDCReason === void 0 ? void 0 : _data$NDCReason.reason,
           remarks: data === null || data === void 0 ? void 0 : (_data$PropertyDetails12 = data.PropertyDetails) === null || _data$PropertyDetails12 === void 0 ? void 0 : _data$PropertyDetails12.remarks
         },
@@ -13367,7 +12603,7 @@ const NewNDCStepFormOne = ({
     }
   };
   const updateApplication = async data => {
-    var _Digit$UserService$ge2, _checkApiDataCheck$Ap, _checkApiDataCheck$Ap2, _checkFormData$respon3, _checkFormData$respon4, _checkFormData$respon5, _checkFormData$respon6, _checkFormData$respon7, _checkApiDataCheck$Ap3, _checkApiDataCheck$Ap4, _checkFormData$respon8, _checkFormData$respon9, _checkApiDataCheck$Ap5, _checkApiDataCheck$Ap6, _checkFormData$respon0, _checkFormData$respon1, _data$NDCReason3, _data$cpt1, _data$cpt1$details, _response$ResponseInf2;
+    var _Digit$UserService$ge2, _checkApiDataCheck$Ap, _checkApiDataCheck$Ap2, _checkFormData$respon3, _checkFormData$respon4, _checkFormData$respon5, _checkFormData$respon6, _checkFormData$respon7, _checkApiDataCheck$Ap3, _checkApiDataCheck$Ap4, _checkFormData$respon8, _checkFormData$respon9, _checkApiDataCheck$Ap5, _checkApiDataCheck$Ap6, _checkFormData$respon0, _checkFormData$respon1, _data$NDCReason3, _data$cpt10, _data$cpt10$details, _response$ResponseInf2;
     const applicant = ((_Digit$UserService$ge2 = Digit.UserService.getUser()) === null || _Digit$UserService$ge2 === void 0 ? void 0 : _Digit$UserService$ge2.info) || {};
     const applicantId = applicant === null || applicant === void 0 ? void 0 : applicant.uuid;
     const owners = (checkApiDataCheck === null || checkApiDataCheck === void 0 ? void 0 : (_checkApiDataCheck$Ap = checkApiDataCheck.Applications) === null || _checkApiDataCheck$Ap === void 0 ? void 0 : (_checkApiDataCheck$Ap2 = _checkApiDataCheck$Ap[0]) === null || _checkApiDataCheck$Ap2 === void 0 ? void 0 : _checkApiDataCheck$Ap2.owners) || (checkFormData === null || checkFormData === void 0 ? void 0 : (_checkFormData$respon3 = checkFormData.responseData) === null || _checkFormData$respon3 === void 0 ? void 0 : (_checkFormData$respon4 = _checkFormData$respon3[0]) === null || _checkFormData$respon4 === void 0 ? void 0 : _checkFormData$respon4.owners);
@@ -13377,7 +12613,7 @@ const NewNDCStepFormOne = ({
     } else {
       var _ref3, _data$PropertyDetails13, _ref4, _data$PropertyDetails15, _data$PropertyDetails17, _data$PropertyDetails18;
       (_ref3 = (data === null || data === void 0 ? void 0 : (_data$PropertyDetails13 = data.PropertyDetails) === null || _data$PropertyDetails13 === void 0 ? void 0 : _data$PropertyDetails13.waterConnection) || []) === null || _ref3 === void 0 ? void 0 : _ref3.forEach(wc => {
-        var _wc$billData4, _data$PropertyDetails14, _data$cpt7, _data$cpt7$details, _wc$billData5, _wc$billData6;
+        var _wc$billData4, _data$PropertyDetails14, _data$cpt8, _data$cpt8$details, _wc$billData5, _wc$billData6;
         ndcDetails.push({
           uuid: wc === null || wc === void 0 ? void 0 : (_wc$billData4 = wc.billData) === null || _wc$billData4 === void 0 ? void 0 : _wc$billData4.id,
           applicantId: applicantId,
@@ -13385,14 +12621,14 @@ const NewNDCStepFormOne = ({
           consumerCode: wc === null || wc === void 0 ? void 0 : wc.connectionNo,
           additionalDetails: {
             propertyAddress: data === null || data === void 0 ? void 0 : (_data$PropertyDetails14 = data.PropertyDetails) === null || _data$PropertyDetails14 === void 0 ? void 0 : _data$PropertyDetails14.address,
-            propertyType: data === null || data === void 0 ? void 0 : (_data$cpt7 = data.cpt) === null || _data$cpt7 === void 0 ? void 0 : (_data$cpt7$details = _data$cpt7.details) === null || _data$cpt7$details === void 0 ? void 0 : _data$cpt7$details.usageCategory
+            propertyType: data === null || data === void 0 ? void 0 : (_data$cpt8 = data.cpt) === null || _data$cpt8 === void 0 ? void 0 : (_data$cpt8$details = _data$cpt8.details) === null || _data$cpt8$details === void 0 ? void 0 : _data$cpt8$details.usageCategory
           },
           dueAmount: (wc === null || wc === void 0 ? void 0 : (_wc$billData5 = wc.billData) === null || _wc$billData5 === void 0 ? void 0 : _wc$billData5.totalAmount) || 0,
           status: wc === null || wc === void 0 ? void 0 : (_wc$billData6 = wc.billData) === null || _wc$billData6 === void 0 ? void 0 : _wc$billData6.status
         });
       });
       (_ref4 = (data === null || data === void 0 ? void 0 : (_data$PropertyDetails15 = data.PropertyDetails) === null || _data$PropertyDetails15 === void 0 ? void 0 : _data$PropertyDetails15.sewerageConnection) || []) === null || _ref4 === void 0 ? void 0 : _ref4.forEach(sc => {
-        var _sc$billData4, _data$PropertyDetails16, _data$cpt8, _data$cpt8$details, _sc$billData5, _sc$billData6;
+        var _sc$billData4, _data$PropertyDetails16, _data$cpt9, _data$cpt9$details, _sc$billData5, _sc$billData6;
         ndcDetails.push({
           uuid: sc === null || sc === void 0 ? void 0 : (_sc$billData4 = sc.billData) === null || _sc$billData4 === void 0 ? void 0 : _sc$billData4.id,
           applicantId: applicantId,
@@ -13400,23 +12636,23 @@ const NewNDCStepFormOne = ({
           consumerCode: sc === null || sc === void 0 ? void 0 : sc.connectionNo,
           additionalDetails: {
             propertyAddress: data === null || data === void 0 ? void 0 : (_data$PropertyDetails16 = data.PropertyDetails) === null || _data$PropertyDetails16 === void 0 ? void 0 : _data$PropertyDetails16.address,
-            propertyType: data === null || data === void 0 ? void 0 : (_data$cpt8 = data.cpt) === null || _data$cpt8 === void 0 ? void 0 : (_data$cpt8$details = _data$cpt8.details) === null || _data$cpt8$details === void 0 ? void 0 : _data$cpt8$details.usageCategory
+            propertyType: data === null || data === void 0 ? void 0 : (_data$cpt9 = data.cpt) === null || _data$cpt9 === void 0 ? void 0 : (_data$cpt9$details = _data$cpt9.details) === null || _data$cpt9$details === void 0 ? void 0 : _data$cpt9$details.usageCategory
           },
           dueAmount: (sc === null || sc === void 0 ? void 0 : (_sc$billData5 = sc.billData) === null || _sc$billData5 === void 0 ? void 0 : _sc$billData5.totalAmount) || 0,
           status: sc === null || sc === void 0 ? void 0 : (_sc$billData6 = sc.billData) === null || _sc$billData6 === void 0 ? void 0 : _sc$billData6.status
         });
       });
       if (data !== null && data !== void 0 && (_data$PropertyDetails17 = data.PropertyDetails) !== null && _data$PropertyDetails17 !== void 0 && (_data$PropertyDetails18 = _data$PropertyDetails17.propertyBillData) !== null && _data$PropertyDetails18 !== void 0 && _data$PropertyDetails18.billData) {
-        var _data$PropertyDetails19, _data$PropertyDetails20, _data$cpt9, _data$PropertyDetails21, _data$cpt0, _data$cpt0$details;
+        var _data$PropertyDetails19, _data$PropertyDetails20, _data$cpt0, _data$PropertyDetails21, _data$cpt1, _data$cpt1$details;
         const billData = data === null || data === void 0 ? void 0 : (_data$PropertyDetails19 = data.PropertyDetails) === null || _data$PropertyDetails19 === void 0 ? void 0 : (_data$PropertyDetails20 = _data$PropertyDetails19.propertyBillData) === null || _data$PropertyDetails20 === void 0 ? void 0 : _data$PropertyDetails20.billData;
         ndcDetails.push({
           uuid: billData === null || billData === void 0 ? void 0 : billData.id,
           applicantId: applicantId,
           businessService: "PT",
-          consumerCode: data === null || data === void 0 ? void 0 : (_data$cpt9 = data.cpt) === null || _data$cpt9 === void 0 ? void 0 : _data$cpt9.id,
+          consumerCode: data === null || data === void 0 ? void 0 : (_data$cpt0 = data.cpt) === null || _data$cpt0 === void 0 ? void 0 : _data$cpt0.id,
           additionalDetails: {
             propertyAddress: data === null || data === void 0 ? void 0 : (_data$PropertyDetails21 = data.PropertyDetails) === null || _data$PropertyDetails21 === void 0 ? void 0 : _data$PropertyDetails21.address,
-            propertyType: data === null || data === void 0 ? void 0 : (_data$cpt0 = data.cpt) === null || _data$cpt0 === void 0 ? void 0 : (_data$cpt0$details = _data$cpt0.details) === null || _data$cpt0$details === void 0 ? void 0 : _data$cpt0$details.usageCategory
+            propertyType: 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.usageCategory
           },
           dueAmount: (billData === null || billData === void 0 ? void 0 : billData.totalAmount) || 0,
           status: billData === null || billData === void 0 ? void 0 : billData.status
@@ -13433,7 +12669,7 @@ const NewNDCStepFormOne = ({
         Documents: [],
         active: true,
         reason: data === null || data === void 0 ? void 0 : (_data$NDCReason3 = data.NDCReason) === null || _data$NDCReason3 === void 0 ? void 0 : _data$NDCReason3.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,
+        auditDetails: data === null || data === void 0 ? void 0 : (_data$cpt10 = data.cpt) === null || _data$cpt10 === void 0 ? void 0 : (_data$cpt10$details = _data$cpt10.details) === null || _data$cpt10$details === void 0 ? void 0 : _data$cpt10$details.auditDetails,
         applicationNo: appNumber,
         uuid: apUUid,
         workflow: {
@@ -13461,17 +12697,17 @@ const NewNDCStepFormOne = ({
     }
   };
   function validateStepData(data) {
-    var _data$cpt10, _data$cpt11, _data$cpt11$dues, _propertyDetails$wate, _propertyDetails$sewe;
+    var _data$cpt11, _data$cpt12, _data$cpt12$dues, _propertyDetails$wate, _propertyDetails$sewe;
     const missingFields = [];
     const invalidFields = [];
     const cpt = (data === null || data === void 0 ? void 0 : data.cpt) || {};
     const cptDetails = (cpt === null || cpt === void 0 ? void 0 : cpt.details) || {};
     const propertyDetails = (data === null || data === void 0 ? void 0 : data.PropertyDetails) || {};
     const NDCReason = (data === null || data === void 0 ? void 0 : data.NDCReason) || {};
-    if (!(data !== null && data !== void 0 && (_data$cpt10 = data.cpt) !== null && _data$cpt10 !== void 0 && _data$cpt10.dues)) {
+    if (!(data !== null && data !== void 0 && (_data$cpt11 = data.cpt) !== null && _data$cpt11 !== void 0 && _data$cpt11.dues)) {
       missingFields.push(`${t("NDC_MESSAGE_PLEASE_CHECK_STATUS_OF_PROPERTY_TAX")} ${cpt === null || cpt === void 0 ? void 0 : cpt.id}`);
     }
-    if ((data === null || data === void 0 ? void 0 : (_data$cpt11 = data.cpt) === null || _data$cpt11 === void 0 ? void 0 : (_data$cpt11$dues = _data$cpt11.dues) === null || _data$cpt11$dues === void 0 ? void 0 : _data$cpt11$dues.totalAmount) > 0) {
+    if ((data === null || data === void 0 ? void 0 : (_data$cpt12 = data.cpt) === null || _data$cpt12 === void 0 ? void 0 : (_data$cpt12$dues = _data$cpt12.dues) === null || _data$cpt12$dues === void 0 ? void 0 : _data$cpt12$dues.totalAmount) > 0) {
       missingFields.push(`${t("NDC_MESSAGE_PLEASE_PAY_DUES_OF_PROPERTY_TAX")} ${cpt === null || cpt === void 0 ? void 0 : cpt.id}`);
     }
     if ((propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$wate = propertyDetails.waterConnection) === null || _propertyDetails$wate === void 0 ? void 0 : _propertyDetails$wate.length) > 0) {
@@ -13717,7 +12953,7 @@ const PropertyDetailsForm$1 = ({
   const [propertyDetails, setPropertyDetails] = useState((formData === null || formData === void 0 ? void 0 : formData.PropertyDetails) || {});
   const [selectedRow, setSelectedRow] = useState(null);
   console.log("apiDataCheck", apiDataCheck);
-  console.log("formData==?/??", formData);
+  console.log("formData==?/||", formData);
   console.log("checkApiDataCheck====", checkApiDataCheck === null || checkApiDataCheck === void 0 ? void 0 : (_checkApiDataCheck$Ap = checkApiDataCheck.Applications) === null || _checkApiDataCheck$Ap === void 0 ? void 0 : _checkApiDataCheck$Ap[0]);
   const {
     isLoading: waterConnectionLoading,
@@ -13917,15 +13153,15 @@ const PropertyDetailsForm$1 = ({
       }));
     }
     try {
-      var _result$Bill;
+      var _result$Bill$, _result$Bill;
       const result = await Digit.PaymentService.fetchBill(tenantId, {
         businessService: bussinessService,
         consumerCode: consumercodes
       });
       setPropertyLoader(false);
+      const amount = (result === null || result === void 0 ? void 0 : (_result$Bill$ = result.Bill[0]) === null || _result$Bill$ === void 0 ? void 0 : _result$Bill$.totalAmount) || 0;
       if ((result === null || result === void 0 ? void 0 : (_result$Bill = result.Bill) === null || _result$Bill === void 0 ? void 0 : _result$Bill.length) > 0) {
-        var _result$Bill$;
-        if ((result === null || result === void 0 ? void 0 : (_result$Bill$ = result.Bill[0]) === null || _result$Bill$ === void 0 ? void 0 : _result$Bill$.totalAmount) > 0) {
+        if (amount > 0) {
           setShowToast({
             error: true,
             label: t("NDC_MESSAGE_DUES_FOUND_PLEASE_PAY")
@@ -15112,8 +14348,8 @@ const NewNDCStepFormTwo = ({
   const updateApplication = async data => {
     var _Digit$UserService$ge, _user$info, _user$info2, _checkFormData$NDCDet, _checkFormData$NDCDet2, _user$info3, _user$info4, _checkFormData$respon, _ref, _data$documents, _response$ResponseInf;
     const applicant = ((_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.info) || {};
-    console.log("final data===?????", data);
-    console.log("checkFormData???====", checkFormData);
+    console.log("final data===||||?", data);
+    console.log("checkFormData||?====", checkFormData);
     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,
@@ -15437,13 +14673,14 @@ const NDCNewFormSummaryStepThreeCitizen = ({
     }
   };
   function mapToNDCPayload(inputData, actionStatus) {
-    var _Digit$UserService$ge, _ref, _inputData$apiData, _inputData$apiData$Ap, _inputData$apiData$Ap2, _formData$responseDat, _formData$apiData, _formData$apiData$App, _inputData$DocummentD, _inputData$DocummentD2;
+    var _Digit$UserService$ge, _inputData$apiData, _inputData$apiData$Ap, _inputData$apiData$Ap2, _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("inputData", inputData);
-    const owners = (_ref = (inputData === null || inputData === void 0 ? void 0 : (_inputData$apiData = inputData.apiData) === null || _inputData$apiData === void 0 ? void 0 : (_inputData$apiData$Ap = _inputData$apiData.Applications) === null || _inputData$apiData$Ap === void 0 ? void 0 : (_inputData$apiData$Ap2 = _inputData$apiData$Ap[0]) === null || _inputData$apiData$Ap2 === void 0 ? void 0 : _inputData$apiData$Ap2.owners) || []) === null || _ref === void 0 ? void 0 : _ref.map(({
-      status,
-      ...rest
-    }) => rest);
+    const owners = ((inputData === null || inputData === void 0 ? void 0 : (_inputData$apiData = inputData.apiData) === null || _inputData$apiData === void 0 ? void 0 : (_inputData$apiData$Ap = _inputData$apiData.Applications) === null || _inputData$apiData$Ap === void 0 ? void 0 : (_inputData$apiData$Ap2 = _inputData$apiData$Ap[0]) === null || _inputData$apiData$Ap2 === void 0 ? void 0 : _inputData$apiData$Ap2.owners) || []).map(item => {
+      const obj = JSON.parse(JSON.stringify(item));
+      delete obj.status;
+      return obj;
+    });
     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 = {
@@ -15867,20 +15104,16 @@ const NewNDCStepFormOne$1 = ({
     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 = ((data === null || data === void 0 ? void 0 : (_data$cpt2 = data.cpt) === null || _data$cpt2 === void 0 ? void 0 : (_data$cpt2$details = _data$cpt2.details) === null || _data$cpt2$details === void 0 ? void 0 : _data$cpt2$details.owners) || []).map(({
-      status,
-      ...rest
-    }) => {
-      var _rest$name, _rest$name$trim, _data$PropertyDetails, _data$PropertyDetails2, _data$PropertyDetails3;
-      if ((rest === null || rest === void 0 ? void 0 : (_rest$name = rest.name) === null || _rest$name === void 0 ? void 0 : (_rest$name$trim = _rest$name.trim()) === null || _rest$name$trim === void 0 ? void 0 : _rest$name$trim.toLowerCase()) === (data === null || data === void 0 ? void 0 : (_data$PropertyDetails = data.PropertyDetails) === null || _data$PropertyDetails === void 0 ? void 0 : (_data$PropertyDetails2 = _data$PropertyDetails.firstName) === null || _data$PropertyDetails2 === void 0 ? void 0 : (_data$PropertyDetails3 = _data$PropertyDetails2.trim()) === null || _data$PropertyDetails3 === void 0 ? void 0 : _data$PropertyDetails3.toLowerCase())) {
+    const owners = ((data === null || data === void 0 ? void 0 : (_data$cpt2 = data.cpt) === null || _data$cpt2 === void 0 ? void 0 : (_data$cpt2$details = _data$cpt2.details) === null || _data$cpt2$details === void 0 ? void 0 : _data$cpt2$details.owners) || []).map(owner => {
+      var _newOwner$name, _newOwner$name$trim, _data$PropertyDetails, _data$PropertyDetails2, _data$PropertyDetails3;
+      const newOwner = JSON.parse(JSON.stringify(owner));
+      delete newOwner.status;
+      if ((newOwner === null || newOwner === void 0 ? void 0 : (_newOwner$name = newOwner.name) === null || _newOwner$name === void 0 ? void 0 : (_newOwner$name$trim = _newOwner$name.trim()) === null || _newOwner$name$trim === void 0 ? void 0 : _newOwner$name$trim.toLowerCase()) === (data === null || data === void 0 ? void 0 : (_data$PropertyDetails = data.PropertyDetails) === null || _data$PropertyDetails === void 0 ? void 0 : (_data$PropertyDetails2 = _data$PropertyDetails.firstName) === null || _data$PropertyDetails2 === void 0 ? void 0 : (_data$PropertyDetails3 = _data$PropertyDetails2.trim()) === null || _data$PropertyDetails3 === void 0 ? void 0 : _data$PropertyDetails3.toLowerCase())) {
         var _data$PropertyDetails4;
-        return {
-          ...rest,
-          emailId: data === null || data === void 0 ? void 0 : (_data$PropertyDetails4 = data.PropertyDetails) === null || _data$PropertyDetails4 === void 0 ? void 0 : _data$PropertyDetails4.email,
-          isPrimaryOwner: true
-        };
+        newOwner.emailId = data === null || data === void 0 ? void 0 : (_data$PropertyDetails4 = data.PropertyDetails) === null || _data$PropertyDetails4 === void 0 ? void 0 : _data$PropertyDetails4.email;
+        newOwner.isPrimaryOwner = true;
       }
-      return rest;
+      return newOwner;
     });
     const ndcDetails = [];
     ((data === null || data === void 0 ? void 0 : (_data$PropertyDetails5 = data.PropertyDetails) === null || _data$PropertyDetails5 === void 0 ? void 0 : _data$PropertyDetails5.waterConnection) || []).forEach(wc => {
@@ -16157,10 +15390,11 @@ const NDCNewFormSummaryStepThreeEmployee = ({
     var _Digit$UserService$ge, _ref, _inputData$apiData, _inputData$apiData$Ap, _inputData$apiData$Ap2, _formData$responseDat, _formData$apiData, _formData$apiData$App, _baseApplication$NdcD, _formData$NDCDetails4, _formData$NDCDetails5, _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("checkFormData", formData);
-    const owners = (_ref = (inputData === null || inputData === void 0 ? void 0 : (_inputData$apiData = inputData.apiData) === null || _inputData$apiData === void 0 ? void 0 : (_inputData$apiData$Ap = _inputData$apiData.Applications) === null || _inputData$apiData$Ap === void 0 ? void 0 : (_inputData$apiData$Ap2 = _inputData$apiData$Ap[0]) === null || _inputData$apiData$Ap2 === void 0 ? void 0 : _inputData$apiData$Ap2.owners) || []) === null || _ref === void 0 ? void 0 : _ref.map(({
-      status,
-      ...rest
-    }) => rest);
+    const owners = (_ref = (inputData === null || inputData === void 0 ? void 0 : (_inputData$apiData = inputData.apiData) === null || _inputData$apiData === void 0 ? void 0 : (_inputData$apiData$Ap = _inputData$apiData.Applications) === null || _inputData$apiData$Ap === void 0 ? void 0 : (_inputData$apiData$Ap2 = _inputData$apiData$Ap[0]) === null || _inputData$apiData$Ap2 === void 0 ? void 0 : _inputData$apiData$Ap2.owners) || []) === null || _ref === void 0 ? void 0 : _ref.map(item => {
+      const obj = JSON.parse(JSON.stringify(item));
+      delete obj.status;
+      return obj;
+    });
     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]) || {};
     const updatedApplication = {
       ...baseApplication,