@mseva/digit-ui-module-ptr 1.0.94 → 1.0.96

package/dist/index.modern.js

@@ -8391,10 +8391,10 @@ const PTRCitizenPet = ({
       goNext(data);
       return;
     }
+    console.log("data", data);
     const {
       address,
-      lastName,
-      firstName,
+      name,
       pincode,
       ...filteredOwnerDetails
     } = currentStepData.ownerDetails;
@@ -8402,16 +8402,16 @@ const PTRCitizenPet = ({
       tenantId,
       owner: {
         ...filteredOwnerDetails,
-        name: `${firstName} ${lastName}`,
+        name: name,
         userName: filteredOwnerDetails === null || filteredOwnerDetails === void 0 ? void 0 : filteredOwnerDetails.mobileNumber,
         tenantId,
         type: "CITIZEN"
       },
       petDetails: {
         petName: data.petName,
-        petType: (_data$petType = data.petType) === null || _data$petType === void 0 ? void 0 : _data$petType.code,
+        petType: (_data$petType = data.petType) === null || _data$petType === void 0 ? void 0 : _data$petType.name,
         breedType: (_data$breedType = data.breedType) === null || _data$breedType === void 0 ? void 0 : _data$breedType.code,
-        petGender: (_data$petGender = data.petGender) === null || _data$petGender === void 0 ? void 0 : _data$petGender.code,
+        petGender: (_data$petGender = data.petGender) === null || _data$petGender === void 0 ? void 0 : _data$petGender.name,
         petColor: data.petColor,
         lastVaccineDate: toEpochMilliseconds(data.lastVaccineDate),
         petAge: data.petAge,
@@ -8424,12 +8424,12 @@ const PTRCitizenPet = ({
         addressId: currentStepData.ownerDetails.address
       },
       applicationType: "NEWAPPLICATION",
-      ownerName: `${firstName} ${lastName}`,
+      ownerName: name,
       fatherName: filteredOwnerDetails === null || filteredOwnerDetails === void 0 ? void 0 : filteredOwnerDetails.fatherOrHusbandName,
       mobileNumber: filteredOwnerDetails === null || filteredOwnerDetails === void 0 ? void 0 : filteredOwnerDetails.mobileNumber,
       workflow: {
         action: "INITIATE",
-        comments: "Initial application submitted",
+        comments: "",
         status: "INITIATED"
       }
     };
@@ -8721,7 +8721,7 @@ const PTRCitizenPet = ({
     rules: {
       required: t("PTR_CLINIC_NAME_REQUIRED"),
       pattern: {
-        value: alphaNum,
+        value: /^[a-zA-Z0-9\s&-]+$/,
         message: t("PTR_CLINIC_NAME_INVALID")
       }
     },
@@ -15857,7 +15857,6 @@ const PTRCitizenDetails = ({
     emailId,
     name
   } = userInfo === null || userInfo === void 0 ? void 0 : userInfo.info;
-  const [firstName, lastName] = [(name || "").trim().split(" ").slice(0, -1).join(" "), (name || "").trim().split(" ").slice(-1).join(" ")];
   const isCitizen = window.location.href.includes("citizen");
   const {
     control,
@@ -15871,8 +15870,7 @@ const PTRCitizenDetails = ({
     defaultValues: isCitizen ? {
       mobileNumber: mobileNumber || "",
       emailId: emailId || "",
-      firstName: firstName || "",
-      lastName: lastName || ""
+      name: name || ""
     } : {}
   });
   const onSubmit = data => {
@@ -15897,8 +15895,7 @@ const PTRCitizenDetails = ({
     const error = errors[fieldName];
     if (error.message) return t(error.message);
     const fallbackMessages = {
-      firstName: t("PTR_FIRST_NAME_REQUIRED"),
-      lastName: t("PTR_LAST_NAME_REQUIRED"),
+      name: t("PTR_FIRST_NAME_REQUIRED"),
       emailId: t("PTR_EMAIL_REQUIRED"),
       mobileNumber: t("PTR_MOBILE_REQUIRED"),
       fatherOrHusbandName: t("PTR_FATHER_HUSBAND_NAME_REQUIRED"),
@@ -15919,16 +15916,16 @@ const PTRCitizenDetails = ({
     className: "card-section-header"
   }, t("PTR_CITIZEN_DETAILS")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
-  }, `${t("NDC_FIRST_NAME")}`, " *"), /*#__PURE__*/React.createElement("div", {
+  }, `${t("ES_NEW_APPLICATION_APPLICANT_NAME")}`, " *"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
-    name: "firstName",
+    name: "name",
     rules: {
-      required: t("PTR_FIRST_NAME_REQUIRED"),
+      required: t("Applicant Name is Required"),
       pattern: {
         value: /^[A-Za-z]+(?:[ '-][A-Za-z]+)*\s*$/,
-        message: t("PTR_FIRST_NAME_INVALID")
+        message: t("Applicant Name is Invalid")
       },
       maxLength: {
         value: 100,
@@ -15948,50 +15945,13 @@ const PTRCitizenDetails = ({
       onChange: e => onChange(e.target.value),
       onBlur: e => {
         onBlur(e);
-        trigger("firstName");
+        trigger("name");
       },
       t: t
     })
-  }))), errors.firstName && /*#__PURE__*/React.createElement(CardLabelError, {
+  }))), errors.name && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, getErrorMessage("firstName")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller"
-  }, `${t("NDC_LAST_NAME")}`, " *"), /*#__PURE__*/React.createElement("div", {
-    className: "field"
-  }, /*#__PURE__*/React.createElement(Controller, {
-    control: control,
-    name: "lastName",
-    rules: {
-      required: t("PTR_LAST_NAME_REQUIRED"),
-      pattern: {
-        value: /^[A-Za-z]+(?:[ '-][A-Za-z]+)*\s*$/,
-        message: t("PTR_FIRST_NAME_INVALID")
-      },
-      maxLength: {
-        value: 100,
-        message: "Maximum 100 characters"
-      },
-      minLength: {
-        value: 2,
-        message: "Minimum 2 characters"
-      }
-    },
-    render: ({
-      value,
-      onChange,
-      onBlur
-    }) => /*#__PURE__*/React.createElement(TextInput, {
-      value: value,
-      onChange: e => onChange(e.target.value),
-      onBlur: e => {
-        onBlur(e);
-        trigger("lastName");
-      },
-      t: t
-    })
-  }))), errors.lastName && /*#__PURE__*/React.createElement(CardLabelError, {
-    style: errorStyle
-  }, getErrorMessage("lastName")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }, getErrorMessage("name")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
   }, `${t("NOC_APPLICANT_EMAIL_LABEL")}`, " *"), /*#__PURE__*/React.createElement("div", {
     className: "field"
@@ -16001,7 +15961,7 @@ const PTRCitizenDetails = ({
     rules: {
       required: t("PTR_EMAIL_REQUIRED"),
       pattern: {
-        value: /^[A-Za-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,}$/,
+        value: /^(?!\.)(?!.*\.\.)[a-zA-Z0-9._%+-]+@[a-zA-Z0-9-]+(\.[a-zA-Z]{2,})+$/,
         message: t("PTR_EMAIL_INVALID")
       },
       maxLength: {
@@ -16147,14 +16107,6 @@ const PTRCitizenDetails = ({
       pattern: {
         value: /^[1-9][0-9]{5}$/,
         message: t("PTR_PINCODE_INVALID")
-      },
-      minLength: {
-        value: 6,
-        message: t("PTR_PINCODE_MIN_LENGTH")
-      },
-      maxLength: {
-        value: 6,
-        message: t("PTR_PINCODE_MAX_LENGTH")
       }
     },
     render: ({
@@ -16163,13 +16115,13 @@ const PTRCitizenDetails = ({
       onBlur
     }) => /*#__PURE__*/React.createElement(TextInput, {
       value: value,
+      maxlength: 6,
       onChange: e => onChange(e.target.value.replace(/\D/g, "")),
       onBlur: e => {
         onBlur(e);
         trigger("pincode");
       },
-      t: t,
-      maxLength: 6
+      t: t
     })
   }))), errors.pincode && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
@@ -16985,12 +16937,7 @@ function PTRWFDocument({
         background: "#f6f6f6",
         padding: "8px"
       }
-    }), /*#__PURE__*/React.createElement("p", {
-      style: {
-        marginTop: "8px",
-        textAlign: "center"
-      }
-    }, value !== null && value !== void 0 && value.workflowDocs ? t(`${document === null || document === void 0 ? void 0 : document.documentType}`) : t(`PT_${document === null || document === void 0 ? void 0 : document.documentType}_LABEL`)));
+    }));
   }))));
 }
 
@@ -17091,13 +17038,13 @@ const ModalConfig = ({
   assigneeLabel,
   businessService
 }) => {
-  let checkAssigneeVisible = (action === null || action === void 0 ? void 0 : action.action) === "APPROVE" || (action === null || action === void 0 ? void 0 : action.action) === "VERIFY" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD";
+  let checkAssigneeVisible = (action === null || action === void 0 ? void 0 : action.action) == "SENDBACKTOVERIFIER" || (action === null || action === void 0 ? void 0 : action.action) == "VERIFY" || (action === null || action === void 0 ? void 0 : action.action) == "FORWARD";
   if (action.isTerminateState) {
     checkAssigneeVisible = false;
   }
   return {
     label: {
-      heading: t(`WF_${action === null || action === void 0 ? void 0 : action.action}_APPLICATION`),
+      heading: "",
       submit: t(`${action === null || action === void 0 ? void 0 : action.action}`),
       cancel: t("WF_EMPLOYEE_NEWTL_CANCEL")
     },
@@ -17120,13 +17067,8 @@ const ModalConfig = ({
           selected: selectedApprover
         })
       }, {
-        label: t("WF_COMMON_COMMENTS"),
+        label: `${t("CS_COMMON_COMMENTS")} *`,
         type: "textarea",
-        isMandatory: (action === null || action === void 0 ? void 0 : action.action) === "REJECT" || (action === null || action === void 0 ? void 0 : action.action) === "APPROVE" || (action === null || action === void 0 ? void 0 : action.action) === "VERIFY" || (action === null || action === void 0 ? void 0 : action.action) === "SENDBACKTOCITIZEN" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD",
-        validation: (action === null || action === void 0 ? void 0 : action.action) === "REJECT" || (action === null || action === void 0 ? void 0 : action.action) === "APPROVE" || (action === null || action === void 0 ? void 0 : action.action) === "VERIFY" || (action === null || action === void 0 ? void 0 : action.action) === "SENDBACKTOCITIZEN" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD" ? {
-          required: true,
-          message: t("CORE_COMMON_REQUIRED_ERRMSG")
-        } : {},
         populators: {
           name: "comments"
         }
@@ -17253,7 +17195,6 @@ const PTRModal = ({
   }
   useEffect(() => {
     (async () => {
-      setError(null);
       if (file) {
         if (file.size >= 5242880) {
           setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
@@ -17275,22 +17216,18 @@ const PTRModal = ({
     })();
   }, [file]);
   function submit(data) {
-    setShowToast(null);
-    setError(null);
-    let checkCommentsMandatory = (action === null || action === void 0 ? void 0 : action.action) === "APPROVE" || (action === null || action === void 0 ? void 0 : action.action) === "VERIFY" || (action === null || action === void 0 ? void 0 : action.action) === "REJECT" || (action === null || action === void 0 ? void 0 : action.action) === "SENDBACKTOCITIZEN" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD";
-    if (action !== null && action !== void 0 && action.isTerminateState) checkCommentsMandatory = true;
-    const commentsText = data === null || data === void 0 ? void 0 : data.comments;
-    if (checkCommentsMandatory && (!commentsText || !commentsText.toString().trim())) {
-      setError("Comments are required");
+    let checkAssigneeMandatory = (action === null || action === void 0 ? void 0 : action.action) === "SENDBACKTOVERIFIER" || (action === null || action === void 0 ? void 0 : action.action) === "VERIFY" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD";
+    if (action !== null && action !== void 0 && action.isTerminateState) checkAssigneeMandatory = false;
+    if (checkAssigneeMandatory && !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid)) {
+      setError("Assignee is required");
       setShowToast({
         key: "error"
       });
       return;
     }
-    let checkAssigneeMandatory = (action === null || action === void 0 ? void 0 : action.action) === "APPROVE" || (action === null || action === void 0 ? void 0 : action.action) === "VERIFY" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD";
-    if (action !== null && action !== void 0 && action.isTerminateState) checkAssigneeMandatory = false;
-    if (checkAssigneeMandatory && !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid)) {
-      setError("Assignee is required");
+    const commentsText = data === null || data === void 0 ? void 0 : data.comments;
+    if (!commentsText) {
+      setError("Comments are required");
       setShowToast({
         key: "error"
       });
@@ -17347,8 +17284,9 @@ const PTRModal = ({
     defaultValues: defaultValues,
     formId: "modal-action"
   }), showToast && /*#__PURE__*/React.createElement(Toast, {
-    error: showToast.key === "error" ? true : false,
+    error: showToast.key == "error" ? true : false,
     label: error,
+    isDleteBtn: true,
     onClose: closeToast
   })) : /*#__PURE__*/React.createElement(Loader, null);
 };
@@ -17377,13 +17315,12 @@ const PTRWFApplicationTimeline = props => {
       refetchOnMount: "always"
     }
   });
-  console.log(" majordata :>> ", data);
+  console.log("props.application", props.application);
   function OpenImage(imageSource, index, thumbnailsToShow) {
     var _thumbnailsToShow$ful;
     window.open(thumbnailsToShow === null || thumbnailsToShow === void 0 ? void 0 : (_thumbnailsToShow$ful = thumbnailsToShow.fullImage) === null || _thumbnailsToShow$ful === void 0 ? void 0 : _thumbnailsToShow$ful[0], "_blank");
   }
   const getTimelineCaptions = checkpoint => {
-    console.log("checkpoint is :>> ", checkpoint);
     if (checkpoint.state === "OPEN") {
       var _checkpoint$auditDeta, _props$application4;
       const caption = {
@@ -17495,6 +17432,7 @@ const PTRWFApplicationTimeline = props => {
   const closeModal = () => {
     setSelectedAction(null);
     setShowModal(false);
+    setShowToast(false);
   };
   function onActionSelect(action) {
     const payload = {
@@ -17513,15 +17451,12 @@ const PTRWFApplicationTimeline = props => {
   }
   const submitAction = async data => {
     var _data$Licenses;
-    console.log("data  HUHHHH:>> ", data);
     const payloadData = props.application;
-    console.log("payloadData :>> ", payloadData);
     const updatedApplicant = {
       ...payloadData,
       workflow: {}
     };
     const filtData = data === null || data === void 0 ? void 0 : (_data$Licenses = data.Licenses) === null || _data$Licenses === void 0 ? void 0 : _data$Licenses[0];
-    console.log("filtData whyy :>> ", filtData);
     setLatestComment(filtData === null || filtData === void 0 ? void 0 : filtData.comment);
     updatedApplicant.workflow = {
       action: filtData.action,
@@ -17529,19 +17464,9 @@ const PTRWFApplicationTimeline = props => {
       comments: filtData === null || filtData === void 0 ? void 0 : filtData.comment,
       documents: filtData !== null && filtData !== void 0 && filtData.wfDocuments ? filtData === null || filtData === void 0 ? void 0 : filtData.wfDocuments : null
     };
-    if (!(filtData !== null && filtData !== void 0 && filtData.assignee) && filtData.action == "FORWARD") {
-      setShowToast({
-        key: "error",
-        message: "Assignee is mandatory"
-      });
-      setError("Assignee is mandatory");
-      return;
-    }
-    console.log("updatedApplicant :>> ", updatedApplicant);
     const finalPayload = {
       PetRegistrationApplications: [updatedApplicant]
     };
-    console.log("finalPayload :>> ", finalPayload);
     try {
       var _response$ResponseInf;
       const response = await Digit.PTRService.update({
@@ -17594,7 +17519,7 @@ const PTRWFApplicationTimeline = props => {
       label: t(`ES_PTR_COMMON_STATUS_${data === null || data === void 0 ? void 0 : (_data$processInstance = data.processInstances[index].state) === null || _data$processInstance === void 0 ? void 0 : _data$processInstance["state"]}${timelineStatusPostfix}`),
       customChild: getTimelineCaptions(checkpoint)
     }));
-  }))), (actions === null || actions === void 0 ? void 0 : actions.length) > 0 && ((_actions$ = actions[0]) === null || _actions$ === void 0 ? void 0 : _actions$.action) != "PAY" && /*#__PURE__*/React.createElement(ActionBar, null, displayMenu ? /*#__PURE__*/React.createElement(Menu, {
+  }))), (actions === null || actions === void 0 ? void 0 : actions.length) > 0 && ((_actions$ = actions[0]) === null || _actions$ === void 0 ? void 0 : _actions$.action) != "PAY" && !isCitizen && /*#__PURE__*/React.createElement(ActionBar, null, displayMenu ? /*#__PURE__*/React.createElement(Menu, {
     localeKeyPrefix: `WF_EMPLOYEE_${"PTR"}`,
     options: actions,
     optionKey: "action",
@@ -17620,8 +17545,9 @@ const PTRWFApplicationTimeline = props => {
     errors: error,
     setShowToast: setShowToast
   }) : null), data && showNextActions(data === null || data === void 0 ? void 0 : (_data$actionState2 = data.actionState) === null || _data$actionState2 === void 0 ? void 0 : _data$actionState2.nextActions), showToast && /*#__PURE__*/React.createElement(Toast, {
-    error: showToast.key === "error" ? true : false,
+    error: showToast.key == "error" ? true : false,
     label: error,
+    isDleteBtn: true,
     onClose: closeToast
   }));
 };
@@ -18107,7 +18033,7 @@ const PTRMyApplications = () => {
       var _ob$referenceId;
       return ob === null || ob === void 0 ? void 0 : (_ob$referenceId = ob.referenceId) === null || _ob$referenceId === void 0 ? void 0 : _ob$referenceId.includes(curservice === null || curservice === void 0 ? void 0 : curservice.applicationNumber);
     });
-    if (foundValue) return t("CS_CF_VIEW");else return t("CS_CF_TRACK");
+    if (foundValue) return t("CS_CF_VIEW");else return t("CS_VIEW_DETAILS");
   }
   if (isLoading || serviceloading) {
     return /*#__PURE__*/React.createElement(Loader, null);
@@ -18242,7 +18168,12 @@ function PTRDocument({
       target: "_",
       href: documentLink,
       style: {
-        minWidth: "160px"
+        minWidth: "160px",
+        margin: "12px",
+        display: "flex",
+        flexDirection: "column",
+        alignItems: "center",
+        textAlign: "center"
       },
       key: index
     }, /*#__PURE__*/React.createElement(PDFSvg$1, {
@@ -18254,8 +18185,11 @@ function PTRDocument({
       }
     }), /*#__PURE__*/React.createElement("p", {
       style: {
-        marginTop: "8px"
-      }
+        marginTop: "8px",
+        maxWidth: "140px",
+        wordBreak: "break-word"
+      },
+      title: t(`PT_${document === null || document === void 0 ? void 0 : document.documentType.replace(".", "_")}`)
     }, t(`PT_${document === null || document === void 0 ? void 0 : document.documentType.replace(".", "_")}`)));
   })))));
 }
@@ -18742,7 +18676,7 @@ function get(object, path, defaultValue) {
 var get_1 = get;
 
 const PTRApplicationDetails = () => {
-  var _pet_details$addition, _reciept_data$Payment, _pet_details$address, _pet_details$address2, _pet_details$petDetai, _pet_details$petDetai2, _pet_details$petDetai3, _pet_details$petDetai4, _pet_details$petDetai5, _pet_details$petDetai6;
+  var _pet_details$addition, _reciept_data$Payment, _pet_details$owner, _pet_details$owner2, _pet_details$owner3, _pet_details$owner4, _pet_details$address, _pet_details$address2, _pet_details$petDetai, _pet_details$petDetai2, _pet_details$petDetai3, _pet_details$petDetai4, _pet_details$petDetai5, _pet_details$petDetai6;
   const {
     t
   } = useTranslation();
@@ -18753,6 +18687,7 @@ const PTRApplicationDetails = () => {
   } = useParams();
   const [acknowldgementData, setAcknowldgementData] = useState([]);
   const [showOptions, setShowOptions] = useState(false);
+  const isCitizen = window.location.href.includes("citizen");
   const [popup, setpopup] = useState(false);
   const [showToast, setShowToast] = useState(null);
   const {
@@ -18774,7 +18709,7 @@ const PTRApplicationDetails = () => {
   const petId = get_1(data, "PetRegistrationApplications[0].applicationNumber", []);
   const pet_details = PetRegistrationApplications && PetRegistrationApplications.length > 0 && PetRegistrationApplications[0] || {};
   const application = pet_details;
-  sessionStorage.setItem("ptr-pet", JSON.stringify(application));
+  console.log("pet_details", pet_details);
   const [loading, setLoading] = useState(false);
   const fetchBillData = async () => {
     setLoading(true);
@@ -19358,42 +19293,42 @@ const PTRApplicationDetails = () => {
     onHeadClick: () => setShowOptions(!showOptions),
     displayOptions: showOptions,
     options: dowloadOptions
-  })), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
-    label: t("PDF_STATIC_LABEL_APPLICATION_NUMBER_LABEL"),
-    text: pet_details === null || pet_details === void 0 ? void 0 : pet_details.applicationNumber
-  })), /*#__PURE__*/React.createElement(CardSubHeader, {
-    style: {
-      fontSize: "24px"
-    }
-  }, t("WS_COMMON_TABLE_COL_ADDRESS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
-    label: t("PTR_ADDRESS"),
-    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$address = pet_details.address) === null || _pet_details$address === void 0 ? void 0 : _pet_details$address.addressId) || t("CS_NA")
-  }), /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
-    label: t("PTR_PINCODE"),
-    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$address2 = pet_details.address) === null || _pet_details$address2 === void 0 ? void 0 : _pet_details$address2.pincode) || t("CS_NA")
-  })), /*#__PURE__*/React.createElement(CardSubHeader, {
+  })), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, {
     style: {
       fontSize: "24px"
     }
   }, t("ES_TITLE_APPLICANT_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("REPORT_FSM_RESULT_APPLICANTNAME"),
-    text: (pet_details === null || pet_details === void 0 ? void 0 : pet_details.applicantName) || t("CS_NA")
+    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$owner = pet_details.owner) === null || _pet_details$owner === void 0 ? void 0 : _pet_details$owner.name) || t("CS_NA")
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("NOC_APPLICANT_FATHER_HUSBAND_NAME_LABEL"),
-    text: (pet_details === null || pet_details === void 0 ? void 0 : pet_details.fatherName) || (pet_details === null || pet_details === void 0 ? void 0 : pet_details.fatherOrHusbandName) || t("CS_NA")
+    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$owner2 = pet_details.owner) === null || _pet_details$owner2 === void 0 ? void 0 : _pet_details$owner2.fatherOrHusbandName) || t("CS_NA")
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("MOBILE"),
-    text: (pet_details === null || pet_details === void 0 ? void 0 : pet_details.mobileNumber) || t("CS_NA")
+    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$owner3 = pet_details.owner) === null || _pet_details$owner3 === void 0 ? void 0 : _pet_details$owner3.mobileNumber) || t("CS_NA")
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("CORE_COMMON_PROFILE_EMAIL"),
-    text: (pet_details === null || pet_details === void 0 ? void 0 : pet_details.emailId) || t("CS_NA")
+    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$owner4 = pet_details.owner) === null || _pet_details$owner4 === void 0 ? void 0 : _pet_details$owner4.emailId) || t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
+    className: "border-none",
+    label: t("PDF_STATIC_LABEL_APPLICATION_NUMBER_LABEL"),
+    text: pet_details === null || pet_details === void 0 ? void 0 : pet_details.applicationNumber
+  })), /*#__PURE__*/React.createElement(CardSubHeader, {
+    style: {
+      fontSize: "24px"
+    }
+  }, t("WS_COMMON_TABLE_COL_ADDRESS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
+    className: "border-none",
+    label: t("PTR_ADDRESS"),
+    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$address = pet_details.address) === null || _pet_details$address === void 0 ? void 0 : _pet_details$address.addressId) || t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
+    className: "border-none",
+    label: t("PTR_PINCODE"),
+    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$address2 = pet_details.address) === null || _pet_details$address2 === void 0 ? void 0 : _pet_details$address2.pincode) || t("CS_NA")
   })), /*#__PURE__*/React.createElement(CardSubHeader, {
     style: {
       fontSize: "24px"
@@ -19417,7 +19352,7 @@ const PTRApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("PTR_VACCINATED_DATE"),
-    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$petDetai5 = pet_details.petDetails) === null || _pet_details$petDetai5 === void 0 ? void 0 : _pet_details$petDetai5.lastVaccineDate) || t("CS_NA")
+    text: pet_details !== null && pet_details !== void 0 && (_pet_details$petDetai5 = pet_details.petDetails) !== null && _pet_details$petDetai5 !== void 0 && _pet_details$petDetai5.lastVaccineDate ? new Date(Number(pet_details.petDetails.lastVaccineDate)).toLocaleDateString("en-GB") : t("CS_NA")
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("PTR_VACCINATION_NUMBER"),
@@ -19434,7 +19369,12 @@ const PTRApplicationDetails = () => {
   }) : /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     text: t("PTR_NO_DOCUMENTS_MSG")
-  }))), /*#__PURE__*/React.createElement(PTRWFApplicationTimeline, {
+  }))), ((pet_details === null || pet_details === void 0 ? void 0 : pet_details.status) == "CITIZENACTIONREQUIRED" || (pet_details === null || pet_details === void 0 ? void 0 : pet_details.status) == "INITIATED") && isCitizen && /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar, {
+    label: t("COMMON_EDIT"),
+    onSubmit: () => {
+      history.push(`/digit-ui/citizen/ptr/petservice/new-application/${acknowledgementIds}`);
+    }
+  })), /*#__PURE__*/React.createElement(PTRWFApplicationTimeline, {
     application: application,
     id: application === null || application === void 0 ? void 0 : application.applicationNumber,
     userType: "citizen"
@@ -19444,6 +19384,7 @@ const PTRApplicationDetails = () => {
     style: {
       bottom: "0px"
     },
+    isDleteBtn: true,
     onClose: () => {
       setShowToast(null);
     }
@@ -21267,7 +21208,7 @@ const NewApplication = () => {
 };
 
 const ApplicationDetails = () => {
-  var _pet_details$addition, _reciept_data$Payment2, _pet_details$address, _pet_details$address2, _pet_details$owner, _pet_details$owner2, _pet_details$owner3, _pet_details$owner4, _pet_details$petDetai, _pet_details$petDetai2, _pet_details$petDetai3, _pet_details$petDetai4, _pet_details$petDetai5, _pet_details$petDetai6;
+  var _pet_details$addition, _reciept_data$Payment2, _pet_details$owner, _pet_details$owner2, _pet_details$owner3, _pet_details$owner4, _pet_details$address, _pet_details$address2, _pet_details$petDetai, _pet_details$petDetai2, _pet_details$petDetai3, _pet_details$petDetai4, _pet_details$petDetai5, _pet_details$petDetai6;
   const {
     t
   } = useTranslation();
@@ -21301,7 +21242,6 @@ const ApplicationDetails = () => {
       refetchOnMount: "always"
     }
   });
-  console.log("data :>> ", data);
   const [billData, setBillData] = useState(null);
   const PetRegistrationApplications = get_1(data, "PetRegistrationApplications", []);
   const petId = get_1(data, "PetRegistrationApplications[0].applicationNumber", []);
@@ -21432,32 +21372,7 @@ const ApplicationDetails = () => {
       marginRight: "auto",
       maxWidth: "960px"
     }
-  }, /*#__PURE__*/React.createElement(Header, {
-    styles: {
-      fontSize: "32px"
-    }
-  }, t("CS_APPLICATION_DETAILS")), (PetRegistrationApplications === null || PetRegistrationApplications === void 0 ? void 0 : PetRegistrationApplications.status) == "approved" && 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(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
-    label: t("PDF_STATIC_LABEL_APPLICATION_NUMBER_LABEL"),
-    text: pet_details === null || pet_details === void 0 ? void 0 : pet_details.applicationNumber
-  })), /*#__PURE__*/React.createElement(CardSubHeader, {
-    style: {
-      fontSize: "24px"
-    }
-  }, t("WS_COMMON_TABLE_COL_ADDRESS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
-    label: t("PTR_ADDRESS"),
-    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$address = pet_details.address) === null || _pet_details$address === void 0 ? void 0 : _pet_details$address.addressId) || t("CS_NA")
-  }), /*#__PURE__*/React.createElement(Row, {
-    className: "border-none",
-    label: t("PTR_PINCODE"),
-    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$address2 = pet_details.address) === null || _pet_details$address2 === void 0 ? void 0 : _pet_details$address2.pincode) || t("CS_NA")
-  })), /*#__PURE__*/React.createElement(CardSubHeader, {
+  }), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, {
     style: {
       fontSize: "24px"
     }
@@ -21477,6 +21392,22 @@ const ApplicationDetails = () => {
     className: "border-none",
     label: t("CORE_COMMON_PROFILE_EMAIL"),
     text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$owner4 = pet_details.owner) === null || _pet_details$owner4 === void 0 ? void 0 : _pet_details$owner4.emailId) || t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
+    className: "border-none",
+    label: t("PDF_STATIC_LABEL_APPLICATION_NUMBER_LABEL"),
+    text: pet_details === null || pet_details === void 0 ? void 0 : pet_details.applicationNumber
+  })), /*#__PURE__*/React.createElement(CardSubHeader, {
+    style: {
+      fontSize: "24px"
+    }
+  }, t("WS_COMMON_TABLE_COL_ADDRESS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
+    className: "border-none",
+    label: t("PTR_ADDRESS"),
+    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$address = pet_details.address) === null || _pet_details$address === void 0 ? void 0 : _pet_details$address.addressId) || t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
+    className: "border-none",
+    label: t("PTR_PINCODE"),
+    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$address2 = pet_details.address) === null || _pet_details$address2 === void 0 ? void 0 : _pet_details$address2.pincode) || t("CS_NA")
   })), /*#__PURE__*/React.createElement(CardSubHeader, {
     style: {
       fontSize: "24px"
@@ -21500,7 +21431,7 @@ const ApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("PTR_VACCINATED_DATE"),
-    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$petDetai5 = pet_details.petDetails) === null || _pet_details$petDetai5 === void 0 ? void 0 : _pet_details$petDetai5.lastVaccineDate) || t("CS_NA")
+    text: pet_details !== null && pet_details !== void 0 && (_pet_details$petDetai5 = pet_details.petDetails) !== null && _pet_details$petDetai5 !== void 0 && _pet_details$petDetai5.lastVaccineDate ? new Date(Number(pet_details.petDetails.lastVaccineDate)).toLocaleDateString("en-GB") : t("CS_NA")
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("PTR_VACCINATION_NUMBER"),
@@ -21530,11 +21461,7 @@ const ApplicationDetails = () => {
     onClose: () => {
       setShowToast(null);
     }
-  })), popup && /*#__PURE__*/React.createElement(PTCitizenFeedbackPopUp, {
-    setpopup: setpopup,
-    setShowToast: setShowToast,
-    data: data
-  })));
+  }))));
 };
 
 const GetMessage = (type, action, isSuccess, isEmployee, t) => {
@@ -22496,38 +22423,30 @@ const NewPTRStepFormThree = ({
   const currentStepData = useSelector(function (state) {
     return state.ptr.PTRNewApplicationFormReducer.formData && state.ptr.PTRNewApplicationFormReducer.formData[config === null || config === void 0 ? void 0 : config.key] ? state.ptr.PTRNewApplicationFormReducer.formData[config === null || config === void 0 ? void 0 : config.key] : {};
   });
-  const makeDocumentsValidator = mdms => {
-    const requiredDocs = (mdms || []).filter(d => d === null || d === void 0 ? void 0 : d.required);
-    return (documents = []) => {
-      const errors = {};
-      const missingDocs = [];
-      const docsArray = Array.isArray(documents) ? documents : [];
-      if (!requiredDocs.length) return errors;
-      for (const doc of requiredDocs) {
-        const satisfied = docsArray.some(d => {
-          var _d$documentType;
-          return ((_d$documentType = d.documentType) === null || _d$documentType === void 0 ? void 0 : _d$documentType.includes(doc.code)) && (d.filestoreId || d.fileStoreId);
-        });
-        if (!satisfied) {
-          missingDocs.push(doc.name || t(doc.code.replaceAll(".", "_")));
-        }
-      }
-      if (missingDocs.length > 0) {
-        errors.missingRequired = "PTR_MISSING_REQUIRED_DOCUMENTS";
-        errors.missingDocs = missingDocs;
-      }
-      return errors;
-    };
-  };
+  function validation(documents) {
+    if (!isLoading) {
+      var _documents$documents, _ptrDocumentsType$fil;
+      const ptrDocumentsType = mdmsDocsData || [];
+      const documentsData = (documents === null || documents === void 0 ? void 0 : (_documents$documents = documents.documents) === null || _documents$documents === void 0 ? void 0 : _documents$documents.documents) || [];
+      console.log("ptrDocumentsType", ptrDocumentsType);
+      console.log("documentsData", documentsData);
+      console.log("mdmsDocsData", mdmsDocsData);
+      console.log("documentsData===", documents);
+      const requiredDocs = ptrDocumentsType === null || ptrDocumentsType === void 0 ? void 0 : (_ptrDocumentsType$fil = ptrDocumentsType.filter(doc => doc.required)) === null || _ptrDocumentsType$fil === void 0 ? void 0 : _ptrDocumentsType$fil.map(doc => doc.code);
+      const uploadedDocs = documentsData === null || documentsData === void 0 ? void 0 : documentsData.map(doc => doc.documentType);
+      const missingDocs = requiredDocs.filter(reqDoc => !(uploadedDocs !== null && uploadedDocs !== void 0 && uploadedDocs.includes(reqDoc)));
+      return missingDocs;
+    }
+    return [];
+  }
   function goNext(data) {
-    var _data$documents;
-    const validator = makeDocumentsValidator(mdmsDocsData);
-    const docErrors = validator((data === null || data === void 0 ? void 0 : (_data$documents = data.documents) === null || _data$documents === void 0 ? void 0 : _data$documents.documents) || []);
-    if (docErrors !== null && docErrors !== void 0 && docErrors.missingRequired) {
-      var _docErrors$missingDoc;
-      const missingDocNames = ((_docErrors$missingDoc = docErrors.missingDocs) === null || _docErrors$missingDoc === void 0 ? void 0 : _docErrors$missingDoc.join(", ")) || "";
-      setError(`You haven't uploaded: ${missingDocNames}`);
+    const missingFields = validation(data);
+    if (missingFields.length > 0) {
+      setError(`${t(missingFields[0].replace(".", "_").toUpperCase())} is required`);
       setShowToast(true);
+      setTimeout(() => {
+        setShowToast(false);
+      }, 3000);
       return;
     }
     onGoNext();
@@ -22660,7 +22579,7 @@ const NewPTRStepFormFour = ({
       workflow: {
         ...existingWorkflow,
         action: (selectedAction === null || selectedAction === void 0 ? void 0 : selectedAction.action) || "",
-        comments: (selectedAction === null || selectedAction === void 0 ? void 0 : selectedAction.action) || "",
+        comments: "",
         status: (selectedAction === null || selectedAction === void 0 ? void 0 : selectedAction.action) || ""
       },
       ownerName: `${ownerDetails === null || ownerDetails === void 0 ? void 0 : ownerDetails.firstName} ${ownerDetails === null || ownerDetails === void 0 ? void 0 : ownerDetails.lastName}`,
@@ -23035,7 +22954,6 @@ const updatedCreateEmployeeconfig$1 = createEmployeeConfig$1.map(item => {
     currStepConfig: citizenConfig$2.filter(newConfigItem => newConfigItem.stepNumber === item.stepNumber)
   };
 });
-console.log("updatedCreateEmployeeconfig1", updatedCreateEmployeeconfig$1);
 const RenewPTRStepForm = () => {
   var _data$applicationData;
   const history = useHistory();