@mseva/digit-ui-module-ndc 1.0.34 → 1.0.35

package/dist/index.modern.js

@@ -1309,14 +1309,9 @@ const ApplicationOverview = () => {
       workflow: {}
     };
     const filtData = data === null || data === void 0 ? void 0 : (_data$Licenses = data.Licenses) === null || _data$Licenses === void 0 ? void 0 : _data$Licenses[0];
-    let checkAssigne;
-    if (filtData.action == "SENDBACKTOCITIZEN") {
-      var _payloadData$owners, _payloadData$owners$;
-      checkAssigne = [payloadData === null || payloadData === void 0 ? void 0 : (_payloadData$owners = payloadData.owners) === null || _payloadData$owners === void 0 ? void 0 : (_payloadData$owners$ = _payloadData$owners[0]) === null || _payloadData$owners$ === void 0 ? void 0 : _payloadData$owners$.uuid];
-    }
     updatedApplicant.workflow = {
       action: filtData.action,
-      assignes: (filtData === null || filtData === void 0 ? void 0 : filtData.assignee) || checkAssigne,
+      assignes: filtData === null || filtData === void 0 ? void 0 : filtData.assignee,
       comment: filtData === null || filtData === void 0 ? void 0 : filtData.comment,
       documents: filtData === null || filtData === void 0 ? void 0 : filtData.wfDocuments
     };
@@ -8870,17 +8865,16 @@ function cleanEscapedString(input) {
 const capitalize = text => text.substr(0, 1).toUpperCase() + text.substr(1);
 const ulbCamel = ulb => ulb.toLowerCase().split(" ").map(capitalize).join(" ");
 const getAcknowledgementData = async (application, tenantInfo, t) => {
-  var _application$Applicat, _appData$owners, _appData$NdcDetails, _appData$additionalDe, _tenantInfo$city;
+  var _application$Applicat, _appData$owners, _appData$NdcDetails, _appData$NdcDetails2, _appData$NdcDetails2$, _appData$NdcDetails3, _appData$NdcDetails3$, _appData$NdcDetails3$2, _appData$additionalDe, _tenantInfo$city;
   const appData = (application === null || application === void 0 ? void 0 : (_application$Applicat = application.Applications) === null || _application$Applicat === void 0 ? void 0 : _application$Applicat[0]) || {};
   const owner = (appData === null || appData === void 0 ? void 0 : (_appData$owners = appData.owners) === null || _appData$owners === void 0 ? void 0 : _appData$owners[0]) || {};
   const ndc = (appData === null || appData === void 0 ? void 0 : (_appData$NdcDetails = appData.NdcDetails) === null || _appData$NdcDetails === void 0 ? void 0 : _appData$NdcDetails[0]) || {};
   const add = (ndc === null || ndc === void 0 ? void 0 : ndc.additionalDetails) || {};
   const applicationNumber = (appData === null || appData === void 0 ? void 0 : appData.uuid) || "NA";
-  const propertyId = (ndc === null || ndc === void 0 ? void 0 : ndc.consumerCode) || "NA";
+  const propertyId = appData === null || appData === void 0 ? void 0 : (_appData$NdcDetails2 = appData.NdcDetails) === null || _appData$NdcDetails2 === void 0 ? void 0 : (_appData$NdcDetails2$ = _appData$NdcDetails2[3]) === null || _appData$NdcDetails2$ === void 0 ? void 0 : _appData$NdcDetails2$.consumerCode;
   const propertyType = add !== null && add !== void 0 && add.propertyType ? t(add.propertyType) : "NA";
   const applicantName = (owner === null || owner === void 0 ? void 0 : owner.name) || "NA";
-  const address = (owner === null || owner === void 0 ? void 0 : owner.permanentAddress) || (owner === null || owner === void 0 ? void 0 : owner.correspondenceAddress) || "NA";
-  const ulbName = (tenantInfo === null || tenantInfo === void 0 ? void 0 : tenantInfo.name) || (appData === null || appData === void 0 ? void 0 : appData.tenantId) || "NA";
+  const address = (appData === null || appData === void 0 ? void 0 : (_appData$NdcDetails3 = appData.NdcDetails) === null || _appData$NdcDetails3 === void 0 ? void 0 : (_appData$NdcDetails3$ = _appData$NdcDetails3[0]) === null || _appData$NdcDetails3$ === void 0 ? void 0 : (_appData$NdcDetails3$2 = _appData$NdcDetails3$.additionalDetails) === null || _appData$NdcDetails3$2 === void 0 ? void 0 : _appData$NdcDetails3$2.propertyAddress) || (owner === null || owner === void 0 ? void 0 : owner.permanentAddress) || (owner === null || owner === void 0 ? void 0 : owner.correspondenceAddress) || "NA";
   const duesAmount = (add === null || add === void 0 ? void 0 : add.duesAmount) || (appData === null || appData === void 0 ? void 0 : (_appData$additionalDe = appData.additionalDetails) === null || _appData$additionalDe === void 0 ? void 0 : _appData$additionalDe.duesAmount) || "0";
   const certificateBody = `${t("NDC_MSG_INTRO")}
 
@@ -8888,9 +8882,7 @@ ${t("NDC_MSG_APPLICATION_LABEL")}: ${applicationNumber}
 
 ${t("NDC_MSG_PROPERTY_LABEL")}: ${propertyId}  ${t("NDC_MSG_PROPERTY_TYPE_LABEL")} ${propertyType}
 
-${t("NDC_MSG_APPLICANT_LABEL")}: ${applicantName} ${t("NDC_MSG_FOR_LAND")} ${address}
-
-${t("NDC_MSG_FALLING_CLAUSE_PART1")} ${t("NDC_MSG_FALLING_CLAUSE_PART2")} ${ulbName} ${t("NDC_MSG_AFTER_RECOVERY")} ${duesAmount} ${t("NDC_MSG_DUES_LIST")}
+${t("NDC_MSG_APPLICANT_LABEL")}: ${applicantName} ${t("NDC_MSG_FOR_LAND")} ${address} ${t("NDC_MSG_FALLING_CLAUSE_PART1")} ${t("NDC_MSG_FALLING_CLAUSE_PART2")} Municipal Council/ Corporation ${t("NDC_MSG_AFTER_RECOVERY")} ${duesAmount} ${t("NDC_MSG_DUES_LIST")}
 
 ${t("NDC_MSG_DECLARATION_TITLE")}
 ${t("NDC_MSG_DECL_A")}
@@ -9126,7 +9118,6 @@ const CitizenApplicationOverview = () => {
     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, _propertyDetailsFetch, _propertyDetailsFetch2, _propertyDetailsFetch3, _propertyDetailsFetch4, _propertyDetailsFetch5, _propertyDetailsFetch6, _propertyDetailsFetch7, _propertyDetailsFetch8, _propertyDetailsFetch9, _propertyDetailsFetch0, _propertyDetailsFetch1, _propertyDetailsFetch10, _propertyDetailsFetch11, _propertyDetailsFetch12, _propertyDetailsFetch13, _propertyDetailsFetch14, _propertyDetailsFetch15, _propertyDetailsFetch16, _propertyDetailsFetch17, _propertyDetailsFetch18;
-    const isRed = detail.dueAmount > 0;
     return /*#__PURE__*/React.createElement("div", {
       key: index,
       style: {
@@ -9141,17 +9132,10 @@ const CitizenApplicationOverview = () => {
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("NDC_CONSUMER_CODE"),
       text: detail.consumerCode || "N/A"
-    }), /*#__PURE__*/React.createElement("div", {
-      style: {
-        background: isRed ? "red" : "none",
-        color: isRed ? "white" : "black",
-        paddingTop: isRed ? "8px" : "0",
-        paddingLeft: isRed ? "10px" : "0"
-      }
-    }, /*#__PURE__*/React.createElement(Row, {
+    }), /*#__PURE__*/React.createElement(Row, {
       label: t("NDC_DUE_AMOUNT"),
       text: ((_detail$dueAmount = detail.dueAmount) === null || _detail$dueAmount === void 0 ? void 0 : _detail$dueAmount.toString()) || "0"
-    })), /*#__PURE__*/React.createElement(Row, {
+    }), /*#__PURE__*/React.createElement(Row, {
       label: t("NDC_PROPERTY_TYPE"),
       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, {
@@ -9325,7 +9309,7 @@ const SearchFormFieldsComponents = ({
       name: "uuid",
       inputRef: registerRef({})
     })), /*#__PURE__*/React.createElement(SearchField, null, /*#__PURE__*/React.createElement("label", null, t("CORE_COMMON_PHONE_NUMBER")), /*#__PURE__*/React.createElement(TextInput, {
-      name: "mobileNumber",
+      name: "phoneNumber",
       inputRef: registerRef({})
     })), /*#__PURE__*/React.createElement("div", {
       className: "search-action-wrapper",
@@ -9630,7 +9614,7 @@ const Inbox = ({
   const onSearchFormReset = setSearchFormValue => {
     setSearchFormValue("sourceRefId", null);
     setSearchFormValue("uuid", null);
-    setSearchFormValue("mobileNumber", null);
+    setSearchFormValue("phoneNumber", null);
     dispatch({
       action: "mutateSearchForm",
       data: searchFormDefaultValues
@@ -11730,7 +11714,6 @@ const NewNDCStepForm = () => {
     uuid: id
   }, tenantId);
   useEffect(() => {
-    console.log("applicationDetails", applicationDetails);
     if (applicationDetails !== null && applicationDetails !== void 0 && applicationDetails.Applications.length) {
       dispatch(updateNDCForm("responseData", applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.Applications));
     }
@@ -11779,10 +11762,8 @@ const NewNDCStepFormOne = ({
   const [showToast, setShowToast] = useState(false);
   const [error, setError] = useState("");
   const user = Digit.UserService.getUser();
-  const id = window.location.pathname.split("/").pop();
   const currentStepData = useSelector(state => state.ndc.NDCForm.formData && state.ndc.NDCForm.formData[config.key] ? state.ndc.NDCForm.formData[config.key] : {});
   const checkFormData = useSelector(state => state.ndc.NDCForm.formData || {});
-  const checkFormDatass = useSelector(state => state.ndc.NDCForm || {});
   const tenantId = window.localStorage.getItem("CITIZEN.CITY");
   function goNext(data) {
     var _checkFormData$apiDat, _checkFormData$apiDat2, _checkFormData$apiDat3, _checkFormData$respon, _checkFormData$respon2;
@@ -11795,12 +11776,8 @@ const NewNDCStepFormOne = ({
       }, 3000);
       return;
     }
-    console.log("checkFormData", checkFormData);
-    const isRealId = id && id.startsWith("NDC-");
-    console.log("isRealId", isRealId);
-    if (checkFormData !== null && checkFormData !== void 0 && (_checkFormData$apiDat = checkFormData.apiData) !== null && _checkFormData$apiDat !== void 0 && (_checkFormData$apiDat2 = _checkFormData$apiDat.Applications) !== null && _checkFormData$apiDat2 !== void 0 && (_checkFormData$apiDat3 = _checkFormData$apiDat2[0]) !== null && _checkFormData$apiDat3 !== void 0 && _checkFormData$apiDat3.uuid || checkFormData !== null && checkFormData !== void 0 && (_checkFormData$respon = checkFormData.responseData) !== null && _checkFormData$respon !== void 0 && (_checkFormData$respon2 = _checkFormData$respon[0]) !== null && _checkFormData$respon2 !== void 0 && _checkFormData$respon2.uuid || isRealId) {
-      updateApplication(data);
-      console.log("here bab");
+    if (checkFormData !== null && checkFormData !== void 0 && (_checkFormData$apiDat = checkFormData.apiData) !== null && _checkFormData$apiDat !== void 0 && (_checkFormData$apiDat2 = _checkFormData$apiDat.Applications) !== null && _checkFormData$apiDat2 !== void 0 && (_checkFormData$apiDat3 = _checkFormData$apiDat2[0]) !== null && _checkFormData$apiDat3 !== void 0 && _checkFormData$apiDat3.uuid || checkFormData !== null && checkFormData !== void 0 && (_checkFormData$respon = checkFormData.responseData) !== null && _checkFormData$respon !== void 0 && (_checkFormData$respon2 = _checkFormData$respon[0]) !== null && _checkFormData$respon2 !== void 0 && _checkFormData$respon2.uuid) {
+      onGoNext();
     } else createApplication(data);
   }
   const createApplication = async data => {
@@ -11892,117 +11869,18 @@ const NewNDCStepFormOne = ({
       };
     }
   };
-  const updateApplication = async data => {
-    var _Digit$UserService$ge2, _user$info5, _user$info6, _data$PropertyDetails1, _user$info7, _user$info8, _checkFormData$respon3, _checkFormData$respon4, _checkFormData$respon5, _data$NDCReason2, _data$cpt1, _data$cpt1$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;
-    console.log("data===?????", data);
-    console.log("checkFormData???====", checkFormData);
-    const owners = [{
-      name: user === null || user === void 0 ? void 0 : (_user$info5 = user.info) === null || _user$info5 === void 0 ? void 0 : _user$info5.name,
-      mobileNumber: user === null || user === void 0 ? void 0 : (_user$info6 = user.info) === null || _user$info6 === void 0 ? void 0 : _user$info6.mobileNumber,
-      gender: data === null || data === void 0 ? void 0 : (_data$PropertyDetails1 = data.PropertyDetails) === null || _data$PropertyDetails1 === void 0 ? void 0 : _data$PropertyDetails1.gender,
-      emailId: user === null || user === void 0 ? void 0 : (_user$info7 = user.info) === null || _user$info7 === void 0 ? void 0 : _user$info7.emailId,
-      type: user === null || user === void 0 ? void 0 : (_user$info8 = user.info) === null || _user$info8 === void 0 ? void 0 : _user$info8.type
-    }];
-    let ndcDetails = [];
-    if ((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$respon5 = _checkFormData$respon4.NdcDetails) === null || _checkFormData$respon5 === void 0 ? void 0 : _checkFormData$respon5.length) > 0) {
-      ndcDetails = checkFormData.responseData[0].NdcDetails;
-    } else {
-      var _ref, _data$PropertyDetails10, _ref2, _data$PropertyDetails12, _data$PropertyDetails14, _data$PropertyDetails15;
-      (_ref = (data === null || data === void 0 ? void 0 : (_data$PropertyDetails10 = data.PropertyDetails) === null || _data$PropertyDetails10 === void 0 ? void 0 : _data$PropertyDetails10.waterConnection) || []) === null || _ref === void 0 ? void 0 : _ref.forEach(wc => {
-        var _wc$billData4, _data$PropertyDetails11, _data$cpt7, _data$cpt7$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,
-          businessService: "WS",
-          consumerCode: wc === null || wc === void 0 ? void 0 : wc.connectionNo,
-          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$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
-          },
-          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
-        });
-      });
-      (_ref2 = (data === null || data === void 0 ? void 0 : (_data$PropertyDetails12 = data.PropertyDetails) === null || _data$PropertyDetails12 === void 0 ? void 0 : _data$PropertyDetails12.sewerageConnection) || []) === null || _ref2 === void 0 ? void 0 : _ref2.forEach(sc => {
-        var _sc$billData4, _data$PropertyDetails13, _data$cpt8, _data$cpt8$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,
-          businessService: "SW",
-          consumerCode: sc === null || sc === void 0 ? void 0 : sc.connectionNo,
-          additionalDetails: {
-            propertyAddress: data === null || data === void 0 ? void 0 : (_data$PropertyDetails13 = data.PropertyDetails) === null || _data$PropertyDetails13 === void 0 ? void 0 : _data$PropertyDetails13.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
-          },
-          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$PropertyDetails14 = data.PropertyDetails) !== null && _data$PropertyDetails14 !== void 0 && (_data$PropertyDetails15 = _data$PropertyDetails14.propertyBillData) !== null && _data$PropertyDetails15 !== void 0 && _data$PropertyDetails15.billData) {
-        var _data$PropertyDetails16, _data$PropertyDetails17, _data$cpt9, _data$PropertyDetails18, _data$cpt0, _data$cpt0$details;
-        const billData = data === null || data === void 0 ? void 0 : (_data$PropertyDetails16 = data.PropertyDetails) === null || _data$PropertyDetails16 === void 0 ? void 0 : (_data$PropertyDetails17 = _data$PropertyDetails16.propertyBillData) === null || _data$PropertyDetails17 === void 0 ? void 0 : _data$PropertyDetails17.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,
-          additionalDetails: {
-            propertyAddress: data === null || data === void 0 ? void 0 : (_data$PropertyDetails18 = data.PropertyDetails) === null || _data$PropertyDetails18 === void 0 ? void 0 : _data$PropertyDetails18.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
-          },
-          dueAmount: (billData === null || billData === void 0 ? void 0 : billData.totalAmount) || 0,
-          status: billData === null || billData === void 0 ? void 0 : billData.status
-        });
-      }
-    }
-    const payload = {
-      Applications: [{
-        tenantId,
-        owners,
-        NdcDetails: ndcDetails,
-        Documents: [],
-        active: true,
-        reason: data === null || data === void 0 ? void 0 : (_data$NDCReason2 = data.NDCReason) === null || _data$NDCReason2 === void 0 ? void 0 : _data$NDCReason2.code,
-        auditDetails: data === null || data === void 0 ? void 0 : (_data$cpt1 = data.cpt) === null || _data$cpt1 === void 0 ? void 0 : (_data$cpt1$details = _data$cpt1.details) === null || _data$cpt1$details === void 0 ? void 0 : _data$cpt1$details.auditDetails,
-        uuid: id,
-        workflow: {
-          action: "DRAFT"
-        }
-      }]
-    };
-    console.log("payload", payload);
-    const response = await Digit.NDCService.NDCUpdate({
-      tenantId,
-      details: payload
-    });
-    if ((response === null || response === void 0 ? void 0 : (_response$ResponseInf2 = response.ResponseInfo) === null || _response$ResponseInf2 === void 0 ? void 0 : _response$ResponseInf2.status) === "successful") {
-      dispatch(updateNDCForm("apiData", response));
-      onGoNext();
-      return {
-        isSuccess: true,
-        response
-      };
-    } else {
-      return {
-        isSuccess: false,
-        response
-      };
-    }
-  };
   function validateStepData(data) {
-    var _data$cpt10, _data$cpt11, _data$cpt11$dues, _propertyDetails$wate, _propertyDetails$sewe;
+    var _data$cpt6, _data$cpt7, _data$cpt7$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$cpt6 = data.cpt) !== null && _data$cpt6 !== void 0 && _data$cpt6.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$cpt7 = data.cpt) === null || _data$cpt7 === void 0 ? void 0 : (_data$cpt7$dues = _data$cpt7.dues) === null || _data$cpt7$dues === void 0 ? void 0 : _data$cpt7$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) {
@@ -12271,8 +12149,8 @@ const PropertyDetailsForm$1 = ({
     var _apiDataCheck$2;
     let waterConnection;
     if (apiDataCheck !== null && apiDataCheck !== void 0 && (_apiDataCheck$2 = apiDataCheck[0]) !== null && _apiDataCheck$2 !== void 0 && _apiDataCheck$2.NdcDetails) {
-      var _apiDataCheck$3, _apiDataCheck$3$NdcDe;
-      const resData = apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$3 = apiDataCheck[0]) === null || _apiDataCheck$3 === void 0 ? void 0 : (_apiDataCheck$3$NdcDe = _apiDataCheck$3.NdcDetails) === null || _apiDataCheck$3$NdcDe === void 0 ? void 0 : _apiDataCheck$3$NdcDe.filter(item => {
+      var _apiDataCheck$3;
+      const resData = apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$3 = apiDataCheck[0]) === null || _apiDataCheck$3 === void 0 ? void 0 : _apiDataCheck$3.NdcDetails.filter(item => {
         return item.businessService == "WS";
       });
       waterConnection = (resData === null || resData === void 0 ? void 0 : resData.map(item => ({
@@ -12299,10 +12177,9 @@ const PropertyDetailsForm$1 = ({
   useEffect(() => {
     var _apiDataCheck$4;
     let sewerageConnection;
-    console.log("apiDataCheck", apiDataCheck);
     if (apiDataCheck !== null && apiDataCheck !== void 0 && (_apiDataCheck$4 = apiDataCheck[0]) !== null && _apiDataCheck$4 !== void 0 && _apiDataCheck$4.NdcDetails) {
-      var _apiDataCheck$5, _apiDataCheck$5$NdcDe;
-      const resData = apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$5 = apiDataCheck[0]) === null || _apiDataCheck$5 === void 0 ? void 0 : (_apiDataCheck$5$NdcDe = _apiDataCheck$5.NdcDetails) === null || _apiDataCheck$5$NdcDe === void 0 ? void 0 : _apiDataCheck$5$NdcDe.filter(item => {
+      var _apiDataCheck$5;
+      const resData = apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$5 = apiDataCheck[0]) === null || _apiDataCheck$5 === void 0 ? void 0 : _apiDataCheck$5.NdcDetails.filter(item => {
         return item.businessService == "SW";
       });
       sewerageConnection = (resData === null || resData === void 0 ? void 0 : resData.map(item => ({
@@ -13328,13 +13205,11 @@ const SelectNDCDocuments = ({
   const [error, setError] = useState(null);
   useEffect(() => {
     var _checkFormData$respon, _checkFormData$respon2, _checkFormData$respon3;
-    console.log("coming here again");
-    if (checkFormData !== null && checkFormData !== void 0 && (_checkFormData$respon = checkFormData.responseData) !== null && _checkFormData$respon !== void 0 && (_checkFormData$respon2 = _checkFormData$respon[0]) !== null && _checkFormData$respon2 !== void 0 && (_checkFormData$respon3 = _checkFormData$respon2.Documents) !== null && _checkFormData$respon3 !== void 0 && _checkFormData$respon3.length && documents.length === 0) {
-      var _checkFormData$respon4, _checkFormData$respon5, _checkFormData$respon6;
-      const apiDocs = checkFormData === null || checkFormData === void 0 ? void 0 : (_checkFormData$respon4 = checkFormData.responseData) === null || _checkFormData$respon4 === void 0 ? void 0 : (_checkFormData$respon5 = _checkFormData$respon4[0]) === null || _checkFormData$respon5 === void 0 ? void 0 : (_checkFormData$respon6 = _checkFormData$respon5.Documents) === null || _checkFormData$respon6 === void 0 ? void 0 : _checkFormData$respon6.map(doc => ({
-        documentType: doc === null || doc === void 0 ? void 0 : doc.documentType,
-        fileStoreId: doc === null || doc === void 0 ? void 0 : doc.documentAttachment,
-        documentUid: doc === null || doc === void 0 ? void 0 : doc.documentAttachment
+    if (checkFormData !== null && checkFormData !== void 0 && (_checkFormData$respon = checkFormData.responseData) !== null && _checkFormData$respon !== void 0 && (_checkFormData$respon2 = _checkFormData$respon[0]) !== null && _checkFormData$respon2 !== void 0 && (_checkFormData$respon3 = _checkFormData$respon2.Documents) !== null && _checkFormData$respon3 !== void 0 && _checkFormData$respon3.length) {
+      const apiDocs = checkFormData.responseData[0].Documents.map(doc => ({
+        documentType: doc.documentType,
+        fileStoreId: doc.documentAttachment,
+        documentUid: doc.documentAttachment
       }));
       setDocuments(apiDocs);
     }
@@ -13403,7 +13278,7 @@ function SelectDocument({
     setFile(e.target.files[0]);
   }
   useEffect(() => {
-    if (filteredDocument !== null && filteredDocument !== void 0 && filteredDocument.fileStoreId && !file) {
+    if (filteredDocument !== null && filteredDocument !== void 0 && filteredDocument.fileStoreId) {
       setUploadedFile(filteredDocument.fileStoreId);
     }
   }, [filteredDocument]);
@@ -13485,26 +13360,10 @@ const NewNDCStepFormTwo = ({
   const stateId = Digit.ULBService.getStateId();
   const [showToast, setShowToast] = useState(false);
   const [error, setError] = useState("");
-  const tenantId = window.localStorage.getItem("CITIZEN.CITY");
   const {
     isLoading,
     data
   } = Digit.Hooks.pt.usePropertyMDMS(stateId, "NDC", ["Documents"]);
-  const checkFormData = useSelector(state => state.ndc.NDCForm.formData || {});
-  const id = window.location.pathname.split("/").pop();
-  const user = Digit.UserService.getUser();
-  const {
-    isLoading: propertyLoading,
-    data: applicationDetails,
-    refetch
-  } = Digit.Hooks.ndc.useSearchEmployeeApplication({
-    uuid: id
-  }, tenantId);
-  useEffect(() => {
-    if (applicationDetails !== null && applicationDetails !== void 0 && applicationDetails.Applications.length) {
-      dispatch(updateNDCForm("responseData", applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.Applications));
-    }
-  }, [applicationDetails]);
   function goNext(finaldata) {
     console.log(`Data in step ${config.currStepNumber} is: \n`, finaldata);
     const missingFields = validation(finaldata);
@@ -13516,64 +13375,8 @@ const NewNDCStepFormTwo = ({
       }, 3000);
       return;
     }
-    const isRealId = id && id.startsWith("NDC-");
-    if (isRealId) {
-      updateApplication(finaldata);
-      console.log("here bab");
-    }
+    onGoNext();
   }
-  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);
-    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,
-      gender: checkFormData === null || checkFormData === void 0 ? void 0 : (_checkFormData$NDCDet = checkFormData.NDCDetails) === null || _checkFormData$NDCDet === void 0 ? void 0 : (_checkFormData$NDCDet2 = _checkFormData$NDCDet.PropertyDetails) === null || _checkFormData$NDCDet2 === void 0 ? void 0 : _checkFormData$NDCDet2.gender,
-      emailId: user === null || user === void 0 ? void 0 : (_user$info3 = user.info) === null || _user$info3 === void 0 ? void 0 : _user$info3.emailId,
-      type: user === null || user === void 0 ? void 0 : (_user$info4 = user.info) === null || _user$info4 === void 0 ? void 0 : _user$info4.type
-    }];
-    const baseApplication = (checkFormData === null || checkFormData === void 0 ? void 0 : (_checkFormData$respon = checkFormData.responseData) === null || _checkFormData$respon === void 0 ? void 0 : _checkFormData$respon[0]) || {};
-    const updatedApplication = {
-      ...baseApplication,
-      workflow: {
-        ...(baseApplication === null || baseApplication === void 0 ? void 0 : baseApplication.workflow)
-      },
-      owners: owners,
-      NdcDetails: baseApplication === null || baseApplication === void 0 ? void 0 : baseApplication.NdcDetails,
-      Documents: []
-    };
-    (_ref = (data === null || data === void 0 ? void 0 : (_data$documents = data.documents) === null || _data$documents === void 0 ? void 0 : _data$documents.documents) || []) === null || _ref === void 0 ? void 0 : _ref.forEach(doc => {
-      var _updatedApplication$D;
-      (_updatedApplication$D = updatedApplication.Documents) === null || _updatedApplication$D === void 0 ? void 0 : _updatedApplication$D.push({
-        uuid: doc === null || doc === void 0 ? void 0 : doc.documentUid,
-        documentType: doc === null || doc === void 0 ? void 0 : doc.documentType,
-        documentAttachment: doc === null || doc === void 0 ? void 0 : doc.fileStoreId
-      });
-    });
-    const payload = {
-      Applications: [updatedApplication]
-    };
-    console.log("payload", payload);
-    const response = await Digit.NDCService.NDCUpdate({
-      tenantId,
-      details: payload
-    });
-    if ((response === null || response === void 0 ? void 0 : (_response$ResponseInf = response.ResponseInfo) === null || _response$ResponseInf === void 0 ? void 0 : _response$ResponseInf.status) === "successful") {
-      dispatch(updateNDCForm("apiData", response));
-      onGoNext();
-      return {
-        isSuccess: true,
-        response
-      };
-    } else {
-      return {
-        isSuccess: false,
-        response
-      };
-    }
-  };
   const closeToast = () => {
     setShowToast(false);
     setError("");