@djb25/digit-ui-module-ws 1.0.22 → 1.0.24

package/dist/index.modern.js

@@ -442,7 +442,6 @@ const getFiles = async (filesArray, tenant) => {
 };
 const createPayloadOfWS = async data => {
   var _data$cpt, _data$cpt$details, _data$cpt$details$own, _data$applicationSele, _data$applicationSele2, _data$ConnectionHolde, _data$useDetails, _data$useDetails2, _data$useDetails3, _data$useDetails3$pro, _connectionDetailsObj, _connectionDetailsObj2, _data$useDetails4, _data$useDetails4$pro, _connectionDetailsObj3, _connectionDetailsObj4, _data$useDetails5, _data$useDetails6, _data$useDetails7, _data$useDetails8, _connectionHolder$gen, _data$cpt2, _data$cpt2$details, _data$cpt2$details$ow, _data$cpt2$details$ow2, _connectionHolder$own, _connectionHolder$rel, _data$propertyAddress, _data$applicant, _data$useDetails9, _data$useDetails9$gen, _data$contact, _data$applicant2, _data$applicant3, _data$applicant4, _data$applicationSele3, _data$applicationSele4, _data$contact2, _data$cpt3, _data$cpt4, _data$cpt4$details, _data$roadCuttingDeta, _data$plumberDetails, _data$zro, _data$propertyAddress2, _data$propertyAddress3, _data$cpt5, _data$cpt5$details, _data$cpt5$details$ad, _data$cpt5$details$ad2, _data$plumberDetails2, _data$plumberDetails3, _data$plumberDetails4, _data$plumberDetails5, _data$plumberDetails6, _data$applicationSele5, _data$applicationSele6, _data$applicationSele7, _data$applicationSele8, _connectionDetailsObj5, _data$applicationSele9, _data$applicationSele0, _connectionHolder$own2, _data$applicationSele1, _data$applicationSele10, _data$applicationSele11, _data$applicationSele12, _data$applicationSele13, _data$applicationSele14, _data$applicationSele15, _data$applicationSele16, _data$applicationSele17, _data$applicationSele18, _data$applicationSele19, _data$applicationSele20, _data$applicationSele21, _data$applicationSele22, _data$applicationSele23, _data$contact3, _data$documents, _data$documents2, _data$documents3, _data$cpt6, _Digit, _Digit$Customizations, _Digit$Customizations2, _Digit2, _Digit2$Customization, _Digit2$Customization2;
-  console.log(data, "yuyu");
   data === null || data === void 0 ? void 0 : (_data$cpt = data.cpt) === null || _data$cpt === void 0 ? void 0 : (_data$cpt$details = _data$cpt.details) === null || _data$cpt$details === void 0 ? void 0 : (_data$cpt$details$own = _data$cpt$details.owners) === null || _data$cpt$details$own === void 0 ? void 0 : _data$cpt$details$own.forEach(owner => {
     if (owner !== null && owner !== void 0 && owner.permanentAddress) owner.correspondenceAddress = owner === null || owner === void 0 ? void 0 : owner.permanentAddress;
   });
@@ -11750,6 +11749,7 @@ const WSPropertyDetails = ({
   clearErrors
 }) => {
   var _Digit$SessionStorage, _formData$cptId, _formData$cptId2, _propertyDetails$Prop2, _propertyDetails$Prop3, _propertyDetails$Prop4;
+  const redirectBackUrl = `/digit-ui/${userType}/ws/new-application`;
   const [propertyId, setPropertyId] = React.useState("");
   const tenantId = (_Digit$SessionStorage = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.code;
   const {
@@ -11811,7 +11811,7 @@ const WSPropertyDetails = ({
     type: "button",
     onClick: () => setPropertyId(propertyId)
   }, `${t("PT_SEARCH")}`))), /*#__PURE__*/React.createElement(Link, {
-    to: `/digit-ui/employee/pt/search`
+    to: `/digit-ui/${userType}/commonpt/search?redirectToUrl=${redirectBackUrl}`
   }, /*#__PURE__*/React.createElement(LinkButton, {
     label: t("CPT_SEARCH_PROPERTY"),
     style: {
@@ -11819,7 +11819,7 @@ const WSPropertyDetails = ({
       display: "inline-block"
     }
   })), "\xA0 | \xA0", /*#__PURE__*/React.createElement(Link, {
-    to: `/digit-ui/employee/pt/new-application`
+    to: `/digit-ui/${userType}/commonpt/new-application?redirectToUrl=${redirectBackUrl}`
   }, /*#__PURE__*/React.createElement(LinkButton, {
     label: t("CPT_CREATE_PROPERTY"),
     style: {
@@ -11845,7 +11845,7 @@ const WSPropertyDetails = ({
   }, `${t(`PROPERTY_ADDRESS`)}`), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement("p", null, getPropertyAddress()))), /*#__PURE__*/React.createElement(Link, {
-    to: `/digit-ui/employee/commonpt/view-property?propertyId=${propertyId}&tenantId=${tenantId}`
+    to: `/digit-ui/${userType}/commonpt/view-property?propertyId=${propertyId}&tenantId=${tenantId}`
   }, /*#__PURE__*/React.createElement(LinkButton, {
     label: t("CPT_COMPLETE_PROPERTY_DETAILS"),
     style: {
@@ -12133,15 +12133,15 @@ const ConnectionDetails$1 = _props => {
     const errors = sessionStorage.getItem("FORMSTATE_ERRORS");
     let formStateErros = typeof errors === "string" ? JSON.parse(errors) : {};
     if (emailPattern.test(value)) {
-      var _formStateErros$Conne, _formStateErros$Conne2, _formStateErros$Conne3;
+      var _formStateErros$Conne, _formStateErros$Conne2, _formStateErros$Conne3, _formStateErros$Conne4;
       clearErrors("emailId");
       if (formStateErros["ConnectionHolderDetails"] && (_formStateErros$Conne = formStateErros["ConnectionHolderDetails"]) !== null && _formStateErros$Conne !== void 0 && _formStateErros$Conne.type && (_formStateErros$Conne2 = formStateErros["ConnectionHolderDetails"]) !== null && _formStateErros$Conne2 !== void 0 && (_formStateErros$Conne3 = _formStateErros$Conne2.type) !== null && _formStateErros$Conne3 !== void 0 && _formStateErros$Conne3.emailId) {
         delete formStateErros["ConnectionHolderDetails"].type.emailId;
       }
-      if (Object.keys(formStateErros["ConnectionHolderDetails"].type).length === 0) {
+      if ((_formStateErros$Conne4 = formStateErros["ConnectionHolderDetails"]) !== null && _formStateErros$Conne4 !== void 0 && _formStateErros$Conne4.type && Object.keys(formStateErros["ConnectionHolderDetails"].type).length === 0) {
         delete formStateErros["ConnectionHolderDetails"].type;
       }
-      if (Object.keys(formStateErros["ConnectionHolderDetails"]).length === 0) {
+      if (formStateErros["ConnectionHolderDetails"] && Object.keys(formStateErros["ConnectionHolderDetails"]).length === 0) {
         delete formStateErros["ConnectionHolderDetails"];
       }
       sessionStorage.setItem("FORMSTATE_ERRORS", JSON.stringify(formStateErros));
@@ -12336,6 +12336,7 @@ const ConnectionDetails$1 = _props => {
         autoFocus: focusIndex.index === (connectionHolderDetail === null || connectionHolderDetail === void 0 ? void 0 : connectionHolderDetail.key) && focusIndex.type === "mobileNumber",
         errorStyle: localFormState.touched.mobileNumber && (errors === null || errors === void 0 ? void 0 : (_errors$mobileNumber = errors.mobileNumber) === null || _errors$mobileNumber === void 0 ? void 0 : _errors$mobileNumber.message),
         onChange: val => {
+          setMobileNumber(val);
           props.onChange(val);
           setFocusIndex({
             index: connectionHolderDetail === null || connectionHolderDetail === void 0 ? void 0 : connectionHolderDetail.key,
@@ -31111,9 +31112,158 @@ const createOption = (code, name) => ({
   code,
   name
 });
-const WATER_CONNECTION_USED_BY_OPTIONS = [createOption("5 Star Hotel", "5 Star Hotel"), createOption("4/5 Star Hotel", "4/5 Star Hotel"), createOption("Ex-Army Service", "Ex-Army Service"), createOption("General", "General"), createOption("Bank", "Bank"), createOption("Airport", "Airport"), createOption("Govt. College", "Govt. College")];
+const PROPERTY_CATEGORY_OPTIONS = [createOption("COMMERCIAL", "Commercial"), createOption("INDUSTRIAL", "Industrial"), createOption("INSTITUTIONAL", "Institutional"), createOption("MIXED", "Mixed")];
+const PROPERTY_TYPE_OPTIONS = [createOption("APARTMENT", "Apartment"), createOption("BANQUET_HALL", "Banquet Hall"), createOption("BUNGALOWS", "Bungalows"), createOption("DDA_FLATS", "DDA flats"), createOption("DHARAMSHALAS_HOSTELS", "Dharamshalas or Hostels"), createOption("GOVT_FLATS", "Govt. Flats"), createOption("GROUP_HOUSING_SOCIETY", "Group Housing Society"), createOption("HOTEL_GUEST_HOUSES", "Hotel or Guest Houses"), createOption("INDIVIDUAL_HOUSE", "Individual House"), createOption("MALL_CINEPLEX", "Mall or Cineplex"), createOption("OFFICE_COMPLEX", "Office complex"), createOption("SCHOOL", "School"), createOption("HOSPITAL_NURSING_HOME", "Hospital/Nursing Home")];
+const USAGE_TYPE_OPTIONS = [createOption("BSES_RAJDHANI", "B.S.E.S. RAJDHANI"), createOption("BSES_YAMUNA", "B.S.E.S. YAMUNA"), createOption("BANQUET_HALL_PARTY_HALL", "Banquet hall/ Party hall"), createOption("BEAUTY_PARLORS", "Beauty Parlors"), createOption("BLIND_SCHOOLS", "Blind Schools"), createOption("BOTTLING_PLANT", "Bottling Plant"), createOption("CPWD", "C.P.W.D."), createOption("CENTRAL_GOVT_OFFICES", "Central Govt. Offices"), createOption("CINEPLEX", "Cineplex"), createOption("CLINIC_PATHLAB", "Clinic/Pathlab"), createOption("COOP_GROUP_HOUSING", "Co-operative Group Housing Society"), createOption("COLD_STORAGE", "Cold Storage"), createOption("COLOUR_DYE_SHOP", "Colour Dye shop/factory"), createOption("COOLING_PLANT", "Cooling Plant"), createOption("COURTS", "Courts"), createOption("DSIIDC", "D.S.I.I.D.C"), createOption("DDA", "Delhi Development Authority"), createOption("DELHI_FIRE_SERVICE", "Delhi Fire Service (Fire Station)"), createOption("DELHI_GOVT_OFFICE", "Delhi Govt. Office")];
+const NO_OF_FLOORS_OPTIONS = [createOption("BASEMENT", "Basement"), createOption("GROUND_FLOOR", "Ground Floor"), createOption("1_FLOOR", "1 Floor"), createOption("2_FLOOR", "2 Floor"), createOption("3_FLOOR", "3 Floor"), createOption("4_FLOOR", "4 Floor"), createOption("5_FLOOR", "5 Floor"), createOption("6_FLOOR", "6 Floor")];
 const PROOF_OF_IDENTITY_OPTIONS = [createOption("AADHAAR", "Aadhaar"), createOption("PAN", "PAN"), createOption("VOTER_ID", "Voter ID"), createOption("PASSPORT", "Passport"), createOption("DRIVING_LICENSE", "Driving License")];
-const OWNERSHIP_STATUS_OPTIONS = [createOption("SELF_OWNED", "Self Owned"), createOption("LEASED", "Leased"), createOption("RENTED", "Rented"), createOption("GOVERNMENT_ALLOTTED", "Government Allotted")];
+const OWNERSHIP_DOCUMENTS_OPTIONS = [createOption("ELECTRICITY_BILL", "Electricity bills"), createOption("PROPERTY_TAX_RECEIPT", "Property Tax Receipt"), createOption("SALE_DEED", "Sale Deed")];
+const OTHER_DOCUMENTS_OPTIONS = [createOption("NOC_FROM_OWNER", "NOC From Owner"), createOption("OTHERS", "Others")];
+const CameraIcon = () => /*#__PURE__*/React.createElement("svg", {
+  width: "20",
+  height: "20",
+  viewBox: "0 0 24 24",
+  fill: "none",
+  stroke: "currentColor",
+  strokeWidth: "2",
+  strokeLinecap: "round",
+  strokeLinejoin: "round"
+}, /*#__PURE__*/React.createElement("path", {
+  d: "M23 19a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h4l2-3h6l2 3h4a2 2 0 0 1 2 2z"
+}), /*#__PURE__*/React.createElement("circle", {
+  cx: "12",
+  cy: "13",
+  r: "4"
+}));
+const ViewIcon = () => /*#__PURE__*/React.createElement("svg", {
+  width: "20",
+  height: "20",
+  viewBox: "0 0 24 24",
+  fill: "none",
+  stroke: "currentColor",
+  strokeWidth: "2",
+  strokeLinecap: "round",
+  strokeLinejoin: "round"
+}, /*#__PURE__*/React.createElement("path", {
+  d: "M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"
+}), /*#__PURE__*/React.createElement("circle", {
+  cx: "12",
+  cy: "12",
+  r: "3"
+}));
+const CameraCaptureModal = ({
+  onCapture,
+  onClose,
+  t
+}) => {
+  const videoRef = useRef(null);
+  const canvasRef = useRef(null);
+  const [stream, setStream] = useState(null);
+  const [error, setError] = useState(null);
+  useEffect(() => {
+    const startCamera = async () => {
+      try {
+        const mediaStream = await navigator.mediaDevices.getUserMedia({
+          video: true
+        });
+        if (videoRef.current) {
+          videoRef.current.srcObject = mediaStream;
+        }
+        setStream(mediaStream);
+      } catch (err) {
+        setError(t("WS_CAMERA_ACCESS_ERROR") || "Camera Access Error");
+        console.error("Error accessing camera: ", err);
+      }
+    };
+    startCamera();
+    return () => {
+      if (stream) {
+        stream.getTracks().forEach(track => track.stop());
+      }
+    };
+  }, []);
+  const capturePhoto = () => {
+    if (videoRef.current && canvasRef.current) {
+      const context = canvasRef.current.getContext("2d");
+      canvasRef.current.width = videoRef.current.videoWidth;
+      canvasRef.current.height = videoRef.current.videoHeight;
+      context.translate(canvasRef.current.width, 0);
+      context.scale(-1, 1);
+      context.drawImage(videoRef.current, 0, 0, canvasRef.current.width, canvasRef.current.height);
+      canvasRef.current.toBlob(blob => {
+        const file = new File([blob], `applicant_photo_${Date.now()}.jpg`, {
+          type: "image/jpeg"
+        });
+        onCapture(file);
+      }, "image/jpeg");
+    }
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      position: "fixed",
+      top: 0,
+      left: 0,
+      width: "100%",
+      height: "100%",
+      backgroundColor: "rgba(0,0,0,0.8)",
+      zIndex: 9999,
+      display: "flex",
+      flexDirection: "column",
+      alignItems: "center",
+      justifyContent: "center"
+    }
+  }, error ? /*#__PURE__*/React.createElement("div", {
+    style: {
+      color: "white",
+      marginBottom: "20px"
+    }
+  }, error) : /*#__PURE__*/React.createElement("video", {
+    ref: videoRef,
+    autoPlay: true,
+    playsInline: true,
+    style: {
+      maxWidth: "100%",
+      maxHeight: "80%",
+      backgroundColor: "black",
+      transform: "scaleX(-1)"
+    }
+  }), /*#__PURE__*/React.createElement("canvas", {
+    ref: canvasRef,
+    style: {
+      display: "none"
+    }
+  }), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: "20px",
+      display: "flex",
+      gap: "20px"
+    }
+  }, !error && /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    onClick: capturePhoto,
+    style: {
+      padding: "10px 20px",
+      background: "#f47738",
+      color: "white",
+      border: "none",
+      borderRadius: "4px",
+      cursor: "pointer",
+      fontWeight: "bold"
+    }
+  }, t("WS_CAPTURE_PHOTO") || "Capture"), /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    onClick: onClose,
+    style: {
+      padding: "10px 20px",
+      background: "white",
+      color: "#f47738",
+      border: "1px solid #f47738",
+      borderRadius: "4px",
+      cursor: "pointer",
+      fontWeight: "bold"
+    }
+  }, t("CS_COMMON_CANCEL") || "Cancel")));
+};
 const DEFAULT_SECTION_STATE = {
   application: true,
   applicant: true,
@@ -31157,7 +31307,13 @@ const DEFAULT_FORM_VALUES = {
       code: "INDIVIDUAL",
       name: "Individual"
     },
-    commercialType: null
+    commercialType: null,
+    departmentType: null,
+    govtOrganization: {
+      organizationName: "",
+      natureOfWork: "",
+      organizationDocument: null
+    }
   },
   djbEmployee: {
     isDjbEmployee: false,
@@ -31187,8 +31343,9 @@ const DEFAULT_FORM_VALUES = {
     ward: null
   },
   useDetails: {
+    propertyCategory: null,
     propertyType: null,
-    noOfFloors: "",
+    noOfFloors: null,
     hospitalBeds: "",
     plotArea: "",
     builtUpArea: "",
@@ -31208,10 +31365,15 @@ const DEFAULT_FORM_VALUES = {
     applyForAdequacyCertificate: false
   },
   documents: {
+    applicantPhoto: null,
     proofOfIdentity: null,
+    identityProofNumber: "",
     identityProofFile: null,
     ownershipStatus: null,
+    ownershipDocumentNumber: "",
     ownershipDocumentFile: null,
+    otherDocument: null,
+    otherDocumentNumber: "",
     otherDocumentFile: null
   },
   declaration: {
@@ -31285,115 +31447,6 @@ const ProfileImagePreview = ({
     }
   });
 };
-const ProfileImageUpload = ({
-  value,
-  onUpload,
-  isUploading,
-  error,
-  t,
-  label,
-  required
-}) => {
-  const fileInputRef = React.useRef(null);
-  const fileStoreId = value === null || value === void 0 ? void 0 : value.fileStoreId;
-  const [imageUrl, setImageUrl] = useState(null);
-  useEffect(() => {
-    const fetchImageUrl = async () => {
-      if (fileStoreId) {
-        try {
-          var _response$data2, _response$data2$fileS, _response$data2$fileS2;
-          const tenantId = Digit.ULBService.getStateId();
-          const response = await Digit.UploadServices.Filefetch([fileStoreId], tenantId);
-          const url = response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$fileS = _response$data2.fileStoreIds) === null || _response$data2$fileS === void 0 ? void 0 : (_response$data2$fileS2 = _response$data2$fileS[0]) === null || _response$data2$fileS2 === void 0 ? void 0 : _response$data2$fileS2.url;
-          if (url) {
-            let differentFormats = (url === null || url === void 0 ? void 0 : url.split(",")) || [];
-            let fileURL = "";
-            differentFormats.map(link => {
-              if (!link.includes("large") && !link.includes("medium") && !link.includes("small")) {
-                fileURL = link;
-              }
-            });
-            setImageUrl(fileURL || differentFormats[0]);
-          }
-        } catch (err) {
-          console.error("Error fetching image URL:", err);
-          setImageUrl(null);
-        }
-      } else {
-        setImageUrl(null);
-      }
-    };
-    fetchImageUrl();
-  }, [fileStoreId]);
-  const handleEditClick = () => {
-    fileInputRef.current.click();
-  };
-  return /*#__PURE__*/React.createElement("div", {
-    className: "avatar-upload-container"
-  }, label && /*#__PURE__*/React.createElement(CardLabel, {
-    style: {
-      textAlign: "center",
-      marginBottom: "16px",
-      fontWeight: "700"
-    }
-  }, `${t(label)}${required ? "*" : ""}`), /*#__PURE__*/React.createElement("div", {
-    className: "avatar-wrapper"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "avatar-circle",
-    onClick: handleEditClick
-  }, imageUrl ? /*#__PURE__*/React.createElement("img", {
-    src: imageUrl,
-    alt: "Profile"
-  }) : /*#__PURE__*/React.createElement("div", {
-    className: "avatar-placeholder"
-  }, /*#__PURE__*/React.createElement("svg", {
-    width: "40",
-    height: "40",
-    viewBox: "0 0 24 24",
-    fill: "none",
-    stroke: "#9CA3AF",
-    strokeWidth: "1.5"
-  }, /*#__PURE__*/React.createElement("path", {
-    d: "M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"
-  }), /*#__PURE__*/React.createElement("circle", {
-    cx: "12",
-    cy: "7",
-    r: "4"
-  })))), /*#__PURE__*/React.createElement("div", {
-    className: "avatar-edit-icon",
-    onClick: handleEditClick
-  }, /*#__PURE__*/React.createElement("svg", {
-    width: "18",
-    height: "18",
-    viewBox: "0 0 24 24",
-    fill: "none",
-    stroke: "#0B4B66",
-    strokeWidth: "2.5",
-    strokeLinecap: "round",
-    strokeLinejoin: "round"
-  }, /*#__PURE__*/React.createElement("path", {
-    d: "M17 3a2.828 2.828 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5L17 3z"
-  })))), /*#__PURE__*/React.createElement("input", {
-    type: "file",
-    ref: fileInputRef,
-    style: {
-      display: "none"
-    },
-    accept: "image/*",
-    onChange: onUpload
-  }), isUploading && /*#__PURE__*/React.createElement("div", {
-    style: {
-      fontSize: "14px",
-      marginTop: "8px",
-      color: "#505A5F"
-    }
-  }, "Uploading..."), error && /*#__PURE__*/React.createElement(CardLabelError, {
-    style: {
-      textAlign: "center",
-      marginTop: "8px"
-    }
-  }, error));
-};
 const linkButtonStyle = {
   background: "transparent",
   border: "none",
@@ -31546,9 +31599,9 @@ const SectionCard = ({
 };
 const handleView = async (fileStoreId, tenantId) => {
   try {
-    var _response$data3, _response$data3$fileS, _response$data3$fileS2;
+    var _response$data2, _response$data2$fileS, _response$data2$fileS2;
     const response = await Digit.UploadServices.Filefetch([fileStoreId], tenantId);
-    const url = response === null || response === void 0 ? void 0 : (_response$data3 = response.data) === null || _response$data3 === void 0 ? void 0 : (_response$data3$fileS = _response$data3.fileStoreIds) === null || _response$data3$fileS === void 0 ? void 0 : (_response$data3$fileS2 = _response$data3$fileS[0]) === null || _response$data3$fileS2 === void 0 ? void 0 : _response$data3$fileS2.url;
+    const url = response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$fileS = _response$data2.fileStoreIds) === null || _response$data2$fileS === void 0 ? void 0 : (_response$data2$fileS2 = _response$data2$fileS[0]) === null || _response$data2$fileS2 === void 0 ? void 0 : _response$data2$fileS2.url;
     if (url) {
       const differentFormats = (url === null || url === void 0 ? void 0 : url.split(",")) || [];
       let fileURL = "";
@@ -31646,15 +31699,61 @@ const FileUploadField = ({
     message: value !== null && value !== void 0 && value.fileStoreId ? "1 file uploaded" : "No file uploaded",
     onDelete: onDelete,
     onUpload: onUpload
-  }), /*#__PURE__*/React.createElement(CardText, {
+  }), isUploading && /*#__PURE__*/React.createElement(CardText, {
     style: {
-      marginBottom: "0px",
-      marginTop: "0px"
+      marginTop: "8px"
     }
-  }, isUploading ? "Uploading file..." : (value === null || value === void 0 ? void 0 : value.fileName) || "No file selected"));
+  }, "Uploading file..."), (value === null || value === void 0 ? void 0 : value.fileStoreId) && !isUploading && /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: "8px",
+      display: "flex",
+      alignItems: "center",
+      gap: "8px",
+      background: "#F3F4F6",
+      padding: "4px 12px",
+      borderRadius: "20px",
+      width: "fit-content",
+      border: "1px solid #E5E7EB"
+    }
+  }, /*#__PURE__*/React.createElement(CardText, {
+    style: {
+      margin: 0,
+      fontSize: "14px",
+      color: "#374151",
+      fontWeight: "500"
+    }
+  }, value.fileName), /*#__PURE__*/React.createElement("div", {
+    onClick: onDelete,
+    style: {
+      cursor: "pointer",
+      display: "flex",
+      alignItems: "center",
+      color: "#6B7280"
+    },
+    title: "Remove File"
+  }, /*#__PURE__*/React.createElement("svg", {
+    width: "16",
+    height: "16",
+    viewBox: "0 0 24 24",
+    fill: "none",
+    stroke: "currentColor",
+    strokeWidth: "3",
+    strokeLinecap: "round",
+    strokeLinejoin: "round"
+  }, /*#__PURE__*/React.createElement("line", {
+    x1: "18",
+    y1: "6",
+    x2: "6",
+    y2: "18"
+  }), /*#__PURE__*/React.createElement("line", {
+    x1: "6",
+    y1: "6",
+    x2: "18",
+    y2: "18"
+  })))));
 };
 const NewApplication = () => {
-  var _Digit$SessionStorage, _getFieldError, _getFieldError2, _getFieldError3, _getFieldError4, _getFieldError5, _getFieldError6, _getFieldError7, _getFieldError8, _getFieldError9, _getFieldError0, _getFieldError1, _getFieldError10, _formValues$applicati, _formValues$applicati2, _formValues$applicati3, _formValues$applicati4, _formValues$applicati5, _formValues$applicati6, _formValues$applicati7, _formValues$applicati8, _formValues$applicati9, _formValues$applicati0, _formValues$applicati1, _formValues$applicati10, _formValues$applicati11, _formValues$applicati12, _formValues$applicati13, _formValues$applicati14, _formValues$applicati15, _formValues$applicati16, _formValues$applicati17, _formValues$applicati18, _formValues$applicati19, _formValues$applicati20, _formValues$applicant, _formValues$applicant2, _formValues$applicant3, _formValues$applicant4, _formValues$applicant5, _formValues$applicant6, _formValues$applicant7, _formValues$useDetail, _formValues$applicant8, _formValues$contact, _formValues$contact2, _formValues$contact3, _formValues$documents, _formValues$djbEmploy, _formValues$djbEmploy2, _formValues$djbEmploy3, _formValues$djbEmploy4, _formValues$djbEmploy5, _formValues$governmen, _formValues$governmen2, _formValues$governmen3, _formValues$governmen4, _formValues$propertyA, _formValues$propertyA2, _formValues$propertyA3, _formValues$propertyA4, _formValues$propertyA5, _formValues$propertyA6, _formValues$propertyA7, _formValues$propertyA8, _formValues$propertyA9, _formValues$propertyA0, _formValues$propertyA1, _formValues$useDetail2, _formValues$useDetail3, _formValues$useDetail4, _formValues$useDetail5, _formValues$useDetail6, _formValues$useDetail7, _formValues$useDetail8, _formValues$useDetail9, _formValues$useDetail0, _formValues$useDetail1, _formValues$useDetail10, _formValues$useDetail11, _formValues$bankDetai, _formValues$bankDetai2, _formValues$bankDetai3, _formValues$bankDetai4, _formValues$documents2, _formValues$documents3, _formValues$documents4, _formValues$documents5, _formValues$documents6, _formValues$declarati, _formValues$declarati2, _formValues$declarati3;
+  var _Digit$SessionStorage, _getFieldError, _getFieldError2, _getFieldError3, _getFieldError4, _getFieldError5, _getFieldError6, _getFieldError7, _getFieldError8, _getFieldError9, _getFieldError0, _getFieldError1, _getFieldError10, _getFieldError11, _watch, _watch3, _watch5, _watch7, _watch9, _formValues$applicati, _formValues$applicati2, _formValues$applicati3, _formValues$applicati4, _formValues$applicati5, _formValues$applicati6, _formValues$applicati7, _formValues$applicati8, _formValues$applicati9, _formValues$applicati0, _formValues$applicati1, _formValues$applicati10, _formValues$applicati11, _formValues$applicati12, _formValues$applicati13, _formValues$applicati14, _formValues$applicati15, _formValues$applicati16, _formValues$applicati17, _formValues$applicati18, _formValues$applicati19, _formValues$applicati20, _formValues$applicati21, _formValues$applicati22, _formValues$applicati23, _formValues$applicant, _formValues$applicant2, _formValues$applicant3, _formValues$applicant4, _formValues$applicant5, _formValues$applicant6, _formValues$applicant7, _formValues$useDetail, _formValues$applicant8, _formValues$contact, _formValues$contact2, _formValues$contact3, _formValues$documents, _formValues$djbEmploy, _formValues$djbEmploy2, _formValues$djbEmploy3, _formValues$djbEmploy4, _formValues$djbEmploy5, _formValues$governmen, _formValues$governmen2, _formValues$governmen3, _formValues$governmen4, _formValues$propertyA, _formValues$propertyA2, _formValues$propertyA3, _formValues$propertyA4, _formValues$propertyA5, _formValues$propertyA6, _formValues$propertyA7, _formValues$propertyA8, _formValues$propertyA9, _formValues$propertyA0, _formValues$propertyA1, _formValues$useDetail2, _formValues$useDetail3, _formValues$useDetail4, _formValues$useDetail5, _formValues$useDetail6, _formValues$useDetail7, _formValues$useDetail8, _formValues$useDetail9, _formValues$useDetail0, _formValues$useDetail1, _formValues$useDetail10, _formValues$useDetail11, _formValues$bankDetai, _formValues$bankDetai2, _formValues$bankDetai3, _formValues$bankDetai4, _formValues$documents2, _formValues$documents3, _formValues$documents4, _formValues$documents5, _formValues$documents6, _formValues$documents7, _formValues$documents8, _formValues$documents9, _formValues$documents0, _formValues$documents1, _formValues$declarati, _formValues$declarati2, _formValues$declarati3;
   const {
     t
   } = useTranslation();
@@ -31671,6 +31770,7 @@ const NewApplication = () => {
   const [collapsedSections, setCollapsedSections] = useState(DEFAULT_SECTION_STATE);
   const [showToast, setShowToast] = useState(null);
   const [uploadingFields, setUploadingFields] = useState({});
+  const [showCamera, setShowCamera] = useState(false);
   const [isOtpSent, setIsOtpSent] = useState(false);
   const [otpError, setOtpError] = useState(null);
   const [isEnableLoader, setIsEnableLoader] = useState(false);
@@ -31982,6 +32082,18 @@ const NewApplication = () => {
       clearErrors("applicationSelection.domesticType");
     }
   }, [subCategoryIsDomestic, setValue, clearErrors]);
+  useEffect(() => {
+    if ((activeType === null || activeType === void 0 ? void 0 : activeType.code) !== "ORGANIZATION") {
+      setValue("applicationSelection.departmentType", null);
+      setValue("applicationSelection.govtOrganization.organizationName", "");
+      setValue("applicationSelection.govtOrganization.natureOfWork", "");
+      setValue("applicationSelection.govtOrganization.organizationDocument", null);
+      clearErrors("applicationSelection.departmentType");
+      clearErrors("applicationSelection.govtOrganization.organizationName");
+      clearErrors("applicationSelection.govtOrganization.natureOfWork");
+      clearErrors("applicationSelection.govtOrganization.organizationDocument");
+    }
+  }, [activeType === null || activeType === void 0 ? void 0 : activeType.code, setValue, clearErrors]);
   useEffect(() => {
     if (!connectionTypeIsTemporary) {
       setValue("applicationSelection.temporaryConnection", null);
@@ -32011,7 +32123,7 @@ const NewApplication = () => {
     }));
     clearErrors(fieldName);
     try {
-      var _response$data4, _response$data4$files, _response$data4$files2;
+      var _response$data3, _response$data3$files, _response$data3$files2;
       if (file.size > MAX_FILE_SIZE) {
         throw new Error("File size should be 5 MB or less.");
       }
@@ -32019,7 +32131,7 @@ const NewApplication = () => {
         throw new Error("Only PDF, PNG, JPG and JPEG files are supported.");
       }
       const response = await Digit.UploadServices.Filestorage("WS", file, stateId);
-      const fileStoreId = response === null || response === void 0 ? void 0 : (_response$data4 = response.data) === null || _response$data4 === void 0 ? void 0 : (_response$data4$files = _response$data4.files) === null || _response$data4$files === void 0 ? void 0 : (_response$data4$files2 = _response$data4$files[0]) === null || _response$data4$files2 === void 0 ? void 0 : _response$data4$files2.fileStoreId;
+      const fileStoreId = response === null || response === void 0 ? void 0 : (_response$data3 = response.data) === null || _response$data3 === void 0 ? void 0 : (_response$data3$files = _response$data3.files) === null || _response$data3$files === void 0 ? void 0 : (_response$data3$files2 = _response$data3$files[0]) === null || _response$data3$files2 === void 0 ? void 0 : _response$data3$files2.fileStoreId;
       if (!fileStoreId) {
         throw new Error("File upload failed. Please try again.");
       }
@@ -32047,6 +32159,37 @@ const NewApplication = () => {
       }));
     }
   };
+  const handleCapture = async file => {
+    setShowCamera(false);
+    setUploadingFields(prev => ({
+      ...prev,
+      "documents.applicantPhoto": true
+    }));
+    try {
+      var _response$data4, _response$data4$files, _response$data4$files2;
+      const response = await Digit.UploadServices.Filestorage("WS", file, stateId);
+      const fileStoreId = response === null || response === void 0 ? void 0 : (_response$data4 = response.data) === null || _response$data4 === void 0 ? void 0 : (_response$data4$files = _response$data4.files) === null || _response$data4$files === void 0 ? void 0 : (_response$data4$files2 = _response$data4$files[0]) === null || _response$data4$files2 === void 0 ? void 0 : _response$data4$files2.fileStoreId;
+      if (fileStoreId) {
+        setValue("documents.applicantPhoto", {
+          fileName: file.name,
+          fileSize: file.size,
+          fileStoreId,
+          fileType: file.type
+        });
+        clearErrors("documents.applicantPhoto");
+      }
+    } catch (error) {
+      setShowToast({
+        key: "error",
+        message: "Failed to upload photo"
+      });
+    } finally {
+      setUploadingFields(prev => ({
+        ...prev,
+        "documents.applicantPhoto": false
+      }));
+    }
+  };
   const clearUploadedFile = (fieldName, onChange) => {
     onChange(null);
     clearErrors(fieldName);
@@ -32387,26 +32530,31 @@ const NewApplication = () => {
             align-items: center;
           }
 
-          .avatar-edit-icon {
-            position: absolute;
-            bottom: 4px;
-            right: 4px;
-            background: white;
-            width: 36px;
-            height: 36px;
-            border-radius: 50%;
+          .avatar-edit-icon:hover {
+            transform: scale(1.1);
+            background-color: #F9FAFB;
+          }
+
+          .document-action-btn {
+            background: #E5E7EB;
+            border: 1px solid #9CA3AF;
+            border-radius: 4px;
+            padding: 8px 16px;
             display: flex;
-            justify-content: center;
             align-items: center;
-            box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);
-            border: 1px solid #E5E7EB;
+            justify-content: center;
+            gap: 8px;
+            width: 100%;
             cursor: pointer;
-            transition: all 0.2s ease;
+            font-weight: 500;
+            min-height: 40px;
           }
-
-          .avatar-edit-icon:hover {
-            transform: scale(1.1);
-            background-color: #F9FAFB;
+          .document-action-btn:hover {
+            background: #D1D5DB;
+          }
+          .document-action-btn:disabled {
+            opacity: 0.5;
+            cursor: not-allowed;
           }
         `), /*#__PURE__*/React.createElement("div", {
     className: "employee-form-section-wrapper"
@@ -32432,28 +32580,6 @@ const NewApplication = () => {
     sectionRef: sectionRefs.application
   }, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
-  }, t("WS_ZRO_LOCATION")), /*#__PURE__*/React.createElement("div", {
-    className: "field"
-  }, /*#__PURE__*/React.createElement(Controller, {
-    control: control,
-    name: "zro",
-    rules: {
-      required: t("REQUIRED_FIELD")
-    },
-    isMandatory: true,
-    render: props => /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Dropdown, {
-      className: "form-field",
-      selected: props.value,
-      disable: false,
-      option: mappedZROLocation,
-      errorStyle: !!getFieldError("zro"),
-      select: props.onChange,
-      optionKey: "i18nKey",
-      onBlur: props.onBlur,
-      t: t
-    }))
-  }))), getFieldError("zro") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError = getFieldError("zro")) === null || _getFieldError === void 0 ? void 0 : _getFieldError.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller"
   }, t("WS_SERVICE_TYPE")), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
@@ -32474,7 +32600,7 @@ const NewApplication = () => {
       onBlur: props.onBlur,
       t: t
     })
-  }))), getFieldError("applicationSelection.serviceType") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError2 = getFieldError("applicationSelection.serviceType")) === null || _getFieldError2 === void 0 ? void 0 : _getFieldError2.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }))), getFieldError("applicationSelection.serviceType") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError = getFieldError("applicationSelection.serviceType")) === null || _getFieldError === void 0 ? void 0 : _getFieldError.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
   }, t("WS_APPLICANT_TYPE")), /*#__PURE__*/React.createElement("div", {
     className: "field"
@@ -32496,7 +32622,7 @@ const NewApplication = () => {
       onBlur: props.onBlur,
       t: t
     })
-  }))), getFieldError("applicationSelection.applicantType") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError3 = getFieldError("applicationSelection.applicantType")) === null || _getFieldError3 === void 0 ? void 0 : _getFieldError3.message), isTenantOrRelative && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }))), getFieldError("applicationSelection.applicantType") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError2 = getFieldError("applicationSelection.applicantType")) === null || _getFieldError2 === void 0 ? void 0 : _getFieldError2.message), isTenantOrRelative && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
   }, t("WS_OWNER_AUTHORIZATION")), /*#__PURE__*/React.createElement("div", {
     className: "field"
@@ -32560,7 +32686,7 @@ const NewApplication = () => {
       fontSize: "14px",
       fontWeight: "600"
     }
-  }, t("WS_VERIFIED"), " \u2713"))), getFieldError("applicationSelection.ownerContactNumber") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError4 = getFieldError("applicationSelection.ownerContactNumber")) === null || _getFieldError4 === void 0 ? void 0 : _getFieldError4.message), isOtpSent && !isOwnerVerified && /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }, t("WS_VERIFIED"), " \u2713"))), getFieldError("applicationSelection.ownerContactNumber") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError3 = getFieldError("applicationSelection.ownerContactNumber")) === null || _getFieldError3 === void 0 ? void 0 : _getFieldError3.message), isOtpSent && !isOwnerVerified && /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
   }, t("WS_OTP_VERIFICATION")), /*#__PURE__*/React.createElement("div", {
     className: "field",
@@ -32594,7 +32720,7 @@ const NewApplication = () => {
         setOtpError("Enter 6 digit OTP");
       }
     }
-  }, t("WS_CONFIRM")))), (getFieldError("applicationSelection.ownerOtp") || otpError) && /*#__PURE__*/React.createElement(CardLabelError, null, ((_getFieldError5 = getFieldError("applicationSelection.ownerOtp")) === null || _getFieldError5 === void 0 ? void 0 : _getFieldError5.message) || otpError)), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }, t("WS_CONFIRM")))), (getFieldError("applicationSelection.ownerOtp") || otpError) && /*#__PURE__*/React.createElement(CardLabelError, null, ((_getFieldError4 = getFieldError("applicationSelection.ownerOtp")) === null || _getFieldError4 === void 0 ? void 0 : _getFieldError4.message) || otpError)), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
   }, t("WS_CONNECTION_TYPE")), /*#__PURE__*/React.createElement("div", {
     className: "field"
@@ -32616,7 +32742,7 @@ const NewApplication = () => {
       onBlur: props.onBlur,
       t: t
     })
-  }))), getFieldError("applicationSelection.connectionType") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError6 = getFieldError("applicationSelection.connectionType")) === null || _getFieldError6 === void 0 ? void 0 : _getFieldError6.message), connectionTypeIsTemporary && /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }))), getFieldError("applicationSelection.connectionType") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError5 = getFieldError("applicationSelection.connectionType")) === null || _getFieldError5 === void 0 ? void 0 : _getFieldError5.message), connectionTypeIsTemporary && /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
   }, t("WS_TEMPORARY_CONNECTION")), /*#__PURE__*/React.createElement("div", {
     className: "field"
@@ -32638,7 +32764,7 @@ const NewApplication = () => {
       onBlur: props.onBlur,
       t: t
     })
-  }))), connectionTypeIsTemporary && getFieldError("applicationSelection.temporaryConnection") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError7 = getFieldError("applicationSelection.temporaryConnection")) === null || _getFieldError7 === void 0 ? void 0 : _getFieldError7.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }))), connectionTypeIsTemporary && getFieldError("applicationSelection.temporaryConnection") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError6 = getFieldError("applicationSelection.temporaryConnection")) === null || _getFieldError6 === void 0 ? void 0 : _getFieldError6.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
   }, t("WS_CATEGORY_TYPE")), /*#__PURE__*/React.createElement("div", {
     className: "field"
@@ -32660,7 +32786,7 @@ const NewApplication = () => {
       onBlur: props.onBlur,
       t: t
     })
-  }))), getFieldError("applicationSelection.subCategory") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError8 = getFieldError("applicationSelection.subCategory")) === null || _getFieldError8 === void 0 ? void 0 : _getFieldError8.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }))), getFieldError("applicationSelection.subCategory") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError7 = getFieldError("applicationSelection.subCategory")) === null || _getFieldError7 === void 0 ? void 0 : _getFieldError7.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
   }, t("WS_WATER_DEMAND_TYPE")), /*#__PURE__*/React.createElement("div", {
     className: "field"
@@ -32682,7 +32808,7 @@ const NewApplication = () => {
       onBlur: props.onBlur,
       t: t
     })
-  }))), getFieldError("applicationSelection.categoryType") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError9 = getFieldError("applicationSelection.categoryType")) === null || _getFieldError9 === void 0 ? void 0 : _getFieldError9.message), subCategoryIsDomestic && /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }))), getFieldError("applicationSelection.categoryType") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError8 = getFieldError("applicationSelection.categoryType")) === null || _getFieldError8 === void 0 ? void 0 : _getFieldError8.message), subCategoryIsDomestic && /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
   }, t("WS_DOMESTIC_TYPE")), /*#__PURE__*/React.createElement("div", {
     className: "field"
@@ -32705,7 +32831,7 @@ const NewApplication = () => {
       }],
       t: t
     })
-  }))), subCategoryIsDomestic && getFieldError("applicationSelection.domesticType") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError0 = getFieldError("applicationSelection.domesticType")) === null || _getFieldError0 === void 0 ? void 0 : _getFieldError0.message), subCategoryIsCommercial && /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }))), subCategoryIsDomestic && getFieldError("applicationSelection.domesticType") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError9 = getFieldError("applicationSelection.domesticType")) === null || _getFieldError9 === void 0 ? void 0 : _getFieldError9.message), subCategoryIsCommercial && /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
   }, t("WS_COMMERCIAL_TYPE")), /*#__PURE__*/React.createElement("div", {
     className: "field"
@@ -32729,62 +32855,82 @@ const NewApplication = () => {
       optionsKey: "name",
       t: t
     })
-  }))))), /*#__PURE__*/React.createElement(SectionCard, {
-    description: t("WS_GOVT_CONNECTION_DESC"),
-    isOpen: collapsedSections.governmentEmployee,
-    onToggle: toggleSection,
-    sectionKey: "governmentEmployee",
-    title: t("WS_GOVERNMENT_CONNECTION"),
-    sectionRef: sectionRefs.governmentEmployee
-  }, /*#__PURE__*/React.createElement(FieldBlock, {
-    label: t("WS_GOVERNMENT_CONNECTION")
+  }))), (activeType === null || activeType === void 0 ? void 0 : activeType.code) === "ORGANIZATION" && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+    className: "card-label-smaller"
+  }, `${t("WS_DEPARTMENT_TYPE")} *`), /*#__PURE__*/React.createElement("div", {
+    className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
-    name: "governmentEmployee.isGovernmentEmployee",
-    render: props => /*#__PURE__*/React.createElement(CheckBox, {
-      checked: !!props.value,
-      label: t("WS_APPLICANT_IS_GOVT_CONNECTION"),
-      onChange: event => props.onChange(event.target.checked)
+    name: "applicationSelection.departmentType",
+    rules: {
+      required: (activeType === null || activeType === void 0 ? void 0 : activeType.code) === "ORGANIZATION" ? t("REQUIRED_FIELD") : false
+    },
+    render: props => /*#__PURE__*/React.createElement(RadioButtons, {
+      onSelect: props.onChange,
+      selectedOption: props.value,
+      options: [{
+        code: "GOVERNMENT",
+        name: "Government"
+      }, {
+        code: "NON_GOVERNMENT",
+        name: "Non-Government"
+      }],
+      optionsKey: "name",
+      t: t
     })
-  })), isGovernmentEmployee && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }))), getFieldError("applicationSelection.departmentType") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError0 = getFieldError("applicationSelection.departmentType")) === null || _getFieldError0 === void 0 ? void 0 : _getFieldError0.message), /*#__PURE__*/React.createElement("div", {
+    style: {
+      gridColumn: "1 / -1",
+      marginTop: "16px",
+      marginBottom: "16px"
+    }
+  }, /*#__PURE__*/React.createElement("h2", {
+    style: {
+      color: "#0B4B66",
+      fontSize: "18px",
+      fontWeight: "700"
+    }
+  }, t("WS_DEPARTMENT_ORGANIZATION_DETAILS"))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
-  }, t("WS_ORGANIZATION_NAME")), /*#__PURE__*/React.createElement("div", {
+  }, t("WS_ORGANIZATION_DEPARTMENT_NAME")), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(TextInput, {
-    name: "governmentEmployee.organizationName",
+    name: "applicationSelection.govtOrganization.organizationName",
     inputRef: register({
-      required: isGovernmentEmployee ? "Organization Name is required" : false
+      required: (activeType === null || activeType === void 0 ? void 0 : activeType.code) === "ORGANIZATION" ? "Organization/Department Name is required" : false
     }),
-    errorStyle: !!getFieldError("governmentEmployee.organizationName")
-  }))), getFieldError("governmentEmployee.organizationName") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError1 = getFieldError("governmentEmployee.organizationName")) === null || _getFieldError1 === void 0 ? void 0 : _getFieldError1.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+    errorStyle: !!getFieldError("applicationSelection.govtOrganization.organizationName"),
+    placeholder: t("WS_ORGANIZATION_DEPARTMENT_NAME")
+  }))), getFieldError("applicationSelection.govtOrganization.organizationName") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError1 = getFieldError("applicationSelection.govtOrganization.organizationName")) === null || _getFieldError1 === void 0 ? void 0 : _getFieldError1.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
   }, t("WS_NATURE_OF_WORK")), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(TextInput, {
-    name: "governmentEmployee.natureOfWork",
+    name: "applicationSelection.govtOrganization.natureOfWork",
     inputRef: register({
-      required: isGovernmentEmployee ? "Nature of Work is required" : false
+      required: (activeType === null || activeType === void 0 ? void 0 : activeType.code) === "ORGANIZATION" ? "Nature of Work is required" : false
     }),
-    errorStyle: !!getFieldError("governmentEmployee.natureOfWork")
-  }))), getFieldError("governmentEmployee.natureOfWork") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError10 = getFieldError("governmentEmployee.natureOfWork")) === null || _getFieldError10 === void 0 ? void 0 : _getFieldError10.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+    errorStyle: !!getFieldError("applicationSelection.govtOrganization.natureOfWork"),
+    placeholder: t("WS_NATURE_OF_WORK")
+  }))), getFieldError("applicationSelection.govtOrganization.natureOfWork") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError10 = getFieldError("applicationSelection.govtOrganization.natureOfWork")) === null || _getFieldError10 === void 0 ? void 0 : _getFieldError10.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
-  }, t("WS_UPLOAD_DOCUMENT")), /*#__PURE__*/React.createElement("div", {
+  }, t("WS_ORG_DEPT_DOCUMENT")), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
-    name: "governmentEmployee.organizationDocument",
+    name: "applicationSelection.govtOrganization.organizationDocument",
     rules: {
-      required: isGovernmentEmployee ? "Document is required" : false
+      required: (activeType === null || activeType === void 0 ? void 0 : activeType.code) === "ORGANIZATION" ? "Document is required" : false
     },
     render: props => /*#__PURE__*/React.createElement(FileUploadField, {
-      error: getFieldError("governmentEmployee.organizationDocument"),
-      id: "govt-org-doc",
-      isUploading: !!uploadingFields["governmentEmployee.organizationDocument"],
-      onDelete: () => clearUploadedFile("governmentEmployee.organizationDocument", props.onChange),
-      onUpload: event => uploadFile(event, "governmentEmployee.organizationDocument", props.onChange),
+      error: getFieldError("applicationSelection.govtOrganization.organizationDocument"),
+      id: "org-dept-doc",
+      isUploading: !!uploadingFields["applicationSelection.govtOrganization.organizationDocument"],
+      onDelete: () => clearUploadedFile("applicationSelection.govtOrganization.organizationDocument", props.onChange),
+      onUpload: event => uploadFile(event, "applicationSelection.govtOrganization.organizationDocument", props.onChange),
       value: props.value
     })
-  }))))), /*#__PURE__*/React.createElement("div", {
+  })))))), /*#__PURE__*/React.createElement("div", {
     style: {
       display: previewMode ? "none" : "block"
     }
@@ -32795,25 +32941,7 @@ const NewApplication = () => {
     sectionKey: "applicant",
     title: t(applicantSectionTitle),
     sectionRef: sectionRefs.applicant
-  }, /*#__PURE__*/React.createElement(Controller, {
-    control: control,
-    name: "applicant.UploadPicture",
-    rules: {
-      validate: value => !!value || "Applicant Picture is required."
-    },
-    render: props => {
-      var _getFieldError11;
-      return /*#__PURE__*/React.createElement(ProfileImageUpload, {
-        error: (_getFieldError11 = getFieldError("applicant.UploadPicture")) === null || _getFieldError11 === void 0 ? void 0 : _getFieldError11.message,
-        isUploading: !!uploadingFields["applicant.UploadPicture"],
-        label: "WS_UPLOAD_PICTURE",
-        onUpload: event => uploadFile(event, "applicant.UploadPicture", props.onChange),
-        required: true,
-        t: t,
-        value: props.value
-      });
-    }
-  }), /*#__PURE__*/React.createElement(FieldBlock, {
+  }, /*#__PURE__*/React.createElement(FieldBlock, {
     error: getFieldError("applicant.firstName"),
     label: t("WS_FIRST_NAME"),
     required: true
@@ -32996,7 +33124,29 @@ const NewApplication = () => {
     sectionKey: "propertyAddress",
     title: t("WS_PROPERTY_ADDRESS"),
     sectionRef: sectionRefs.propertyAddress
-  }, /*#__PURE__*/React.createElement(FieldBlock, {
+  }, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+    className: "card-label-smaller"
+  }, t("WS_ZRO_LOCATION")), /*#__PURE__*/React.createElement("div", {
+    className: "field"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "zro",
+    rules: {
+      required: t("REQUIRED_FIELD")
+    },
+    isMandatory: true,
+    render: props => /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Dropdown, {
+      className: "form-field",
+      selected: props.value,
+      disable: false,
+      option: mappedZROLocation,
+      errorStyle: !!getFieldError("zro"),
+      select: props.onChange,
+      optionKey: "i18nKey",
+      onBlur: props.onBlur,
+      t: t
+    }))
+  }))), getFieldError("zro") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError11 = getFieldError("zro")) === null || _getFieldError11 === void 0 ? void 0 : _getFieldError11.message), /*#__PURE__*/React.createElement(FieldBlock, {
     error: getFieldError("propertyAddress.pinCode"),
     label: t("WS_PIN_CODE"),
     required: true
@@ -33093,6 +33243,13 @@ const NewApplication = () => {
     errorStyle: !!getFieldError("propertyAddress.houseNo"),
     inputRef: register(),
     name: "propertyAddress.houseNo"
+  })), /*#__PURE__*/React.createElement(FieldBlock, {
+    error: getFieldError("propertyAddress.Assembly"),
+    label: t("WS_ASSEMBLY")
+  }, /*#__PURE__*/React.createElement(TextInput, {
+    errorStyle: !!getFieldError("propertyAddress.Assembly"),
+    inputRef: register(),
+    name: "propertyAddress.Assembly"
   })), /*#__PURE__*/React.createElement(FieldBlock, {
     error: getFieldError("propertyAddress.block"),
     label: t("WS_BLOCK")
@@ -33114,6 +33271,20 @@ const NewApplication = () => {
     errorStyle: !!getFieldError("propertyAddress.landmark"),
     inputRef: register(),
     name: "propertyAddress.landmark"
+  })), /*#__PURE__*/React.createElement(FieldBlock, {
+    error: getFieldError("propertyAddress.Latitude"),
+    label: t("WS_LATITUDE")
+  }, /*#__PURE__*/React.createElement(TextInput, {
+    errorStyle: !!getFieldError("propertyAddress.Latitude"),
+    inputRef: register(),
+    name: "propertyAddress.Latitude"
+  })), /*#__PURE__*/React.createElement(FieldBlock, {
+    error: getFieldError("propertyAddress.Longitude"),
+    label: t("WS_LONGITUDE")
+  }, /*#__PURE__*/React.createElement(TextInput, {
+    errorStyle: !!getFieldError("propertyAddress.Longitude"),
+    inputRef: register(),
+    name: "propertyAddress.Longitude"
   })), /*#__PURE__*/React.createElement(FieldBlock, {
     error: getFieldError("propertyAddress.address"),
     isFullWidth: true,
@@ -33135,6 +33306,23 @@ const NewApplication = () => {
     title: t("WS_PROPERTY_AND_WATER_CONNECTION_USE_DETAILS"),
     sectionRef: sectionRefs.useDetails
   }, /*#__PURE__*/React.createElement(FieldBlock, {
+    error: getFieldError("useDetails.propertyCategory"),
+    label: t("WS_PROPERTY_CATEGORY"),
+    required: true
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "useDetails.propertyCategory",
+    rules: {
+      required: "Property Category is required."
+    },
+    render: props => /*#__PURE__*/React.createElement(Dropdown, {
+      option: PROPERTY_CATEGORY_OPTIONS,
+      optionKey: "name",
+      selected: props.value,
+      select: props.onChange,
+      t: t
+    })
+  })), /*#__PURE__*/React.createElement(FieldBlock, {
     error: getFieldError("useDetails.propertyType"),
     label: t("WS_PROPERTY_TYPE"),
     required: true
@@ -33145,7 +33333,41 @@ const NewApplication = () => {
       required: "Property Type is required."
     },
     render: props => /*#__PURE__*/React.createElement(Dropdown, {
-      option: dropdownData.propertyTypes,
+      option: PROPERTY_TYPE_OPTIONS,
+      optionKey: "name",
+      selected: props.value,
+      select: props.onChange,
+      t: t
+    })
+  })), /*#__PURE__*/React.createElement(FieldBlock, {
+    error: getFieldError("useDetails.WaterConnectionUsageType"),
+    label: t("WS_WATER_CONNECTION_USAGE_TYPE"),
+    required: true
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "useDetails.WaterConnectionUsageType",
+    rules: {
+      required: "Usage Type is required."
+    },
+    render: props => /*#__PURE__*/React.createElement(Dropdown, {
+      option: USAGE_TYPE_OPTIONS,
+      optionKey: "name",
+      selected: props.value,
+      select: props.onChange,
+      t: t
+    })
+  })), /*#__PURE__*/React.createElement(FieldBlock, {
+    error: getFieldError("useDetails.noOfFloors"),
+    label: t("WS_NUMBER_OF_FLOORS"),
+    required: true
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "useDetails.noOfFloors",
+    rules: {
+      required: "No. of Floors is required."
+    },
+    render: props => /*#__PURE__*/React.createElement(Dropdown, {
+      option: NO_OF_FLOORS_OPTIONS,
       optionKey: "name",
       selected: props.value,
       select: props.onChange,
@@ -33180,25 +33402,42 @@ const NewApplication = () => {
     }),
     name: "useDetails.builtUpArea"
   })), /*#__PURE__*/React.createElement(FieldBlock, {
-    error: getFieldError("useDetails.noOfFloors"),
-    label: t("WS_NUMBER_OF_FLOORS"),
+    error: getFieldError("useDetails.SelectYearofConstruction"),
+    label: t("WS_SELECT_YEAR_OF_CONSTRUCTION"),
+    required: true
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "useDetails.SelectYearofConstruction",
+    rules: {
+      required: "Select Year of Construction is required."
+    },
+    render: props => /*#__PURE__*/React.createElement(Dropdown, {
+      option: yearOptions,
+      optionKey: "value",
+      selected: props.value,
+      select: props.onChange,
+      t: t
+    })
+  })), /*#__PURE__*/React.createElement(FieldBlock, {
+    error: getFieldError("useDetails.NumberofDwellingUnits"),
+    label: t("WS_NUMBER_OF_DWELLING_UNITS"),
     required: true
   }, /*#__PURE__*/React.createElement(TextInput, {
-    errorStyle: !!getFieldError("useDetails.noOfFloors"),
+    errorStyle: !!getFieldError("useDetails.NumberofDwellingUnits"),
     inputRef: register({
       pattern: {
-        value: NUMBER_PATTERN,
-        message: "Enter a valid whole number."
+        value: DECIMAL_PATTERN,
+        message: "Enter a valid numeric value."
       },
-      required: "No. of Floors is required."
+      required: "Built Up Area is required."
     }),
-    name: "useDetails.noOfFloors"
+    name: "useDetails.NumberofDwellingUnits"
   })), /*#__PURE__*/React.createElement(FieldBlock, {
-    error: getFieldError("useDetails.NumberofDwellingUnits"),
-    label: t("WS_NUMBER_OF_DWELLING_UNITS"),
+    error: getFieldError("useDetails.NumberofRooms"),
+    label: t("WS_NUMBER_OF_ROOMS"),
     required: true
   }, /*#__PURE__*/React.createElement(TextInput, {
-    errorStyle: !!getFieldError("useDetails.NumberofDwellingUnits"),
+    errorStyle: !!getFieldError("useDetails.NumberofRooms"),
     inputRef: register({
       pattern: {
         value: DECIMAL_PATTERN,
@@ -33206,7 +33445,7 @@ const NewApplication = () => {
       },
       required: "Built Up Area is required."
     }),
-    name: "useDetails.NumberofDwellingUnits"
+    name: "useDetails.NumberofRooms"
   })), isHospitalProperty ? /*#__PURE__*/React.createElement(FieldBlock, {
     error: getFieldError("useDetails.hospitalBeds"),
     label: t("WS_NUMBER_OF_BEDS"),
@@ -33221,41 +33460,7 @@ const NewApplication = () => {
       required: isHospitalProperty ? "No. of Beds is required for Hospital / Nursing Home." : false
     }),
     name: "useDetails.hospitalBeds"
-  })) : null, /*#__PURE__*/React.createElement(FieldBlock, {
-    error: getFieldError("useDetails.SelectYearofConstruction"),
-    label: t("WS_SELECT_YEAR_OF_CONSTRUCTION"),
-    required: true
-  }, /*#__PURE__*/React.createElement(Controller, {
-    control: control,
-    name: "useDetails.SelectYearofConstruction",
-    rules: {
-      required: "Select Year of Construction is required."
-    },
-    render: props => /*#__PURE__*/React.createElement(Dropdown, {
-      option: yearOptions,
-      optionKey: "value",
-      selected: props.value,
-      select: props.onChange,
-      t: t
-    })
-  })), /*#__PURE__*/React.createElement(FieldBlock, {
-    error: getFieldError("useDetails.WaterConnectionUsageType"),
-    label: t("WS_WATER_CONNECTION_USAGE_TYPE"),
-    required: true
-  }, /*#__PURE__*/React.createElement(Controller, {
-    control: control,
-    name: "useDetails.WaterConnectionUsageType",
-    rules: {
-      required: "Water Connection Usage Type is required."
-    },
-    render: props => /*#__PURE__*/React.createElement(Dropdown, {
-      option: WATER_CONNECTION_USED_BY_OPTIONS,
-      optionKey: "name",
-      selected: props.value,
-      select: props.onChange,
-      t: t
-    })
-  }))), /*#__PURE__*/React.createElement(SectionCard, {
+  })) : null), /*#__PURE__*/React.createElement(SectionCard, {
     description: "Refund or payment-linked bank account details.",
     isOpen: collapsedSections.bank,
     onToggle: toggleSection,
@@ -33320,9 +33525,90 @@ const NewApplication = () => {
     sectionKey: "documents",
     title: "Documents to be Attached",
     sectionRef: sectionRefs.documents
-  }, /*#__PURE__*/React.createElement(FieldBlock, {
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "documents.applicantPhoto",
+    render: props => /*#__PURE__*/React.createElement(FileUploadField, {
+      error: getFieldError("documents.applicantPhoto"),
+      id: "applicant-photo",
+      isUploading: !!uploadingFields["documents.applicantPhoto"],
+      label: "Upload Applicant Photo",
+      onDelete: () => clearUploadedFile("documents.applicantPhoto", props.onChange),
+      onUpload: event => uploadFile(event, "documents.applicantPhoto", props.onChange),
+      value: props.value
+    })
+  }), /*#__PURE__*/React.createElement(FieldBlock, {
+    label: "Click Applicant Photo"
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      gap: "8px"
+    }
+  }, /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    className: "document-action-btn",
+    onClick: () => setShowCamera(true)
+  }, /*#__PURE__*/React.createElement(CameraIcon, null), " Click Photo"), ((_watch = watch("documents.applicantPhoto")) === null || _watch === void 0 ? void 0 : _watch.fileStoreId) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    className: "document-action-btn",
+    style: {
+      width: "50px"
+    },
+    onClick: () => {
+      var _watch2;
+      return handleView((_watch2 = watch("documents.applicantPhoto")) === null || _watch2 === void 0 ? void 0 : _watch2.fileStoreId, stateId);
+    },
+    title: "View Photo"
+  }, /*#__PURE__*/React.createElement(ViewIcon, null)))), ((_watch3 = watch("documents.applicantPhoto")) === null || _watch3 === void 0 ? void 0 : _watch3.fileStoreId) && /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: "8px",
+      display: "flex",
+      alignItems: "center",
+      gap: "8px",
+      background: "#F3F4F6",
+      padding: "4px 12px",
+      borderRadius: "20px",
+      width: "fit-content",
+      border: "1px solid #E5E7EB"
+    }
+  }, /*#__PURE__*/React.createElement(CardText, {
+    style: {
+      margin: 0,
+      fontSize: "14px",
+      color: "#374151",
+      fontWeight: "500"
+    }
+  }, watch("documents.applicantPhoto").fileName), /*#__PURE__*/React.createElement("div", {
+    onClick: () => clearUploadedFile("documents.applicantPhoto", val => setValue("documents.applicantPhoto", val)),
+    style: {
+      cursor: "pointer",
+      display: "flex",
+      alignItems: "center",
+      color: "#6B7280"
+    },
+    title: "Remove Photo"
+  }, /*#__PURE__*/React.createElement("svg", {
+    width: "16",
+    height: "16",
+    viewBox: "0 0 24 24",
+    fill: "none",
+    stroke: "currentColor",
+    strokeWidth: "3",
+    strokeLinecap: "round",
+    strokeLinejoin: "round"
+  }, /*#__PURE__*/React.createElement("line", {
+    x1: "18",
+    y1: "6",
+    x2: "6",
+    y2: "18"
+  }), /*#__PURE__*/React.createElement("line", {
+    x1: "6",
+    y1: "6",
+    x2: "18",
+    y2: "18"
+  }))))), /*#__PURE__*/React.createElement(FieldBlock, {
     error: getFieldError("documents.proofOfIdentity"),
-    label: "Proof of Identity",
+    label: "Proof of Identity *",
     required: true
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
@@ -33338,13 +33624,12 @@ const NewApplication = () => {
       t: t
     })
   })), /*#__PURE__*/React.createElement(FieldBlock, {
-    error: getFieldError("propertyAddress.proofOfIdentity"),
-    label: "Proof of Identity Document",
-    required: true
+    error: getFieldError("documents.identityProofNumber"),
+    label: "Proof of Identity Document"
   }, /*#__PURE__*/React.createElement(TextInput, {
-    errorStyle: !!getFieldError("propertyAddress.proofOfIdentity"),
+    name: "documents.identityProofNumber",
     inputRef: register(),
-    name: "propertyAddress.proofOfIdentity"
+    placeholder: "Identity No."
   })), /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "documents.identityProofFile",
@@ -33353,42 +33638,48 @@ const NewApplication = () => {
     },
     render: props => /*#__PURE__*/React.createElement(FileUploadField, {
       error: getFieldError("documents.identityProofFile"),
-      helperText: "Max size 5 MB. Allowed types: PDF, PNG, JPG, JPEG.",
       id: "identity-proof-file",
       isUploading: !!uploadingFields["documents.identityProofFile"],
-      label: "Upload Identity Proof",
+      label: "Proof of Identity Upload Document *",
       onDelete: () => clearUploadedFile("documents.identityProofFile", props.onChange),
       onUpload: event => uploadFile(event, "documents.identityProofFile", props.onChange),
       required: true,
       value: props.value
     })
   }), /*#__PURE__*/React.createElement(FieldBlock, {
-    error: getFieldError("propertyAddress.otherDocument")
-  }), /*#__PURE__*/React.createElement(FieldBlock, {
+    label: "View Document"
+  }, /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    className: "document-action-btn",
+    onClick: () => {
+      var _watch4;
+      return handleView((_watch4 = watch("documents.identityProofFile")) === null || _watch4 === void 0 ? void 0 : _watch4.fileStoreId, stateId);
+    },
+    disabled: !((_watch5 = watch("documents.identityProofFile")) !== null && _watch5 !== void 0 && _watch5.fileStoreId)
+  }, /*#__PURE__*/React.createElement(ViewIcon, null), " View")), /*#__PURE__*/React.createElement(FieldBlock, {
     error: getFieldError("documents.ownershipStatus"),
-    label: "Ownership Proof",
+    label: "Proof of Ownership *",
     required: true
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "documents.ownershipStatus",
     rules: {
-      required: "Ownership Status is required."
+      required: "Ownership Proof is required."
     },
     render: props => /*#__PURE__*/React.createElement(Dropdown, {
-      option: OWNERSHIP_STATUS_OPTIONS,
+      option: OWNERSHIP_DOCUMENTS_OPTIONS,
       optionKey: "name",
       selected: props.value,
       select: props.onChange,
       t: t
     })
   })), /*#__PURE__*/React.createElement(FieldBlock, {
-    error: getFieldError("propertyAddress.ownershipStatus"),
-    label: "Proof of Identity Ownership Document",
-    required: true
+    error: getFieldError("documents.ownershipDocumentNumber"),
+    label: "Proof of Ownership Document"
   }, /*#__PURE__*/React.createElement(TextInput, {
-    errorStyle: !!getFieldError("propertyAddress.ownershipStatus"),
+    name: "documents.ownershipDocumentNumber",
     inputRef: register(),
-    name: "propertyAddress.ownershipStatus"
+    placeholder: "Ownership No."
   })), /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "documents.ownershipDocumentFile",
@@ -33397,56 +33688,71 @@ const NewApplication = () => {
     },
     render: props => /*#__PURE__*/React.createElement(FileUploadField, {
       error: getFieldError("documents.ownershipDocumentFile"),
-      helperText: "Max size 5 MB. Allowed types: PDF, PNG, JPG, JPEG.",
       id: "ownership-document-file",
       isUploading: !!uploadingFields["documents.ownershipDocumentFile"],
-      label: "Upload Ownership Document",
+      label: "Proof of Ownership Upload Document *",
       onDelete: () => clearUploadedFile("documents.ownershipDocumentFile", props.onChange),
       onUpload: event => uploadFile(event, "documents.ownershipDocumentFile", props.onChange),
       required: true,
       value: props.value
     })
   }), /*#__PURE__*/React.createElement(FieldBlock, {
-    error: getFieldError("propertyAddress.otherDocument")
-  }), /*#__PURE__*/React.createElement(FieldBlock, {
+    label: "View Document"
+  }, /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    className: "document-action-btn",
+    onClick: () => {
+      var _watch6;
+      return handleView((_watch6 = watch("documents.ownershipDocumentFile")) === null || _watch6 === void 0 ? void 0 : _watch6.fileStoreId, stateId);
+    },
+    disabled: !((_watch7 = watch("documents.ownershipDocumentFile")) !== null && _watch7 !== void 0 && _watch7.fileStoreId)
+  }, /*#__PURE__*/React.createElement(ViewIcon, null), " View")), /*#__PURE__*/React.createElement(FieldBlock, {
     error: getFieldError("documents.otherDocument"),
-    label: "Other Document",
-    required: true
+    label: "Other"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "documents.otherDocument",
-    rules: {
-      required: "Other Document is required."
-    },
     render: props => /*#__PURE__*/React.createElement(Dropdown, {
-      option: OWNERSHIP_STATUS_OPTIONS,
+      option: OTHER_DOCUMENTS_OPTIONS,
       optionKey: "name",
       selected: props.value,
       select: props.onChange,
       t: t
     })
   })), /*#__PURE__*/React.createElement(FieldBlock, {
-    error: getFieldError("propertyAddress.otherDocument"),
-    label: "Other Document",
-    required: true
+    error: getFieldError("documents.otherDocumentNumber"),
+    label: "Other Document"
   }, /*#__PURE__*/React.createElement(TextInput, {
-    errorStyle: !!getFieldError("propertyAddress.otherDocument"),
+    name: "documents.otherDocumentNumber",
     inputRef: register(),
-    name: "propertyAddress.otherDocument"
+    placeholder: "Other Document No."
   })), /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "documents.otherDocumentFile",
+    rules: {
+      validate: value => !!value || "Other Upload Document is required."
+    },
     render: props => /*#__PURE__*/React.createElement(FileUploadField, {
       error: getFieldError("documents.otherDocumentFile"),
-      helperText: "Optional. Max size 5 MB. Allowed types: PDF, PNG, JPG, JPEG.",
       id: "other-document-file",
       isUploading: !!uploadingFields["documents.otherDocumentFile"],
-      label: "Other Document",
+      label: "Other Upload Document *",
       onDelete: () => clearUploadedFile("documents.otherDocumentFile", props.onChange),
       onUpload: event => uploadFile(event, "documents.otherDocumentFile", props.onChange),
+      required: true,
       value: props.value
     })
-  })), /*#__PURE__*/React.createElement(SectionCard, {
+  }), /*#__PURE__*/React.createElement(FieldBlock, {
+    label: "View Document"
+  }, /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    className: "document-action-btn",
+    onClick: () => {
+      var _watch8;
+      return handleView((_watch8 = watch("documents.otherDocumentFile")) === null || _watch8 === void 0 ? void 0 : _watch8.fileStoreId, stateId);
+    },
+    disabled: !((_watch9 = watch("documents.otherDocumentFile")) !== null && _watch9 !== void 0 && _watch9.fileStoreId)
+  }, /*#__PURE__*/React.createElement(ViewIcon, null), " View"))), /*#__PURE__*/React.createElement(SectionCard, {
     description: "Declaration and undertaking to be signed by the applicant.",
     isOpen: collapsedSections.declaration,
     onToggle: toggleSection,
@@ -33536,16 +33842,19 @@ const NewApplication = () => {
   }), (formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati12 = formValues.applicationSelection) === null || _formValues$applicati12 === void 0 ? void 0 : (_formValues$applicati13 = _formValues$applicati12.subCategory) === null || _formValues$applicati13 === void 0 ? void 0 : _formValues$applicati13.code) === "COMMERCIAL" && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Commercial Type",
     value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati14 = formValues.applicationSelection) === null || _formValues$applicati14 === void 0 ? void 0 : _formValues$applicati14.commercialType
+  }), (formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati15 = formValues.applicationSelection) === null || _formValues$applicati15 === void 0 ? void 0 : (_formValues$applicati16 = _formValues$applicati15.commercialType) === null || _formValues$applicati16 === void 0 ? void 0 : _formValues$applicati16.code) === "ORGANIZATION" && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PreviewItem, {
+    label: "Department Type",
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati17 = formValues.applicationSelection) === null || _formValues$applicati17 === void 0 ? void 0 : _formValues$applicati17.departmentType
   }), /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Organization Name",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati15 = formValues.applicationSelection) === null || _formValues$applicati15 === void 0 ? void 0 : (_formValues$applicati16 = _formValues$applicati15.govtOrganization) === null || _formValues$applicati16 === void 0 ? void 0 : _formValues$applicati16.organizationName
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati18 = formValues.applicationSelection) === null || _formValues$applicati18 === void 0 ? void 0 : (_formValues$applicati19 = _formValues$applicati18.govtOrganization) === null || _formValues$applicati19 === void 0 ? void 0 : _formValues$applicati19.organizationName
   }), /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Nature of Work",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati17 = formValues.applicationSelection) === null || _formValues$applicati17 === void 0 ? void 0 : (_formValues$applicati18 = _formValues$applicati17.govtOrganization) === null || _formValues$applicati18 === void 0 ? void 0 : _formValues$applicati18.natureOfWork
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati20 = formValues.applicationSelection) === null || _formValues$applicati20 === void 0 ? void 0 : (_formValues$applicati21 = _formValues$applicati20.govtOrganization) === null || _formValues$applicati21 === void 0 ? void 0 : _formValues$applicati21.natureOfWork
   }), /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Organization Document",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati19 = formValues.applicationSelection) === null || _formValues$applicati19 === void 0 ? void 0 : (_formValues$applicati20 = _formValues$applicati19.govtOrganization) === null || _formValues$applicati20 === void 0 ? void 0 : _formValues$applicati20.organizationDocument
-  }))), /*#__PURE__*/React.createElement(SectionCard, {
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati22 = formValues.applicationSelection) === null || _formValues$applicati22 === void 0 ? void 0 : (_formValues$applicati23 = _formValues$applicati22.govtOrganization) === null || _formValues$applicati23 === void 0 ? void 0 : _formValues$applicati23.organizationDocument
+  })))), /*#__PURE__*/React.createElement(SectionCard, {
     description: "Applicant identity and organization information.",
     isOpen: collapsedSections.applicant,
     onToggle: toggleSection,
@@ -33749,20 +34058,35 @@ const NewApplication = () => {
     title: "Documents to be Attached",
     onEditClick: () => handleSectionEdit("documents")
   }, /*#__PURE__*/React.createElement(PreviewItem, {
+    label: "Applicant Photo",
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$documents2 = formValues.documents) === null || _formValues$documents2 === void 0 ? void 0 : _formValues$documents2.applicantPhoto
+  }), /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Proof of Identity",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$documents2 = formValues.documents) === null || _formValues$documents2 === void 0 ? void 0 : _formValues$documents2.proofOfIdentity
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$documents3 = formValues.documents) === null || _formValues$documents3 === void 0 ? void 0 : _formValues$documents3.proofOfIdentity
+  }), /*#__PURE__*/React.createElement(PreviewItem, {
+    label: "Identity No.",
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$documents4 = formValues.documents) === null || _formValues$documents4 === void 0 ? void 0 : _formValues$documents4.identityProofNumber
   }), /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Upload Identity Proof",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$documents3 = formValues.documents) === null || _formValues$documents3 === void 0 ? void 0 : _formValues$documents3.identityProofFile
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$documents5 = formValues.documents) === null || _formValues$documents5 === void 0 ? void 0 : _formValues$documents5.identityProofFile
   }), /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Ownership Status",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$documents4 = formValues.documents) === null || _formValues$documents4 === void 0 ? void 0 : _formValues$documents4.ownershipStatus
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$documents6 = formValues.documents) === null || _formValues$documents6 === void 0 ? void 0 : _formValues$documents6.ownershipStatus
+  }), /*#__PURE__*/React.createElement(PreviewItem, {
+    label: "Ownership No.",
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$documents7 = formValues.documents) === null || _formValues$documents7 === void 0 ? void 0 : _formValues$documents7.ownershipDocumentNumber
   }), /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Upload Ownership Document",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$documents5 = formValues.documents) === null || _formValues$documents5 === void 0 ? void 0 : _formValues$documents5.ownershipDocumentFile
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$documents8 = formValues.documents) === null || _formValues$documents8 === void 0 ? void 0 : _formValues$documents8.ownershipDocumentFile
+  }), /*#__PURE__*/React.createElement(PreviewItem, {
+    label: "Other",
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$documents9 = formValues.documents) === null || _formValues$documents9 === void 0 ? void 0 : _formValues$documents9.otherDocument
+  }), /*#__PURE__*/React.createElement(PreviewItem, {
+    label: "Other Document No.",
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$documents0 = formValues.documents) === null || _formValues$documents0 === void 0 ? void 0 : _formValues$documents0.otherDocumentNumber
   }), /*#__PURE__*/React.createElement(PreviewItem, {
-    label: "Other Document",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$documents6 = formValues.documents) === null || _formValues$documents6 === void 0 ? void 0 : _formValues$documents6.otherDocumentFile
+    label: "Other Upload Document",
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$documents1 = formValues.documents) === null || _formValues$documents1 === void 0 ? void 0 : _formValues$documents1.otherDocumentFile
   })), /*#__PURE__*/React.createElement(SectionCard, {
     description: "Applicant declaration details.",
     isOpen: collapsedSections.declaration,
@@ -33803,7 +34127,11 @@ const NewApplication = () => {
     label: showToast === null || showToast === void 0 ? void 0 : showToast.message,
     onClose: closeToast,
     warning: showToast === null || showToast === void 0 ? void 0 : showToast.warning
-  }) : null);
+  }) : null, showCamera && /*#__PURE__*/React.createElement(CameraCaptureModal, {
+    onCapture: handleCapture,
+    onClose: () => setShowCamera(false),
+    t: t
+  }));
 };
 
 const configPTApproverApplication = ({
@@ -36810,7 +37138,11 @@ const ActionModal$b = ({
       applicationData.vehicleId = selectVehicle === null || selectVehicle === void 0 ? void 0 : selectVehicle.vehicleId;
       applicationData.driverId = selectVehicle === null || selectVehicle === void 0 ? void 0 : selectVehicle.driverId;
     }
-    let requestPayload = businessService === "watertanker" ? {
+    if (businessService === "watertanker-fixedpoint") {
+      workflow.moduleName = "request-service.water_tanker";
+      workflow.businessService = "watertanker-fixedpoint";
+    }
+    let requestPayload = businessService === "watertanker" || businessService === "watertanker-fixedpoint" ? {
       waterTankerBookingDetail: {
         ...applicationData,
         workflow
@@ -39869,7 +40201,7 @@ function ApplicationDetailsContent({
         fontSize: "24px"
       } : {
         marginBottom: "16px",
-        marginTop: "32px",
+        marginTop: "16px",
         fontSize: "24px"
       }
     }, t(detail.title), detail !== null && detail !== void 0 && detail.Component ? /*#__PURE__*/React.createElement(detail.Component, null) : null)), (detail === null || detail === void 0 ? void 0 : detail.isTable) && /*#__PURE__*/React.createElement("table", {
@@ -45004,7 +45336,7 @@ const OLDApplication = () => {
     setShowToast(null);
   };
   const onSubmit = async data => {
-    var _data$cpt, _propertyDetails$Prop2, _formStateErros$Conne, _Object$keys2, _formStateErros$Conne2, _data$cpt3, _data$ConnectionDetai, _data$ConnectionHolde, _data$ConnectionHolde2, _data$ConnectionHolde3, _data$ConnectionHolde4, _data$ConnectionHolde5, _propertyDetails$Prop4, _propertyDetails$Prop5, _propertyDetails$Prop6, _propertyDetails$Prop7, _data$ConnectionDetai2;
+    var _data$cpt, _propertyDetails$Prop2, _formStateErros$Conne, _Object$keys2, _formStateErros$Conne2, _data$cpt3, _data$ConnectionDetai, _data$ConnectionHolde, _data$ConnectionHolde2, _data$ConnectionHolde3, _data$ConnectionHolde4, _data$ConnectionHolde5, _propertyDetails$Prop4, _propertyDetails$Prop5, _propertyDetails$Prop6, _propertyDetails$Prop7, _data$ConnectionHolde6, _data$ConnectionHolde7, _data$cpt4, _data$cpt4$details, _data$cpt4$details$ow, _data$cpt4$details$ow2, _data$ConnectionDetai2;
     console.log("[WS] onSubmit triggered", {
       data,
       propertyId,
@@ -45058,7 +45390,8 @@ const OLDApplication = () => {
       },
       categoryType: {
         code: (data === null || data === void 0 ? void 0 : (_data$ConnectionHolde = data.ConnectionHolderDetails) === null || _data$ConnectionHolde === void 0 ? void 0 : (_data$ConnectionHolde2 = _data$ConnectionHolde[0]) === null || _data$ConnectionHolde2 === void 0 ? void 0 : (_data$ConnectionHolde3 = _data$ConnectionHolde2.ownerType) === null || _data$ConnectionHolde3 === void 0 ? void 0 : _data$ConnectionHolde3.code) || (data === null || data === void 0 ? void 0 : (_data$ConnectionHolde4 = data.ConnectionHolderDetails) === null || _data$ConnectionHolde4 === void 0 ? void 0 : (_data$ConnectionHolde5 = _data$ConnectionHolde4[0]) === null || _data$ConnectionHolde5 === void 0 ? void 0 : _data$ConnectionHolde5.ownerType) || (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop4 = propertyDetails.Properties) === null || _propertyDetails$Prop4 === void 0 ? void 0 : (_propertyDetails$Prop5 = _propertyDetails$Prop4[0]) === null || _propertyDetails$Prop5 === void 0 ? void 0 : (_propertyDetails$Prop6 = _propertyDetails$Prop5.owners) === null || _propertyDetails$Prop6 === void 0 ? void 0 : (_propertyDetails$Prop7 = _propertyDetails$Prop6[0]) === null || _propertyDetails$Prop7 === void 0 ? void 0 : _propertyDetails$Prop7.ownerType) || "NONE"
-      }
+      },
+      ownerContactNumber: (data === null || data === void 0 ? void 0 : (_data$ConnectionHolde6 = data.ConnectionHolderDetails) === null || _data$ConnectionHolde6 === void 0 ? void 0 : (_data$ConnectionHolde7 = _data$ConnectionHolde6[0]) === null || _data$ConnectionHolde7 === void 0 ? void 0 : _data$ConnectionHolde7.mobileNumber) || (data === null || data === void 0 ? void 0 : (_data$cpt4 = data.cpt) === null || _data$cpt4 === void 0 ? void 0 : (_data$cpt4$details = _data$cpt4.details) === null || _data$cpt4$details === void 0 ? void 0 : (_data$cpt4$details$ow = _data$cpt4$details.owners) === null || _data$cpt4$details$ow === void 0 ? void 0 : (_data$cpt4$details$ow2 = _data$cpt4$details$ow[0]) === null || _data$cpt4$details$ow2 === void 0 ? void 0 : _data$cpt4$details$ow2.mobileNumber)
     };
     if (data !== null && data !== void 0 && (_data$ConnectionDetai2 = data.ConnectionDetails) !== null && _data$ConnectionDetai2 !== void 0 && _data$ConnectionDetai2[0]) {
       data.ConnectionDetails[0].water = true;