@djb25/digit-ui-module-ws 1.0.18 → 1.0.19

package/dist/index.modern.js

@@ -441,7 +441,7 @@ const getFiles = async (filesArray, tenant) => {
   response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && (_response$data$fileSt = _response$data.fileStoreIds) !== null && _response$data$fileSt !== void 0 && (_response$data$fileSt2 = _response$data$fileSt[0]) !== null && _response$data$fileSt2 !== void 0 && _response$data$fileSt2.url ? window.open(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) : null;
 };
 const createPayloadOfWS = async data => {
-  var _data$cpt, _data$cpt$details, _data$cpt$details$own, _data$applicationSele, _data$applicationSele2, _data$useDetails, _data$useDetails2, _data$useDetails3, _data$useDetails3$pro, _data$useDetails4, _data$useDetails4$pro, _data$useDetails5, _data$useDetails6, _data$useDetails7, _data$useDetails8, _data$propertyAddress, _data$applicant, _data$useDetails9, _data$useDetails9$gen, _data$contact, _data$applicant2, _data$applicant3, _data$applicant4, _data$applicationSele3, _data$applicationSele4, _data$contact2, _data$cpt2, _data$cpt3, _data$cpt3$details, _data$zro, _data$propertyAddress2, _data$propertyAddress3, _data$applicationSele5, _data$applicationSele6, _data$applicationSele7, _data$applicationSele8, _data$applicationSele9, _data$applicationSele0, _data$applicationSele1, _data$applicationSele10, _data$applicationSele11, _data$applicationSele12, _data$applicationSele13, _data$contact3, _data$cpt4, _data$cpt4$details, _data$propertyAddress4, _data$propertyAddress5, _data$cpt5, _Digit, _Digit$Customizations, _Digit$Customizations2, _Digit2, _Digit2$Customization, _Digit2$Customization2;
+  var _data$cpt, _data$cpt$details, _data$cpt$details$own, _data$applicationSele, _data$applicationSele2, _data$useDetails, _data$useDetails2, _data$useDetails3, _data$useDetails3$pro, _data$useDetails4, _data$useDetails4$pro, _data$useDetails5, _data$useDetails6, _data$useDetails7, _data$useDetails8, _data$propertyAddress, _data$applicant, _data$useDetails9, _data$useDetails9$gen, _data$contact, _data$applicant2, _data$applicant3, _data$applicant4, _data$applicationSele3, _data$applicationSele4, _data$contact2, _data$cpt2, _data$cpt3, _data$cpt3$details, _data$zro, _data$propertyAddress2, _data$propertyAddress3, _data$applicationSele5, _data$applicationSele6, _data$applicationSele7, _data$applicationSele8, _data$applicationSele9, _data$applicationSele0, _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$cpt4, _data$cpt4$details, _data$propertyAddress4, _data$propertyAddress5, _data$cpt5, _Digit, _Digit$Customizations, _Digit$Customizations2, _Digit2, _Digit2$Customization, _Digit2$Customization2;
   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;
   });
@@ -483,9 +483,18 @@ const createPayloadOfWS = async data => {
       connectionType: data === null || data === void 0 ? void 0 : (_data$applicationSele7 = data.applicationSelection) === null || _data$applicationSele7 === void 0 ? void 0 : (_data$applicationSele8 = _data$applicationSele7.connectionType) === null || _data$applicationSele8 === void 0 ? void 0 : _data$applicationSele8.code,
       categoryType: data === null || data === void 0 ? void 0 : (_data$applicationSele9 = data.applicationSelection) === null || _data$applicationSele9 === void 0 ? void 0 : (_data$applicationSele0 = _data$applicationSele9.categoryType) === null || _data$applicationSele0 === void 0 ? void 0 : _data$applicationSele0.code,
       subCategory: data === null || data === void 0 ? void 0 : (_data$applicationSele1 = data.applicationSelection) === null || _data$applicationSele1 === void 0 ? void 0 : (_data$applicationSele10 = _data$applicationSele1.subCategory) === null || _data$applicationSele10 === void 0 ? void 0 : _data$applicationSele10.code,
-      commercialType: data === null || data === void 0 ? void 0 : (_data$applicationSele11 = data.applicationSelection) === null || _data$applicationSele11 === void 0 ? void 0 : (_data$applicationSele12 = _data$applicationSele11.commercialType) === null || _data$applicationSele12 === void 0 ? void 0 : _data$applicationSele12.code,
-      govtOrganization: data === null || data === void 0 ? void 0 : (_data$applicationSele13 = data.applicationSelection) === null || _data$applicationSele13 === void 0 ? void 0 : _data$applicationSele13.govtOrganization,
+      domesticType: data === null || data === void 0 ? void 0 : (_data$applicationSele11 = data.applicationSelection) === null || _data$applicationSele11 === void 0 ? void 0 : (_data$applicationSele12 = _data$applicationSele11.domesticType) === null || _data$applicationSele12 === void 0 ? void 0 : _data$applicationSele12.code,
+      temporaryConnection: data === null || data === void 0 ? void 0 : (_data$applicationSele13 = data.applicationSelection) === null || _data$applicationSele13 === void 0 ? void 0 : (_data$applicationSele14 = _data$applicationSele13.temporaryConnection) === null || _data$applicationSele14 === void 0 ? void 0 : _data$applicationSele14.code,
+      ownerAuthorizationDoc: data === null || data === void 0 ? void 0 : (_data$applicationSele15 = data.applicationSelection) === null || _data$applicationSele15 === void 0 ? void 0 : (_data$applicationSele16 = _data$applicationSele15.ownerAuthorizationDoc) === null || _data$applicationSele16 === void 0 ? void 0 : (_data$applicationSele17 = _data$applicationSele16[0]) === null || _data$applicationSele17 === void 0 ? void 0 : (_data$applicationSele18 = _data$applicationSele17[1]) === null || _data$applicationSele18 === void 0 ? void 0 : _data$applicationSele18.fileStoreId,
+      ownerContactNumber: data === null || data === void 0 ? void 0 : (_data$applicationSele19 = data.applicationSelection) === null || _data$applicationSele19 === void 0 ? void 0 : _data$applicationSele19.ownerContactNumber,
+      isOwnerVerified: data === null || data === void 0 ? void 0 : (_data$applicationSele20 = data.applicationSelection) === null || _data$applicationSele20 === void 0 ? void 0 : _data$applicationSele20.isOwnerVerified,
+      commercialType: data === null || data === void 0 ? void 0 : (_data$applicationSele21 = data.applicationSelection) === null || _data$applicationSele21 === void 0 ? void 0 : (_data$applicationSele22 = _data$applicationSele21.commercialType) === null || _data$applicationSele22 === void 0 ? void 0 : _data$applicationSele22.code,
+      govtOrganization: data === null || data === void 0 ? void 0 : (_data$applicationSele23 = data.applicationSelection) === null || _data$applicationSele23 === void 0 ? void 0 : _data$applicationSele23.govtOrganization,
+      governmentEmployee: data === null || data === void 0 ? void 0 : data.governmentEmployee,
       whatsAppNumber: data === null || data === void 0 ? void 0 : (_data$contact3 = data.contact) === null || _data$contact3 === void 0 ? void 0 : _data$contact3.whatsAppNumber,
+      identityProofNumber: data === null || data === void 0 ? void 0 : (_data$documents = data.documents) === null || _data$documents === void 0 ? void 0 : _data$documents.identityProofNumber,
+      ownershipDocumentNumber: data === null || data === void 0 ? void 0 : (_data$documents2 = data.documents) === null || _data$documents2 === void 0 ? void 0 : _data$documents2.ownershipDocumentNumber,
+      otherDocumentNumber: data === null || data === void 0 ? void 0 : (_data$documents3 = data.documents) === null || _data$documents3 === void 0 ? void 0 : _data$documents3.otherDocumentNumber,
       detailsProvidedBy: ""
     },
     tenantId: (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.tenantId) || (data === null || data === void 0 ? void 0 : (_data$propertyAddress4 = data.propertyAddress) === null || _data$propertyAddress4 === void 0 ? void 0 : (_data$propertyAddress5 = _data$propertyAddress4.city) === null || _data$propertyAddress5 === void 0 ? void 0 : _data$propertyAddress5.code),
@@ -515,11 +524,11 @@ const updatePayloadOfWS = async (data, type) => {
   return payload;
 };
 const convertToWSUpdate = data => {
-  var _data$WaterConnection, _data$WaterConnection2, _data$documents, _Digit5, _Digit5$Customization, _Digit5$Customization2, _Digit6, _Digit6$Customization, _Digit6$Customization2;
+  var _data$WaterConnection, _data$WaterConnection2, _data$documents4, _Digit5, _Digit5$Customization, _Digit5$Customization2, _Digit6, _Digit6$Customization, _Digit6$Customization2;
   let formdata = {
     WaterConnection: {
       ...(data === null || data === void 0 ? void 0 : (_data$WaterConnection = data.WaterConnectionResult) === null || _data$WaterConnection === void 0 ? void 0 : (_data$WaterConnection2 = _data$WaterConnection.WaterConnection) === null || _data$WaterConnection2 === void 0 ? void 0 : _data$WaterConnection2[0]),
-      documents: [...(data === null || data === void 0 ? void 0 : (_data$documents = data.documents) === null || _data$documents === void 0 ? void 0 : _data$documents.documents)],
+      documents: [...(data === null || data === void 0 ? void 0 : (_data$documents4 = data.documents) === null || _data$documents4 === void 0 ? void 0 : _data$documents4.documents)],
       processInstance: {
         action: "SUBMIT_APPLICATION"
       }
@@ -529,7 +538,7 @@ const convertToWSUpdate = data => {
   return formdata;
 };
 const convertToEditWSUpdate = data => {
-  var _data$WaterConnection3, _data$WaterConnection4, _data$documents2, _data$ConnectionHolde, _data$ConnectionHolde2, _data$ConnectionHolde3, _data$ConnectionHolde4, _data$ConnectionHolde5, _data$ConnectionHolde6, _data$ConnectionHolde7, _data$ConnectionHolde8, _data$ConnectionHolde9, _data$ConnectionHolde0, _data$ConnectionHolde1, _data$ConnectionHolde10, _data$ConnectionHolde11, _data$waterConectionD, _data$waterConectionD2, _data$waterConectionD3, _data$applicationType, _data$applicationType2, _data$serviceName, _waterResult$serviceN, _data$documents3, _data$sewerageConnect, _data$sewerageConnect2, _Digit7, _Digit7$Customization, _Digit7$Customization2, _Digit8, _Digit8$Customization, _Digit8$Customization2;
+  var _data$WaterConnection3, _data$WaterConnection4, _data$documents5, _data$ConnectionHolde, _data$ConnectionHolde2, _data$ConnectionHolde3, _data$ConnectionHolde4, _data$ConnectionHolde5, _data$ConnectionHolde6, _data$ConnectionHolde7, _data$ConnectionHolde8, _data$ConnectionHolde9, _data$ConnectionHolde0, _data$ConnectionHolde1, _data$ConnectionHolde10, _data$ConnectionHolde11, _data$waterConectionD, _data$waterConectionD2, _data$waterConectionD3, _data$applicationType, _data$applicationType2, _data$serviceName, _waterResult$serviceN, _data$documents6, _data$sewerageConnect, _data$sewerageConnect2, _Digit7, _Digit7$Customization, _Digit7$Customization2, _Digit8, _Digit8$Customization, _Digit8$Customization2;
   let waterResult = data === null || data === void 0 ? void 0 : (_data$WaterConnection3 = data.WaterConnectionResult) === null || _data$WaterConnection3 === void 0 ? void 0 : (_data$WaterConnection4 = _data$WaterConnection3.WaterConnection) === null || _data$WaterConnection4 === void 0 ? void 0 : _data$WaterConnection4[0];
   let formdata = {
     WaterConnection: {
@@ -541,7 +550,7 @@ const convertToEditWSUpdate = data => {
       status: data !== null && data !== void 0 && data.isEditApplication ? data === null || data === void 0 ? void 0 : data.status : waterResult === null || waterResult === void 0 ? void 0 : waterResult.status,
       connectionNo: (data !== null && data !== void 0 && data.isEditApplication ? data === null || data === void 0 ? void 0 : data.connectionNo : waterResult === null || waterResult === void 0 ? void 0 : waterResult.connectionNo) || null,
       oldConnectionNo: null,
-      documents: [...(data === null || data === void 0 ? void 0 : (_data$documents2 = data.documents) === null || _data$documents2 === void 0 ? void 0 : _data$documents2.documents)],
+      documents: [...(data === null || data === void 0 ? void 0 : (_data$documents5 = data.documents) === null || _data$documents5 === void 0 ? void 0 : _data$documents5.documents)],
       plumberInfo: data !== null && data !== void 0 && data.isEditApplication ? data === null || data === void 0 ? void 0 : data.plumberInfo : (waterResult === null || waterResult === void 0 ? void 0 : waterResult.plumberInfo) || [],
       roadType: null,
       roadCuttingArea: null,
@@ -594,7 +603,7 @@ const convertToEditWSUpdate = data => {
       water: data !== null && data !== void 0 && (_data$applicationType = data.applicationType) !== null && _data$applicationType !== void 0 && _data$applicationType.includes("WATER") ? true : false,
       sewerage: data !== null && data !== void 0 && (_data$applicationType2 = data.applicationType) !== null && _data$applicationType2 !== void 0 && _data$applicationType2.includes("WATER") ? true : false,
       service: data !== null && data !== void 0 && data.isEditApplication ? data === null || data === void 0 ? void 0 : (_data$serviceName = data.serviceName) === null || _data$serviceName === void 0 ? void 0 : _data$serviceName.code : waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$serviceN = waterResult.serviceName) === null || _waterResult$serviceN === void 0 ? void 0 : _waterResult$serviceN.code,
-      reviewDocData: [...(data === null || data === void 0 ? void 0 : (_data$documents3 = data.documents) === null || _data$documents3 === void 0 ? void 0 : _data$documents3.documents)],
+      reviewDocData: [...(data === null || data === void 0 ? void 0 : (_data$documents6 = data.documents) === null || _data$documents6 === void 0 ? void 0 : _data$documents6.documents)],
       proposedWaterClosets: data === null || data === void 0 ? void 0 : (_data$sewerageConnect = data.sewerageConnectionDetails) === null || _data$sewerageConnect === void 0 ? void 0 : _data$sewerageConnect.proposedWaterClosets,
       proposedToilets: data === null || data === void 0 ? void 0 : (_data$sewerageConnect2 = data.sewerageConnectionDetails) === null || _data$sewerageConnect2 === void 0 ? void 0 : _data$sewerageConnect2.proposedToilets,
       comment: "",
@@ -608,7 +617,7 @@ const convertToEditWSUpdate = data => {
   return formdata;
 };
 const convertToEditSWUpdate = data => {
-  var _data$SewerageConnect, _data$SewerageConnect2, _data$documents4, _data$ConnectionHolde12, _data$ConnectionHolde13, _data$ConnectionHolde14, _data$ConnectionHolde15, _data$ConnectionHolde16, _data$ConnectionHolde17, _data$ConnectionHolde18, _data$ConnectionHolde19, _data$ConnectionHolde20, _data$ConnectionHolde21, _data$ConnectionHolde22, _data$ConnectionHolde23, _data$ConnectionHolde24, _data$waterConectionD4, _data$waterConectionD5, _data$waterConectionD6, _data$applicationType3, _data$applicationType4, _data$serviceName2, _SewerageResult$servi, _data$documents5, _data$sewerageConnect3, _data$sewerageConnect4, _Digit9, _Digit9$Customization, _Digit9$Customization2, _Digit0, _Digit0$Customization, _Digit0$Customization2;
+  var _data$SewerageConnect, _data$SewerageConnect2, _data$documents7, _data$ConnectionHolde12, _data$ConnectionHolde13, _data$ConnectionHolde14, _data$ConnectionHolde15, _data$ConnectionHolde16, _data$ConnectionHolde17, _data$ConnectionHolde18, _data$ConnectionHolde19, _data$ConnectionHolde20, _data$ConnectionHolde21, _data$ConnectionHolde22, _data$ConnectionHolde23, _data$ConnectionHolde24, _data$waterConectionD4, _data$waterConectionD5, _data$waterConectionD6, _data$applicationType3, _data$applicationType4, _data$serviceName2, _SewerageResult$servi, _data$documents8, _data$sewerageConnect3, _data$sewerageConnect4, _Digit9, _Digit9$Customization, _Digit9$Customization2, _Digit0, _Digit0$Customization, _Digit0$Customization2;
   let SewerageResult = data === null || data === void 0 ? void 0 : (_data$SewerageConnect = data.SewerageConnectionResult) === null || _data$SewerageConnect === void 0 ? void 0 : (_data$SewerageConnect2 = _data$SewerageConnect.SewerageConnections) === null || _data$SewerageConnect2 === void 0 ? void 0 : _data$SewerageConnect2[0];
   let formdata = {
     SewerageConnection: {
@@ -620,7 +629,7 @@ const convertToEditSWUpdate = data => {
       status: data !== null && data !== void 0 && data.isEditApplication ? data === null || data === void 0 ? void 0 : data.status : SewerageResult === null || SewerageResult === void 0 ? void 0 : SewerageResult.status,
       connectionNo: (data !== null && data !== void 0 && data.isEditApplication ? data === null || data === void 0 ? void 0 : data.connectionNo : SewerageResult === null || SewerageResult === void 0 ? void 0 : SewerageResult.connectionNo) || null,
       oldConnectionNo: null,
-      documents: [...(data === null || data === void 0 ? void 0 : (_data$documents4 = data.documents) === null || _data$documents4 === void 0 ? void 0 : _data$documents4.documents)],
+      documents: [...(data === null || data === void 0 ? void 0 : (_data$documents7 = data.documents) === null || _data$documents7 === void 0 ? void 0 : _data$documents7.documents)],
       plumberInfo: data !== null && data !== void 0 && data.isEditApplication ? data === null || data === void 0 ? void 0 : data.plumberInfo : (SewerageResult === null || SewerageResult === void 0 ? void 0 : SewerageResult.plumberInfo) || [],
       roadType: null,
       roadCuttingArea: null,
@@ -673,7 +682,7 @@ const convertToEditSWUpdate = data => {
       water: data !== null && data !== void 0 && (_data$applicationType3 = data.applicationType) !== null && _data$applicationType3 !== void 0 && _data$applicationType3.includes("WATER") ? true : false,
       sewerage: data !== null && data !== void 0 && (_data$applicationType4 = data.applicationType) !== null && _data$applicationType4 !== void 0 && _data$applicationType4.includes("WATER") ? true : false,
       service: data !== null && data !== void 0 && data.isEditApplication ? data === null || data === void 0 ? void 0 : (_data$serviceName2 = data.serviceName) === null || _data$serviceName2 === void 0 ? void 0 : _data$serviceName2.code : SewerageResult === null || SewerageResult === void 0 ? void 0 : (_SewerageResult$servi = SewerageResult.serviceName) === null || _SewerageResult$servi === void 0 ? void 0 : _SewerageResult$servi.code,
-      reviewDocData: [...(data === null || data === void 0 ? void 0 : (_data$documents5 = data.documents) === null || _data$documents5 === void 0 ? void 0 : _data$documents5.documents)],
+      reviewDocData: [...(data === null || data === void 0 ? void 0 : (_data$documents8 = data.documents) === null || _data$documents8 === void 0 ? void 0 : _data$documents8.documents)],
       proposedWaterClosets: data === null || data === void 0 ? void 0 : (_data$sewerageConnect3 = data.sewerageConnectionDetails) === null || _data$sewerageConnect3 === void 0 ? void 0 : _data$sewerageConnect3.proposedWaterClosets,
       proposedToilets: data === null || data === void 0 ? void 0 : (_data$sewerageConnect4 = data.sewerageConnectionDetails) === null || _data$sewerageConnect4 === void 0 ? void 0 : _data$sewerageConnect4.proposedToilets,
       comment: "",
@@ -687,12 +696,12 @@ const convertToEditSWUpdate = data => {
   return formdata;
 };
 const convertToSWUpdate = data => {
-  var _data$SewerageConnect3, _data$SewerageConnect4, _data$documents6, _Digit1, _Digit1$Customization, _Digit1$Customization2, _Digit10, _Digit10$Customizatio, _Digit10$Customizatio2;
+  var _data$SewerageConnect3, _data$SewerageConnect4, _data$documents9, _Digit1, _Digit1$Customization, _Digit1$Customization2, _Digit10, _Digit10$Customizatio, _Digit10$Customizatio2;
   let formdata = {
     SewerageConnection: {
       ...(data === null || data === void 0 ? void 0 : (_data$SewerageConnect3 = data.SewerageConnectionResult) === null || _data$SewerageConnect3 === void 0 ? void 0 : (_data$SewerageConnect4 = _data$SewerageConnect3.SewerageConnections) === null || _data$SewerageConnect4 === void 0 ? void 0 : _data$SewerageConnect4[0]),
       connectionType: "Non Metered",
-      documents: [...(data === null || data === void 0 ? void 0 : (_data$documents6 = data.documents) === null || _data$documents6 === void 0 ? void 0 : _data$documents6.documents)],
+      documents: [...(data === null || data === void 0 ? void 0 : (_data$documents9 = data.documents) === null || _data$documents9 === void 0 ? void 0 : _data$documents9.documents)],
       processInstance: {
         action: "SUBMIT_APPLICATION"
       }
@@ -30927,6 +30936,10 @@ var applicantTypes = [
 	{
 		code: "TENANT",
 		name: "Tenant"
+	},
+	{
+		code: "RELATIVE",
+		name: "Relative"
 	}
 ];
 var connectionTypes = [
@@ -30993,18 +31006,50 @@ var propertyTypes = [
 		name: "Hospital"
 	}
 ];
+var temporaryConnectionTypes = [
+	{
+		code: "EXHIBITION",
+		name: "Exhibition"
+	},
+	{
+		code: "OFFICIAL_FUNCTION",
+		name: "Official Function"
+	},
+	{
+		code: "RELIGIOUS_FUNCTION",
+		name: "Religious Function"
+	},
+	{
+		code: "CIRCUS",
+		name: "Circus"
+	},
+	{
+		code: "CONSTRUCTION",
+		name: "Construction"
+	},
+	{
+		code: "AS_PER_COURT_ORDERS",
+		name: "as per Court Orders"
+	},
+	{
+		code: "SOCIAL_FAMILY_FUNCTION",
+		name: "Social/Family Function"
+	}
+];
 var dropdownData = {
 	serviceTypes: serviceTypes,
 	applicantTypes: applicantTypes,
 	connectionTypes: connectionTypes,
 	categoryTypes: categoryTypes,
 	subCategories: subCategories,
-	propertyTypes: propertyTypes
+	propertyTypes: propertyTypes,
+	temporaryConnectionTypes: temporaryConnectionTypes
 };
 
 const FORM_STORAGE_KEY = "WS_EMPLOYEE_NEW_APPLICATION_FORM";
 const MAX_FILE_SIZE = 5242880;
 const SUPPORTED_FILE_TYPES = /(\.pdf|\.png|\.jpe?g)$/i;
+const DECLARATION_POINTS = ["I understand that sanction of connection does not acknowledge or confer any title, ownership or occupancy right in favour of the applicant.", "I declare that there is no dispute on property and there is no stay from any court of law against obtaining water/ sewerage connection.", "The Property on which connection is being applied is not booked/unauthorized/encroachment of Govt.Land/misuse etc.", "I further undertake that in case of any dispute about the ownership of the property I will absolve DJB from any legal battle in the court of law as the water connection applied for is related to supply of potable water and not to decide the ownership of property.", "I further undertake to pay the charges as and when demanded by DJB, and in the event of non-payment, DJB will be at liberty to disconnect the services being provided by DJB.", "I further undertake that I have not taken 'DJB Employee Rebate' against any other Premise/Connection.", "In case of variation in plot size as per document submitted by the undersigned and on actual measurement by DJB representative, difference of Infrastructure charge/any other charge on actual measurement will be paid by me.", "In case connection is found non-feasible on technical ground as per any prevalent policy of DJB the water connection may be denied or if sanctioned inadvertently, the said sanction may be withdrawn and may be disconnected without any notice.", "I hereby undertake that all the facts and documents submitted are true and correct, in case of any misrepresentation or wrong facts etc., sanction of connection may be disconnected without any notice.."];
 const NAME_PATTERN = /^[a-zA-Z\s.'-]{1,50}$/;
 const EMAIL_PATTERN = /^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}$/;
 const MOBILE_PATTERN = /^[6-9][0-9]{9}$/;
@@ -31024,7 +31069,8 @@ const DEFAULT_SECTION_STATE = {
   application: true,
   applicant: true,
   contact: true,
-  employee: true,
+  djbEmployee: true,
+  governmentEmployee: true,
   address: true,
   usage: true,
   bank: true,
@@ -31040,9 +31086,7 @@ const DEFAULT_FORM_VALUES = {
     middleName: "",
     lastName: "",
     ParentorSpouse: "",
-    isGovernmentOrganization: false,
-    applicantIdProofFile: null,
-    governmentOrganizationName: ""
+    applicantIdProofFile: null
   },
   contact: {
     emailId: "",
@@ -31055,12 +31099,13 @@ const DEFAULT_FORM_VALUES = {
     connectionType: null,
     categoryType: null,
     subCategory: null,
-    commercialType: null,
-    govtOrganization: {
-      organizationName: "",
-      natureOfWork: "",
-      organizationDocument: null
-    }
+    temporaryConnection: null,
+    ownerAuthorizationDoc: null,
+    ownerContactNumber: "",
+    ownerOtp: "",
+    isOwnerVerified: false,
+    domesticType: null,
+    commercialType: null
   },
   djbEmployee: {
     isDjbEmployee: false,
@@ -31068,6 +31113,12 @@ const DEFAULT_FORM_VALUES = {
     retirementDate: "",
     officeNameAndAddress: ""
   },
+  governmentEmployee: {
+    isGovernmentEmployee: false,
+    organizationName: "",
+    natureOfWork: "",
+    organizationDocument: null
+  },
   propertyAddress: {
     address: "",
     landmark: "",
@@ -31290,6 +31341,16 @@ const ProfileImageUpload = ({
     }
   }, error));
 };
+const linkButtonStyle = {
+  background: "transparent",
+  border: "none",
+  color: "#0B4B66",
+  cursor: "pointer",
+  fontSize: "14px",
+  fontWeight: "600",
+  padding: 0,
+  textDecoration: "underline"
+};
 const buildDefaultValues = () => ({
   zro: {
     value: "",
@@ -31539,7 +31600,7 @@ const FileUploadField = ({
   }, isUploading ? "Uploading file..." : (value === null || value === void 0 ? void 0 : value.fileName) || "No file selected"));
 };
 const NewApplication = () => {
-  var _Digit$SessionStorage, _getFieldError, _getFieldError2, _getFieldError3, _getFieldError4, _getFieldError5, _getFieldError6, _getFieldError7, _getFieldError8, _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$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$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;
+  var _Digit$SessionStorage, _getFieldError, _getFieldError2, _getFieldError3, _getFieldError4, _getFieldError5, _getFieldError6, _getFieldError7, _getFieldError8, _getFieldError9, _getFieldError0, _getFieldError1, _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;
   const {
     t
   } = useTranslation();
@@ -31556,6 +31617,8 @@ const NewApplication = () => {
   const [collapsedSections, setCollapsedSections] = useState(DEFAULT_SECTION_STATE);
   const [showToast, setShowToast] = useState(null);
   const [uploadingFields, setUploadingFields] = useState({});
+  const [isOtpSent, setIsOtpSent] = useState(false);
+  const [otpError, setOtpError] = useState(null);
   const [isEnableLoader, setIsEnableLoader] = useState(false);
   const [appDetails, setAppDetails] = useState({});
   const [waterAndSewerageBoth, setWaterAndSewerageBoth] = useState(null);
@@ -31639,6 +31702,7 @@ const NewApplication = () => {
     applicant: React.useRef(null),
     contact: React.useRef(null),
     djbEmployee: React.useRef(null),
+    governmentEmployee: React.useRef(null),
     propertyAddress: React.useRef(null),
     useDetails: React.useRef(null),
     bankDetails: React.useRef(null),
@@ -31674,6 +31738,7 @@ const NewApplication = () => {
   const formValues = watch();
   const isGovernmentOrganization = watch("applicant.isGovernmentOrganization");
   const isDjbEmployee = watch("djbEmployee.isDjbEmployee");
+  const isGovernmentEmployee = watch("governmentEmployee.isGovernmentEmployee");
   const selectedPropertyType = watch("useDetails.propertyType");
   const selectedLocality = watch("propertyAddress.locality");
   const selectedSubLocality = watch("propertyAddress.subLocality");
@@ -31691,6 +31756,19 @@ const NewApplication = () => {
   const subCategoryIsCommercial = (selectedSubCategory === null || selectedSubCategory === void 0 ? void 0 : selectedSubCategory.code) === "COMMERCIAL";
   const hasPendingUpload = Object.values(uploadingFields).some(Boolean);
   const isHospitalProperty = (selectedPropertyType === null || selectedPropertyType === void 0 ? void 0 : selectedPropertyType.code) === "HOSPITAL" || (selectedPropertyType === null || selectedPropertyType === void 0 ? void 0 : selectedPropertyType.code) === "HOSPITAL_NURSING_HOME";
+  const selectedApplicantType = watch("applicationSelection.applicantType");
+  const isTenantOrRelative = (selectedApplicantType === null || selectedApplicantType === void 0 ? void 0 : selectedApplicantType.code) === "TENANT" || (selectedApplicantType === null || selectedApplicantType === void 0 ? void 0 : selectedApplicantType.code) === "RELATIVE";
+  const isOwnerVerified = watch("applicationSelection.isOwnerVerified");
+  const subCategoryIsDomestic = (selectedSubCategory === null || selectedSubCategory === void 0 ? void 0 : selectedSubCategory.code) === "DOMESTIC";
+  const selectedConnectionType = watch("applicationSelection.connectionType");
+  const connectionTypeIsTemporary = (selectedConnectionType === null || selectedConnectionType === void 0 ? void 0 : selectedConnectionType.code) === "TEMPORARY";
+  const selectedDomesticType = watch("applicationSelection.domesticType");
+  const activeType = (selectedSubCategory === null || selectedSubCategory === void 0 ? void 0 : selectedSubCategory.code) === "DOMESTIC" ? selectedDomesticType : selectedCommercialType;
+  const applicantSectionTitle = useMemo(() => {
+    if ((activeType === null || activeType === void 0 ? void 0 : activeType.code) === "INDIVIDUAL") return "Applicant Details";
+    if ((activeType === null || activeType === void 0 ? void 0 : activeType.code) === "ORGANIZATION") return "Authorized Person Details";
+    return "Details of Applicant";
+  }, [activeType]);
   const timelineConfig = [{
     sectionId: "application",
     route: "application-selection",
@@ -31698,11 +31776,15 @@ const NewApplication = () => {
   }, {
     sectionId: "applicant",
     route: "applicant-details",
-    actions: "Details of Applicant"
+    actions: applicantSectionTitle
   }, ...(isDjbEmployee ? [{
     sectionId: "djbEmployee",
     route: "djb-employee",
     actions: "For DJB Employee"
+  }] : []), ...(isGovernmentEmployee ? [{
+    sectionId: "governmentEmployee",
+    route: "government-employee",
+    actions: "For Government Employee"
   }] : []), {
     sectionId: "propertyAddress",
     route: "property-address",
@@ -31719,6 +31801,10 @@ const NewApplication = () => {
     sectionId: "documents",
     route: "documents",
     actions: "Documents to be Attached"
+  }, {
+    sectionId: "declaration",
+    route: "declaration",
+    actions: "Declaration/Undertaking"
   }, {
     sectionId: "Review",
     route: "review",
@@ -31798,12 +31884,46 @@ const NewApplication = () => {
       clearErrors("djbEmployee.officeNameAndAddress");
     }
   }, [isDjbEmployee, setValue, clearErrors]);
+  useEffect(() => {
+    if (!isGovernmentEmployee) {
+      setValue("governmentEmployee.organizationName", "");
+      setValue("governmentEmployee.natureOfWork", "");
+      setValue("governmentEmployee.organizationDocument", null);
+      clearErrors("governmentEmployee.organizationName");
+      clearErrors("governmentEmployee.natureOfWork");
+      clearErrors("governmentEmployee.organizationDocument");
+    }
+  }, [isGovernmentEmployee, setValue, clearErrors]);
   useEffect(() => {
     if (!isHospitalProperty) {
       setValue("useDetails.hospitalBeds", "");
       clearErrors("useDetails.hospitalBeds");
     }
   }, [isHospitalProperty, setValue, clearErrors]);
+  useEffect(() => {
+    if (!isTenantOrRelative) {
+      setValue("applicationSelection.ownerAuthorizationDoc", null);
+      setValue("applicationSelection.ownerContactNumber", "");
+      setValue("applicationSelection.ownerOtp", "");
+      setValue("applicationSelection.isOwnerVerified", false);
+      setIsOtpSent(false);
+      clearErrors("applicationSelection.ownerAuthorizationDoc");
+      clearErrors("applicationSelection.ownerContactNumber");
+      clearErrors("applicationSelection.ownerOtp");
+    }
+  }, [isTenantOrRelative, setValue, clearErrors]);
+  useEffect(() => {
+    if (!subCategoryIsDomestic) {
+      setValue("applicationSelection.domesticType", null);
+      clearErrors("applicationSelection.domesticType");
+    }
+  }, [subCategoryIsDomestic, setValue, clearErrors]);
+  useEffect(() => {
+    if (!connectionTypeIsTemporary) {
+      setValue("applicationSelection.temporaryConnection", null);
+      clearErrors("applicationSelection.temporaryConnection");
+    }
+  }, [connectionTypeIsTemporary, setValue, clearErrors]);
   useEffect(() => {}, [selectedLocality === null || selectedLocality === void 0 ? void 0 : selectedLocality.code, setValue]);
   const closeToast = () => setShowToast(null);
   const closeToastOfError = () => setShowToast(null);
@@ -32341,7 +32461,105 @@ const NewApplication = () => {
       onBlur: props.onBlur,
       t: t
     })
-  }))), getFieldError("applicationSelection.applicantType") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError2 = getFieldError("applicationSelection.applicantType")) === null || _getFieldError2 === void 0 ? void 0 : _getFieldError2.message), /*#__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"
+  }, "Owner Authorization"), /*#__PURE__*/React.createElement("div", {
+    className: "field"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "applicationSelection.ownerAuthorizationDoc",
+    rules: {
+      required: isTenantOrRelative ? "Owner Authorization is required" : false
+    },
+    render: props => /*#__PURE__*/React.createElement(FileUploadField, {
+      error: getFieldError("applicationSelection.ownerAuthorizationDoc"),
+      id: "owner-auth-doc",
+      isUploading: !!uploadingFields["applicationSelection.ownerAuthorizationDoc"],
+      onDelete: () => clearUploadedFile("applicationSelection.ownerAuthorizationDoc", props.onChange),
+      onUpload: event => uploadFile(event, "applicationSelection.ownerAuthorizationDoc", props.onChange),
+      value: props.value
+    })
+  }))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+    className: "card-label-smaller"
+  }, "Owner Contact Number"), /*#__PURE__*/React.createElement("div", {
+    className: "field",
+    style: {
+      display: "flex",
+      alignItems: "center",
+      gap: "10px"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: 1
+    }
+  }, /*#__PURE__*/React.createElement(TextInput, {
+    name: "applicationSelection.ownerContactNumber",
+    inputRef: register({
+      required: isTenantOrRelative ? "Owner Contact Number is required" : false,
+      pattern: {
+        value: MOBILE_PATTERN,
+        message: "Enter a valid 10-digit mobile number."
+      }
+    }),
+    errorStyle: !!getFieldError("applicationSelection.ownerContactNumber"),
+    maxlength: 10,
+    disable: isOwnerVerified
+  })), !isOwnerVerified && /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    style: linkButtonStyle,
+    onClick: () => {
+      const mobile = watch("applicationSelection.ownerContactNumber");
+      if (MOBILE_PATTERN.test(mobile)) {
+        setIsOtpSent(true);
+        setOtpError(null);
+      } else {
+        setError("applicationSelection.ownerContactNumber", {
+          type: "manual",
+          message: "Enter a valid mobile number first."
+        });
+      }
+    }
+  }, isOtpSent ? "Resend OTP" : "Verify"), isOwnerVerified && /*#__PURE__*/React.createElement("span", {
+    style: {
+      color: "green",
+      fontSize: "14px",
+      fontWeight: "600"
+    }
+  }, "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"
+  }, "OTP Verification"), /*#__PURE__*/React.createElement("div", {
+    className: "field",
+    style: {
+      display: "flex",
+      alignItems: "center",
+      gap: "10px"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: 1
+    }
+  }, /*#__PURE__*/React.createElement(TextInput, {
+    name: "applicationSelection.ownerOtp",
+    inputRef: register({
+      required: isOtpSent ? "OTP is required" : false
+    }),
+    errorStyle: !!getFieldError("applicationSelection.ownerOtp") || !!otpError,
+    maxlength: 6
+  })), /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    style: linkButtonStyle,
+    onClick: () => {
+      const otp = watch("applicationSelection.ownerOtp");
+      if (otp && otp.length === 6) {
+        setValue("applicationSelection.isOwnerVerified", true);
+        setIsOtpSent(false);
+        setOtpError(null);
+        clearErrors("applicationSelection.ownerOtp");
+      } else {
+        setOtpError("Enter 6 digit OTP");
+      }
+    }
+  }, "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"
   }, "Connection Type"), /*#__PURE__*/React.createElement("div", {
     className: "field"
@@ -32363,31 +32581,31 @@ const NewApplication = () => {
       onBlur: props.onBlur,
       t: t
     })
-  }))), getFieldError("applicationSelection.connectionType") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError3 = getFieldError("applicationSelection.connectionType")) === null || _getFieldError3 === void 0 ? void 0 : _getFieldError3.message), /*#__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"
-  }, "Category Type"), /*#__PURE__*/React.createElement("div", {
+  }, "Temporary Connection"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
-    name: "applicationSelection.categoryType",
+    name: "applicationSelection.temporaryConnection",
     rules: {
-      required: t("REQUIRED_FIELD")
+      required: connectionTypeIsTemporary ? t("REQUIRED_FIELD") : false
     },
     isMandatory: true,
     render: props => /*#__PURE__*/React.createElement(Dropdown, {
       className: "form-field",
       selected: props.value,
       disable: false,
-      option: dropdownData.categoryTypes,
-      errorStyle: !!getFieldError("applicationSelection.categoryType"),
+      option: dropdownData.temporaryConnectionTypes,
+      errorStyle: !!getFieldError("applicationSelection.temporaryConnection"),
       select: props.onChange,
       optionKey: "name",
       onBlur: props.onBlur,
       t: t
     })
-  }))), getFieldError("applicationSelection.categoryType") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError4 = getFieldError("applicationSelection.categoryType")) === null || _getFieldError4 === void 0 ? void 0 : _getFieldError4.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"
-  }, "Sub Category"), /*#__PURE__*/React.createElement("div", {
+  }, "Category Type"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
@@ -32407,7 +32625,51 @@ const NewApplication = () => {
       onBlur: props.onBlur,
       t: t
     })
-  }))), getFieldError("applicationSelection.subCategory") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError5 = getFieldError("applicationSelection.subCategory")) === null || _getFieldError5 === void 0 ? void 0 : _getFieldError5.message), subCategoryIsCommercial && /*#__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"
+  }, "Water Demand Type"), /*#__PURE__*/React.createElement("div", {
+    className: "field"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "applicationSelection.categoryType",
+    rules: {
+      required: t("REQUIRED_FIELD")
+    },
+    isMandatory: true,
+    render: props => /*#__PURE__*/React.createElement(Dropdown, {
+      className: "form-field",
+      selected: props.value,
+      disable: false,
+      option: dropdownData.categoryTypes,
+      errorStyle: !!getFieldError("applicationSelection.categoryType"),
+      select: props.onChange,
+      optionKey: "name",
+      onBlur: props.onBlur,
+      t: t
+    })
+  }))), 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"
+  }, "Domestic Type"), /*#__PURE__*/React.createElement("div", {
+    className: "field"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "applicationSelection.domesticType",
+    rules: {
+      required: subCategoryIsDomestic ? t("REQUIRED_FIELD") : false
+    },
+    render: props => /*#__PURE__*/React.createElement(RadioButtons, {
+      onSelect: props.onChange,
+      selectedOption: props.value,
+      optionsKey: "name",
+      options: [{
+        code: "INDIVIDUAL",
+        name: "Individual"
+      }, {
+        code: "ORGANIZATION",
+        name: "Organization"
+      }]
+    })
+  }))), 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"
   }, "Commercial Type"), /*#__PURE__*/React.createElement("div", {
     className: "field"
@@ -32422,67 +32684,71 @@ const NewApplication = () => {
       onSelect: props.onChange,
       selectedOption: props.value,
       options: [{
-        code: "GOV",
-        name: "Gov"
+        code: "INDIVIDUAL",
+        name: "Individual"
       }, {
-        code: "NON_GOV",
-        name: "Non-Gov"
+        code: "ORGANIZATION",
+        name: "Organization"
       }],
       optionsKey: "name",
       t: t
     })
-  }))), subCategoryIsCommercial && !!selectedCommercialType && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    style: {
-      gridColumn: "span 2",
-      marginTop: "24px",
-      marginBottom: "16px"
-    }
-  }, /*#__PURE__*/React.createElement(CardLabel, {
-    style: {
-      color: "#3B82F6",
-      fontWeight: "700",
-      fontSize: "18px",
-      marginBottom: "0"
-    }
-  }, "Organization Details")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }))))), /*#__PURE__*/React.createElement(SectionCard, {
+    description: "Enable this section only when the applicant is a Government Connection.",
+    isOpen: collapsedSections.governmentEmployee,
+    onToggle: toggleSection,
+    sectionKey: "governmentEmployee",
+    title: "Government Connection",
+    sectionRef: sectionRefs.governmentEmployee
+  }, /*#__PURE__*/React.createElement(FieldBlock, {
+    label: "Government Connection"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "governmentEmployee.isGovernmentEmployee",
+    render: props => /*#__PURE__*/React.createElement(CheckBox, {
+      checked: !!props.value,
+      label: "Applicant is a Government Connection",
+      onChange: event => props.onChange(event.target.checked)
+    })
+  })), isGovernmentEmployee && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
   }, "Organization Name"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(TextInput, {
-    name: "applicationSelection.govtOrganization.organizationName",
+    name: "governmentEmployee.organizationName",
     inputRef: register({
-      required: !!selectedCommercialType ? "Organization Name is required" : false
+      required: isGovernmentEmployee ? "Organization Name is required" : false
     }),
-    errorStyle: !!getFieldError("applicationSelection.govtOrganization.organizationName")
-  }))), getFieldError("applicationSelection.govtOrganization.organizationName") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError6 = getFieldError("applicationSelection.govtOrganization.organizationName")) === null || _getFieldError6 === void 0 ? void 0 : _getFieldError6.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+    errorStyle: !!getFieldError("governmentEmployee.organizationName")
+  }))), getFieldError("governmentEmployee.organizationName") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError0 = getFieldError("governmentEmployee.organizationName")) === null || _getFieldError0 === void 0 ? void 0 : _getFieldError0.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
   }, "Nature of Work"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(TextInput, {
-    name: "applicationSelection.govtOrganization.natureOfWork",
+    name: "governmentEmployee.natureOfWork",
     inputRef: register({
-      required: !!selectedCommercialType ? "Nature of Work is required" : false
+      required: isGovernmentEmployee ? "Nature of Work is required" : false
     }),
-    errorStyle: !!getFieldError("applicationSelection.govtOrganization.natureOfWork")
-  }))), getFieldError("applicationSelection.govtOrganization.natureOfWork") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError7 = getFieldError("applicationSelection.govtOrganization.natureOfWork")) === null || _getFieldError7 === void 0 ? void 0 : _getFieldError7.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+    errorStyle: !!getFieldError("governmentEmployee.natureOfWork")
+  }))), getFieldError("governmentEmployee.natureOfWork") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError1 = getFieldError("governmentEmployee.natureOfWork")) === null || _getFieldError1 === void 0 ? void 0 : _getFieldError1.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
   }, "Upload Document"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
-    name: "applicationSelection.govtOrganization.organizationDocument",
+    name: "governmentEmployee.organizationDocument",
     rules: {
-      required: !!selectedCommercialType ? "Document is required" : false
+      required: isGovernmentEmployee ? "Document is required" : false
     },
     render: props => /*#__PURE__*/React.createElement(FileUploadField, {
-      error: getFieldError("applicationSelection.govtOrganization.organizationDocument"),
+      error: getFieldError("governmentEmployee.organizationDocument"),
       id: "govt-org-doc",
-      isUploading: !!uploadingFields["applicationSelection.govtOrganization.organizationDocument"],
-      onDelete: () => clearUploadedFile("applicationSelection.govtOrganization.organizationDocument", props.onChange),
-      onUpload: event => uploadFile(event, "applicationSelection.govtOrganization.organizationDocument", props.onChange),
+      isUploading: !!uploadingFields["governmentEmployee.organizationDocument"],
+      onDelete: () => clearUploadedFile("governmentEmployee.organizationDocument", props.onChange),
+      onUpload: event => uploadFile(event, "governmentEmployee.organizationDocument", props.onChange),
       value: props.value
     })
-  })))), subCategoryIsCommercial && getFieldError("applicationSelection.commercialType") && /*#__PURE__*/React.createElement(CardLabelError, null, (_getFieldError8 = getFieldError("applicationSelection.commercialType")) === null || _getFieldError8 === void 0 ? void 0 : _getFieldError8.message))), /*#__PURE__*/React.createElement("div", {
+  }))))), /*#__PURE__*/React.createElement("div", {
     style: {
       display: previewMode ? "none" : "block"
     }
@@ -32491,7 +32757,7 @@ const NewApplication = () => {
     isOpen: collapsedSections.applicant,
     onToggle: toggleSection,
     sectionKey: "applicant",
-    title: "Details of Applicant",
+    title: applicantSectionTitle,
     sectionRef: sectionRefs.applicant
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
@@ -32500,9 +32766,9 @@ const NewApplication = () => {
       validate: value => !!value || "Applicant Picture is required."
     },
     render: props => {
-      var _getFieldError9;
+      var _getFieldError10;
       return /*#__PURE__*/React.createElement(ProfileImageUpload, {
-        error: (_getFieldError9 = getFieldError("applicant.UploadPicture")) === null || _getFieldError9 === void 0 ? void 0 : _getFieldError9.message,
+        error: (_getFieldError10 = getFieldError("applicant.UploadPicture")) === null || _getFieldError10 === void 0 ? void 0 : _getFieldError10.message,
         isUploading: !!uploadingFields["applicant.UploadPicture"],
         label: "Upload Picture",
         onUpload: event => uploadFile(event, "applicant.UploadPicture", props.onChange),
@@ -32635,7 +32901,7 @@ const NewApplication = () => {
     isOpen: collapsedSections.employee,
     onToggle: toggleSection,
     sectionKey: "djbEmployee",
-    title: "For DJB Employee",
+    title: "DJB Employee",
     sectionRef: sectionRefs.djbEmployee
   }, /*#__PURE__*/React.createElement(FieldBlock, {
     label: "DJB Employee"
@@ -32782,13 +33048,6 @@ const NewApplication = () => {
     errorStyle: !!getFieldError("propertyAddress.state"),
     inputRef: register(),
     name: "propertyAddress.state"
-  })), /*#__PURE__*/React.createElement(FieldBlock, {
-    error: getFieldError("propertyAddress.district"),
-    label: "District"
-  }, /*#__PURE__*/React.createElement(TextInput, {
-    errorStyle: !!getFieldError("propertyAddress.district"),
-    inputRef: register(),
-    name: "propertyAddress.district"
   })), /*#__PURE__*/React.createElement(FieldBlock, {
     error: getFieldError("propertyAddress.street"),
     label: "Street"
@@ -33047,6 +33306,14 @@ const NewApplication = () => {
       select: props.onChange,
       t: t
     })
+  })), /*#__PURE__*/React.createElement(FieldBlock, {
+    error: getFieldError("propertyAddress.proofOfIdentity"),
+    label: "Proof of Identity Document",
+    required: true
+  }, /*#__PURE__*/React.createElement(TextInput, {
+    errorStyle: !!getFieldError("propertyAddress.proofOfIdentity"),
+    inputRef: register(),
+    name: "propertyAddress.proofOfIdentity"
   })), /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "documents.identityProofFile",
@@ -33064,9 +33331,11 @@ const NewApplication = () => {
       required: true,
       value: props.value
     })
+  }), /*#__PURE__*/React.createElement(FieldBlock, {
+    error: getFieldError("propertyAddress.otherDocument")
   }), /*#__PURE__*/React.createElement(FieldBlock, {
     error: getFieldError("documents.ownershipStatus"),
-    label: "Ownership Status",
+    label: "Ownership Proof",
     required: true
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
@@ -33081,6 +33350,14 @@ const NewApplication = () => {
       select: props.onChange,
       t: t
     })
+  })), /*#__PURE__*/React.createElement(FieldBlock, {
+    error: getFieldError("propertyAddress.ownershipStatus"),
+    label: "Proof of Identity Ownership Document",
+    required: true
+  }, /*#__PURE__*/React.createElement(TextInput, {
+    errorStyle: !!getFieldError("propertyAddress.ownershipStatus"),
+    inputRef: register(),
+    name: "propertyAddress.ownershipStatus"
   })), /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "documents.ownershipDocumentFile",
@@ -33098,7 +33375,34 @@ const NewApplication = () => {
       required: true,
       value: props.value
     })
-  }), /*#__PURE__*/React.createElement(Controller, {
+  }), /*#__PURE__*/React.createElement(FieldBlock, {
+    error: getFieldError("propertyAddress.otherDocument")
+  }), /*#__PURE__*/React.createElement(FieldBlock, {
+    error: getFieldError("documents.otherDocument"),
+    label: "Other Document",
+    required: true
+  }, /*#__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,
+      optionKey: "name",
+      selected: props.value,
+      select: props.onChange,
+      t: t
+    })
+  })), /*#__PURE__*/React.createElement(FieldBlock, {
+    error: getFieldError("propertyAddress.otherDocument"),
+    label: "Other Document",
+    required: true
+  }, /*#__PURE__*/React.createElement(TextInput, {
+    errorStyle: !!getFieldError("propertyAddress.otherDocument"),
+    inputRef: register(),
+    name: "propertyAddress.otherDocument"
+  })), /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "documents.otherDocumentFile",
     render: props => /*#__PURE__*/React.createElement(FileUploadField, {
@@ -33111,6 +33415,56 @@ const NewApplication = () => {
       onUpload: event => uploadFile(event, "documents.otherDocumentFile", props.onChange),
       value: props.value
     })
+  })), /*#__PURE__*/React.createElement(SectionCard, {
+    description: "Declaration and undertaking to be signed by the applicant.",
+    isOpen: collapsedSections.declaration,
+    onToggle: toggleSection,
+    sectionKey: "declaration",
+    title: "Declaration/Undertaking",
+    sectionRef: sectionRefs.declaration
+  }, DECLARATION_POINTS.map((point, index) => /*#__PURE__*/React.createElement("p", {
+    key: index
+  }, /*#__PURE__*/React.createElement("span", null, String(index + 1), "."), /*#__PURE__*/React.createElement("span", null, point))), /*#__PURE__*/React.createElement(FieldBlock, {
+    error: getFieldError("propertyAddress.otherDocument")
+  }), /*#__PURE__*/React.createElement(FieldBlock, {
+    error: getFieldError("declaration.submittedBy"),
+    label: "Submitted By *",
+    required: true
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "declaration.submittedBy",
+    rules: {
+      required: "Submission type is required."
+    },
+    render: props => /*#__PURE__*/React.createElement(Dropdown, {
+      option: [{
+        code: "SELF",
+        name: "SELF"
+      }, {
+        code: "RELATIVE",
+        name: "Relative"
+      }],
+      optionKey: "name",
+      selected: props.value,
+      select: props.onChange,
+      t: t
+    })
+  })), /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "declaration.signatureFile",
+    rules: {
+      validate: value => !!value || "Signature upload is required."
+    },
+    render: props => /*#__PURE__*/React.createElement(FileUploadField, {
+      error: getFieldError("declaration.signatureFile"),
+      id: "signature-file",
+      isUploading: !!uploadingFields["declaration.signatureFile"],
+      label: "Upload Signature",
+      onDelete: () => clearUploadedFile("declaration.signatureFile", props.onChange),
+      onUpload: event => uploadFile(event, "declaration.signatureFile", props.onChange),
+      required: true,
+      value: props.value
+    })
   })))), previewMode && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SectionCard, {
     description: "Selected request and connection type.",
     isOpen: collapsedSections.application,
@@ -33130,30 +33484,42 @@ const NewApplication = () => {
   }), /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Connection Type",
     value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati3 = formValues.applicationSelection) === null || _formValues$applicati3 === void 0 ? void 0 : _formValues$applicati3.connectionType
+  }), (formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati4 = formValues.applicationSelection) === null || _formValues$applicati4 === void 0 ? void 0 : (_formValues$applicati5 = _formValues$applicati4.connectionType) === null || _formValues$applicati5 === void 0 ? void 0 : _formValues$applicati5.code) === "TEMPORARY" && /*#__PURE__*/React.createElement(PreviewItem, {
+    label: "Temporary Connection",
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati6 = formValues.applicationSelection) === null || _formValues$applicati6 === void 0 ? void 0 : _formValues$applicati6.temporaryConnection
+  }), isTenantOrRelative && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PreviewItem, {
+    label: "Owner Authorization",
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati7 = formValues.applicationSelection) === null || _formValues$applicati7 === void 0 ? void 0 : _formValues$applicati7.ownerAuthorizationDoc
   }), /*#__PURE__*/React.createElement(PreviewItem, {
+    label: "Owner Contact Number",
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati8 = formValues.applicationSelection) === null || _formValues$applicati8 === void 0 ? void 0 : _formValues$applicati8.ownerContactNumber
+  })), /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Category Type",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati4 = formValues.applicationSelection) === null || _formValues$applicati4 === void 0 ? void 0 : _formValues$applicati4.categoryType
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati9 = formValues.applicationSelection) === null || _formValues$applicati9 === void 0 ? void 0 : _formValues$applicati9.categoryType
   }), /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Sub Category",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati5 = formValues.applicationSelection) === null || _formValues$applicati5 === void 0 ? void 0 : _formValues$applicati5.subCategory
-  }), (formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati6 = formValues.applicationSelection) === null || _formValues$applicati6 === void 0 ? void 0 : (_formValues$applicati7 = _formValues$applicati6.subCategory) === null || _formValues$applicati7 === void 0 ? void 0 : _formValues$applicati7.code) === "COMMERCIAL" && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PreviewItem, {
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati0 = formValues.applicationSelection) === null || _formValues$applicati0 === void 0 ? void 0 : _formValues$applicati0.subCategory
+  }), (formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati1 = formValues.applicationSelection) === null || _formValues$applicati1 === void 0 ? void 0 : (_formValues$applicati10 = _formValues$applicati1.subCategory) === null || _formValues$applicati10 === void 0 ? void 0 : _formValues$applicati10.code) === "DOMESTIC" && /*#__PURE__*/React.createElement(PreviewItem, {
+    label: "Domestic Type",
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati11 = formValues.applicationSelection) === null || _formValues$applicati11 === void 0 ? void 0 : _formValues$applicati11.domesticType
+  }), (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$applicati8 = formValues.applicationSelection) === null || _formValues$applicati8 === void 0 ? void 0 : _formValues$applicati8.commercialType
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati14 = formValues.applicationSelection) === null || _formValues$applicati14 === void 0 ? void 0 : _formValues$applicati14.commercialType
   }), /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Organization Name",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati9 = formValues.applicationSelection) === null || _formValues$applicati9 === void 0 ? void 0 : (_formValues$applicati0 = _formValues$applicati9.govtOrganization) === null || _formValues$applicati0 === void 0 ? void 0 : _formValues$applicati0.organizationName
+    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
   }), /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Nature of Work",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati1 = formValues.applicationSelection) === null || _formValues$applicati1 === void 0 ? void 0 : (_formValues$applicati10 = _formValues$applicati1.govtOrganization) === null || _formValues$applicati10 === void 0 ? void 0 : _formValues$applicati10.natureOfWork
+    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
   }), /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Organization Document",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$applicati11 = formValues.applicationSelection) === null || _formValues$applicati11 === void 0 ? void 0 : (_formValues$applicati12 = _formValues$applicati11.govtOrganization) === null || _formValues$applicati12 === void 0 ? void 0 : _formValues$applicati12.organizationDocument
+    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, {
     description: "Applicant identity and organization information.",
     isOpen: collapsedSections.applicant,
     onToggle: toggleSection,
     sectionKey: "applicant",
-    title: "Details of Applicant",
+    title: applicantSectionTitle,
     onEditClick: () => handleSectionEdit("applicant")
   }, /*#__PURE__*/React.createElement("div", {
     style: {
@@ -33219,9 +33585,9 @@ const NewApplication = () => {
     value: formValues === null || formValues === void 0 ? void 0 : (_formValues$documents = formValues.documents) === null || _formValues$documents === void 0 ? void 0 : _formValues$documents.identityProofFile
   })), /*#__PURE__*/React.createElement(SectionCard, {
     description: "DJB employee-specific information.",
-    isOpen: collapsedSections.employee,
+    isOpen: collapsedSections.djbEmployee,
     onToggle: toggleSection,
-    sectionKey: "employee",
+    sectionKey: "djbEmployee",
     title: "For DJB Employee",
     onEditClick: () => handleSectionEdit("djbEmployee")
   }, /*#__PURE__*/React.createElement(PreviewItem, {
@@ -33237,7 +33603,23 @@ const NewApplication = () => {
     isFullWidth: true,
     label: "Office Name & Address",
     value: formValues === null || formValues === void 0 ? void 0 : (_formValues$djbEmploy5 = formValues.djbEmployee) === null || _formValues$djbEmploy5 === void 0 ? void 0 : _formValues$djbEmploy5.officeNameAndAddress
-  })) : null), /*#__PURE__*/React.createElement(SectionCard, {
+  })) : null), (formValues === null || formValues === void 0 ? void 0 : (_formValues$governmen = formValues.governmentEmployee) === null || _formValues$governmen === void 0 ? void 0 : _formValues$governmen.isGovernmentEmployee) && /*#__PURE__*/React.createElement(SectionCard, {
+    description: "Government employee organization details.",
+    isOpen: collapsedSections.governmentEmployee,
+    onToggle: toggleSection,
+    sectionKey: "governmentEmployee",
+    title: "For Government Employee",
+    onEditClick: () => handleSectionEdit("governmentEmployee")
+  }, /*#__PURE__*/React.createElement(PreviewItem, {
+    label: "Organization Name",
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$governmen2 = formValues.governmentEmployee) === null || _formValues$governmen2 === void 0 ? void 0 : _formValues$governmen2.organizationName
+  }), /*#__PURE__*/React.createElement(PreviewItem, {
+    label: "Nature of Work",
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$governmen3 = formValues.governmentEmployee) === null || _formValues$governmen3 === void 0 ? void 0 : _formValues$governmen3.natureOfWork
+  }), /*#__PURE__*/React.createElement(PreviewItem, {
+    label: "Organization Document",
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$governmen4 = formValues.governmentEmployee) === null || _formValues$governmen4 === void 0 ? void 0 : _formValues$governmen4.organizationDocument
+  })), /*#__PURE__*/React.createElement(SectionCard, {
     description: "Property address and administrative boundary values.",
     isOpen: collapsedSections.address,
     onToggle: toggleSection,
@@ -33350,6 +33732,23 @@ const NewApplication = () => {
   }), /*#__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
+  })), /*#__PURE__*/React.createElement(SectionCard, {
+    description: "Applicant declaration details.",
+    isOpen: collapsedSections.declaration,
+    onToggle: toggleSection,
+    sectionKey: "declaration",
+    title: "Declaration/Undertaking",
+    onEditClick: () => handleSectionEdit("declaration")
+  }, /*#__PURE__*/React.createElement(PreviewItem, {
+    label: "Submitted By",
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$declarati = formValues.declaration) === null || _formValues$declarati === void 0 ? void 0 : _formValues$declarati.submittedBy
+  }), /*#__PURE__*/React.createElement(PreviewItem, {
+    isFullWidth: true,
+    label: "Signature",
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$declarati2 = formValues.declaration) === null || _formValues$declarati2 === void 0 ? void 0 : _formValues$declarati2.signatureFile
+  }), /*#__PURE__*/React.createElement(PreviewItem, {
+    label: "Agreed",
+    value: formValues !== null && formValues !== void 0 && (_formValues$declarati3 = formValues.declaration) !== null && _formValues$declarati3 !== void 0 && _formValues$declarati3.agree ? "Yes" : "No"
   }))))), /*#__PURE__*/React.createElement(ActionBar, {
     style: actionBarStyle
   }, !previewMode ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SubmitBar, {