@mseva/digit-ui-module-ptr 1.0.42 → 1.0.44

package/dist/index.js

@@ -6675,291 +6675,133 @@ const OwnerForm$1 = _props => {
   }));
 };
 
-let actions = [];
-const getAction = flow => {
-  switch (flow) {
-    case "STAKEHOLDER":
-      actions = [];
-      break;
-    default:
-      actions = ["ES_TITILE_OWNER_DETAILS", "ES_TITILE_PET_DETAILS", "PTR_LOCATION_DETAILS", "ES_TITILE_DOCUMENT_DETAILS", "PTR_SUMMARY"];
-  }
-};
-const Timeline = _ref => {
-  let {
-    currentStep = 1,
-    flow = ""
-  } = _ref;
-  const {
-    t
-  } = reactI18next.useTranslation();
-  const isMobile = window.Digit.Utils.browser.isMobile();
-  getAction(flow);
-  return /*#__PURE__*/React__default.createElement("div", {
-    className: "timeline-container",
-    style: isMobile ? {} : {
-      maxWidth: "960px",
-      minWidth: "640px",
-      marginRight: "auto"
-    }
-  }, actions.map((action, index, arr) => /*#__PURE__*/React__default.createElement("div", {
-    className: "timeline-checkpoint",
-    key: index
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "timeline-content"
-  }, /*#__PURE__*/React__default.createElement("span", {
-    className: `circle ${index <= currentStep - 1 && "active"}`
-  }, index < currentStep - 1 ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.TickMark, null) : index + 1), /*#__PURE__*/React__default.createElement("span", {
-    className: "secondary-color"
-  }, t(action))), index < arr.length - 1 && /*#__PURE__*/React__default.createElement("span", {
-    className: `line ${index < currentStep - 1 && "active"}`
-  }))));
-};
-
+const Breed_Type = [{
+  i18nKey: `PTR_GENDER`,
+  code: `123`,
+  name: `test`
+}];
 const PTRCitizenPet = _ref => {
-  var _formData$pets, _formData$pets2, _formData$pets3, _formData$pets4, _formData$pets5, _formData$pets6, _formData$pets7, _formData$pets8, _formData$pets9, _formData$pets0;
   let {
-    t,
-    config,
-    onSelect,
-    userType,
-    formData,
-    ownerIndex
+    onGoBack,
+    goNext,
+    currentStepData,
+    t
   } = _ref;
-  const {
-    pathname: url
-  } = reactRouterDom.useLocation();
-  let index = window.location.href.charAt(window.location.href.length - 1);
-  let validation = {};
-  const [petType, setPetType] = React.useState(formData.pets && formData.pets[index] && formData.pets[index].petType || (formData === null || formData === void 0 ? void 0 : (_formData$pets = formData.pets) === null || _formData$pets === void 0 ? void 0 : _formData$pets.petType) || "");
-  const [breedType, setBreedType] = React.useState(formData.pets && formData.pets[index] && formData.pets[index].breedType || (formData === null || formData === void 0 ? void 0 : (_formData$pets2 = formData.pets) === null || _formData$pets2 === void 0 ? void 0 : _formData$pets2.breedType) || "");
-  const [petGender, setPetGender] = React.useState(formData.pets && formData.pets[index] && formData.pets[index].petGender || (formData === null || formData === void 0 ? void 0 : (_formData$pets3 = formData.pets) === null || _formData$pets3 === void 0 ? void 0 : _formData$pets3.petGender) || "");
-  const [petName, setPetName] = React.useState(formData.pets && formData.pets[index] && formData.pets[index].petName || (formData === null || formData === void 0 ? void 0 : (_formData$pets4 = formData.pets) === null || _formData$pets4 === void 0 ? void 0 : _formData$pets4.petName) || "");
-  const [petAge, setPetAge] = React.useState(formData.pets && formData.pets[index] && formData.pets[index].petAge || (formData === null || formData === void 0 ? void 0 : (_formData$pets5 = formData.pets) === null || _formData$pets5 === void 0 ? void 0 : _formData$pets5.petAge) || "");
-  const [doctorName, setDoctorName] = React.useState(formData.pets && formData.pets[index] && formData.pets[index].doctorName || (formData === null || formData === void 0 ? void 0 : (_formData$pets6 = formData.pets) === null || _formData$pets6 === void 0 ? void 0 : _formData$pets6.doctorName) || "");
-  const [clinicName, setClinicName] = React.useState(formData.pets && formData.pets[index] && formData.pets[index].clinicName || (formData === null || formData === void 0 ? void 0 : (_formData$pets7 = formData.pets) === null || _formData$pets7 === void 0 ? void 0 : _formData$pets7.clinicName) || "");
-  const [vaccinationNumber, setVaccinationNumber] = React.useState(formData.pets && formData.pets[index] && formData.pets[index].vaccinationNumber || (formData === null || formData === void 0 ? void 0 : (_formData$pets8 = formData.pets) === null || _formData$pets8 === void 0 ? void 0 : _formData$pets8.vaccinationNumber) || "");
-  const [lastVaccineDate, setVaccinationDate] = React.useState(formData.pets && formData.pets[index] && formData.pets[index].lastVaccineDate || (formData === null || formData === void 0 ? void 0 : (_formData$pets9 = formData.pets) === null || _formData$pets9 === void 0 ? void 0 : _formData$pets9.lastVaccineDate) || "");
-  const [color, setColor] = React.useState(formData.pets && formData.pets[index] && formData.pets[index].color || (formData === null || formData === void 0 ? void 0 : (_formData$pets0 = formData.pets) === null || _formData$pets0 === void 0 ? void 0 : _formData$pets0.color) || "");
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const stateId = Digit.ULBService.getStateId();
-  const Menu = [{
-    code: "DOG",
-    i18nKey: "Dog"
-  }, {
-    code: "CAT",
-    i18nKey: "Cat"
-  }, {
-    code: "BIRD",
-    i18nKey: "Bird"
-  }];
-  const Breed_Type = [{
-    code: "LABRADOR",
-    name: "Labrador",
-    PetType: "DOG"
-  }, {
-    code: "PERSIAN",
-    name: "Persian",
-    PetType: "CAT"
-  }, {
-    code: "PARROT",
-    name: "Parrot",
-    PetType: "BIRD"
-  }];
-  let menu = [];
-  let breed_type = [];
-  Menu && Menu.map(petone => {
-    menu.push({
-      i18nKey: `PTR_PET_${petone.code}`,
-      code: `${petone.code}`,
-      value: `${petone.name}`
-    });
-  });
   const {
-    control
+    control,
+    handleSubmit,
+    setValue
   } = reactHookForm.useForm();
-  Breed_Type && Breed_Type.map(breedss => {
-    if (breedss.PetType == (petType === null || petType === void 0 ? void 0 : petType.code)) {
-      breed_type.push({
-        i18nKey: `PTR_BREED_TYPE_${breedss.code}`,
-        code: `${breedss.code}`,
-        value: `${breedss.name}`
-      });
-    }
-  });
-  const {
-    data: Pet_Sex
-  } = Digit.Hooks.ptr.usePTRGenderMDMS(stateId, "common-masters", "GenderType");
-  let pet_sex = [];
-  Pet_Sex && Pet_Sex.map(ptrgenders => {
-    if (ptrgenders.code !== "TRANSGENDER") pet_sex.push({
-      i18nKey: `PTR_GENDER_${ptrgenders.code}`,
-      code: `${ptrgenders.code}`,
-      name: `${ptrgenders.code}`
-    });
-  });
-  console.log("petFormData", formData);
-  function setColorName(e) {
-    setColor(e.target.value);
-  }
-  function setvaccinationdate(e) {
-    setVaccinationDate(e.target.value);
-  }
-  function setvaccinationnumber(e) {
-    setVaccinationNumber(e.target.value);
-  }
-  function setpetname(e) {
-    setPetName(e.target.value);
-  }
-  const goNext = () => {
-    let owner = formData.pets && formData.pets[index];
-    let ownerStep;
-    if (userType === "citizen") {
-      ownerStep = {
-        ...owner,
-        petType,
-        breedType,
-        petGender,
-        petName,
-        color,
-        lastVaccineDate,
-        vaccinationNumber
-      };
-      onSelect(config.key, {
-        ...formData[config.key],
-        ...ownerStep
-      }, false, index);
-    } else {
-      ownerStep = {
-        ...owner,
-        petType,
-        breedType,
-        petGender,
-        petName,
-        color,
-        lastVaccineDate,
-        vaccinationNumber
-      };
-      onSelect(config.key, ownerStep, false, index);
-    }
+  const onSubmit = data => {
+    console.log("data in first step", data);
+    goNext(data);
   };
-  const onSkip = () => onSelect();
   React.useEffect(() => {
-    goNext();
-  }, [petType, breedType, petGender, petName, lastVaccineDate, color, vaccinationNumber]);
-  console.log("PTRCitizenPet formData", !petType || !breedType || !petGender || !petName || !color || !lastVaccineDate || !vaccinationNumber);
-  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.FormStep, {
-    config: config,
-    onSelect: goNext,
-    onSkip: onSkip,
-    t: t,
-    isDisabled: !petType || !breedType || !petGender || !petName || !color || !lastVaccineDate || !vaccinationNumber
-  }, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("PTR_PET_NAME")}`), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, _extends({
-    t: t,
-    type: "text",
-    isMandatory: false,
-    optionKey: "i18nKey",
+    console.log("currentStepData", currentStepData);
+    const formattedData = currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.petDetails;
+    if (formattedData) {
+      console.log("coming here", formattedData);
+      Object.entries(formattedData).forEach(_ref2 => {
+        let [key, value] = _ref2;
+        setValue(key, value);
+      });
+    }
+  }, [currentStepData, setValue]);
+  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("form", {
+    onSubmit: handleSubmit(onSubmit)
+  }, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("PTR_PET_NAME")}`), /*#__PURE__*/React__default.createElement(reactHookForm.Controller, {
+    control: control,
     name: "petName",
-    value: petName,
-    onChange: setpetname,
-    style: {
-      width: "86%"
-    },
-    ValidationRequired: false
-  }, validation = {
-    isRequired: true,
-    pattern: "^[a-zA-Z-.`' ]*$",
-    type: "text",
-    title: t("PT_NAME_ERROR_MESSAGE")
-  })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("PTR_SEARCH_PET_TYPE")}`), /*#__PURE__*/React__default.createElement(reactHookForm.Controller, {
+    render: props => /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
+      value: props.value,
+      onChange: e => {
+        props.onChange(e.target.value);
+      },
+      onBlur: e => {
+        props.onBlur(e);
+      }
+    })
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("PTR_SEARCH_PET_TYPE")}`), /*#__PURE__*/React__default.createElement(reactHookForm.Controller, {
     control: control,
     name: "petType",
-    defaultValue: petType,
-    rules: {
-      required: t("CORE_COMMON_REQUIRED_ERRMSG")
-    },
     render: props => /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
       className: "form-field",
-      selected: petType,
-      select: setPetType,
-      option: menu,
-      optionKey: "i18nKey",
-      t: t
+      select: props.onChange,
+      selected: props.value,
+      option: Breed_Type,
+      optionKey: "i18nKey"
     })
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("PTR_SEARCH_BREED_TYPE")}`), /*#__PURE__*/React__default.createElement(reactHookForm.Controller, {
     control: control,
     name: "breedType",
-    defaultValue: breedType,
-    rules: {
-      required: t("CORE_COMMON_REQUIRED_ERRMSG")
-    },
     render: props => /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
       className: "form-field",
-      selected: breedType,
-      select: setBreedType,
-      option: breed_type,
-      optionKey: "i18nKey",
-      t: t
+      select: props.onChange,
+      selected: props.value,
+      option: Breed_Type,
+      optionKey: "i18nKey"
     })
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("PTR_PET_GENDER")}`), /*#__PURE__*/React__default.createElement(reactHookForm.Controller, {
     control: control,
     name: "petGender",
-    defaultValue: petGender,
-    rules: {
-      required: t("CORE_COMMON_REQUIRED_ERRMSG")
-    },
     render: props => /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
       className: "form-field",
-      selected: petGender,
-      select: setPetGender,
-      option: pet_sex,
-      optionKey: "i18nKey",
-      t: t
+      select: props.onChange,
+      selected: props.value,
+      option: Breed_Type,
+      optionKey: "i18nKey"
     })
-  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("PTR_COLOR")}`), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, _extends({
-    t: t,
-    type: "text",
-    isMandatory: false,
-    optionKey: "i18nKey",
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("PTR_COLOR")}`), /*#__PURE__*/React__default.createElement(reactHookForm.Controller, {
+    control: control,
     name: "color",
-    value: color,
-    onChange: setColorName,
-    style: {
-      width: "86%"
-    },
-    ValidationRequired: false
-  }, validation = {
-    isRequired: true,
-    pattern: "^[a-zA-Z-.`' ]*$",
-    type: "text",
-    title: t("PT_NAME_ERROR_MESSAGE")
-  })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("PTR_VACCINATED_DATE")}`), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
-    t: t,
-    type: "date",
-    isMandatory: false,
-    optionKey: "i18nKey",
+    render: props => /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
+      value: props.value,
+      onChange: e => {
+        props.onChange(e.target.value);
+      },
+      onBlur: e => {
+        props.onBlur(e);
+      }
+    })
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("PTR_VACCINATED_DATE")}`), /*#__PURE__*/React__default.createElement(reactHookForm.Controller, {
+    control: control,
     name: "lastVaccineDate",
-    value: lastVaccineDate,
-    onChange: setvaccinationdate,
-    style: {
-      width: "86%"
-    },
-    max: new Date().toISOString().split('T')[0],
-    rules: {
-      required: t("CORE_COMMON_REQUIRED_ERRMSG"),
-      validDate: val => /^\d{4}-\d{2}-\d{2}$/.test(val) ? true : t("ERR_DEFAULT_INPUT_FIELD_MSG")
-    }
-  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("PTR_VACCINATION_NUMBER")}`), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
-    t: t,
-    type: "text",
-    isMandatory: false,
-    optionKey: "i18nKey",
+    render: props => /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
+      type: "date",
+      value: props.value,
+      onChange: e => {
+        props.onChange(e.target.value);
+      },
+      onBlur: e => {
+        props.onBlur(e);
+      }
+    })
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("PTR_VACCINATION_NUMBER")}`), /*#__PURE__*/React__default.createElement(reactHookForm.Controller, {
+    control: control,
     name: "vaccinationNumber",
-    value: vaccinationNumber,
-    onChange: setvaccinationnumber,
+    render: props => /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
+      value: props.value,
+      onChange: e => {
+        props.onChange(e.target.value);
+      },
+      onBlur: e => {
+        props.onBlur(e);
+      }
+    })
+  })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.ActionBar, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
     style: {
-      width: "86%"
-    }
+      background: " white",
+      color: "black",
+      border: "1px solid",
+      marginRight: "10px"
+    },
+    label: "Back",
+    onSubmit: onGoBack
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
+    label: "Next",
+    submit: "submit"
   }))));
 };
 
@@ -7240,6 +7082,47 @@ function PTRSelectDocument(_ref2) {
   }))));
 }
 
+let actions = [];
+const getAction = flow => {
+  switch (flow) {
+    case "STAKEHOLDER":
+      actions = [];
+      break;
+    default:
+      actions = ["ES_TITILE_OWNER_DETAILS", "ES_TITILE_PET_DETAILS", "PTR_LOCATION_DETAILS", "ES_TITILE_DOCUMENT_DETAILS", "PTR_SUMMARY"];
+  }
+};
+const Timeline = _ref => {
+  let {
+    currentStep = 1,
+    flow = ""
+  } = _ref;
+  const {
+    t
+  } = reactI18next.useTranslation();
+  const isMobile = window.Digit.Utils.browser.isMobile();
+  getAction(flow);
+  return /*#__PURE__*/React__default.createElement("div", {
+    className: "timeline-container",
+    style: isMobile ? {} : {
+      maxWidth: "960px",
+      minWidth: "640px",
+      marginRight: "auto"
+    }
+  }, actions.map((action, index, arr) => /*#__PURE__*/React__default.createElement("div", {
+    className: "timeline-checkpoint",
+    key: index
+  }, /*#__PURE__*/React__default.createElement("div", {
+    className: "timeline-content"
+  }, /*#__PURE__*/React__default.createElement("span", {
+    className: `circle ${index <= currentStep - 1 && "active"}`
+  }, index < currentStep - 1 ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.TickMark, null) : index + 1), /*#__PURE__*/React__default.createElement("span", {
+    className: "secondary-color"
+  }, t(action))), index < arr.length - 1 && /*#__PURE__*/React__default.createElement("span", {
+    className: `line ${index < currentStep - 1 && "active"}`
+  }))));
+};
+
 const PTRSelectStreet = _ref => {
   let {
     t,
@@ -14064,170 +13947,114 @@ const PTRCreate = _ref => {
 };
 
 const PTRCitizenDetails = _ref => {
-  var _formData$ownerss, _formData$ownerss2, _formData$ownerss3, _formData$ownerss4, _formData$ownerss5, _formData$ownerss6;
   let {
     t,
-    config,
-    onSelect,
-    userType,
-    formData,
-    ownerIndex
+    goNext,
+    currentStepData
   } = _ref;
-  const {
-    pathname: url
-  } = reactRouterDom.useLocation();
-  let index = 0;
-  let validation = {};
-  const [firstName, setFirstName] = React.useState(formData.ownerss && formData.ownerss[index] && formData.ownerss[index].firstName || (formData === null || formData === void 0 ? void 0 : (_formData$ownerss = formData.ownerss) === null || _formData$ownerss === void 0 ? void 0 : _formData$ownerss.firstName) || "");
-  const [lastName, setLastName] = React.useState(formData.ownerss && formData.ownerss[index] && formData.ownerss[index].lastName || (formData === null || formData === void 0 ? void 0 : (_formData$ownerss2 = formData.ownerss) === null || _formData$ownerss2 === void 0 ? void 0 : _formData$ownerss2.lastName) || "");
-  const [address, setAddress] = React.useState(formData.ownerss && formData.ownerss[index] && formData.ownerss[index].address || (formData === null || formData === void 0 ? void 0 : (_formData$ownerss3 = formData.ownerss) === null || _formData$ownerss3 === void 0 ? void 0 : _formData$ownerss3.address) || "");
-  const [emailId, setEmail] = React.useState(formData.ownerss && formData.ownerss[index] && formData.ownerss[index].emailId || (formData === null || formData === void 0 ? void 0 : (_formData$ownerss4 = formData.ownerss) === null || _formData$ownerss4 === void 0 ? void 0 : _formData$ownerss4.emailId) || "");
-  const [mobileNumber, setMobileNumber] = React.useState(formData.ownerss && formData.ownerss[index] && formData.ownerss[index].mobileNumber || (formData === null || formData === void 0 ? void 0 : (_formData$ownerss5 = formData.ownerss) === null || _formData$ownerss5 === void 0 ? void 0 : _formData$ownerss5.mobileNumber) || "");
-  const [fatherName, setFatherOrHusbandName] = React.useState(formData.ownerss && formData.ownerss[index] && formData.ownerss[index].fatherName || (formData === null || formData === void 0 ? void 0 : (_formData$ownerss6 = formData.ownerss) === null || _formData$ownerss6 === void 0 ? void 0 : _formData$ownerss6.fatherName) || "");
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const stateId = Digit.ULBService.getStateId();
-  function setOwnerFirstName(e) {
-    setFirstName(e.target.value);
-  }
-  function setOwnerAddress(e) {
-    setAddress(e.target.value);
-  }
-  function setOwnerLastName(e) {
-    setLastName(e.target.value);
-  }
-  function setOwnerEmail(e) {
-    setEmail(e.target.value);
-  }
-  function setMobileNo(e) {
-    setMobileNumber(e.target.value);
-  }
-  function setGuardiansName(e) {
-    setFatherOrHusbandName(e.target.value);
-  }
-  const goNext = () => {
-    console.log("GoNext Called", formData);
-    let owner = formData.ownerss && formData.ownerss[index];
-    let ownerStep;
-    if (userType === "citizen") {
-      ownerStep = {
-        ...owner,
-        mobileNumber,
-        fatherName,
-        emailId,
-        firstName,
-        lastName,
-        address
-      };
-      onSelect(config.key, {
-        ...formData[config.key],
-        ...ownerStep
-      }, false, index);
-    } else {
-      ownerStep = {
-        ...owner,
-        mobileNumber,
-        fatherName,
-        emailId,
-        firstName,
-        lastName,
-        address
-      };
-      onSelect(config.key, ownerStep, false, index);
-    }
+  const {
+    control,
+    handleSubmit,
+    setValue
+  } = reactHookForm.useForm();
+  const onSubmit = data => {
+    console.log("data in first step", data);
+    goNext(data);
   };
-  const onSkip = () => onSelect();
   React.useEffect(() => {
-    console.log("useEffect called in PTRCitizenDetails", formData, userType);
-    goNext();
-  }, [mobileNumber, fatherName, emailId, firstName, lastName, address]);
-  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.FormStep, {
-    config: config,
-    onSelect: goNext,
-    onSkip: onSkip,
-    t: t,
-    isDisabled: !mobileNumber || !fatherName || !emailId || !firstName || !lastName || !address
-  }, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("NDC_FIRST_NAME")}`), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, _extends({
-    t: t,
-    type: "text",
-    isMandatory: false,
-    optionKey: "i18nKey",
+    console.log("currentStepData", currentStepData);
+    const formattedData = currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.ownerDetails;
+    if (formattedData) {
+      console.log("coming here", formattedData);
+      Object.entries(formattedData).forEach(_ref2 => {
+        let [key, value] = _ref2;
+        setValue(key, value);
+      });
+    }
+  }, [currentStepData, setValue]);
+  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("form", {
+    onSubmit: handleSubmit(onSubmit)
+  }, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("NDC_FIRST_NAME")}`), /*#__PURE__*/React__default.createElement(reactHookForm.Controller, {
+    control: control,
     name: "firstName",
-    value: firstName,
-    onChange: setOwnerFirstName,
-    ValidationRequired: true
-  }, validation = {
-    isRequired: true,
-    pattern: "^[a-zA-Z ]+$",
-    type: "tel",
-    title: t("PT_NAME_ERROR_MESSAGE")
-  })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("NDC_LAST_NAME")}`), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, _extends({
-    t: t,
-    type: "text",
-    isMandatory: false,
-    optionKey: "i18nKey",
+    render: props => /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
+      value: props.value,
+      onChange: e => {
+        props.onChange(e.target.value);
+      },
+      onBlur: e => {
+        props.onBlur(e);
+      },
+      t: t
+    })
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("NDC_LAST_NAME")}`), /*#__PURE__*/React__default.createElement(reactHookForm.Controller, {
+    control: control,
     name: "lastName",
-    value: lastName,
-    onChange: setOwnerLastName,
-    ValidationRequired: true
-  }, validation = {
-    isRequired: true,
-    pattern: "^[a-zA-Z ]+$",
-    type: "tel",
-    title: t("PT_NAME_ERROR_MESSAGE")
-  })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("NOC_APPLICANT_EMAIL_LABEL")}`), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, _extends({
-    t: t,
-    type: "text",
-    isMandatory: true,
-    optionKey: "i18nKey",
+    render: props => /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
+      value: props.value,
+      onChange: e => {
+        props.onChange(e.target.value);
+      },
+      onBlur: e => {
+        props.onBlur(e);
+      },
+      t: t
+    })
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("NOC_APPLICANT_EMAIL_LABEL")}`), /*#__PURE__*/React__default.createElement(reactHookForm.Controller, {
+    control: control,
     name: "emailId",
-    value: emailId,
-    onChange: setOwnerEmail,
-    ValidationRequired: true
-  }, validation = {
-    isRequired: true,
-    pattern: "^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$",
-    type: "text",
-    title: t("PTR_NAME_ERROR_MESSAGE")
-  })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("NOC_APPLICANT_MOBILE_NO_LABEL")}`), /*#__PURE__*/React__default.createElement(digitUiReactComponents.MobileNumber, {
-    value: mobileNumber,
+    render: props => /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
+      value: props.value,
+      onChange: e => {
+        props.onChange(e.target.value);
+      },
+      onBlur: e => {
+        props.onBlur(e);
+      },
+      t: t
+    })
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("NOC_APPLICANT_MOBILE_NO_LABEL")}`), /*#__PURE__*/React__default.createElement(reactHookForm.Controller, {
+    control: control,
     name: "mobileNumber",
-    onChange: value => setMobileNo({
-      target: {
-        value
-      }
-    }),
-    required: true,
-    pattern: "[6-9]{1}[0-9]{9}",
-    type: "tel",
-    title: t("CORE_COMMON_APPLICANT_MOBILE_NUMBER_INVALID")
-  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_FATHER_HUSBAND")}`), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, _extends({
-    t: t,
-    type: "text",
-    isMandatory: false,
-    optionKey: "i18nKey",
+    render: props => /*#__PURE__*/React__default.createElement(digitUiReactComponents.MobileNumber, {
+      value: props.value,
+      onChange: props.onChange,
+      onBlur: props.onBlur,
+      t: t
+    })
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_FATHER_HUSBAND")}`), /*#__PURE__*/React__default.createElement(reactHookForm.Controller, {
+    control: control,
     name: "fatherName",
-    value: fatherName,
-    onChange: setGuardiansName,
-    ValidationRequired: true
-  }, validation = {
-    isRequired: true,
-    pattern: "^[a-zA-Z ]+$",
-    type: "tel",
-    title: t("PTR_NAME_ERROR_MESSAGE")
-  })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("PT_COMMON_COL_ADDRESS")}`), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextArea, _extends({
-    t: t,
-    type: "text",
-    isMandatory: false,
-    optionKey: "i18nKey",
+    render: props => /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
+      value: props.value,
+      onChange: e => {
+        props.onChange(e.target.value);
+      },
+      onBlur: e => {
+        props.onBlur(e);
+      },
+      t: t
+    })
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, `${t("PT_COMMON_COL_ADDRESS")}`), /*#__PURE__*/React__default.createElement(reactHookForm.Controller, {
+    control: control,
     name: "address",
-    value: address,
-    onChange: setOwnerAddress,
-    ValidationRequired: true
-  }, validation = {
-    isRequired: true,
-    type: "text",
-    title: t("PT_ADDRESS_ERROR_MESSAGE")
-  })))));
+    render: props => /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextArea, {
+      name: "address",
+      value: props.value,
+      onChange: e => {
+        props.onChange(e.target.value);
+      },
+      onBlur: e => {
+        props.onBlur(e);
+      },
+      t: t
+    })
+  })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.ActionBar, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
+    label: "Next",
+    submit: "submit"
+  }))));
 };
 
 const PTRCitizenAddress = _ref => {
@@ -19639,7 +19466,7 @@ const ActionModal$3 = _ref => {
   var _applicationData, _applicationData$land, _applicationData$land2, _applicationData2, _applicationData2$lan, _applicationData2$lan2, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6;
   const submit = function (data) {
     try {
-      var _applicationData3, _data$comments, _data$comments2, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _workflowDetails$data15, _workflowDetails$data16, _workflowDetails$data17, _workflowDetails$data18, _workflowDetails$data19, _workflowDetails$data20, _workflowDetails$data21, _workflowDetails$data22, _workflowDetails$data23, _workflowDetails$data24, _workflowDetails$data25, _workflowDetails$data26, _workflowDetails$data27, _workflowDetails$data28;
+      var _applicationData3, _data$comments, _data$comments2, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _workflowDetails$data15, _workflowDetails$data16, _workflowDetails$data17, _workflowDetails$data18, _workflowDetails$data19, _workflowDetails$data20, _workflowDetails$data21, _workflowDetails$data22, _workflowDetails$data23, _workflowDetails$data24, _workflowDetails$data25, _workflowDetails$data26, _workflowDetails$data27, _workflowDetails$data28, _workflowDetails$data29, _workflowDetails$data30;
       let workflow = {
         action: action === null || action === void 0 ? void 0 : action.action,
         comments: data === null || data === void 0 ? void 0 : data.comments,
@@ -19659,8 +19486,8 @@ const ActionModal$3 = _ref => {
           action: action === null || action === void 0 ? void 0 : action.action,
           comment: (data === null || data === void 0 ? void 0 : (_data$comments = data.comments) === null || _data$comments === void 0 ? void 0 : _data$comments.length) > 0 ? data === null || data === void 0 ? void 0 : data.comments : null,
           comments: (data === null || data === void 0 ? void 0 : (_data$comments2 = data.comments) === null || _data$comments2 === void 0 ? void 0 : _data$comments2.length) > 0 ? data === null || data === void 0 ? void 0 : data.comments : null,
-          assignee: (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data7 = workflowDetails.data) === null || _workflowDetails$data7 === void 0 ? void 0 : (_workflowDetails$data8 = _workflowDetails$data7.processInstances) === null || _workflowDetails$data8 === void 0 ? void 0 : (_workflowDetails$data9 = _workflowDetails$data8[0]) === null || _workflowDetails$data9 === void 0 ? void 0 : (_workflowDetails$data0 = _workflowDetails$data9.state) === null || _workflowDetails$data0 === void 0 ? void 0 : _workflowDetails$data0.applicationStatus) === "FIELDINSPECTION_INPROGRESS" ? [workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data1 = workflowDetails.data) === null || _workflowDetails$data1 === void 0 ? void 0 : (_workflowDetails$data10 = _workflowDetails$data1.processInstances) === null || _workflowDetails$data10 === void 0 ? void 0 : (_workflowDetails$data11 = _workflowDetails$data10[0]) === null || _workflowDetails$data11 === void 0 ? void 0 : (_workflowDetails$data12 = _workflowDetails$data11.assigner) === null || _workflowDetails$data12 === void 0 ? void 0 : _workflowDetails$data12.uuid] : !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? null : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
-          assignes: (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data13 = workflowDetails.data) === null || _workflowDetails$data13 === void 0 ? void 0 : (_workflowDetails$data14 = _workflowDetails$data13.processInstances) === null || _workflowDetails$data14 === void 0 ? void 0 : (_workflowDetails$data15 = _workflowDetails$data14[0]) === null || _workflowDetails$data15 === void 0 ? void 0 : (_workflowDetails$data16 = _workflowDetails$data15.state) === null || _workflowDetails$data16 === void 0 ? void 0 : _workflowDetails$data16.applicationStatus) === "FIELDINSPECTION_INPROGRESS" ? [workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data17 = workflowDetails.data) === null || _workflowDetails$data17 === void 0 ? void 0 : (_workflowDetails$data18 = _workflowDetails$data17.processInstances) === null || _workflowDetails$data18 === void 0 ? void 0 : (_workflowDetails$data19 = _workflowDetails$data18[0]) === null || _workflowDetails$data19 === void 0 ? void 0 : (_workflowDetails$data20 = _workflowDetails$data19.assigner) === null || _workflowDetails$data20 === void 0 ? void 0 : _workflowDetails$data20.uuid] : !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? null : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
+          assignee: (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data7 = workflowDetails.data) === null || _workflowDetails$data7 === void 0 ? void 0 : (_workflowDetails$data8 = _workflowDetails$data7.processInstances) === null || _workflowDetails$data8 === void 0 ? void 0 : (_workflowDetails$data9 = _workflowDetails$data8[0]) === null || _workflowDetails$data9 === void 0 ? void 0 : (_workflowDetails$data10 = _workflowDetails$data9.state) === null || _workflowDetails$data10 === void 0 ? void 0 : _workflowDetails$data10.applicationStatus) === "FIELDINSPECTION_INPROGRESS" ? [workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data11 = workflowDetails.data) === null || _workflowDetails$data11 === void 0 ? void 0 : (_workflowDetails$data12 = _workflowDetails$data11.processInstances) === null || _workflowDetails$data12 === void 0 ? void 0 : (_workflowDetails$data13 = _workflowDetails$data12[0]) === null || _workflowDetails$data13 === void 0 ? void 0 : (_workflowDetails$data14 = _workflowDetails$data13.assigner) === null || _workflowDetails$data14 === void 0 ? void 0 : _workflowDetails$data14.uuid] : !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? null : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
+          assignes: (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data15 = workflowDetails.data) === null || _workflowDetails$data15 === void 0 ? void 0 : (_workflowDetails$data16 = _workflowDetails$data15.processInstances) === null || _workflowDetails$data16 === void 0 ? void 0 : (_workflowDetails$data17 = _workflowDetails$data16[0]) === null || _workflowDetails$data17 === void 0 ? void 0 : (_workflowDetails$data18 = _workflowDetails$data17.state) === null || _workflowDetails$data18 === void 0 ? void 0 : _workflowDetails$data18.applicationStatus) === "FIELDINSPECTION_INPROGRESS" ? [workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data19 = workflowDetails.data) === null || _workflowDetails$data19 === void 0 ? void 0 : (_workflowDetails$data20 = _workflowDetails$data19.processInstances) === null || _workflowDetails$data20 === void 0 ? void 0 : (_workflowDetails$data21 = _workflowDetails$data20[0]) === null || _workflowDetails$data21 === void 0 ? void 0 : (_workflowDetails$data22 = _workflowDetails$data21.assigner) === null || _workflowDetails$data22 === void 0 ? void 0 : _workflowDetails$data22.uuid] : !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? null : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
           varificationDocuments: uploadedFile ? [{
             documentType: (action === null || action === void 0 ? void 0 : action.action) + " DOC",
             fileName: file === null || file === void 0 ? void 0 : file.name,
@@ -19669,7 +19496,7 @@ const ActionModal$3 = _ref => {
         },
         action: action === null || action === void 0 ? void 0 : action.action,
         comment: data === null || data === void 0 ? void 0 : data.comments,
-        assignee: (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data21 = workflowDetails.data) === null || _workflowDetails$data21 === void 0 ? void 0 : (_workflowDetails$data22 = _workflowDetails$data21.processInstances) === null || _workflowDetails$data22 === void 0 ? void 0 : (_workflowDetails$data23 = _workflowDetails$data22[0]) === null || _workflowDetails$data23 === void 0 ? void 0 : (_workflowDetails$data24 = _workflowDetails$data23.state) === null || _workflowDetails$data24 === void 0 ? void 0 : _workflowDetails$data24.applicationStatus) === "FIELDINSPECTION_INPROGRESS" ? [workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data25 = workflowDetails.data) === null || _workflowDetails$data25 === void 0 ? void 0 : (_workflowDetails$data26 = _workflowDetails$data25.processInstances) === null || _workflowDetails$data26 === void 0 ? void 0 : (_workflowDetails$data27 = _workflowDetails$data26[0]) === null || _workflowDetails$data27 === void 0 ? void 0 : (_workflowDetails$data28 = _workflowDetails$data27.assigner) === null || _workflowDetails$data28 === void 0 ? void 0 : _workflowDetails$data28.uuid] : !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? null : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
+        assignee: (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data23 = workflowDetails.data) === null || _workflowDetails$data23 === void 0 ? void 0 : (_workflowDetails$data24 = _workflowDetails$data23.processInstances) === null || _workflowDetails$data24 === void 0 ? void 0 : (_workflowDetails$data25 = _workflowDetails$data24[0]) === null || _workflowDetails$data25 === void 0 ? void 0 : (_workflowDetails$data26 = _workflowDetails$data25.state) === null || _workflowDetails$data26 === void 0 ? void 0 : _workflowDetails$data26.applicationStatus) === "FIELDINSPECTION_INPROGRESS" ? [workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data27 = workflowDetails.data) === null || _workflowDetails$data27 === void 0 ? void 0 : (_workflowDetails$data28 = _workflowDetails$data27.processInstances) === null || _workflowDetails$data28 === void 0 ? void 0 : (_workflowDetails$data29 = _workflowDetails$data28[0]) === null || _workflowDetails$data29 === void 0 ? void 0 : (_workflowDetails$data30 = _workflowDetails$data29.assigner) === null || _workflowDetails$data30 === void 0 ? void 0 : _workflowDetails$data30.uuid] : !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? null : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
         wfDocuments: uploadedFile ? [{
           documentType: (action === null || action === void 0 ? void 0 : action.action) + " DOC",
           fileName: file === null || file === void 0 ? void 0 : file.name,
@@ -21089,7 +20916,7 @@ const ActionModal$5 = _ref => {
     })();
   }, [file]);
   function submit(data) {
-    var _applicationData, _applicationData7, _applicationData8, _applicationData8$app, _applicationData9, _applicationData9$pro, _applicationData0, _applicationData0$pro, _applicationData10, _applicationData11;
+    var _applicationData, _applicationData7, _applicationData8, _applicationData8$app, _applicationData9, _applicationData9$pro, _applicationData10, _applicationData10$pr, _applicationData12, _applicationData13;
     if ((_applicationData = applicationData) !== null && _applicationData !== void 0 && _applicationData.isBillAmend) {
       var _applicationData2, _applicationData2$bil, _applicationData3, _applicationData4, _applicationData4$bil, _applicationData5, _applicationData5$app, _applicationData6, _applicationData6$app;
       const comments = data !== null && data !== void 0 && data.comments ? data.comments : null;
@@ -21174,38 +21001,38 @@ const ActionModal$5 = _ref => {
       const connectionExecutionDate = cloneDeep_1(data === null || data === void 0 ? void 0 : data.date);
       applicationData.connectionExecutionDate = convertDateToEpochNew(connectionExecutionDate);
     }
-    if (((_applicationData9 = applicationData) === null || _applicationData9 === void 0 ? void 0 : (_applicationData9$pro = _applicationData9.processInstance) === null || _applicationData9$pro === void 0 ? void 0 : _applicationData9$pro.businessService) == "DisconnectWSConnection" || ((_applicationData0 = applicationData) === null || _applicationData0 === void 0 ? void 0 : (_applicationData0$pro = _applicationData0.processInstance) === null || _applicationData0$pro === void 0 ? void 0 : _applicationData0$pro.businessService) == "DisconnectSWConnection" || window.location.href.includes("disconnection")) {
-      var _applicationData1;
-      ((_applicationData1 = applicationData) === null || _applicationData1 === void 0 ? void 0 : _applicationData1.serviceType) == "WATER" ? submitAction({
+    if (((_applicationData9 = applicationData) === null || _applicationData9 === void 0 ? void 0 : (_applicationData9$pro = _applicationData9.processInstance) === null || _applicationData9$pro === void 0 ? void 0 : _applicationData9$pro.businessService) == "DisconnectWSConnection" || ((_applicationData10 = applicationData) === null || _applicationData10 === void 0 ? void 0 : (_applicationData10$pr = _applicationData10.processInstance) === null || _applicationData10$pr === void 0 ? void 0 : _applicationData10$pr.businessService) == "DisconnectSWConnection" || window.location.href.includes("disconnection")) {
+      var _applicationData11;
+      ((_applicationData11 = applicationData) === null || _applicationData11 === void 0 ? void 0 : _applicationData11.serviceType) == "WATER" ? submitAction({
         WaterConnection: applicationData,
         disconnectRequest: true
       }) : submitAction({
         SewerageConnection: applicationData,
         disconnectRequest: true
       });
-    } else if (((_applicationData10 = applicationData) === null || _applicationData10 === void 0 ? void 0 : _applicationData10.applicationType) == "SEWERAGE_RECONNECTION") {
+    } else if (((_applicationData12 = applicationData) === null || _applicationData12 === void 0 ? void 0 : _applicationData12.applicationType) == "SEWERAGE_RECONNECTION") {
       submitAction({
         SewerageConnection: applicationData,
         disconnectRequest: false,
         reconnectRequest: true
       });
-    } else if (((_applicationData11 = applicationData) === null || _applicationData11 === void 0 ? void 0 : _applicationData11.applicationType) == "WATER_RECONNECTION") {
+    } else if (((_applicationData13 = applicationData) === null || _applicationData13 === void 0 ? void 0 : _applicationData13.applicationType) == "WATER_RECONNECTION") {
       submitAction({
         WaterConnection: applicationData,
         disconnectRequest: false,
         reconnectRequest: true
       });
     } else {
-      var _parsedAdhocRebateDat, _parsedAdhocRebateDat2, _parsedAdhocRebateDat3, _parsedAdhocRebateDat4, _parsedAdhocRebateDat5, _parsedAdhocRebateDat6, _parsedAdhocRebateDat7, _parsedAdhocRebateDat8, _parsedAdhocRebateDat9, _parsedAdhocRebateDat0, _parsedAdhocRebateDat1, _parsedAdhocRebateDat10, _applicationData12;
+      var _parsedAdhocRebateDat, _parsedAdhocRebateDat2, _parsedAdhocRebateDat3, _parsedAdhocRebateDat4, _parsedAdhocRebateDat5, _parsedAdhocRebateDat6, _parsedAdhocRebateDat7, _parsedAdhocRebateDat8, _parsedAdhocRebateDat9, _parsedAdhocRebateDat10, _parsedAdhocRebateDat11, _parsedAdhocRebateDat12, _applicationData14;
       const adhocRebateData = sessionStorage.getItem("Digit.ADHOC_ADD_REBATE_DATA");
       const parsedAdhocRebateData = adhocRebateData ? JSON.parse(adhocRebateData) : "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat !== void 0 && _parsedAdhocRebateDat.adhocPenalty) applicationData.additionalDetails.adhocPenalty = parseInt(parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat2 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat2 === void 0 ? void 0 : _parsedAdhocRebateDat2.adhocPenalty) || "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat3 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat3 !== void 0 && _parsedAdhocRebateDat3.adhocPenaltyComment) applicationData.additionalDetails.adhocPenaltyComment = (parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat4 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat4 === void 0 ? void 0 : _parsedAdhocRebateDat4.adhocPenaltyComment) || "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat5 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat5 !== void 0 && _parsedAdhocRebateDat5.adhocPenaltyReason) applicationData.additionalDetails.adhocPenaltyReason = (parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat6 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat6 === void 0 ? void 0 : _parsedAdhocRebateDat6.adhocPenaltyReason) || "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat7 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat7 !== void 0 && _parsedAdhocRebateDat7.adhocRebate) applicationData.additionalDetails.adhocRebate = parseInt(parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat8 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat8 === void 0 ? void 0 : _parsedAdhocRebateDat8.adhocRebate) || "";
-      if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat9 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat9 !== void 0 && _parsedAdhocRebateDat9.adhocRebateComment) applicationData.additionalDetails.adhocRebateComment = (parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat0 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat0 === void 0 ? void 0 : _parsedAdhocRebateDat0.adhocRebateComment) || "";
-      if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat1 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat1 !== void 0 && _parsedAdhocRebateDat1.adhocRebateReason) applicationData.additionalDetails.adhocRebateReason = (parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat10 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat10 === void 0 ? void 0 : _parsedAdhocRebateDat10.adhocRebateReason) || "";
-      ((_applicationData12 = applicationData) === null || _applicationData12 === void 0 ? void 0 : _applicationData12.serviceType) == "WATER" ? submitAction({
+      if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat9 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat9 !== void 0 && _parsedAdhocRebateDat9.adhocRebateComment) applicationData.additionalDetails.adhocRebateComment = (parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat10 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat10 === void 0 ? void 0 : _parsedAdhocRebateDat10.adhocRebateComment) || "";
+      if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat11 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat11 !== void 0 && _parsedAdhocRebateDat11.adhocRebateReason) applicationData.additionalDetails.adhocRebateReason = (parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat12 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat12 === void 0 ? void 0 : _parsedAdhocRebateDat12.adhocRebateReason) || "";
+      ((_applicationData14 = applicationData) === null || _applicationData14 === void 0 ? void 0 : _applicationData14.serviceType) == "WATER" ? submitAction({
         WaterConnection: applicationData,
         disconnectRequest: false,
         reconnectRequest: false
@@ -21217,8 +21044,8 @@ const ActionModal$5 = _ref => {
     }
   }
   React.useEffect(() => {
-    var _applicationData13, _applicationData13$pr, _applicationData14, _applicationData14$pr;
-    if (((_applicationData13 = applicationData) === null || _applicationData13 === void 0 ? void 0 : (_applicationData13$pr = _applicationData13.processInstance) === null || _applicationData13$pr === void 0 ? void 0 : _applicationData13$pr.businessService) == "DisconnectWSConnection" || ((_applicationData14 = applicationData) === null || _applicationData14 === void 0 ? void 0 : (_applicationData14$pr = _applicationData14.processInstance) === null || _applicationData14$pr === void 0 ? void 0 : _applicationData14$pr.businessService) == "DisconnectSWConnection") {
+    var _applicationData15, _applicationData15$pr, _applicationData16, _applicationData16$pr;
+    if (((_applicationData15 = applicationData) === null || _applicationData15 === void 0 ? void 0 : (_applicationData15$pr = _applicationData15.processInstance) === null || _applicationData15$pr === void 0 ? void 0 : _applicationData15$pr.businessService) == "DisconnectWSConnection" || ((_applicationData16 = applicationData) === null || _applicationData16 === void 0 ? void 0 : (_applicationData16$pr = _applicationData16.processInstance) === null || _applicationData16$pr === void 0 ? void 0 : _applicationData16$pr.businessService) == "DisconnectSWConnection") {
       if (action) {
         setConfig(configWSDisConnectApplication({
           t,
@@ -23214,7 +23041,7 @@ function PropertyOwners(_ref) {
 }
 
 const ScruntinyDetails = _ref => {
-  var _scrutinyDetails$valu, _scrutinyDetails$perm, _scrutinyDetails$valu2, _scrutinyDetails$valu3, _additionalDetails$se1, _additionalDetails$se10, _additionalDetails$se11, _additionalDetails$se12, _additionalDetails$se13, _additionalDetails$se14, _additionalDetails$se15, _additionalDetails$se16, _docLessAdjustment$fi, _additionalDetails$se17, _docLessAdjustment$fi2, _additionalDetails$se18, _docLessAdjustment$fi3, _docLessAdjustment$fi4, _additionalDetails$se19, _additionalDetails$se20, _additionalDetails$se21, _additionalDetails$se22, _scrutinyDetails$scru;
+  var _scrutinyDetails$valu, _scrutinyDetails$perm, _scrutinyDetails$valu2, _scrutinyDetails$valu3, _additionalDetails$se11, _additionalDetails$se12, _additionalDetails$se13, _additionalDetails$se14, _additionalDetails$se15, _additionalDetails$se16, _additionalDetails$se17, _additionalDetails$se18, _docLessAdjustment$fi, _additionalDetails$se19, _docLessAdjustment$fi2, _additionalDetails$se20, _docLessAdjustment$fi3, _docLessAdjustment$fi4, _additionalDetails$se21, _additionalDetails$se22, _additionalDetails$se23, _additionalDetails$se24, _scrutinyDetails$scru;
   let {
     scrutinyDetails,
     paymentsList = [],
@@ -23339,8 +23166,8 @@ const ScruntinyDetails = _ref => {
   }
   function setLessAdjusmentVal(value) {
     if (/^[0-9]*$/.test(value)) {
-      var _additionalDetails$se7, _additionalDetails$se8, _additionalDetails$se9, _additionalDetails$se0;
-      if (parseFloat(value) > (parseFloat(development) ? parseFloat(development) : 0) + parseFloat(otherCharges ? parseFloat(otherCharges) : 0) + parseFloat(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se7 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se7 === void 0 ? void 0 : _additionalDetails$se7.BPA_MALBA_CHARGES) + parseFloat(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se8 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se8 === void 0 ? void 0 : _additionalDetails$se8.BPA_LABOUR_CESS) + parseFloat(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se9 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se9 === void 0 ? void 0 : _additionalDetails$se9.BPA_WATER_CHARGES) + parseFloat(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se0 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se0 === void 0 ? void 0 : _additionalDetails$se0.BPA_GAUSHALA_CHARGES_CESS)) {
+      var _additionalDetails$se7, _additionalDetails$se8, _additionalDetails$se9, _additionalDetails$se10;
+      if (parseFloat(value) > (parseFloat(development) ? parseFloat(development) : 0) + parseFloat(otherCharges ? parseFloat(otherCharges) : 0) + parseFloat(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se7 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se7 === void 0 ? void 0 : _additionalDetails$se7.BPA_MALBA_CHARGES) + parseFloat(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se8 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se8 === void 0 ? void 0 : _additionalDetails$se8.BPA_LABOUR_CESS) + parseFloat(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se9 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se9 === void 0 ? void 0 : _additionalDetails$se9.BPA_WATER_CHARGES) + parseFloat(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se10 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se10 === void 0 ? void 0 : _additionalDetails$se10.BPA_GAUSHALA_CHARGES_CESS)) {
         alert("Less adjustment fees cannot be grater than Total of other P2 fees");
       } else {
         setLessAdjusment(value);
@@ -23454,26 +23281,26 @@ const ScruntinyDetails = _ref => {
   }, t("HIDE_P2_FEES_DETAILS"))), showSanctionFee && /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, null, t("BPA_P2_SUMMARY_FEE_EST")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     className: "border-none",
     label: t(`BPA_COMMON_MALBA_AMT`),
-    text: `₹ ${additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se1 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se1 === void 0 ? void 0 : _additionalDetails$se1.BPA_MALBA_CHARGES}`
+    text: `₹ ${additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se11 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se11 === void 0 ? void 0 : _additionalDetails$se11.BPA_MALBA_CHARGES}`
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     className: "border-none",
     label: t(`BPA_COMMON_LABOUR_AMT`),
-    text: `₹ ${additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se10 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se10 === void 0 ? void 0 : _additionalDetails$se10.BPA_LABOUR_CESS}`
+    text: `₹ ${additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se12 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se12 === void 0 ? void 0 : _additionalDetails$se12.BPA_LABOUR_CESS}`
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     className: "border-none",
     label: t(`BPA_COMMON_WATER_AMT`),
-    text: `₹ ${additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se11 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se11 === void 0 ? void 0 : _additionalDetails$se11.BPA_WATER_CHARGES}`
+    text: `₹ ${additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se13 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se13 === void 0 ? void 0 : _additionalDetails$se13.BPA_WATER_CHARGES}`
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     className: "border-none",
     label: t(`BPA_COMMON_GAUSHALA_AMT`),
-    text: `₹ ${additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se12 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se12 === void 0 ? void 0 : _additionalDetails$se12.BPA_GAUSHALA_CHARGES_CESS}`
+    text: `₹ ${additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se14 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se14 === void 0 ? void 0 : _additionalDetails$se14.BPA_GAUSHALA_CHARGES_CESS}`
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, null, t("BPA_P2_SUMMARY_FEE_EST_MANUAL")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, t("BPA_COMMON_DEVELOPMENT_AMT")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
     t: t,
     type: "text",
     isMandatory: false,
     optionKey: "i18nKey",
     name: "development",
-    defaultValue: (additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se13 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se13 === void 0 ? void 0 : _additionalDetails$se13.BPA_DEVELOPMENT_CHARGES) || 0,
+    defaultValue: (additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se15 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se15 === void 0 ? void 0 : _additionalDetails$se15.BPA_DEVELOPMENT_CHARGES) || 0,
     value: development,
     disabled: !isEditApplication,
     onChange: e => {
@@ -23488,7 +23315,7 @@ const ScruntinyDetails = _ref => {
     isMandatory: false,
     optionKey: "i18nKey",
     name: "otherCharges",
-    defaultValue: (additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se14 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se14 === void 0 ? void 0 : _additionalDetails$se14.BPA_OTHER_CHARGES) || 0,
+    defaultValue: (additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se16 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se16 === void 0 ? void 0 : _additionalDetails$se16.BPA_OTHER_CHARGES) || 0,
     value: otherCharges,
     disabled: !isEditApplication,
     onChange: e => {
@@ -23501,7 +23328,7 @@ const ScruntinyDetails = _ref => {
     t: t,
     type: "text",
     name: "otherChargesDiscription",
-    defaultValue: additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se15 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se15 === void 0 ? void 0 : _additionalDetails$se15.BPA_COMMON_OTHER_AMT_DISCRIPTION,
+    defaultValue: additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se17 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se17 === void 0 ? void 0 : _additionalDetails$se17.BPA_COMMON_OTHER_AMT_DISCRIPTION,
     value: otherChargesDisc,
     disabled: !isEditApplication,
     onChange: e => {
@@ -23514,7 +23341,7 @@ const ScruntinyDetails = _ref => {
     isMandatory: false,
     optionKey: "i18nKey",
     name: "lessAdjusment",
-    defaultValue: (additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se16 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se16 === void 0 ? void 0 : _additionalDetails$se16.BPA_LESS_ADJUSMENT_PLOT) || "",
+    defaultValue: (additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se18 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se18 === void 0 ? void 0 : _additionalDetails$se18.BPA_LESS_ADJUSMENT_PLOT) || "",
     value: lessAdjusment,
     disabled: !isEditApplication,
     onChange: e => {
@@ -23537,11 +23364,11 @@ const ScruntinyDetails = _ref => {
     message: uploadedFile ? `1 ${t(`FILEUPLOADED`)}` : t(`ES_NO_FILE_SELECTED_LABEL`),
     error: errorFile,
     uploadMessage: uploadMessage
-  })) : null, (docLessAdjustment === null || docLessAdjustment === void 0 ? void 0 : (_docLessAdjustment$fi = docLessAdjustment.fileStoreIds) === null || _docLessAdjustment$fi === void 0 ? void 0 : _docLessAdjustment$fi.length) && parseInt(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se17 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se17 === void 0 ? void 0 : _additionalDetails$se17.BPA_LESS_ADJUSMENT_PLOT) > 0 && /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, {
+  })) : null, (docLessAdjustment === null || docLessAdjustment === void 0 ? void 0 : (_docLessAdjustment$fi = docLessAdjustment.fileStoreIds) === null || _docLessAdjustment$fi === void 0 ? void 0 : _docLessAdjustment$fi.length) && parseInt(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se19 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se19 === void 0 ? void 0 : _additionalDetails$se19.BPA_LESS_ADJUSMENT_PLOT) > 0 && /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, {
     style: {
       marginTop: "15px"
     }
-  }, t("BPA_COMMON_LESS_AMT_PREVIOUS_FILE")), (docLessAdjustment === null || docLessAdjustment === void 0 ? void 0 : (_docLessAdjustment$fi2 = docLessAdjustment.fileStoreIds) === null || _docLessAdjustment$fi2 === void 0 ? void 0 : _docLessAdjustment$fi2.length) && parseInt(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se18 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se18 === void 0 ? void 0 : _additionalDetails$se18.BPA_LESS_ADJUSMENT_PLOT) > 0 && /*#__PURE__*/React__default.createElement("a", {
+  }, t("BPA_COMMON_LESS_AMT_PREVIOUS_FILE")), (docLessAdjustment === null || docLessAdjustment === void 0 ? void 0 : (_docLessAdjustment$fi2 = docLessAdjustment.fileStoreIds) === null || _docLessAdjustment$fi2 === void 0 ? void 0 : _docLessAdjustment$fi2.length) && parseInt(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se20 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se20 === void 0 ? void 0 : _additionalDetails$se20.BPA_LESS_ADJUSMENT_PLOT) > 0 && /*#__PURE__*/React__default.createElement("a", {
     target: "_blank",
     href: docLessAdjustment === null || docLessAdjustment === void 0 ? void 0 : (_docLessAdjustment$fi3 = docLessAdjustment.fileStoreIds[(docLessAdjustment === null || docLessAdjustment === void 0 ? void 0 : (_docLessAdjustment$fi4 = docLessAdjustment.fileStoreIds) === null || _docLessAdjustment$fi4 === void 0 ? void 0 : _docLessAdjustment$fi4.length) - 1]) === null || _docLessAdjustment$fi3 === void 0 ? void 0 : _docLessAdjustment$fi3.url
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.PDFSvg, null)), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
@@ -23549,7 +23376,7 @@ const ScruntinyDetails = _ref => {
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     className: "border-none",
     label: t(`BPA_P2_TOTAL_FEE`),
-    text: `₹ ${(parseFloat(development) ? parseFloat(development) : 0) + parseFloat(otherCharges ? parseFloat(otherCharges) : 0) + parseFloat(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se19 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se19 === void 0 ? void 0 : _additionalDetails$se19.BPA_MALBA_CHARGES) + parseFloat(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se20 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se20 === void 0 ? void 0 : _additionalDetails$se20.BPA_LABOUR_CESS) + parseFloat(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se21 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se21 === void 0 ? void 0 : _additionalDetails$se21.BPA_WATER_CHARGES) + parseFloat(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se22 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se22 === void 0 ? void 0 : _additionalDetails$se22.BPA_GAUSHALA_CHARGES_CESS) - (parseFloat(lessAdjusment) ? parseFloat(lessAdjusment) : 0)}`
+    text: `₹ ${(parseFloat(development) ? parseFloat(development) : 0) + parseFloat(otherCharges ? parseFloat(otherCharges) : 0) + parseFloat(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se21 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se21 === void 0 ? void 0 : _additionalDetails$se21.BPA_MALBA_CHARGES) + parseFloat(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se22 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se22 === void 0 ? void 0 : _additionalDetails$se22.BPA_LABOUR_CESS) + parseFloat(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se23 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se23 === void 0 ? void 0 : _additionalDetails$se23.BPA_WATER_CHARGES) + parseFloat(additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se24 = additionalDetails.selfCertificationCharges) === null || _additionalDetails$se24 === void 0 ? void 0 : _additionalDetails$se24.BPA_GAUSHALA_CHARGES_CESS) - (parseFloat(lessAdjusment) ? parseFloat(lessAdjusment) : 0)}`
   }))), /*#__PURE__*/React__default.createElement("div", null, scrutinyDetails === null || scrutinyDetails === void 0 ? void 0 : (_scrutinyDetails$scru = scrutinyDetails.scruntinyDetails) === null || _scrutinyDetails$scru === void 0 ? void 0 : _scrutinyDetails$scru.map((report, index) => {
     return /*#__PURE__*/React__default.createElement(React.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
       className: "border-none",
@@ -24105,7 +23932,7 @@ const Rebate_menu = [{
   value: "Others"
 }];
 const WSFeeEstimation = _ref => {
-  var _wsAdditionalDetails$, _wsAdditionalDetails$18, _fields$adhocPenaltyR, _fields$adhocRebateRe;
+  var _wsAdditionalDetails$, _wsAdditionalDetails$20, _fields$adhocPenaltyR, _fields$adhocRebateRe;
   let {
     wsAdditionalDetails,
     workflowDetails
@@ -24189,16 +24016,16 @@ const WSFeeEstimation = _ref => {
           message: t("ERR_WS_REBATE_GREATER_THAN_AMOUNT")
         });
       } else {
-        var _wsAdditionalDetails$0, _wsAdditionalDetails$1, _wsAdditionalDetails$10, _wsAdditionalDetails$11, _wsAdditionalDetails$12, _wsAdditionalDetails$13, _wsAdditionalDetails$14, _wsAdditionalDetails$15, _wsAdditionalDetails$16, _wsAdditionalDetails$17;
-        const applicationNo = wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$0 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$0 === void 0 ? void 0 : (_wsAdditionalDetails$1 = _wsAdditionalDetails$0.appDetails) === null || _wsAdditionalDetails$1 === void 0 ? void 0 : _wsAdditionalDetails$1.applicationNo;
-        const tenantId = wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$10 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$10 === void 0 ? void 0 : (_wsAdditionalDetails$11 = _wsAdditionalDetails$10.appDetails) === null || _wsAdditionalDetails$11 === void 0 ? void 0 : _wsAdditionalDetails$11.tenantId;
+        var _wsAdditionalDetails$10, _wsAdditionalDetails$11, _wsAdditionalDetails$12, _wsAdditionalDetails$13, _wsAdditionalDetails$14, _wsAdditionalDetails$15, _wsAdditionalDetails$16, _wsAdditionalDetails$17, _wsAdditionalDetails$18, _wsAdditionalDetails$19;
+        const applicationNo = wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$10 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$10 === void 0 ? void 0 : (_wsAdditionalDetails$11 = _wsAdditionalDetails$10.appDetails) === null || _wsAdditionalDetails$11 === void 0 ? void 0 : _wsAdditionalDetails$11.applicationNo;
+        const tenantId = wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$12 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$12 === void 0 ? void 0 : (_wsAdditionalDetails$13 = _wsAdditionalDetails$12.appDetails) === null || _wsAdditionalDetails$13 === void 0 ? void 0 : _wsAdditionalDetails$13.tenantId;
         const appAdditionalDetails = {
-          ...(wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$12 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$12 === void 0 ? void 0 : (_wsAdditionalDetails$13 = _wsAdditionalDetails$12.appDetails) === null || _wsAdditionalDetails$13 === void 0 ? void 0 : _wsAdditionalDetails$13.additionalDetails),
+          ...(wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$14 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$14 === void 0 ? void 0 : (_wsAdditionalDetails$15 = _wsAdditionalDetails$14.appDetails) === null || _wsAdditionalDetails$15 === void 0 ? void 0 : _wsAdditionalDetails$15.additionalDetails),
           ...fields
         };
         wsAdditionalDetails.additionalDetails.appDetails.additionalDetails = appAdditionalDetails;
         const data = {
-          CalculationCriteria: (wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$14 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$14 === void 0 ? void 0 : (_wsAdditionalDetails$15 = _wsAdditionalDetails$14.appDetails) === null || _wsAdditionalDetails$15 === void 0 ? void 0 : _wsAdditionalDetails$15.service) == "WATER" ? [{
+          CalculationCriteria: (wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$16 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$16 === void 0 ? void 0 : (_wsAdditionalDetails$17 = _wsAdditionalDetails$16.appDetails) === null || _wsAdditionalDetails$17 === void 0 ? void 0 : _wsAdditionalDetails$17.service) == "WATER" ? [{
             applicationNo: applicationNo,
             tenantId: tenantId,
             waterConnection: wsAdditionalDetails.additionalDetails.appDetails
@@ -24209,7 +24036,7 @@ const WSFeeEstimation = _ref => {
           }],
           isconnectionCalculation: false
         };
-        let businessService = (wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$16 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$16 === void 0 ? void 0 : (_wsAdditionalDetails$17 = _wsAdditionalDetails$16.appDetails) === null || _wsAdditionalDetails$17 === void 0 ? void 0 : _wsAdditionalDetails$17.service) == "WATER" ? "WS" : "SW";
+        let businessService = (wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$18 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$18 === void 0 ? void 0 : (_wsAdditionalDetails$19 = _wsAdditionalDetails$18.appDetails) === null || _wsAdditionalDetails$19 === void 0 ? void 0 : _wsAdditionalDetails$19.service) == "WATER" ? "WS" : "SW";
         Digit.WSService.wsCalculationEstimate(data, businessService).then((result, err) => {
           var _result$Calculation, _result$Calculation$, _result$Calculation$$, _result$Calculation3, _result$Calculation3$, _result$Calculation4, _result$Calculation4$, _result$Calculation5, _result$Calculation5$, _result$Calculation6, _result$Calculation6$, _result$Calculation7;
           if ((result === null || result === void 0 ? void 0 : (_result$Calculation = result.Calculation) === null || _result$Calculation === void 0 ? void 0 : (_result$Calculation$ = _result$Calculation[0]) === null || _result$Calculation$ === void 0 ? void 0 : (_result$Calculation$$ = _result$Calculation$.taxHeadEstimates) === null || _result$Calculation$$ === void 0 ? void 0 : _result$Calculation$$.length) > 0) {
@@ -24315,7 +24142,7 @@ const WSFeeEstimation = _ref => {
     } : {
       color: "#00703C"
     }
-  }))), wsAdditionalDetails !== null && wsAdditionalDetails !== void 0 && (_wsAdditionalDetails$18 = wsAdditionalDetails.additionalDetails) !== null && _wsAdditionalDetails$18 !== void 0 && _wsAdditionalDetails$18.isAdhocRebate ? /*#__PURE__*/React__default.createElement("div", {
+  }))), wsAdditionalDetails !== null && wsAdditionalDetails !== void 0 && (_wsAdditionalDetails$20 = wsAdditionalDetails.additionalDetails) !== null && _wsAdditionalDetails$20 !== void 0 && _wsAdditionalDetails$20.isAdhocRebate ? /*#__PURE__*/React__default.createElement("div", {
     onClick: e => {
       showPopUp(true);
     }
@@ -25342,7 +25169,7 @@ const PaymentHistory = _ref => {
 };
 
 function ApplicationDetailsContent(_ref) {
-  var _applicationDetails$a2, _applicationDetails$a3, _applicationDetails$a1, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data19, _workflowDetails$data20;
+  var _applicationDetails$a2, _applicationDetails$a3, _applicationDetails$a11, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data21, _workflowDetails$data22;
   let {
     applicationDetails,
     demandData,
@@ -25513,12 +25340,12 @@ function ApplicationDetailsContent(_ref) {
         privacy: privacy
       });
     } else {
-      var _applicationData$audi2, _checkpoint$assignes8, _checkpoint$assignes9, _checkpoint$assignes0, _checkpoint$assignes1;
+      var _applicationData$audi2, _checkpoint$assignes8, _checkpoint$assignes9, _checkpoint$assignes10, _checkpoint$assignes11;
       const caption = {
         date: convertEpochToDateDMY(applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$audi2 = applicationData.auditDetails) === null || _applicationData$audi2 === void 0 ? void 0 : _applicationData$audi2.lastModifiedTime),
         name: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$assignes8 = checkpoint.assignes) === null || _checkpoint$assignes8 === void 0 ? void 0 : (_checkpoint$assignes9 = _checkpoint$assignes8[0]) === null || _checkpoint$assignes9 === void 0 ? void 0 : _checkpoint$assignes9.name,
         wfComment: checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.wfComment,
-        mobileNumber: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$assignes0 = checkpoint.assignes) === null || _checkpoint$assignes0 === void 0 ? void 0 : (_checkpoint$assignes1 = _checkpoint$assignes0[0]) === null || _checkpoint$assignes1 === void 0 ? void 0 : _checkpoint$assignes1.mobileNumber
+        mobileNumber: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$assignes10 = checkpoint.assignes) === null || _checkpoint$assignes10 === void 0 ? void 0 : (_checkpoint$assignes11 = _checkpoint$assignes10[0]) === null || _checkpoint$assignes11 === void 0 ? void 0 : _checkpoint$assignes11.mobileNumber
       };
       return /*#__PURE__*/React__default.createElement(TLCaption, {
         data: caption
@@ -25695,14 +25522,14 @@ function ApplicationDetailsContent(_ref) {
           });
         }
       } else {
-        var _applicationDetails$a8, _applicationDetails$a9, _applicationDetails$a0;
+        var _applicationDetails$a8, _applicationDetails$a9, _applicationDetails$a10;
         if ((applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a8 = applicationDetails.applicationData) === null || _applicationDetails$a8 === void 0 ? void 0 : _applicationDetails$a8.status) === "INACTIVE") {
           alert("Property is inactive, cannot edit.");
           return;
         } else if ((applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a9 = applicationDetails.applicationData) === null || _applicationDetails$a9 === void 0 ? void 0 : _applicationDetails$a9.status) === "INWORKFLOW") {
           alert("Property is in workflow, cannot edit.");
           return;
-        } else if ((applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a0 = applicationDetails.applicationData) === null || _applicationDetails$a0 === void 0 ? void 0 : _applicationDetails$a0.status) === "ACTIVE") {
+        } else if ((applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a10 = applicationDetails.applicationData) === null || _applicationDetails$a10 === void 0 ? void 0 : _applicationDetails$a10.status) === "ACTIVE") {
           history.push({
             pathname: `/digit-ui/citizen/pt/property/edit-application/${pID}`
           });
@@ -25746,8 +25573,8 @@ function ApplicationDetailsContent(_ref) {
     infoClickLable: "WS_CLICK_ON_LABEL",
     infoClickInfoLabel: getClickInfoDetails(),
     infoClickInfoLabel1: getClickInfoDetails1()
-  }) : null, applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a1 = applicationDetails.applicationDetails) === null || _applicationDetails$a1 === void 0 ? void 0 : _applicationDetails$a1.map((detail, index) => {
-    var _detail$values, _detail$additionalDet, _applicationDetails$a10, _applicationDetails$a11, _applicationDetails$a12, _applicationDetails$a13, _detail$additionalDet2, _applicationDetails$a14, _applicationDetails$a15, _detail$additionalDet3, _detail$additionalDet4, _detail$additionalDet5, _detail$additionalDet6, _detail$additionalDet7, _detail$additionalDet8, _detail$additionalDet9, _detail$additionalDet0, _detail$additionalDet1, _workflowDetails$data, _workflowDetails$data2, _detail$additionalDet10, _detail$additionalDet11, _detail$additionalDet12, _detail$additionalDet13, _detail$additionalDet14, _detail$additionalDet15, _detail$additionalDet16, _detail$additionalDet17, _detail$additionalDet18, _detail$additionalDet19, _detail$additionalDet20, _detail$additionalDet21, _detail$additionalDet22, _detail$additionalDet23, _detail$additionalDet24, _detail$additionalDet25, _detail$additionalDet26, _detail$additionalDet27;
+  }) : null, applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a11 = applicationDetails.applicationDetails) === null || _applicationDetails$a11 === void 0 ? void 0 : _applicationDetails$a11.map((detail, index) => {
+    var _detail$values, _detail$additionalDet, _applicationDetails$a12, _applicationDetails$a13, _applicationDetails$a14, _applicationDetails$a15, _detail$additionalDet2, _applicationDetails$a16, _applicationDetails$a17, _detail$additionalDet3, _detail$additionalDet4, _detail$additionalDet5, _detail$additionalDet6, _detail$additionalDet7, _detail$additionalDet8, _detail$additionalDet9, _detail$additionalDet10, _detail$additionalDet11, _workflowDetails$data, _workflowDetails$data2, _detail$additionalDet12, _detail$additionalDet13, _detail$additionalDet14, _detail$additionalDet15, _detail$additionalDet16, _detail$additionalDet17, _detail$additionalDet18, _detail$additionalDet19, _detail$additionalDet20, _detail$additionalDet21, _detail$additionalDet22, _detail$additionalDet23, _detail$additionalDet24, _detail$additionalDet25, _detail$additionalDet26, _detail$additionalDet27, _detail$additionalDet28, _detail$additionalDet29;
     return /*#__PURE__*/React__default.createElement(React__default.Fragment, {
       key: index
     }, /*#__PURE__*/React__default.createElement("div", {
@@ -25891,10 +25718,10 @@ function ApplicationDetailsContent(_ref) {
     })))), (detail === null || detail === void 0 ? void 0 : detail.belowComponent) && /*#__PURE__*/React__default.createElement(detail.belowComponent, null), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet = detail.additionalDetails) === null || _detail$additionalDet === void 0 ? void 0 : _detail$additionalDet.inspectionReport) && /*#__PURE__*/React__default.createElement(ScruntinyDetails, {
       scrutinyDetails: detail === null || detail === void 0 ? void 0 : detail.additionalDetails,
       paymentsList: paymentsList,
-      additionalDetails: applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a10 = applicationDetails.applicationData) === null || _applicationDetails$a10 === void 0 ? void 0 : _applicationDetails$a10.additionalDetails,
+      additionalDetails: applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a12 = applicationDetails.applicationData) === null || _applicationDetails$a12 === void 0 ? void 0 : _applicationDetails$a12.additionalDetails,
       applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData
-    }), (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a11 = applicationDetails.applicationData) === null || _applicationDetails$a11 === void 0 ? void 0 : (_applicationDetails$a12 = _applicationDetails$a11.additionalDetails) === null || _applicationDetails$a12 === void 0 ? void 0 : (_applicationDetails$a13 = _applicationDetails$a12.fieldinspection_pending) === null || _applicationDetails$a13 === void 0 ? void 0 : _applicationDetails$a13.length) > 0 && (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet2 = detail.additionalDetails) === null || _detail$additionalDet2 === void 0 ? void 0 : _detail$additionalDet2.fiReport) && /*#__PURE__*/React__default.createElement(InspectionReport, {
-      fiReport: applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a14 = applicationDetails.applicationData) === null || _applicationDetails$a14 === void 0 ? void 0 : (_applicationDetails$a15 = _applicationDetails$a14.additionalDetails) === null || _applicationDetails$a15 === void 0 ? void 0 : _applicationDetails$a15.fieldinspection_pending
+    }), (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a13 = applicationDetails.applicationData) === null || _applicationDetails$a13 === void 0 ? void 0 : (_applicationDetails$a14 = _applicationDetails$a13.additionalDetails) === null || _applicationDetails$a14 === void 0 ? void 0 : (_applicationDetails$a15 = _applicationDetails$a14.fieldinspection_pending) === null || _applicationDetails$a15 === void 0 ? void 0 : _applicationDetails$a15.length) > 0 && (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet2 = detail.additionalDetails) === null || _detail$additionalDet2 === void 0 ? void 0 : _detail$additionalDet2.fiReport) && /*#__PURE__*/React__default.createElement(InspectionReport, {
+      fiReport: applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a16 = applicationDetails.applicationData) === null || _applicationDetails$a16 === void 0 ? void 0 : (_applicationDetails$a17 = _applicationDetails$a16.additionalDetails) === null || _applicationDetails$a17 === void 0 ? void 0 : _applicationDetails$a17.fieldinspection_pending
     }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet3 = detail.additionalDetails) === null || _detail$additionalDet3 === void 0 ? void 0 : _detail$additionalDet3.floors) && /*#__PURE__*/React__default.createElement(PropertyFloors, {
       floors: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet4 = detail.additionalDetails) === null || _detail$additionalDet4 === void 0 ? void 0 : _detail$additionalDet4.floors
     }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet5 = detail.additionalDetails) === null || _detail$additionalDet5 === void 0 ? void 0 : _detail$additionalDet5.owners) && /*#__PURE__*/React__default.createElement(PropertyOwners, {
@@ -25902,12 +25729,12 @@ function ApplicationDetailsContent(_ref) {
     }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet7 = detail.additionalDetails) === null || _detail$additionalDet7 === void 0 ? void 0 : _detail$additionalDet7.units) && /*#__PURE__*/React__default.createElement(TLTradeUnits, {
       units: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet8 = detail.additionalDetails) === null || _detail$additionalDet8 === void 0 ? void 0 : _detail$additionalDet8.units
     }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet9 = detail.additionalDetails) === null || _detail$additionalDet9 === void 0 ? void 0 : _detail$additionalDet9.accessories) && /*#__PURE__*/React__default.createElement(TLTradeAccessories, {
-      units: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet0 = detail.additionalDetails) === null || _detail$additionalDet0 === void 0 ? void 0 : _detail$additionalDet0.accessories
-    }), !isEditApplication && (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet1 = detail.additionalDetails) === null || _detail$additionalDet1 === void 0 ? void 0 : _detail$additionalDet1.permissions) && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : (_workflowDetails$data2 = _workflowDetails$data.nextActions) === null || _workflowDetails$data2 === void 0 ? void 0 : _workflowDetails$data2.length) > 0 && /*#__PURE__*/React__default.createElement(PermissionCheck, {
+      units: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet10 = detail.additionalDetails) === null || _detail$additionalDet10 === void 0 ? void 0 : _detail$additionalDet10.accessories
+    }), !isEditApplication && (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet11 = detail.additionalDetails) === null || _detail$additionalDet11 === void 0 ? void 0 : _detail$additionalDet11.permissions) && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : (_workflowDetails$data2 = _workflowDetails$data.nextActions) === null || _workflowDetails$data2 === void 0 ? void 0 : _workflowDetails$data2.length) > 0 && /*#__PURE__*/React__default.createElement(PermissionCheck, {
       applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData,
       t: t,
-      permissions: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet10 = detail.additionalDetails) === null || _detail$additionalDet10 === void 0 ? void 0 : _detail$additionalDet10.permissions
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet11 = detail.additionalDetails) === null || _detail$additionalDet11 === void 0 ? void 0 : _detail$additionalDet11.obpsDocuments) && /*#__PURE__*/React__default.createElement("div", {
+      permissions: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet12 = detail.additionalDetails) === null || _detail$additionalDet12 === void 0 ? void 0 : _detail$additionalDet12.permissions
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet13 = detail.additionalDetails) === null || _detail$additionalDet13 === void 0 ? void 0 : _detail$additionalDet13.obpsDocuments) && /*#__PURE__*/React__default.createElement("div", {
       style: {
         display: "flex"
       }
@@ -25916,29 +25743,29 @@ function ApplicationDetailsContent(_ref) {
       applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData,
       docs: detail.additionalDetails.obpsDocuments,
       bpaActionsDetails: workflowDetails
-    })), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet12 = detail.additionalDetails) === null || _detail$additionalDet12 === void 0 ? void 0 : _detail$additionalDet12.noc) && /*#__PURE__*/React__default.createElement(NOCDocuments, {
+    })), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet14 = detail.additionalDetails) === null || _detail$additionalDet14 === void 0 ? void 0 : _detail$additionalDet14.noc) && /*#__PURE__*/React__default.createElement(NOCDocuments, {
       t: t,
       isNoc: true,
       NOCdata: detail.values,
       applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData,
       docs: detail.additionalDetails.noc,
-      noc: (_detail$additionalDet13 = detail.additionalDetails) === null || _detail$additionalDet13 === void 0 ? void 0 : _detail$additionalDet13.data,
+      noc: (_detail$additionalDet15 = detail.additionalDetails) === null || _detail$additionalDet15 === void 0 ? void 0 : _detail$additionalDet15.data,
       bpaActionsDetails: workflowDetails
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet14 = detail.additionalDetails) === null || _detail$additionalDet14 === void 0 ? void 0 : _detail$additionalDet14.scruntinyDetails) && /*#__PURE__*/React__default.createElement(ScruntinyDetails, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet16 = detail.additionalDetails) === null || _detail$additionalDet16 === void 0 ? void 0 : _detail$additionalDet16.scruntinyDetails) && /*#__PURE__*/React__default.createElement(ScruntinyDetails, {
       scrutinyDetails: detail === null || detail === void 0 ? void 0 : detail.additionalDetails
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet15 = detail.additionalDetails) === null || _detail$additionalDet15 === void 0 ? void 0 : _detail$additionalDet15.buildingExtractionDetails) && /*#__PURE__*/React__default.createElement(ScruntinyDetails, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet17 = detail.additionalDetails) === null || _detail$additionalDet17 === void 0 ? void 0 : _detail$additionalDet17.buildingExtractionDetails) && /*#__PURE__*/React__default.createElement(ScruntinyDetails, {
       scrutinyDetails: detail === null || detail === void 0 ? void 0 : detail.additionalDetails
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet16 = detail.additionalDetails) === null || _detail$additionalDet16 === void 0 ? void 0 : _detail$additionalDet16.subOccupancyTableDetails) && /*#__PURE__*/React__default.createElement(SubOccupancyTable, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet18 = detail.additionalDetails) === null || _detail$additionalDet18 === void 0 ? void 0 : _detail$additionalDet18.subOccupancyTableDetails) && /*#__PURE__*/React__default.createElement(SubOccupancyTable, {
       edcrDetails: detail === null || detail === void 0 ? void 0 : detail.additionalDetails,
       applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet17 = detail.additionalDetails) === null || _detail$additionalDet17 === void 0 ? void 0 : _detail$additionalDet17.documentsWithUrl) && /*#__PURE__*/React__default.createElement(DocumentsPreview, {
-      documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet18 = detail.additionalDetails) === null || _detail$additionalDet18 === void 0 ? void 0 : _detail$additionalDet18.documentsWithUrl
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet19 = detail.additionalDetails) === null || _detail$additionalDet19 === void 0 ? void 0 : _detail$additionalDet19.taxHeadEstimatesCalculation) && /*#__PURE__*/React__default.createElement(PropertyEstimates, {
-      taxHeadEstimatesCalculation: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet20 = detail.additionalDetails) === null || _detail$additionalDet20 === void 0 ? void 0 : _detail$additionalDet20.taxHeadEstimatesCalculation
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet19 = detail.additionalDetails) === null || _detail$additionalDet19 === void 0 ? void 0 : _detail$additionalDet19.documentsWithUrl) && /*#__PURE__*/React__default.createElement(DocumentsPreview, {
+      documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet20 = detail.additionalDetails) === null || _detail$additionalDet20 === void 0 ? void 0 : _detail$additionalDet20.documentsWithUrl
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet21 = detail.additionalDetails) === null || _detail$additionalDet21 === void 0 ? void 0 : _detail$additionalDet21.taxHeadEstimatesCalculation) && /*#__PURE__*/React__default.createElement(PropertyEstimates, {
+      taxHeadEstimatesCalculation: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet22 = detail.additionalDetails) === null || _detail$additionalDet22 === void 0 ? void 0 : _detail$additionalDet22.taxHeadEstimatesCalculation
     }), (detail === null || detail === void 0 ? void 0 : detail.isWaterConnectionDetails) && /*#__PURE__*/React__default.createElement(WSAdditonalDetails, {
       wsAdditionalDetails: detail,
       oldValue: oldValue
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet21 = detail.additionalDetails) === null || _detail$additionalDet21 === void 0 ? void 0 : _detail$additionalDet21.redirectUrl) && /*#__PURE__*/React__default.createElement("div", {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet23 = detail.additionalDetails) === null || _detail$additionalDet23 === void 0 ? void 0 : _detail$additionalDet23.redirectUrl) && /*#__PURE__*/React__default.createElement("div", {
       style: {
         fontSize: "16px",
         lineHeight: "24px",
@@ -25946,16 +25773,16 @@ function ApplicationDetailsContent(_ref) {
         padding: "10px 0px"
       }
     }, /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
-      to: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet22 = detail.additionalDetails) === null || _detail$additionalDet22 === void 0 ? void 0 : (_detail$additionalDet23 = _detail$additionalDet22.redirectUrl) === null || _detail$additionalDet23 === void 0 ? void 0 : _detail$additionalDet23.url
+      to: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet24 = detail.additionalDetails) === null || _detail$additionalDet24 === void 0 ? void 0 : (_detail$additionalDet25 = _detail$additionalDet24.redirectUrl) === null || _detail$additionalDet25 === void 0 ? void 0 : _detail$additionalDet25.url
     }, /*#__PURE__*/React__default.createElement("span", {
       className: "link",
       style: {
         color: "#a82227"
       }
-    }, detail === null || detail === void 0 ? void 0 : (_detail$additionalDet24 = detail.additionalDetails) === null || _detail$additionalDet24 === void 0 ? void 0 : (_detail$additionalDet25 = _detail$additionalDet24.redirectUrl) === null || _detail$additionalDet25 === void 0 ? void 0 : _detail$additionalDet25.title))), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet26 = detail.additionalDetails) === null || _detail$additionalDet26 === void 0 ? void 0 : _detail$additionalDet26.estimationDetails) && /*#__PURE__*/React__default.createElement(WSFeeEstimation, {
+    }, detail === null || detail === void 0 ? void 0 : (_detail$additionalDet26 = detail.additionalDetails) === null || _detail$additionalDet26 === void 0 ? void 0 : (_detail$additionalDet27 = _detail$additionalDet26.redirectUrl) === null || _detail$additionalDet27 === void 0 ? void 0 : _detail$additionalDet27.title))), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet28 = detail.additionalDetails) === null || _detail$additionalDet28 === void 0 ? void 0 : _detail$additionalDet28.estimationDetails) && /*#__PURE__*/React__default.createElement(WSFeeEstimation, {
       wsAdditionalDetails: detail,
       workflowDetails: workflowDetails
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet27 = detail.additionalDetails) === null || _detail$additionalDet27 === void 0 ? void 0 : _detail$additionalDet27.estimationDetails) && /*#__PURE__*/React__default.createElement(ViewBreakup, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet29 = detail.additionalDetails) === null || _detail$additionalDet29 === void 0 ? void 0 : _detail$additionalDet29.estimationDetails) && /*#__PURE__*/React__default.createElement(ViewBreakup, {
       wsAdditionalDetails: detail,
       workflowDetails: workflowDetails
     }));
@@ -25975,13 +25802,13 @@ function ApplicationDetailsContent(_ref) {
   }, t("ES_APPLICATION_DETAILS_APPLICATION_TIMELINE")), workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data5 = workflowDetails.data) !== null && _workflowDetails$data5 !== void 0 && _workflowDetails$data5.timeline && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data6 = workflowDetails.data) === null || _workflowDetails$data6 === void 0 ? void 0 : (_workflowDetails$data7 = _workflowDetails$data6.timeline) === null || _workflowDetails$data7 === void 0 ? void 0 : _workflowDetails$data7.length) === 1 ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.CheckPoint, {
     isCompleted: true,
     label: t(`${timelineStatusPrefix}${workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data8 = workflowDetails.data) === null || _workflowDetails$data8 === void 0 ? void 0 : (_workflowDetails$data9 = _workflowDetails$data8.timeline[0]) === null || _workflowDetails$data9 === void 0 ? void 0 : _workflowDetails$data9.state}`),
-    customChild: getTimelineCaptions(workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data0 = workflowDetails.data) === null || _workflowDetails$data0 === void 0 ? void 0 : _workflowDetails$data0.timeline[0], workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data1 = workflowDetails.data) === null || _workflowDetails$data1 === void 0 ? void 0 : _workflowDetails$data1.timeline)
-  }) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.ConnectingCheckPoints, null, (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data10 = workflowDetails.data) === null || _workflowDetails$data10 === void 0 ? void 0 : _workflowDetails$data10.timeline) && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data11 = workflowDetails.data) === null || _workflowDetails$data11 === void 0 ? void 0 : _workflowDetails$data11.timeline.slice(0, showAllTimeline ? workflowDetails === null || workflowDetails === void 0 ? void 0 : workflowDetails.data.timeline.length : 2).map((checkpoint, index, arr) => {
-    var _workflowDetails$data18;
+    customChild: getTimelineCaptions(workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data10 = workflowDetails.data) === null || _workflowDetails$data10 === void 0 ? void 0 : _workflowDetails$data10.timeline[0], workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data11 = workflowDetails.data) === null || _workflowDetails$data11 === void 0 ? void 0 : _workflowDetails$data11.timeline)
+  }) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.ConnectingCheckPoints, null, (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data12 = workflowDetails.data) === null || _workflowDetails$data12 === void 0 ? void 0 : _workflowDetails$data12.timeline) && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data13 = workflowDetails.data) === null || _workflowDetails$data13 === void 0 ? void 0 : _workflowDetails$data13.timeline.slice(0, showAllTimeline ? workflowDetails === null || workflowDetails === void 0 ? void 0 : workflowDetails.data.timeline.length : 2).map((checkpoint, index, arr) => {
+    var _workflowDetails$data20;
     let timelineStatusPostfix = "";
     if (window.location.href.includes("/obps/")) {
-      var _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _workflowDetails$data15, _workflowDetails$data16, _workflowDetails$data17;
-      if (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data12 = workflowDetails.data) !== null && _workflowDetails$data12 !== void 0 && (_workflowDetails$data13 = _workflowDetails$data12.timeline[index - 1]) !== null && _workflowDetails$data13 !== void 0 && (_workflowDetails$data14 = _workflowDetails$data13.state) !== null && _workflowDetails$data14 !== void 0 && _workflowDetails$data14.includes("BACK_FROM") || workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data15 = workflowDetails.data) !== null && _workflowDetails$data15 !== void 0 && (_workflowDetails$data16 = _workflowDetails$data15.timeline[index - 1]) !== null && _workflowDetails$data16 !== void 0 && (_workflowDetails$data17 = _workflowDetails$data16.state) !== null && _workflowDetails$data17 !== void 0 && _workflowDetails$data17.includes("SEND_TO_CITIZEN")) timelineStatusPostfix = `_NOT_DONE`;else if ((checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.performedAction) === "SEND_TO_ARCHITECT") timelineStatusPostfix = `_BY_ARCHITECT_DONE`;else timelineStatusPostfix = index == 0 ? "" : `_DONE`;
+      var _workflowDetails$data14, _workflowDetails$data15, _workflowDetails$data16, _workflowDetails$data17, _workflowDetails$data18, _workflowDetails$data19;
+      if (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data14 = workflowDetails.data) !== null && _workflowDetails$data14 !== void 0 && (_workflowDetails$data15 = _workflowDetails$data14.timeline[index - 1]) !== null && _workflowDetails$data15 !== void 0 && (_workflowDetails$data16 = _workflowDetails$data15.state) !== null && _workflowDetails$data16 !== void 0 && _workflowDetails$data16.includes("BACK_FROM") || workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data17 = workflowDetails.data) !== null && _workflowDetails$data17 !== void 0 && (_workflowDetails$data18 = _workflowDetails$data17.timeline[index - 1]) !== null && _workflowDetails$data18 !== void 0 && (_workflowDetails$data19 = _workflowDetails$data18.state) !== null && _workflowDetails$data19 !== void 0 && _workflowDetails$data19.includes("SEND_TO_CITIZEN")) timelineStatusPostfix = `_NOT_DONE`;else if ((checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.performedAction) === "SEND_TO_ARCHITECT") timelineStatusPostfix = `_BY_ARCHITECT_DONE`;else timelineStatusPostfix = index == 0 ? "" : `_DONE`;
     }
     return /*#__PURE__*/React__default.createElement(React__default.Fragment, {
       key: index
@@ -25990,9 +25817,9 @@ function ApplicationDetailsContent(_ref) {
       isCompleted: index === 0,
       info: checkpoint.comment,
       label: t(`${timelineStatusPrefix}${(checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.performedAction) === "REOPEN" ? checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.performedAction : checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint[statusAttribute]}${timelineStatusPostfix}`),
-      customChild: getTimelineCaptions(checkpoint, index, workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data18 = workflowDetails.data) === null || _workflowDetails$data18 === void 0 ? void 0 : _workflowDetails$data18.timeline)
+      customChild: getTimelineCaptions(checkpoint, index, workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data20 = workflowDetails.data) === null || _workflowDetails$data20 === void 0 ? void 0 : _workflowDetails$data20.timeline)
     }));
-  }))), (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data19 = workflowDetails.data) === null || _workflowDetails$data19 === void 0 ? void 0 : (_workflowDetails$data20 = _workflowDetails$data19.timeline) === null || _workflowDetails$data20 === void 0 ? void 0 : _workflowDetails$data20.length) > 2 && /*#__PURE__*/React__default.createElement(digitUiReactComponents.LinkButton, {
+  }))), (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data21 = workflowDetails.data) === null || _workflowDetails$data21 === void 0 ? void 0 : (_workflowDetails$data22 = _workflowDetails$data21.timeline) === null || _workflowDetails$data22 === void 0 ? void 0 : _workflowDetails$data22.length) > 2 && /*#__PURE__*/React__default.createElement(digitUiReactComponents.LinkButton, {
     label: showAllTimeline ? t("COLLAPSE") : t("VIEW_TIMELINE"),
     onClick: toggleTimeline
   })))), window.location.href.includes("/pt/") ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.ActionBar, {
@@ -26033,7 +25860,7 @@ function ApplicationDetailsContent(_ref) {
 }
 
 function ApplicationDetailsToast(_ref) {
-  var _showToast$error, _showToast$error2, _showToast$error3, _showToast$error4, _showToast$error5, _showToast$error6, _showToast$error7, _showToast$error8, _showToast$action2, _showToast$error9, _showToast$error0, _showToast$error1, _showToast$error10, _showToast$error11, _showToast$error12, _showToast$error13, _showToast$error14, _showToast$action4;
+  var _showToast$error, _showToast$error2, _showToast$error3, _showToast$error4, _showToast$error5, _showToast$error6, _showToast$error7, _showToast$error8, _showToast$action2, _showToast$error9, _showToast$error10, _showToast$error11, _showToast$error12, _showToast$error13, _showToast$error14, _showToast$error15, _showToast$error16, _showToast$action4;
   let {
     t,
     showToast,
@@ -26090,26 +25917,26 @@ function ApplicationDetailsToast(_ref) {
         label = (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error" ? showToast === null || showToast === void 0 ? void 0 : (_showToast$error9 = showToast.error) === null || _showToast$error9 === void 0 ? void 0 : _showToast$error9.message : getMessage(["BPA_APPROVAL_REVOCATED_MESSAGE_HEAD", "BPA_APPROVAL_OC_REVOCATED_MESSAGE_HEAD"]);
         break;
       case "VERIFY_AND_FORWARD":
-        label = (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error" ? showToast === null || showToast === void 0 ? void 0 : (_showToast$error0 = showToast.error) === null || _showToast$error0 === void 0 ? void 0 : _showToast$error0.message : getMessage(["BPA_FORWARD_SUCCESS_MESSAGE_MAIN"]);
+        label = (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error" ? showToast === null || showToast === void 0 ? void 0 : (_showToast$error10 = showToast.error) === null || _showToast$error10 === void 0 ? void 0 : _showToast$error10.message : getMessage(["BPA_FORWARD_SUCCESS_MESSAGE_MAIN"]);
         break;
       case "SEND_BACK_TO_CITIZEN":
-        label = (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error" ? showToast === null || showToast === void 0 ? void 0 : (_showToast$error1 = showToast.error) === null || _showToast$error1 === void 0 ? void 0 : _showToast$error1.message : getMessage(["BPA_SENDBACK_SUCCESS_MESSAGE_MAIN"]);
+        label = (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error" ? showToast === null || showToast === void 0 ? void 0 : (_showToast$error11 = showToast.error) === null || _showToast$error11 === void 0 ? void 0 : _showToast$error11.message : getMessage(["BPA_SENDBACK_SUCCESS_MESSAGE_MAIN"]);
         break;
       case "APPROVE":
-        label = (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error" ? showToast === null || showToast === void 0 ? void 0 : (_showToast$error10 = showToast.error) === null || _showToast$error10 === void 0 ? void 0 : _showToast$error10.message : getMessage(["BPA_APPROVAL_CHECKLIST_MESSAGE_HEAD"]);
+        label = (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error" ? showToast === null || showToast === void 0 ? void 0 : (_showToast$error12 = showToast.error) === null || _showToast$error12 === void 0 ? void 0 : _showToast$error12.message : getMessage(["BPA_APPROVAL_CHECKLIST_MESSAGE_HEAD"]);
         break;
       case "REJECT":
-        label = (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error" ? showToast === null || showToast === void 0 ? void 0 : (_showToast$error11 = showToast.error) === null || _showToast$error11 === void 0 ? void 0 : _showToast$error11.message : getMessage(["BPA_APPROVAL_REJECTED_MESSAGE_HEAD", "BPA_OC_APPROVAL_REJECTED_MESSAGE_HEAD"]);
+        label = (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error" ? showToast === null || showToast === void 0 ? void 0 : (_showToast$error13 = showToast.error) === null || _showToast$error13 === void 0 ? void 0 : _showToast$error13.message : getMessage(["BPA_APPROVAL_REJECTED_MESSAGE_HEAD", "BPA_OC_APPROVAL_REJECTED_MESSAGE_HEAD"]);
         break;
       case "FORWARD":
-        label = (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error" ? showToast === null || showToast === void 0 ? void 0 : (_showToast$error12 = showToast.error) === null || _showToast$error12 === void 0 ? void 0 : _showToast$error12.message : getMessage(["BPA_FORWARD_SUCCESS_MESSAGE_MAIN"]);
+        label = (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error" ? showToast === null || showToast === void 0 ? void 0 : (_showToast$error14 = showToast.error) === null || _showToast$error14 === void 0 ? void 0 : _showToast$error14.message : getMessage(["BPA_FORWARD_SUCCESS_MESSAGE_MAIN"]);
         break;
       case "SEND_BACK_FOR_DOCUMENT_VERIFICATION":
       case "SEND_BACK_FOR_FIELD_INSPECTION":
-        label = (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error" ? showToast === null || showToast === void 0 ? void 0 : (_showToast$error13 = showToast.error) === null || _showToast$error13 === void 0 ? void 0 : _showToast$error13.message : getMessage(["BPA_SENDBACK_SUCCESS_MESSAGE_MAIN"]);
+        label = (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error" ? showToast === null || showToast === void 0 ? void 0 : (_showToast$error15 = showToast.error) === null || _showToast$error15 === void 0 ? void 0 : _showToast$error15.message : getMessage(["BPA_SENDBACK_SUCCESS_MESSAGE_MAIN"]);
         break;
       default:
-        label = (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error" ? showToast === null || showToast === void 0 ? void 0 : (_showToast$error14 = showToast.error) === null || _showToast$error14 === void 0 ? void 0 : _showToast$error14.message : t(`ES_${businessService}_${showToast === null || showToast === void 0 ? void 0 : (_showToast$action4 = showToast.action) === null || _showToast$action4 === void 0 ? void 0 : _showToast$action4.action}_UPDATE_SUCCESS`);
+        label = (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error" ? showToast === null || showToast === void 0 ? void 0 : (_showToast$error16 = showToast.error) === null || _showToast$error16 === void 0 ? void 0 : _showToast$error16.message : t(`ES_${businessService}_${showToast === null || showToast === void 0 ? void 0 : (_showToast$action4 = showToast.action) === null || _showToast$action4 === void 0 ? void 0 : _showToast$action4.action}_UPDATE_SUCCESS`);
     }
     return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, showToast && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Toast, {
       error: showToast.key === "error",
@@ -26117,8 +25944,8 @@ function ApplicationDetailsToast(_ref) {
       onClose: closeToast
     }));
   } else {
-    var _showToast$error15, _showToast$action5;
-    const label = (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error" ? showToast === null || showToast === void 0 ? void 0 : (_showToast$error15 = showToast.error) === null || _showToast$error15 === void 0 ? void 0 : _showToast$error15.message : `ES_${businessService}_${showToast === null || showToast === void 0 ? void 0 : (_showToast$action5 = showToast.action) === null || _showToast$action5 === void 0 ? void 0 : _showToast$action5.action}_UPDATE_SUCCESS`;
+    var _showToast$error17, _showToast$action5;
+    const label = (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error" ? showToast === null || showToast === void 0 ? void 0 : (_showToast$error17 = showToast.error) === null || _showToast$error17 === void 0 ? void 0 : _showToast$error17.message : `ES_${businessService}_${showToast === null || showToast === void 0 ? void 0 : (_showToast$action5 = showToast.action) === null || _showToast$action5 === void 0 ? void 0 : _showToast$action5.action}_UPDATE_SUCCESS`;
     return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, showToast && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Toast, {
       error: showToast.key === "error",
       label: t(label),
@@ -26357,7 +26184,7 @@ const ApplicationDetails = props => {
   }, [showToast]);
   function onActionSelect(action) {
     if (action) {
-      var _action$redirectionUr8, _action$redirectionUr9, _action$redirectionUr0;
+      var _action$redirectionUr8, _action$redirectionUr9, _action$redirectionUr10;
       if ((action === null || action === void 0 ? void 0 : action.action) == "EDIT PAY 2" && window.location.href.includes("bpa")) {
         window.location.assign(window.location.href.split("bpa")[0] + "editApplication/bpa" + window.location.href.split("bpa")[1]);
       } else if (action !== null && action !== void 0 && action.isWarningPopUp) {
@@ -26381,15 +26208,15 @@ const ApplicationDetails = props => {
         }
       } else if (!(action !== null && action !== void 0 && action.redirectionUrl) && (action === null || action === void 0 ? void 0 : action.action) != "EDIT PAY 2") {
         setShowModal(true);
-      } else if ((action === null || action === void 0 ? void 0 : (_action$redirectionUr8 = action.redirectionUrl) === null || _action$redirectionUr8 === void 0 ? void 0 : (_action$redirectionUr9 = _action$redirectionUr8.state) === null || _action$redirectionUr9 === void 0 ? void 0 : (_action$redirectionUr0 = _action$redirectionUr9.applicationData) === null || _action$redirectionUr0 === void 0 ? void 0 : _action$redirectionUr0.workflowCode) === "DIRECTRENEWAL") {
+      } else if ((action === null || action === void 0 ? void 0 : (_action$redirectionUr8 = action.redirectionUrl) === null || _action$redirectionUr8 === void 0 ? void 0 : (_action$redirectionUr9 = _action$redirectionUr8.state) === null || _action$redirectionUr9 === void 0 ? void 0 : (_action$redirectionUr10 = _action$redirectionUr9.applicationData) === null || _action$redirectionUr10 === void 0 ? void 0 : _action$redirectionUr10.workflowCode) === "DIRECTRENEWAL") {
         console.log("Got Inside Direct");
         setShowModal(true);
       } else {
-        var _action$redirectionUr1, _action$redirectionUr10;
+        var _action$redirectionUr11, _action$redirectionUr12;
         history.push({
-          pathname: (_action$redirectionUr1 = action.redirectionUrl) === null || _action$redirectionUr1 === void 0 ? void 0 : _action$redirectionUr1.pathname,
+          pathname: (_action$redirectionUr11 = action.redirectionUrl) === null || _action$redirectionUr11 === void 0 ? void 0 : _action$redirectionUr11.pathname,
           state: {
-            ...((_action$redirectionUr10 = action.redirectionUrl) === null || _action$redirectionUr10 === void 0 ? void 0 : _action$redirectionUr10.state)
+            ...((_action$redirectionUr12 = action.redirectionUrl) === null || _action$redirectionUr12 === void 0 ? void 0 : _action$redirectionUr12.state)
           }
         });
       }
@@ -27677,7 +27504,7 @@ const createEmployeeConfig = [{
   isStepEnabled: true,
   type: "component",
   component: "NewPTRStepFormOne",
-  key: "ownerss",
+  key: "ownerDetails",
   withoutLabel: true,
   texts: {
     submitBarLabel: "CS_COMMON_NEXT"
@@ -27689,7 +27516,7 @@ const createEmployeeConfig = [{
   isStepEnabled: true,
   type: "component",
   component: "NewPTRStepFormTwo",
-  key: "pets",
+  key: "petDetails",
   withoutLabel: true,
   texts: {
     submitBarLabel: "CS_COMMON_NEXT"
@@ -27772,83 +27599,33 @@ const NewPTRStepFormOne = _ref => {
   let {
     config,
     onGoNext,
-    onBackClick,
-    t
+    onBackClick
   } = _ref;
   const dispatch = reactRedux.useDispatch();
+  const {
+    t
+  } = reactI18next.useTranslation();
   const [showToast, setShowToast] = React.useState(false);
   const [error, setError] = React.useState("");
   const currentStepData = reactRedux.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] : {};
+    return state.ptr.PTRNewApplicationFormReducer.formData;
   });
-  function validateStepData(data) {
-    const ownerss = (data === null || data === void 0 ? void 0 : data.ownerss) || [];
-    const missingFields = [];
-    const notFormattedFields = [];
-    if (!(ownerss !== null && ownerss !== void 0 && ownerss.firstName)) missingFields.push("FIRST_NAME");
-    if (!(ownerss !== null && ownerss !== void 0 && ownerss.lastName)) missingFields.push("LAST_NAME");
-    if (!(ownerss !== null && ownerss !== void 0 && ownerss.emailId)) missingFields.push("EMAIL_ID");
-    if (!(ownerss !== null && ownerss !== void 0 && ownerss.mobileNumber)) missingFields.push("MOBILE_NUMBER");
-    if (!(ownerss !== null && ownerss !== void 0 && ownerss.fatherName)) missingFields.push("FATHER_NAME");
-    if (!(ownerss !== null && ownerss !== void 0 && ownerss.address)) missingFields.push("ADDRESS");
-    if (ownerss !== null && ownerss !== void 0 && ownerss.mobileNumber && !/^[6-9]\d{9}$/.test(ownerss.mobileNumber)) {
-      notFormattedFields.push("MOBILE_NUMBER");
-    }
-    if (ownerss !== null && ownerss !== void 0 && ownerss.emailId && !/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/.test(ownerss.emailId)) {
-      notFormattedFields.push("EMAIL_ID");
-    }
-    if (ownerss !== null && ownerss !== void 0 && ownerss.firstName && !/^[a-zA-Z ]+$/.test(ownerss.firstName)) {
-      notFormattedFields.push("FIRST_NAME");
-    }
-    if (ownerss !== null && ownerss !== void 0 && ownerss.lastName && !/^[a-zA-Z ]+$/.test(ownerss.lastName)) {
-      notFormattedFields.push("LAST_NAME");
-    }
-    if (ownerss !== null && ownerss !== void 0 && ownerss.fatherName && !/^[a-zA-Z ]+$/.test(ownerss.fatherName)) {
-      notFormattedFields.push("FATHER_NAME");
-    }
-    return {
-      missingFields,
-      notFormattedFields
-    };
-  }
   function goNext(data) {
-    const {
-      missingFields,
-      notFormattedFields
-    } = validateStepData(currentStepData);
-    if (missingFields.length > 0) {
-      setError(`Please fill the following field: ${missingFields[0]}`);
-      setShowToast(true);
-      return;
-    }
-    if (notFormattedFields.length > 0) {
-      setError(`Please format the following field: ${notFormattedFields[0]}`);
-      setShowToast(true);
-      return;
-    }
+    dispatch(UPDATE_PTRNewApplication_FORM(config.key, data));
     onGoNext();
   }
   function onGoBack(data) {
     onBackClick(config.key, data);
   }
-  const onFormValueChange = function (setValue, data) {
-    console.log("onFormValueChange data in AdministrativeDetails: ", data, "\n Bool: ", !lodash.isEqual(data, currentStepData));
-    if (!lodash.isEqual(data, currentStepData)) {
-      dispatch(UPDATE_PTRNewApplication_FORM(config.key, data));
-    }
-  };
   const closeToast = () => {
     setShowToast(false);
     setError("");
   };
-  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.FormComposer, {
-    defaultValues: currentStepData,
-    config: config.currStepConfig,
-    onSubmit: goNext,
-    onFormValueChange: onFormValueChange,
-    label: t(`${config.texts.submitBarLabel}`),
-    currentStep: config.currStepNumber,
-    onBackClick: onGoBack
+  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(PTRCitizenDetails, {
+    onGoBack: onGoBack,
+    goNext: goNext,
+    currentStepData: currentStepData,
+    t: t
   }), showToast && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Toast, {
     isDleteBtn: true,
     error: true,
@@ -27861,65 +27638,33 @@ const NewPTRStepFormTwo = _ref => {
   let {
     config,
     onGoNext,
-    onBackClick,
-    t
+    onBackClick
   } = _ref;
   const dispatch = reactRedux.useDispatch();
+  const {
+    t
+  } = reactI18next.useTranslation();
   const [showToast, setShowToast] = React.useState(false);
   const [error, setError] = React.useState("");
   const currentStepData = reactRedux.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] : {};
+    return state.ptr.PTRNewApplicationFormReducer.formData;
   });
   function goNext(data) {
-    console.log("goNext data in NewPTRStepFormTwo: ", data);
-    const {
-      missingFields,
-      notFormattedFields
-    } = validateStepData(currentStepData);
-    if (missingFields.length > 0) {
-      setError(`Please fill the following field: ${missingFields[0]}`);
-      setShowToast(true);
-      return;
-    }
+    dispatch(UPDATE_PTRNewApplication_FORM(config.key, data));
     onGoNext();
   }
-  function validateStepData(data) {
-    const pets = (data === null || data === void 0 ? void 0 : data.pets) || [];
-    const missingFields = [];
-    const notFormattedFields = [];
-    if (!(pets !== null && pets !== void 0 && pets.petName)) missingFields.push("PET_NAME");
-    if (!(pets !== null && pets !== void 0 && pets.petType)) missingFields.push("PET_TYPE");
-    if (!(pets !== null && pets !== void 0 && pets.breedType)) missingFields.push("BREED_TYPE");
-    if (!(pets !== null && pets !== void 0 && pets.petGender)) missingFields.push("PET_GENDER");
-    if (!(pets !== null && pets !== void 0 && pets.color)) missingFields.push("COLOR");
-    if (!(pets !== null && pets !== void 0 && pets.lastVaccineDate)) missingFields.push("LAST_VACCINE_DATE");
-    if (!(pets !== null && pets !== void 0 && pets.vaccinationNumber)) missingFields.push("VACCINATION_NUMBER");
-    return {
-      missingFields,
-      notFormattedFields
-    };
-  }
   function onGoBack(data) {
     onBackClick(config.key, data);
   }
-  const onFormValueChange = function (setValue, data) {
-    console.log("onFormValueChange data in AdministrativeDetails: ", data, "\n Bool: ", !lodash.isEqual(data, currentStepData));
-    if (!lodash.isEqual(data, currentStepData)) {
-      dispatch(UPDATE_PTRNewApplication_FORM(config.key, data));
-    }
-  };
   const closeToast = () => {
     setShowToast(false);
     setError("");
   };
-  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.FormComposer, {
-    defaultValues: currentStepData,
-    config: config.currStepConfig,
-    onSubmit: goNext,
-    onFormValueChange: onFormValueChange,
-    label: t(`${config.texts.submitBarLabel}`),
-    currentStep: config.currStepNumber,
-    onBackClick: onGoBack
+  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(PTRCitizenPet, {
+    onGoBack: onGoBack,
+    goNext: goNext,
+    currentStepData: currentStepData,
+    t: t
   }), showToast && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Toast, {
     isDleteBtn: true,
     error: true,