@djb25/digit-ui-module-ws 1.0.82 → 1.0.84

package/dist/index.modern.js

@@ -1,7 +1,7 @@
 import React, { useState, useMemo, useEffect, useRef, Fragment as Fragment$2, useReducer, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link, useHistory, useLocation, Switch, Route, useRouteMatch, Redirect, useParams } from 'react-router-dom';
-import { Loader, Card, KeyNote, SubmitBar, InfoBannerIcon, SearchForm, SearchField, Dropdown, TextInput, Table, Banner, CardText, ActionBar, HomeIcon, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, VerticalTimeline, CollapsibleCardPage, LabelFieldPair, CardLabel, CardLabelError, CheckBox, PrintBtnCommon, MultiLink, LinkButton, Toast, TickMark, FormStep, RadioOrSelect, CardHeader, CitizenInfoLabel, CardSubHeader, DatePicker, RadioButtons, UploadFile, ViewsIcon, Modal, DeleteIcon, WrapUnMaskComponent, MobileNumber, StatusTable, Row, CardSectionHeader, InfoIcon, TextArea, Header, FilterFormField, RemoveableTag as RemoveableTag$1, MultiSelectDropdown, InboxComposer, DropIcon, WSICon, EmployeeModuleCard, SearchAction, PopUp, DetailsCard, CloseSvg, Localities, DownloadBtnCommon, CollectionIcon, ResponseComposer, TelePhone, DisplayPhotos, PDFSvg, GenericFileIcon, EditIcon, Label, CardSectionSubText, DownloadIcon, CardLabelDesc, FormComposer, MultiUploadWrapper, Close as Close$f, BreakLine, AddIcon, CheckPoint, ConnectingCheckPoints, Menu, ButtonSelector as ButtonSelector$1, CitizenHomeCard } from '@djb25/digit-ui-react-components';
+import { Loader, Card, KeyNote, SubmitBar, InfoBannerIcon, SearchForm, SearchField, Dropdown, TextInput, Table, Banner, CardText, ActionBar, HomeIcon, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, VerticalTimeline, CollapsibleCardPage, LabelFieldPair, CardLabel, CardLabelError, CheckBox, PrintBtnCommon, MultiLink, LinkButton, Toast, TickMark, FormStep, RadioOrSelect, CardHeader, CitizenInfoLabel, CardSubHeader, DatePicker, RadioButtons, UploadFile, ViewsIcon, Modal, DeleteIcon, WrapUnMaskComponent, MobileNumber, RemoveIcon, StatusTable, Row, CardSectionHeader, InfoIcon, TextArea, Header, FilterFormField, RemoveableTag as RemoveableTag$1, MultiSelectDropdown, InboxComposer, DropIcon, WSICon, EmployeeModuleCard, SearchAction, PopUp, DetailsCard, CloseSvg, Localities, DownloadBtnCommon, CollectionIcon, ResponseComposer, TelePhone, DisplayPhotos, PDFSvg, GenericFileIcon, EditIcon, Label, CardSectionSubText, DownloadIcon, CardLabelDesc, FormComposer, MultiUploadWrapper, Close as Close$f, BreakLine, AddIcon, CheckPoint, ConnectingCheckPoints, Menu, ButtonSelector as ButtonSelector$1, CitizenHomeCard } from '@djb25/digit-ui-react-components';
 import { useForm, Controller, useWatch, useFormContext } from 'react-hook-form';
 import { read, utils as utils$1 } from 'xlsx';
 import { useQueryClient, useQuery } from 'react-query';
@@ -531,7 +531,7 @@ const getFiles = function (filesArray, tenant) {
 };
 const createPayloadOfWS = function (data) {
   try {
-    var _Digit$UserService$ge, _userInfo$roles, _data$cpt, _data$cpt$details, _data$cpt$details$own, _data$applicationSele, _data$ConnectionDetai, _data$ConnectionDetai2, _ref, _data$ConnectionHolde, _data$documents, _data$djbEmployee, _data$governmentEmplo, _connectionHolder$gen, _data$cpt2, _data$cpt2$details, _data$cpt2$details$ow, _data$cpt2$details$ow2, _connectionHolder$own, _connectionHolder$rel, _data$propertyAddress, _data$applicant, _data$useDetails, _data$useDetails$gend, _data$contact, _data$applicant2, _data$applicant3, _data$applicant4, _data$contact2, _data$contact3, _data$applicationSele2, _data$applicationSele3, _data$contact4, _data$cpt3, _data$cpt4, _data$cpt4$details, _data$propertyAddress2, _data$propertyAddress3, _data$propertyAddress4, _data$cpt5, _data$cpt5$details, _data$cpt5$details$ad, _data$propertyAddress5, _data$cpt6, _data$cpt6$details, _data$cpt6$details$ad, _data$propertyAddress6, _data$cpt7, _data$cpt7$details, _data$cpt7$details$ad, _data$propertyAddress7, _data$cpt8, _data$cpt8$details, _data$cpt8$details$ad, _data$propertyAddress8, _data$cpt9, _data$cpt9$details, _data$cpt9$details$ad, _data$propertyAddress9, _data$cpt0, _data$cpt0$details, _data$cpt0$details$ad, _data$propertyAddress0, _data$cpt1, _data$cpt1$details, _data$cpt1$details$ad, _data$propertyAddress1, _data$cpt10, _data$cpt10$details, _data$cpt10$details$a, _data$propertyAddress10, _data$cpt11, _data$cpt11$details, _data$cpt11$details$a, _data$cpt12, _data$cpt12$details, _data$cpt12$details$a, _data$propertyAddress11, _data$cpt13, _data$cpt13$details, _data$cpt13$details$a, _data$cpt13$details$a2, _data$propertyAddress12, _data$cpt14, _data$cpt14$details, _data$cpt14$details$a, _data$cpt14$details$a2, _data$propertyAddress13, _data$cpt15, _data$cpt15$details, _data$cpt15$details$a, _data$cpt15$details$a2, _data$cpt16, _data$cpt16$details, _data$roadCuttingDeta, _data$plumberDetails, _data$djbEmployee4, _data$djbEmployee4$do, _data$djbEmployee5, _data$zro, _data$propertyAddress14, _data$propertyAddress15, _data$cpt17, _data$cpt17$details, _data$cpt17$details$a, _data$cpt17$details$a2, _data$plumberDetails2, _data$plumberDetails3, _data$plumberDetails4, _data$plumberDetails5, _data$plumberDetails6, _data$applicationSele4, _data$applicationSele5, _data$applicationSele6, _data$applicationSele7, _connectionDetailsObj, _useDetailsObject$cat, _data$applicationSele8, _data$applicationSele9, _connectionHolder$own2, _useDetailsObject$noO, _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$applicationSele24, _data$contact5, _data$documents2, _data$documents3, _data$documents4, _data$cpt18, _Digit, _Digit$Customizations, _Digit$Customizations2, _Digit2, _Digit2$Customization, _Digit2$Customization2;
+    var _Digit$UserService$ge, _userInfo$roles, _data$cpt, _data$cpt$details, _data$cpt$details$own, _data$applicationSele, _data$ConnectionDetai, _data$ConnectionDetai2, _ref, _data$ConnectionHolde, _data$documents, _data$djbEmployee, _data$governmentEmplo, _connectionHolder$gen, _data$cpt2, _data$cpt2$details, _data$cpt2$details$ow, _data$cpt2$details$ow2, _connectionHolder$own, _connectionHolder$rel, _data$propertyAddress, _data$applicant, _data$useDetails, _data$useDetails$gend, _data$contact, _data$applicant2, _data$applicant3, _data$applicant4, _data$contact2, _data$contact3, _data$applicationSele2, _data$applicationSele3, _data$contact4, _data$cpt3, _data$cpt4, _data$cpt4$details, _data$propertyAddress2, _data$propertyAddress3, _data$propertyAddress4, _data$cpt5, _data$cpt5$details, _data$cpt5$details$ad, _data$propertyAddress5, _data$cpt6, _data$cpt6$details, _data$cpt6$details$ad, _data$propertyAddress6, _data$cpt7, _data$cpt7$details, _data$cpt7$details$ad, _data$propertyAddress7, _data$cpt8, _data$cpt8$details, _data$cpt8$details$ad, _data$propertyAddress8, _data$cpt9, _data$cpt9$details, _data$cpt9$details$ad, _data$propertyAddress9, _data$cpt0, _data$cpt0$details, _data$cpt0$details$ad, _data$propertyAddress0, _data$cpt1, _data$cpt1$details, _data$cpt1$details$ad, _data$propertyAddress1, _data$cpt10, _data$cpt10$details, _data$cpt10$details$a, _data$propertyAddress10, _data$cpt11, _data$cpt11$details, _data$cpt11$details$a, _data$cpt12, _data$cpt12$details, _data$cpt12$details$a, _data$propertyAddress11, _data$cpt13, _data$cpt13$details, _data$cpt13$details$a, _data$cpt13$details$a2, _data$propertyAddress12, _data$cpt14, _data$cpt14$details, _data$cpt14$details$a, _data$cpt14$details$a2, _data$propertyAddress13, _data$cpt15, _data$cpt15$details, _data$cpt15$details$a, _data$cpt15$details$a2, _data$cpt16, _data$cpt16$details, _data$roadCuttingDeta, _data$plumberDetails, _data$disability, _data$djbEmployee4, _data$djbEmployee4$do, _data$djbEmployee5, _data$zro, _data$propertyAddress14, _data$propertyAddress15, _data$cpt17, _data$cpt17$details, _data$cpt17$details$a, _data$cpt17$details$a2, _data$plumberDetails2, _data$plumberDetails3, _data$plumberDetails4, _data$plumberDetails5, _data$plumberDetails6, _data$applicationSele4, _data$applicationSele5, _data$applicationSele6, _data$applicationSele7, _connectionDetailsObj, _useDetailsObject$cat, _data$applicationSele8, _data$applicationSele9, _connectionHolder$own2, _useDetailsObject$noO, _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$applicationSele24, _data$contact5, _data$documents2, _data$documents3, _data$documents4, _data$cpt18, _Digit, _Digit$Customizations, _Digit$Customizations2, _Digit2, _Digit2$Customization, _Digit2$Customization2;
     const userInfo = (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.info;
     const isCitizen = (userInfo === null || userInfo === void 0 ? void 0 : userInfo.type) === "CITIZEN" || (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$roles = userInfo.roles) === null || _userInfo$roles === void 0 ? void 0 : _userInfo$roles.some(role => role.code === "CITIZEN"));
     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 => {
@@ -642,7 +642,8 @@ const createPayloadOfWS = function (data) {
         name: details === null || details === void 0 ? void 0 : details.plumberName,
         mobileNumber: details === null || details === void 0 ? void 0 : details.plumberMobileNo
       })),
-      additionalDetails: _extends({}, useDetailsObject, data === null || data === void 0 ? void 0 : data.djbEmployee, {
+      additionalDetails: _extends({}, useDetailsObject, data === null || data === void 0 ? void 0 : data.djbEmployee, data === null || data === void 0 ? void 0 : data.disability, {
+        isDivyangjan: !!(data !== null && data !== void 0 && (_data$disability = data.disability) !== null && _data$disability !== void 0 && _data$disability.isDivyangjan),
         document: (data === null || data === void 0 ? void 0 : (_data$djbEmployee4 = data.djbEmployee) === null || _data$djbEmployee4 === void 0 ? void 0 : (_data$djbEmployee4$do = _data$djbEmployee4.document) === null || _data$djbEmployee4$do === void 0 ? void 0 : _data$djbEmployee4$do.fileStoreId) || (data === null || data === void 0 ? void 0 : (_data$djbEmployee5 = data.djbEmployee) === null || _data$djbEmployee5 === void 0 ? void 0 : _data$djbEmployee5.document) || undefined
       }, data === null || data === void 0 ? void 0 : data.bankDetails, data === null || data === void 0 ? void 0 : data.declarationData, data === null || data === void 0 ? void 0 : data.declaration, {
         zro: (data === null || data === void 0 ? void 0 : (_data$zro = data.zro) === null || _data$zro === void 0 ? void 0 : _data$zro.code) || (data === null || data === void 0 ? void 0 : data.zro),
@@ -18047,6 +18048,14 @@ const UploadFileDigiLocker = props => {
 };
 
 const DIGILOCKER_SUPPORTED_CODES = ["AADHAAR", "AADHAR", "DRIVING", "DRVLC", "PAN"];
+const ENVIRONMENT_FILE_STORE_IDS = {
+  uat: "261542df-8dae-41e7-aa17-00cd288faf3b",
+  dev: "0d394691-45ed-4036-97e8-8de8b0f166b1"
+};
+const getEnvironmentFileStoreId = () => {
+  const hostname = window.location.hostname.toLowerCase();
+  return hostname.includes("uat") ? ENVIRONMENT_FILE_STORE_IDS.uat : ENVIRONMENT_FILE_STORE_IDS.dev;
+};
 const isDigiLockerEligible = function (code) {
   if (code === void 0) {
     code = "";
@@ -18054,8 +18063,26 @@ const isDigiLockerEligible = function (code) {
   const upper = code.toUpperCase();
   return DIGILOCKER_SUPPORTED_CODES.some(keyword => upper.includes(keyword));
 };
+const isOtherDocument = function (code) {
+  if (code === void 0) {
+    code = "";
+  }
+  return code.toUpperCase().includes("OTHER");
+};
+const removeDuplicateOtherDocuments = function (documentList) {
+  if (documentList === void 0) {
+    documentList = [];
+  }
+  const documentTypes = new Set();
+  return documentList.filter(document => {
+    if (!isOtherDocument(document === null || document === void 0 ? void 0 : document.documentType)) return true;
+    if (documentTypes.has(document.documentType)) return false;
+    documentTypes.add(document.documentType);
+    return true;
+  });
+};
 const WSDocumentsEmployee = _ref => {
-  var _formData$documents, _formData$DocumentsRe, _applicationDetailsDa, _applicationDetailsDa2, _wsDocs$wsDocsData3;
+  var _applicationDetailsDa, _applicationDetailsDa2, _wsDocs$wsDocsData3;
   let t = _ref.t,
     config = _ref.config,
     onSelect = _ref.onSelect,
@@ -18065,7 +18092,10 @@ const WSDocumentsEmployee = _ref => {
     clearFormErrors = _ref.clearErrors,
     formState = _ref.formState;
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const _useState = useState(userType === "citizen" ? (formData === null || formData === void 0 ? void 0 : (_formData$documents = formData.documents) === null || _formData$documents === void 0 ? void 0 : _formData$documents.documents) || (formData === null || formData === void 0 ? void 0 : formData.documents) || [] : (formData === null || formData === void 0 ? void 0 : (_formData$DocumentsRe = formData.DocumentsRequired) === null || _formData$DocumentsRe === void 0 ? void 0 : _formData$DocumentsRe.documents) || []),
+  const _useState = useState(() => {
+      var _formData$documents, _formData$DocumentsRe;
+      return removeDuplicateOtherDocuments(userType === "citizen" ? (formData === null || formData === void 0 ? void 0 : (_formData$documents = formData.documents) === null || _formData$documents === void 0 ? void 0 : _formData$documents.documents) || (formData === null || formData === void 0 ? void 0 : formData.documents) || [] : (formData === null || formData === void 0 ? void 0 : (_formData$DocumentsRe = formData.DocumentsRequired) === null || _formData$DocumentsRe === void 0 ? void 0 : _formData$DocumentsRe.documents) || []);
+    }),
     documents = _useState[0],
     setDocuments = _useState[1];
   const _useState2 = useState(true),
@@ -18092,10 +18122,21 @@ const WSDocumentsEmployee = _ref => {
       onSelect(config.key, documentStep);
     } else {
       onSelect(config.key, {
-        documents
+        documents: removeDuplicateOtherDocuments(documents)
       });
     }
   };
+  const downloadDocument = function () {
+    try {
+      return Promise.resolve(Digit.UploadServices.DownloadFile(getEnvironmentFileStoreId(), "dl", "NOC for New Delhi Jal Board Connection.pdf")).then(function (downloaded) {
+        if (!downloaded) {
+          setError(t("CS_FILE_DOWNLOAD_ERROR") || "PDF download failed");
+        }
+      });
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
   useEffect(() => {
     var _wsDocs$wsDocsData;
     let count = 0;
@@ -18152,7 +18193,8 @@ const WSDocumentsEmployee = _ref => {
       setFormError: setFormError,
       clearFormErrors: clearFormErrors,
       config: config,
-      formState: formState
+      formState: formState,
+      isOtherDocument: isOtherDocument(document === null || document === void 0 ? void 0 : document.code)
     });
   }));
   if (userType === "citizen") {
@@ -18173,14 +18215,32 @@ const WSDocumentsEmployee = _ref => {
   return /*#__PURE__*/React.createElement(CollapsibleCardPage, {
     title: t("WS_DOCUMENTS"),
     defaultOpen: true
-  }, innerContent, error && /*#__PURE__*/React.createElement(Toast, {
+  }, /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    onClick: event => {
+      event.stopPropagation();
+      downloadDocument();
+    },
+    style: {
+      cursor: "pointer",
+      color: "#fff",
+      fontWeight: "bold",
+      padding: "6px 14px",
+      border: "1px solid #00497e",
+      borderRadius: "4px",
+      backgroundColor: "#00497e",
+      marginLeft: "auto",
+      marginRight: "32px",
+      whiteSpace: "nowrap"
+    }
+  }, t("WS_DOWNLOAD_DOCUMENT")), innerContent, error && /*#__PURE__*/React.createElement(Toast, {
     label: error,
     onClose: () => setError(null),
     error: true
   }));
 };
 function SelectDocument(_ref2) {
-  var _formData$ConnectionD, _doc$i18nKey, _selectedDocument$cod2, _selectedDocument$cod3, _selectedDocument$cod4, _selectedDocument$cod5, _selectedDocument$cod6, _selectedDocument$cod7, _selectedDocument$cod8, _selectedDocument$cod9, _selectedDocument$cod0, _selectedDocument$cod1, _selectedDocument$cod10, _selectedDocument$cod11, _selectedDocument$cod12, _selectedDocument$cod13, _selectedDocument$cod14, _selectedDocument$cod15, _doc$i18nKey2, _doc$i18nKey3;
+  var _formData$ConnectionD, _doc$i18nKey, _selectedDocument$cod2, _selectedDocument$cod3, _selectedDocument$cod4, _selectedDocument$cod5, _selectedDocument$cod6, _selectedDocument$cod7, _selectedDocument$cod8, _selectedDocument$cod9, _selectedDocument$cod0, _selectedDocument$cod1, _selectedDocument$cod10, _selectedDocument$cod11, _selectedDocument$cod12, _selectedDocument$cod13, _selectedDocument$cod14, _selectedDocument$cod15, _doc$i18nKey2;
   let t = _ref2.t,
     doc = _ref2.document,
     setDocuments = _ref2.setDocuments,
@@ -18191,11 +18251,17 @@ function SelectDocument(_ref2) {
     clearFormErrors = _ref2.clearFormErrors,
     config = _ref2.config,
     formState = _ref2.formState,
-    id = _ref2.id;
+    id = _ref2.id,
+    _ref2$isOtherDocument = _ref2.isOtherDocument,
+    isOther = _ref2$isOtherDocument === void 0 ? false : _ref2$isOtherDocument;
   const fileRef = useRef();
-  const filteredDocument = documents === null || documents === void 0 ? void 0 : documents.filter(item => {
+  const otherUploadedDocuments = isOther ? (documents === null || documents === void 0 ? void 0 : documents.filter(item => {
     var _item$documentType;
     return item === null || item === void 0 ? void 0 : (_item$documentType = item.documentType) === null || _item$documentType === void 0 ? void 0 : _item$documentType.includes(doc === null || doc === void 0 ? void 0 : doc.code);
+  })) || [] : [];
+  const filteredDocument = isOther ? null : documents === null || documents === void 0 ? void 0 : documents.filter(item => {
+    var _item$documentType2;
+    return item === null || item === void 0 ? void 0 : (_item$documentType2 = item.documentType) === null || _item$documentType2 === void 0 ? void 0 : _item$documentType2.includes(doc === null || doc === void 0 ? void 0 : doc.code);
   })[0];
   const _useState4 = useState(() => {
       var _filteredDocument$doc, _doc$dropdownData2;
@@ -18214,10 +18280,10 @@ function SelectDocument(_ref2) {
   const _useState5 = useState(null),
     file = _useState5[0],
     setFile = _useState5[1];
-  const _useState6 = useState(() => (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.fileStoreId) || null),
+  const _useState6 = useState(() => isOther ? null : (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.fileStoreId) || null),
     uploadedFile = _useState6[0],
     setUploadedFile = _useState6[1];
-  const _useState7 = useState(() => (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.documentUid) || (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.documentNumber) || ""),
+  const _useState7 = useState(() => isOther ? "" : (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.documentUid) || (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.documentNumber) || ""),
     documentUid = _useState7[0],
     setDocumentUid = _useState7[1];
   const _useState8 = useState(false),
@@ -18276,12 +18342,23 @@ function SelectDocument(_ref2) {
     setShowCamera(false);
   };
   const handleSelectDocument = value => setSelectedDocument(value);
-  const viewDocument = function () {
+  const removeUploadedDocument = fileStoreId => {
+    setDocuments(previousDocuments => previousDocuments.filter(item => (item === null || item === void 0 ? void 0 : item.fileStoreId) !== fileStoreId));
+    if (fileStoreId === uploadedFile) {
+      setUploadedFile(null);
+      setFile(null);
+      setDocumentUid("");
+    }
+  };
+  const viewDocument = function (fileStoreId) {
+    if (fileStoreId === void 0) {
+      fileStoreId = uploadedFile;
+    }
     try {
       const _temp2 = function () {
-        if (uploadedFile) {
+        if (fileStoreId) {
           const _temp = _catch(function () {
-            return Promise.resolve(Digit.UploadServices.FileFetchbyid(uploadedFile, Digit.ULBService.getStateId())).then(function (res) {
+            return Promise.resolve(Digit.UploadServices.FileFetchbyid(fileStoreId, Digit.ULBService.getStateId())).then(function (res) {
               if (res !== null && res !== void 0 && res.data) {
                 var _res$headers, _res$headers2;
                 const contentType = ((_res$headers = res.headers) === null || _res$headers === void 0 ? void 0 : _res$headers["content-type"]) || ((_res$headers2 = res.headers) === null || _res$headers2 === void 0 ? void 0 : _res$headers2["Content-Type"]) || "";
@@ -18362,7 +18439,7 @@ function SelectDocument(_ref2) {
   useEffect(() => {
     if (selectedDocument !== null && selectedDocument !== void 0 && selectedDocument.code) {
       setDocuments(prev => {
-        const filteredDocumentsByDocumentType = prev === null || prev === void 0 ? void 0 : prev.filter(item => (item === null || item === void 0 ? void 0 : item.documentType) !== (selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.code));
+        const filteredDocumentsByDocumentType = isOther ? prev === null || prev === void 0 ? void 0 : prev.filter(item => (item === null || item === void 0 ? void 0 : item.fileStoreId) !== (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.fileStoreId)) : prev === null || prev === void 0 ? void 0 : prev.filter(item => (item === null || item === void 0 ? void 0 : item.documentType) !== (selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.code));
         if ((uploadedFile === null || uploadedFile === void 0 ? void 0 : uploadedFile.length) === 0 || uploadedFile === null) {
           return filteredDocumentsByDocumentType;
         }
@@ -18371,6 +18448,7 @@ function SelectDocument(_ref2) {
           documentType: selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.code,
           fileStoreId: uploadedFile,
           fileName: (file === null || file === void 0 ? void 0 : file.name) || (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.fileName) || "",
+          documentName: (selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.i18nKey) || (selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.code) || "",
           documentUid: documentUid,
           documentNumber: documentUid,
           i18nKey: selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.code,
@@ -18400,48 +18478,60 @@ function SelectDocument(_ref2) {
     (function () {
       try {
         setError(null);
-        const _temp6 = function () {
+        const _temp7 = function () {
           if (file) {
-            const _temp5 = function () {
-              if (file.size >= 5242880) {
-                setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
+            const isDuplicateDocument = isOther && documents.some(item => (item === null || item === void 0 ? void 0 : item.documentType) === (selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.code));
+            const _temp6 = function () {
+              if (isDuplicateDocument) {
+                const documentNameKey = (selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.i18nKey) || (selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.code) || "This";
+                const translatedDocumentName = t(documentNameKey);
+                const documentName = translatedDocumentName === documentNameKey ? documentNameKey.replaceAll("_", " ") : translatedDocumentName;
+                setError("Document \"" + documentName + "\" has already been uploaded.");
+                setFile(null);
               } else {
-                const _temp4 = function () {
-                  if ((doc === null || doc === void 0 ? void 0 : doc.code) === "OWNER.APPLICANTPHOTO" && !file.type.match(/image\/(jpeg|png)/i) && !file.name.match(/\.(jpg|jpeg|png)$/i)) {
-                    setError(t("WS_ONLY_JPG_PNG_ALLOWED") || "Only JPG and PNG files are allowed for Applicant Photo");
-                    setFile(null);
+                const _temp5 = function () {
+                  if (file.size >= 5242880) {
+                    setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
                   } else {
-                    const _temp3 = _finallyRethrows(function () {
-                      return _catch(function () {
-                        setUploadedFile(null);
-                        setIsUploading(true);
-                        return Promise.resolve(Digit.UploadServices.Filestorage("WS", file, Digit.ULBService.getStateId())).then(function (response) {
-                          var _response$data, _response$data$files;
-                          if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
-                            var _response$data2, _response$data2$files;
-                            setUploadedFile(response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$files = _response$data2.files[0]) === null || _response$data2$files === void 0 ? void 0 : _response$data2$files.fileStoreId);
-                          } else {
+                    const _temp4 = function () {
+                      if ((doc === null || doc === void 0 ? void 0 : doc.code) === "OWNER.APPLICANTPHOTO" && !file.type.match(/image\/(jpeg|png)/i) && !file.name.match(/\.(jpg|jpeg|png)$/i)) {
+                        setError(t("WS_ONLY_JPG_PNG_ALLOWED") || "Only JPG and PNG files are allowed for Applicant Photo");
+                        setFile(null);
+                      } else {
+                        const _temp3 = _finallyRethrows(function () {
+                          return _catch(function () {
+                            setUploadedFile(null);
+                            setIsUploading(true);
+                            return Promise.resolve(Digit.UploadServices.Filestorage("WS", file, Digit.ULBService.getStateId())).then(function (response) {
+                              var _response$data, _response$data$files;
+                              if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
+                                var _response$data2, _response$data2$files;
+                                setUploadedFile(response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$files = _response$data2.files[0]) === null || _response$data2$files === void 0 ? void 0 : _response$data2$files.fileStoreId);
+                              } else {
+                                setError(t("CS_FILE_UPLOAD_ERROR"));
+                              }
+                            });
+                          }, function () {
                             setError(t("CS_FILE_UPLOAD_ERROR"));
-                          }
+                          });
+                        }, function (_wasThrown, _result) {
+                          setIsUploading(false);
+                          if (_wasThrown) throw _result;
+                          return _result;
                         });
-                      }, function () {
-                        setError(t("CS_FILE_UPLOAD_ERROR"));
-                      });
-                    }, function (_wasThrown, _result) {
-                      setIsUploading(false);
-                      if (_wasThrown) throw _result;
-                      return _result;
-                    });
-                    if (_temp3 && _temp3.then) return _temp3.then(function () {});
+                        if (_temp3 && _temp3.then) return _temp3.then(function () {});
+                      }
+                    }();
+                    if (_temp4 && _temp4.then) return _temp4.then(function () {});
                   }
                 }();
-                if (_temp4 && _temp4.then) return _temp4.then(function () {});
+                if (_temp5 && _temp5.then) return _temp5.then(function () {});
               }
             }();
-            if (_temp5 && _temp5.then) return _temp5.then(function () {});
+            if (_temp6 && _temp6.then) return _temp6.then(function () {});
           }
         }();
-        return _temp6 && _temp6.then ? _temp6.then(function () {}) : void 0;
+        return _temp7 && _temp7.then ? _temp7.then(function () {}) : void 0;
       } catch (e) {
         Promise.reject(e);
       }
@@ -18567,11 +18657,35 @@ function SelectDocument(_ref2) {
       gap: "8px",
       gridColumn: "span 1"
     }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "space-between"
+    }
   }, /*#__PURE__*/React.createElement(CardLabel, {
     style: {
       margin: 0
     }
-  }, doc !== null && doc !== void 0 && doc.required ? t((doc === null || doc === void 0 ? void 0 : (_doc$i18nKey2 = doc.i18nKey) === null || _doc$i18nKey2 === void 0 ? void 0 : _doc$i18nKey2.replaceAll(".", "_")) + "_UPLOAD_DOCUMENT") + "*" : "" + t((doc === null || doc === void 0 ? void 0 : (_doc$i18nKey3 = doc.i18nKey) === null || _doc$i18nKey3 === void 0 ? void 0 : _doc$i18nKey3.replaceAll(".", "_")) + "_UPLOAD_DOCUMENT")), /*#__PURE__*/React.createElement("div", {
+  }, t((doc === null || doc === void 0 ? void 0 : (_doc$i18nKey2 = doc.i18nKey) === null || _doc$i18nKey2 === void 0 ? void 0 : _doc$i18nKey2.replaceAll(".", "_")) + "_UPLOAD_DOCUMENT"), doc !== null && doc !== void 0 && doc.required ? "*" : ""), isOther && /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    onClick: () => {
+      setUploadedFile(null);
+      setFile(null);
+      setSelectedDocument(doc !== null && doc !== void 0 && doc.hasDropdown ? {} : doc);
+      setDocumentUid("");
+      setDocNumberError(null);
+    },
+    style: {
+      border: "1px solid #00497e",
+      background: "#fff",
+      color: "#00497e",
+      borderRadius: "4px",
+      padding: "4px 10px",
+      cursor: "pointer",
+      fontWeight: "bold"
+    }
+  }, "+ Add")), /*#__PURE__*/React.createElement("div", {
     className: "field",
     style: {
       display: "flex",
@@ -18642,7 +18756,47 @@ function SelectDocument(_ref2) {
       setIsDocumentUidLocked(false);
       setDocumentUid("");
     }
-  })))), /*#__PURE__*/React.createElement("div", {
+  }))), (isOther ? otherUploadedDocuments : uploadedFile ? [{
+    fileStoreId: uploadedFile,
+    fileName: (file === null || file === void 0 ? void 0 : file.name) || (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.fileName),
+    documentNumber: documentUid
+  }] : []).map((uploadedDocument, index) => /*#__PURE__*/React.createElement("div", {
+    key: uploadedDocument.fileStoreId || index,
+    style: {
+      display: "flex",
+      alignItems: "center",
+      gap: "12px",
+      marginTop: "4px",
+      color: "#00497e"
+    }
+  }, /*#__PURE__*/React.createElement("span", {
+    style: {
+      fontWeight: "bold"
+    }
+  }, uploadedDocument.documentName || uploadedDocument.i18nKey || uploadedDocument.documentType ? t(uploadedDocument.documentName || uploadedDocument.i18nKey || uploadedDocument.documentType) : t("CS_COMMON_DOCUMENT"), " - ", uploadedDocument.fileName || t("CS_COMMON_DOCUMENT")), uploadedDocument.documentNumber && /*#__PURE__*/React.createElement("span", null, uploadedDocument.documentNumber), /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    onClick: () => viewDocument(uploadedDocument.fileStoreId),
+    title: t("WS_VIEW_DOCUMENT") || "View Document",
+    style: {
+      border: "none",
+      background: "transparent",
+      color: "#00497e",
+      cursor: "pointer",
+      padding: 0
+    }
+  }, /*#__PURE__*/React.createElement(ViewsIcon, null)), /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    onClick: () => removeUploadedDocument(uploadedDocument.fileStoreId),
+    title: "Remove Document",
+    style: {
+      border: "none",
+      background: "transparent",
+      color: "#d32f2f",
+      cursor: "pointer",
+      padding: 0,
+      fontSize: "18px"
+    }
+  }, /*#__PURE__*/React.createElement(RemoveIcon, null))))), /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
       flexDirection: "column",
@@ -18695,21 +18849,7 @@ function SelectDocument(_ref2) {
       fontWeight: "bold",
       fontSize: "14px"
     }
-  }, "\u2714 Uploaded")), uploadedFile && /*#__PURE__*/React.createElement("div", {
-    onClick: viewDocument,
-    style: {
-      display: "flex",
-      alignItems: "center",
-      gap: "8px",
-      cursor: "pointer",
-      color: "#00497e",
-      fontWeight: "bold",
-      padding: "8px 16px",
-      border: "1px solid #00497e",
-      borderRadius: "4px",
-      backgroundColor: "#fff"
-    }
-  }, /*#__PURE__*/React.createElement(ViewsIcon, null), /*#__PURE__*/React.createElement("span", null, t("WS_VIEW_DOCUMENT") || "View Document")))), showCamera && /*#__PURE__*/React.createElement(CameraCaptureModal, {
+  }, "\u2714 Uploaded")))), showCamera && /*#__PURE__*/React.createElement(CameraCaptureModal, {
     onCapture: handleCapture,
     onClose: () => setShowCamera(false),
     t: t
@@ -18785,7 +18925,7 @@ const CameraCaptureModal = _ref4 => {
   useEffect(() => {
     const startCamera = function () {
       try {
-        const _temp7 = _catch(function () {
+        const _temp8 = _catch(function () {
           return Promise.resolve(navigator.mediaDevices.getUserMedia({
             video: true
           })).then(function (mediaStream) {
@@ -18798,7 +18938,7 @@ const CameraCaptureModal = _ref4 => {
           setError(t("WS_CAMERA_ACCESS_ERROR") || "Camera Access Error");
           console.error("Error accessing camera: ", err);
         });
-        return Promise.resolve(_temp7 && _temp7.then ? _temp7.then(function () {}) : void 0);
+        return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(function () {}) : void 0);
       } catch (e) {
         return Promise.reject(e);
       }
@@ -23546,6 +23686,57 @@ const WSDjbEmployee = _ref => {
   return /*#__PURE__*/React.createElement(React.Fragment, null, FormContent);
 };
 
+const WSDivyangjan = _ref => {
+  var _formData$disability, _formData$additionalD;
+  let config = _ref.config,
+    onSelect = _ref.onSelect,
+    userType = _ref.userType,
+    formData = _ref.formData;
+  const _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  const _useForm = useForm({
+      defaultValues: {
+        isDivyangjan: !!(formData !== null && formData !== void 0 && (_formData$disability = formData.disability) !== null && _formData$disability !== void 0 && _formData$disability.isDivyangjan || formData !== null && formData !== void 0 && (_formData$additionalD = formData.additionalDetails) !== null && _formData$additionalD !== void 0 && _formData$additionalD.isDivyangjan)
+      }
+    }),
+    control = _useForm.control,
+    watch = _useForm.watch;
+  const formValue = watch();
+  const goNext = () => onSelect(config.key, {
+    isDivyangjan: !!formValue.isDivyangjan
+  });
+  const onSkip = () => onSelect();
+  useEffect(() => {
+    if (userType === "employee") {
+      onSelect(config.key, {
+        isDivyangjan: !!formValue.isDivyangjan
+      });
+    }
+  }, [config.key, formValue.isDivyangjan, onSelect, userType]);
+  const content = /*#__PURE__*/React.createElement(CollapsibleCardPage, {
+    title: "Divyangjan/Person with Disability?",
+    defaultOpen: true
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: "max-content"
+    }
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "isDivyangjan",
+    render: props => /*#__PURE__*/React.createElement(CheckBox, {
+      label: "Divyangjan/Person with Disability?",
+      checked: !!props.value,
+      onChange: event => props.onChange(event.target.checked)
+    })
+  })));
+  return userType === "citizen" ? /*#__PURE__*/React.createElement(FormStep, {
+    t: t,
+    config: config,
+    onSelect: goNext,
+    onSkip: onSkip
+  }, content) : content;
+};
+
 const _excluded$1 = ["t", "config", "onSelect", "formData", "formState", "setError", "clearErrors"];
 const NUMBER_PATTERN$1 = /^\d+$/;
 const DECIMAL_PATTERN$1 = /^\d+(\.\d{1,2})?$/;
@@ -27621,12 +27812,25 @@ const newConfig = [{
       cardText: "",
       submitBarLabel: "CS_COMMON_NEXT"
     }
+  }, {
+    route: "disability-details",
+    component: "WSDivyangjan",
+    key: "disability",
+    nextStep: "document-details",
+    WATER: "document-details",
+    hideInEmployee: true,
+    texts: {
+      headerCaption: "WS_COMMON_CONNECTION_DETAIL",
+      header: "Divyangjan/Person with Disability?",
+      cardText: "",
+      submitBarLabel: "CS_COMMON_NEXT"
+    }
   }, {
     route: "djb-employee-details",
     component: "WSDjbEmployee",
     key: "djbEmployee",
-    nextStep: "document-details",
-    WATER: "document-details",
+    nextStep: "disability-details",
+    WATER: "disability-details",
     hideInEmployee: true,
     texts: {
       headerCaption: "WS_COMMON_CONNECTION_DETAIL",
@@ -33632,7 +33836,7 @@ const getConnectionDetailsPDF = function (application, property, tenantInfo, t)
 };
 
 const ConnectionDetails$5 = () => {
-  var _Digit$SessionStorage, _user$info, _data$SewerageConnect, _data$SewerageConnect2, _data$WaterConnection, _data$WaterConnection2, _Object$keys, _connectionData$Water, _connectionData$Sewer, _data$WaterConnection3, _data$WaterConnection4, _data$WaterConnection5, _data$WaterConnection6, _data$WaterConnection7, _data$WaterConnection8, _data$WaterConnection9, _data$WaterConnection0, _data$SewerageConnect3, _data$SewerageConnect4, _data$SewerageConnect5, _data$SewerageConnect6, _state, _state$applicationNo, _state2, _state3, _state4, _state4$applicationTy, _state5, _state6, _state7, _state8, _state8$applicationTy, _state9, _state0, _state1, _state10, _state10$applicationT, _state11, _state12, _state13, _state14, _state15, _state15$applicationT, _state16, _state16$waterSource, _state16$waterSource$, _state17, _state18, _state18$waterSource, _state18$waterSource$, _state19, _state20, _state21, _state22, _state22$additionalDe, _state23, _state23$applicationT, _state24, _state24$additionalDe, _state24$additionalDe2, _state25, _state25$additionalDe, _state25$additionalDe2, _state26, _state26$additionalDe, _state27, _state27$additionalDe, _state28, _state28$additionalDe, _state28$additionalDe2, _state29, _state29$additionalDe, _state30, _state31, _state32, _state33, _state33$property, _state33$property$own, _PTData$Properties2, _PTData$Properties2$, _PTData$Properties3, _PTData$Properties3$, _PTData$Properties3$$, _PTData$Properties3$$2, _PTData$Properties4, _PTData$Properties4$, _user$info2, _user$info2$userName, _user$info3, _user$info4, _state34, _state34$additionalDe, _state34$additionalDe2, _state35, _state35$additionalDe, _state35$additionalDe2, _state36, _state36$additionalDe, _state37, _state37$additionalDe, _state38, _state38$additionalDe, _state39, _state39$additionalDe, _state40, _state40$additionalDe, _state41, _state42, _state43, _state44, _state44$connectionHo, _state44$connectionHo2, _data$WaterConnection16, _data$WaterConnection17, _data$WaterConnection18, _data$WaterConnection19, _data$SewerageConnect0, _data$SewerageConnect1, _data$SewerageConnect10, _data$SewerageConnect11, _data$WaterConnection20, _data$WaterConnection21, _data$WaterConnection22, _data$WaterConnection23, _data$SewerageConnect12, _data$SewerageConnect13, _data$SewerageConnect14, _data$SewerageConnect15, _data$WaterConnection24, _data$WaterConnection25, _data$WaterConnection26, _data$WaterConnection27, _data$SewerageConnect16, _data$SewerageConnect17, _data$SewerageConnect18, _data$SewerageConnect19, _data$WaterConnection28, _data$WaterConnection29, _data$WaterConnection30, _data$WaterConnection31, _data$SewerageConnect20, _data$SewerageConnect21, _data$SewerageConnect22, _data$SewerageConnect23, _data$WaterConnection32, _data$WaterConnection33, _data$WaterConnection34, _data$WaterConnection35, _data$SewerageConnect24, _data$SewerageConnect25, _data$SewerageConnect26, _data$SewerageConnect27, _data$WaterConnection36, _data$WaterConnection37, _data$WaterConnection38, _data$WaterConnection39, _data$SewerageConnect28, _data$SewerageConnect29, _data$SewerageConnect30, _data$SewerageConnect31, _data$WaterConnection40, _data$WaterConnection41, _data$WaterConnection42, _data$WaterConnection43, _data$SewerageConnect32, _data$SewerageConnect33, _data$SewerageConnect34, _data$SewerageConnect35, _data$WaterConnection44, _data$WaterConnection45, _data$WaterConnection46, _data$WaterConnection47, _data$SewerageConnect36, _data$SewerageConnect37, _data$SewerageConnect38, _data$SewerageConnect39, _data$WaterConnection48, _data$WaterConnection49, _data$WaterConnection50, _data$WaterConnection51, _data$SewerageConnect40, _data$SewerageConnect41, _data$SewerageConnect42, _data$SewerageConnect43, _data$WaterConnection52, _data$WaterConnection53, _data$WaterConnection54, _data$WaterConnection55, _data$SewerageConnect44, _data$SewerageConnect45, _data$SewerageConnect46, _data$SewerageConnect47, _state45, _state45$additionalDe, _state46, _state46$additionalDe, _state47, _state47$additionalDe, _state48, _state48$additionalDe, _state49, _state49$additionalDe, _state50, _state51, _state54, _state55, _state56, _state57, _state58, _state59, _paymentDetails$data17, _paymentDetails$data18;
+  var _Digit$SessionStorage, _user$info, _data$SewerageConnect, _data$SewerageConnect2, _data$WaterConnection, _data$WaterConnection2, _Object$keys, _connectionData$Water, _connectionData$Water2, _connectionData$Sewer, _connectionData$Sewer2, _data$WaterConnection3, _data$WaterConnection4, _data$WaterConnection5, _data$WaterConnection6, _data$WaterConnection7, _data$WaterConnection8, _data$WaterConnection9, _data$WaterConnection0, _data$SewerageConnect3, _data$SewerageConnect4, _data$SewerageConnect5, _data$SewerageConnect6, _state, _state$applicationNo, _state2, _state3, _state4, _state4$applicationTy, _state5, _state6, _state7, _state8, _state8$applicationTy, _state9, _state0, _state1, _state10, _state10$applicationT, _state11, _state12, _state13, _state14, _state15, _state15$applicationT, _state16, _state16$waterSource, _state16$waterSource$, _state17, _state18, _state18$waterSource, _state18$waterSource$, _state19, _state20, _state21, _state22, _state22$additionalDe, _state23, _state23$applicationT, _state24, _state24$additionalDe, _state24$additionalDe2, _state25, _state25$additionalDe, _state25$additionalDe2, _state26, _state26$additionalDe, _state27, _state27$additionalDe, _state28, _state28$additionalDe, _state28$additionalDe2, _state29, _state29$additionalDe, _state30, _state31, _state32, _state33, _state33$property, _state33$property$own, _PTData$Properties2, _PTData$Properties2$, _PTData$Properties3, _PTData$Properties3$, _PTData$Properties3$$, _PTData$Properties3$$2, _PTData$Properties4, _PTData$Properties4$, _user$info2, _user$info2$userName, _user$info3, _user$info4, _state34, _state34$additionalDe, _state34$additionalDe2, _state35, _state35$additionalDe, _state35$additionalDe2, _state36, _state36$additionalDe, _state37, _state37$additionalDe, _state38, _state38$additionalDe, _state39, _state39$additionalDe, _state40, _state40$additionalDe, _state41, _state42, _state43, _state44, _state44$connectionHo, _state44$connectionHo2, _data$WaterConnection16, _data$WaterConnection17, _data$WaterConnection18, _data$WaterConnection19, _data$SewerageConnect0, _data$SewerageConnect1, _data$SewerageConnect10, _data$SewerageConnect11, _data$WaterConnection20, _data$WaterConnection21, _data$WaterConnection22, _data$WaterConnection23, _data$SewerageConnect12, _data$SewerageConnect13, _data$SewerageConnect14, _data$SewerageConnect15, _data$WaterConnection24, _data$WaterConnection25, _data$WaterConnection26, _data$WaterConnection27, _data$SewerageConnect16, _data$SewerageConnect17, _data$SewerageConnect18, _data$SewerageConnect19, _data$WaterConnection28, _data$WaterConnection29, _data$WaterConnection30, _data$WaterConnection31, _data$SewerageConnect20, _data$SewerageConnect21, _data$SewerageConnect22, _data$SewerageConnect23, _data$WaterConnection32, _data$WaterConnection33, _data$WaterConnection34, _data$WaterConnection35, _data$SewerageConnect24, _data$SewerageConnect25, _data$SewerageConnect26, _data$SewerageConnect27, _data$WaterConnection36, _data$WaterConnection37, _data$WaterConnection38, _data$WaterConnection39, _data$SewerageConnect28, _data$SewerageConnect29, _data$SewerageConnect30, _data$SewerageConnect31, _data$WaterConnection40, _data$WaterConnection41, _data$WaterConnection42, _data$WaterConnection43, _data$SewerageConnect32, _data$SewerageConnect33, _data$SewerageConnect34, _data$SewerageConnect35, _data$WaterConnection44, _data$WaterConnection45, _data$WaterConnection46, _data$WaterConnection47, _data$SewerageConnect36, _data$SewerageConnect37, _data$SewerageConnect38, _data$SewerageConnect39, _data$WaterConnection48, _data$WaterConnection49, _data$WaterConnection50, _data$WaterConnection51, _data$SewerageConnect40, _data$SewerageConnect41, _data$SewerageConnect42, _data$SewerageConnect43, _data$WaterConnection52, _data$WaterConnection53, _data$WaterConnection54, _data$WaterConnection55, _data$SewerageConnect44, _data$SewerageConnect45, _data$SewerageConnect46, _data$SewerageConnect47, _state45, _state45$additionalDe, _state46, _state46$additionalDe, _state47, _state47$additionalDe, _state48, _state48$additionalDe, _state49, _state49$additionalDe, _state50, _state51, _state54, _state55, _state56, _state57, _state58, _state59, _paymentDetails$data17, _paymentDetails$data18;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const menuRef = useRef();
@@ -33683,7 +33887,7 @@ const ConnectionDetails$5 = () => {
       enabled: filter2 !== null && filter2 !== void 0 && filter2.connectionNumber ? true : false
     }, true),
     connectionData = _Digit$Hooks$ws$useMy2.data;
-  state = ((_Object$keys = Object.keys(state)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) > 0 ? state : applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? connectionData === null || connectionData === void 0 ? void 0 : (_connectionData$Water = connectionData.WaterConnection) === null || _connectionData$Water === void 0 ? void 0 : _connectionData$Water[0] : connectionData === null || connectionData === void 0 ? void 0 : (_connectionData$Sewer = connectionData.SewerageConnections) === null || _connectionData$Sewer === void 0 ? void 0 : _connectionData$Sewer[0];
+  state = ((_Object$keys = Object.keys(state)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) > 0 ? state : applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? (connectionData === null || connectionData === void 0 ? void 0 : (_connectionData$Water = connectionData.WaterConnection) === null || _connectionData$Water === void 0 ? void 0 : _connectionData$Water.find(c => c.applicationStatus === "CONNECTION_ACTIVATED")) || (connectionData === null || connectionData === void 0 ? void 0 : (_connectionData$Water2 = connectionData.WaterConnection) === null || _connectionData$Water2 === void 0 ? void 0 : _connectionData$Water2[0]) : (connectionData === null || connectionData === void 0 ? void 0 : (_connectionData$Sewer = connectionData.SewerageConnections) === null || _connectionData$Sewer === void 0 ? void 0 : _connectionData$Sewer.find(c => c.applicationStatus === "CONNECTION_ACTIVATED")) || (connectionData === null || connectionData === void 0 ? void 0 : (_connectionData$Sewer2 = connectionData.SewerageConnections) === null || _connectionData$Sewer2 === void 0 ? void 0 : _connectionData$Sewer2[0]);
   const closeModal = () => {
     setShowOptions(false);
   };
@@ -35143,6 +35347,7 @@ const CheckPage = _ref => {
   const propertyAddress = (value === null || value === void 0 ? void 0 : value.propertyLocationDetails) || {};
   const useDetails = (value === null || value === void 0 ? void 0 : (_value$waterConnectio = value.waterConnection) === null || _value$waterConnectio === void 0 ? void 0 : _value$waterConnectio.useDetails) || {};
   const djbEmployee = (value === null || value === void 0 ? void 0 : value.djbEmployee) || {};
+  const disability = (value === null || value === void 0 ? void 0 : value.disability) || (value === null || value === void 0 ? void 0 : value.additionalDetails) || {};
   const bankDetails = (value === null || value === void 0 ? void 0 : value.bankDetails) || {};
   const additionalDetails = {};
   const checkForNA = val => val ? val : "CS_NA";
@@ -35450,7 +35655,15 @@ const CheckPage = _ref => {
       },
       onClick: () => openFilePDF(djbEmployee === null || djbEmployee === void 0 ? void 0 : djbEmployee.document)
     }, /*#__PURE__*/React.createElement(GenericFileIcon, null), " ", t("CS_COMMON_VIEW"))
-  }))), /*#__PURE__*/React.createElement(CardSubHeader, null, t("WS_BANK_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, {
+  }))), /*#__PURE__*/React.createElement(CardSubHeader, null, "Divyangjan/Person with Disability?"), /*#__PURE__*/React.createElement(StatusTable, {
+    style: {
+      marginTop: "10px",
+      marginBottom: "30px"
+    }
+  }, /*#__PURE__*/React.createElement(Row, {
+    label: "Divyangjan/Person with Disability?",
+    text: "" + (disability !== null && disability !== void 0 && disability.isDivyangjan ? t("CORE_COMMON_YES") : t("CORE_COMMON_NO"))
+  })), /*#__PURE__*/React.createElement(CardSubHeader, null, t("WS_BANK_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, {
     style: {
       marginTop: "10px",
       marginBottom: "30px"
@@ -36904,20 +37117,22 @@ const getAddress$1 = (address, t) => {
   return (address !== null && address !== void 0 && address.doorNo ? (address === null || address === void 0 ? void 0 : address.doorNo) + ", " : "") + " " + (address !== null && address !== void 0 && address.street ? (address === null || address === void 0 ? void 0 : address.street) + ", " : "") + (address !== null && address !== void 0 && address.landmark ? (address === null || address === void 0 ? void 0 : address.landmark) + ", " : "") + t(Digit.Utils.pt.getMohallaLocale(address === null || address === void 0 ? void 0 : address.locality.code, address === null || address === void 0 ? void 0 : address.tenantId)) + ", " + t(Digit.Utils.pt.getCityLocale(address === null || address === void 0 ? void 0 : address.tenantId)) + (address !== null && address !== void 0 && address.pincode && t(address === null || address === void 0 ? void 0 : address.pincode) ? ", " + address.pincode : " ");
 };
 const WSInfoPage = () => {
-  var _Digit$UserService$ge, _Digit$UserService$ge2, _propertyDetails$Prop;
+  var _user$info, _user$info$userName, _user$info2, _propertyDetails$Prop;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const history = useHistory();
   const location = useLocation();
   const match = useRouteMatch();
   const isEmployee = window.location.href.includes("/employee");
+  const user = Digit.UserService.getUser();
+  const userMobileNumber = user !== null && user !== void 0 && (_user$info = user.info) !== null && _user$info !== void 0 && (_user$info$userName = _user$info.userName) !== null && _user$info$userName !== void 0 && _user$info$userName.match(/^[0-9]{10}$/) ? user.info.userName : user === null || user === void 0 ? void 0 : (_user$info2 = user.info) === null || _user$info2 === void 0 ? void 0 : _user$info2.mobileNumber;
   const _useState = useState(null),
     hasProperty = _useState[0],
     setHasProperty = _useState[1];
   const _useState2 = useState(null),
     selectedProperty = _useState2[0],
     setSelectedProperty = _useState2[1];
-  const _useState3 = useState(""),
+  const _useState3 = useState(isEmployee ? "" : userMobileNumber || ""),
     searchMobileNumber = _useState3[0],
     setSearchMobileNumber = _useState3[1];
   const _useState4 = useState(false),
@@ -36935,9 +37150,11 @@ const WSInfoPage = () => {
   const _useState8 = useState(null),
     showToast = _useState8[0],
     setShowToast = _useState8[1];
+  useEffect(() => {
+    sessionStorage.removeItem("WS_OTP_VERIFIED_PROPERTY_ID");
+  }, []);
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const userMobileNumber = (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : (_Digit$UserService$ge2 = _Digit$UserService$ge.info) === null || _Digit$UserService$ge2 === void 0 ? void 0 : _Digit$UserService$ge2.mobileNumber;
-  const mobileNumberToSearch = isEmployee ? searchMobileNumber : userMobileNumber;
+  const mobileNumberToSearch = searchMobileNumber;
   const _Digit$Hooks$pt$usePr = Digit.Hooks.pt.usePropertySearch({
       filters: {
         mobileNumber: mobileNumberToSearch
@@ -36963,6 +37180,7 @@ const WSInfoPage = () => {
     const isEmployee = window.location.href.includes("/employee");
     const baseUrl = isEmployee ? "/digit-ui/employee/ws" : "/digit-ui/citizen/ws";
     if ((hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && selectedProperty) {
+      sessionStorage.setItem("WS_OTP_VERIFIED_PROPERTY_ID", selectedProperty.propertyId);
       history.push(baseUrl + "/old-application?propertyId=" + selectedProperty.propertyId);
     } else {
       history.push(baseUrl + "/old-application");
@@ -36981,7 +37199,7 @@ const WSInfoPage = () => {
             mobileNumber: mobileNumberToSearch,
             tenantId: "dl",
             type: "register",
-            userType: isEmployee ? "EMPLOYEE" : "CITIZEN"
+            userType: "EMPLOYEE"
           }
         };
         return Promise.resolve(Digit.UserService.sendOtp(payload, "dl")).then(function (response) {
@@ -37115,11 +37333,7 @@ const WSInfoPage = () => {
       if (e.stopPropagation) e.stopPropagation();
     }
     if ((hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && selectedProperty) {
-      if (!isEmployee) {
-        proceedToNext();
-      } else {
-        handleSendOtp(e);
-      }
+      handleSendOtp(e);
     } else if ((hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && !selectedProperty) {
       return;
     } else {
@@ -37228,7 +37442,26 @@ const WSInfoPage = () => {
     style: {
       marginBottom: "24px"
     }
-  }, isEmployee && /*#__PURE__*/React.createElement("div", {
+  }, !isEmployee && /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginBottom: "16px"
+    }
+  }, /*#__PURE__*/React.createElement(Label, null, t("CORE_COMMON_MOBILE_NUMBER")), /*#__PURE__*/React.createElement(TextInput, {
+    t: t,
+    type: "number",
+    isMandatory: false,
+    name: "mobileNumber",
+    value: searchMobileNumber,
+    onChange: e => {
+      const val = e.target.value.replace(/\D/g, "").slice(0, 10);
+      setSearchMobileNumber(val);
+      setSelectedProperty(null);
+      setShowOtpVerification(false);
+      setOtp("");
+    },
+    placeholder: t("Enter mobile number"),
+    maxLength: 10
+  })), isEmployee && /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
       flexDirection: "column",
@@ -38639,6 +38872,7 @@ const DEFAULT_SECTION_STATE = {
   applicant: true,
   contact: true,
   djbEmployee: true,
+  disability: true,
   governmentEmployee: true,
   address: true,
   usage: true,
@@ -38691,6 +38925,9 @@ const DEFAULT_FORM_VALUES = {
     retirementDate: "",
     officeNameAndAddress: ""
   },
+  disability: {
+    isDivyangjan: false
+  },
   governmentEmployee: {
     isGovernmentEmployee: false,
     organizationName: "",
@@ -38844,6 +39081,7 @@ const buildDefaultValues = () => ({
   applicant: _extends({}, DEFAULT_FORM_VALUES.applicant),
   contact: _extends({}, DEFAULT_FORM_VALUES.contact),
   djbEmployee: _extends({}, DEFAULT_FORM_VALUES.djbEmployee),
+  disability: _extends({}, DEFAULT_FORM_VALUES.disability),
   propertyAddress: _extends({}, DEFAULT_FORM_VALUES.propertyAddress),
   useDetails: _extends({}, DEFAULT_FORM_VALUES.useDetails),
   bankDetails: _extends({}, DEFAULT_FORM_VALUES.bankDetails),
@@ -39109,7 +39347,7 @@ const FileUploadField = _ref6 => {
   })))));
 };
 const NewApplication = () => {
-  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, _formValues$declarati4, _formValues$declarati5;
+  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$disabilit, _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, _formValues$declarati4, _formValues$declarati5;
   const _useTranslation2 = useTranslation(),
     t = _useTranslation2.t;
   const history = useHistory();
@@ -39151,6 +39389,7 @@ const NewApplication = () => {
     setWaterAndSewerageBoth = _useState12[1];
   const _useState13 = useState(new URLSearchParams(location.search).get("propertyId")),
     propertyId = _useState13[0];
+  const initialPropertyQuery = useRef(location.search);
   const initialFormValues = buildDefaultValues();
   const _useState14 = useState(""),
     city = _useState14[0],
@@ -39243,6 +39482,7 @@ const NewApplication = () => {
     applicant: React.useRef(null),
     contact: React.useRef(null),
     djbEmployee: React.useRef(null),
+    disability: React.useRef(null),
     governmentEmployee: React.useRef(null),
     propertyAddress: React.useRef(null),
     useDetails: React.useRef(null),
@@ -39318,7 +39558,11 @@ const NewApplication = () => {
     sectionId: "djbEmployee",
     route: "djb-employee",
     actions: "For DJB Employee"
-  }] : []), ...(isGovernmentEmployee ? [{
+  }] : []), {
+    sectionId: "disability",
+    route: "disability",
+    actions: "Divyangjan/Person with Disability"
+  }, ...(isGovernmentEmployee ? [{
     sectionId: "governmentEmployee",
     route: "government-employee",
     actions: "For Government Employee"
@@ -39399,6 +39643,12 @@ const NewApplication = () => {
     sewerageMutation = _Digit$Hooks$ws$useWa2.mutate;
   const _Digit$Hooks$ws$useWS4 = Digit.Hooks.ws.useWSApplicationActions("SEWERAGE"),
     sewerageUpdateMutation = _Digit$Hooks$ws$useWS4.mutate;
+  useEffect(() => {
+    if (location.search !== initialPropertyQuery.current) {
+      window.sessionStorage.removeItem(FORM_STORAGE_KEY);
+      history.replace("/digit-ui/employee/ws/info");
+    }
+  }, [history, location.search]);
   useEffect(() => {
     if (!isGovernmentOrganization) {
       setValue("applicant.governmentOrganizationName", "");
@@ -40471,6 +40721,23 @@ const NewApplication = () => {
       minHeight: "96px"
     }
   })))), /*#__PURE__*/React.createElement(SectionCard, {
+    description: "Please indicate whether the applicant is a Divyangjan/Person with Disability.",
+    isOpen: collapsedSections.disability,
+    onToggle: toggleSection,
+    sectionKey: "disability",
+    title: "Divyangjan/Person with Disability?",
+    sectionRef: sectionRefs.disability
+  }, /*#__PURE__*/React.createElement(FieldBlock, {
+    label: "Divyangjan/Person with Disability?"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "disability.isDivyangjan",
+    render: props => /*#__PURE__*/React.createElement(CheckBox, {
+      checked: !!props.value,
+      label: "Divyangjan/Person with Disability?",
+      onChange: event => props.onChange(event.target.checked)
+    })
+  }))), /*#__PURE__*/React.createElement(SectionCard, {
     description: t("WS_PROPERTY_ADDRESS_DESC"),
     isOpen: collapsedSections.address,
     onToggle: toggleSection,
@@ -41292,7 +41559,17 @@ 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), (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, {
+  })) : null), /*#__PURE__*/React.createElement(SectionCard, {
+    description: "Divyangjan/Person with Disability declaration.",
+    isOpen: collapsedSections.disability,
+    onToggle: toggleSection,
+    sectionKey: "disability",
+    title: "Divyangjan/Person with Disability?",
+    onEditClick: () => handleSectionEdit("disability")
+  }, /*#__PURE__*/React.createElement(PreviewItem, {
+    label: "Divyangjan/Person with Disability?",
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$disabilit = formValues.disability) === null || _formValues$disabilit === void 0 ? void 0 : _formValues$disabilit.isDivyangjan
+  })), (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,
@@ -51354,7 +51631,8 @@ const EditModifyApplication = () => {
 };
 
 const Step1_SearchConnection = _ref => {
-  let defaultKNumber = _ref.defaultKNumber,
+  let t = _ref.t,
+    defaultKNumber = _ref.defaultKNumber,
     onNext = _ref.onNext,
     isEditFlow = _ref.isEditFlow;
   const _useState = useState(defaultKNumber || ""),
@@ -51363,9 +51641,55 @@ const Step1_SearchConnection = _ref => {
   const _useState2 = useState(false),
     isLoading = _useState2[0],
     setIsLoading = _useState2[1];
-  const _useState3 = useState(null),
-    showToast = _useState3[0],
-    setShowToast = _useState3[1];
+  const _useState3 = useState(false),
+    isConsenting = _useState3[0],
+    setIsConsenting = _useState3[1];
+  const _useState4 = useState(null),
+    showToast = _useState4[0],
+    setShowToast = _useState4[1];
+  const handleDigiLockerConsent = function (e) {
+    try {
+      if (e !== null && e !== void 0 && e.preventDefault) e.preventDefault();
+      if (e !== null && e !== void 0 && e.stopPropagation) e.stopPropagation();
+      setIsConsenting(true);
+      const _temp = _finallyRethrows(function () {
+        return _catch(function () {
+          const tenantId = Digit.ULBService.getCurrentTenantId() || "dl";
+          return Promise.resolve(Digit.DigiLockerService.authorization({
+            module: "WS",
+            tenantId
+          })).then(function (data) {
+            const redirectUrl = (data === null || data === void 0 ? void 0 : data.redirectURL) || (data === null || data === void 0 ? void 0 : data.redirectUrl);
+            const verifier = (data === null || data === void 0 ? void 0 : data.dlReqRef) || (data === null || data === void 0 ? void 0 : data.codeverifier) || (data === null || data === void 0 ? void 0 : data.codeVerifier) || (data === null || data === void 0 ? void 0 : data.code_verifier);
+            if (verifier) {
+              sessionStorage.setItem("code_verfier_register", verifier);
+            }
+            if (redirectUrl) {
+              window.location.href = redirectUrl;
+            } else {
+              setShowToast({
+                key: "error",
+                message: "No redirect URL returned from DigiLocker API"
+              });
+            }
+          });
+        }, function (err) {
+          var _err$response, _err$response$data, _err$response$data$Er, _err$response$data$Er2;
+          setShowToast({
+            key: "error",
+            message: (err === null || err === void 0 ? void 0 : (_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : (_err$response$data$Er = _err$response$data.Errors) === null || _err$response$data$Er === void 0 ? void 0 : (_err$response$data$Er2 = _err$response$data$Er[0]) === null || _err$response$data$Er2 === void 0 ? void 0 : _err$response$data$Er2.message) || (err === null || err === void 0 ? void 0 : err.message) || "Error fetching DigiLocker authorization URL"
+          });
+        });
+      }, function (_wasThrown, _result) {
+        setIsConsenting(false);
+        if (_wasThrown) throw _result;
+        return _result;
+      });
+      return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
   const handleSendOtp = function () {
     try {
       if (!kNumber) {
@@ -51389,7 +51713,7 @@ const Step1_SearchConnection = _ref => {
           businessService: "WS"
         }).catch(() => null)).then(function (wsResponse) {
           var _wsResponse$WaterConn;
-          function _temp2() {
+          function _temp3() {
             var _connection, _connection$connectio, _connection$connectio2, _connection2;
             if (!connection) {
               setIsLoading(false);
@@ -51408,6 +51732,16 @@ const Step1_SearchConnection = _ref => {
               });
               return;
             }
+            if (isEditFlow) {
+              setIsLoading(false);
+              onNext({
+                kNumber,
+                mobileNumber: fetchedMobileNumber,
+                serviceType: detectedServiceType,
+                activeConnection: connection
+              });
+              return;
+            }
             const userType = Digit.UserService.getType().toUpperCase();
             const payload = {
               otp: {
@@ -51428,7 +51762,7 @@ const Step1_SearchConnection = _ref => {
             });
           }
           let connection = wsResponse === null || wsResponse === void 0 ? void 0 : (_wsResponse$WaterConn = wsResponse.WaterConnection) === null || _wsResponse$WaterConn === void 0 ? void 0 : _wsResponse$WaterConn.find(c => c.applicationStatus === 'CONNECTION_ACTIVATED');
-          const _temp = function () {
+          const _temp2 = function () {
             if (!connection) {
               return Promise.resolve(Digit.WSService.search({
                 tenantId,
@@ -51441,14 +51775,14 @@ const Step1_SearchConnection = _ref => {
               });
             }
           }();
-          return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
+          return _temp2 && _temp2.then ? _temp2.then(_temp3) : _temp3(_temp2);
         });
       }, function (err) {
-        var _err$response, _err$response$data, _err$response$data$Er, _err$response$data$Er2;
+        var _err$response2, _err$response2$data, _err$response2$data$E, _err$response2$data$E2;
         setIsLoading(false);
         setShowToast({
           key: "error",
-          message: (err === null || err === void 0 ? void 0 : (_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : (_err$response$data$Er = _err$response$data.Errors) === null || _err$response$data$Er === void 0 ? void 0 : (_err$response$data$Er2 = _err$response$data$Er[0]) === null || _err$response$data$Er2 === void 0 ? void 0 : _err$response$data$Er2.message) || "Failed to send OTP"
+          message: (err === null || err === void 0 ? void 0 : (_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : (_err$response2$data$E = _err$response2$data.Errors) === null || _err$response2$data$E === void 0 ? void 0 : (_err$response2$data$E2 = _err$response2$data$E[0]) === null || _err$response2$data$E2 === void 0 ? void 0 : _err$response2$data$E2.message) || "Failed to send OTP"
         });
       }));
     } catch (e) {
@@ -51483,7 +51817,7 @@ const Step1_SearchConnection = _ref => {
     style: {
       fontSize: isMobileView ? "13px" : undefined
     }
-  }, "Please enter your K Number to proceed with the mutation application. An OTP will be sent to the registered mobile number."), /*#__PURE__*/React.createElement("div", {
+  }, isEditFlow ? "Please verify the K Number to proceed with the mutation edit." : "Please enter your K Number to proceed with the mutation application. An OTP will be sent to the registered mobile number."), /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: "24px",
       marginTop: "16px",
@@ -51510,6 +51844,11 @@ const Step1_SearchConnection = _ref => {
       width: "100%"
     },
     disabled: isEditFlow
+  })), !isEditFlow && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(SubmitBar, {
+    label: t("WS_LOGIN_WITH_DIGILOCKER") || "Login with DigiLocker",
+    onSubmit: handleDigiLockerConsent,
+    disabled: isConsenting,
+    submit: true
   })), /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
@@ -51531,7 +51870,7 @@ const Step1_SearchConnection = _ref => {
       maxWidth: isMobileView ? "100%" : "200px",
       fontSize: isMobileView ? "14px" : undefined
     }
-  }, isLoading ? "Sending OTP..." : "Send OTP →"))), showToast && /*#__PURE__*/React.createElement(Toast, {
+  }, isLoading ? isEditFlow ? "Proceeding..." : "Sending OTP..." : isEditFlow ? "Proceed →" : "Send OTP →"))), showToast && /*#__PURE__*/React.createElement(Toast, {
     error: showToast.key === "error",
     warning: showToast.key === "warning",
     label: showToast.message,
@@ -53469,7 +53808,7 @@ const Step5_Submission = _ref => {
 };
 
 const MutationApplication = () => {
-  var _Digit$SessionStorage, _user$info, _state, _user$info2, _user$info2$userName, _user$info3, _user$info4, _details$applicationD, _applicationDetails$a, _applicationDetails$a2, _applicationDetails$a4, _applicationDetails$a8, _applicationDetails$a9;
+  var _state, _state2, _state3, _Digit$SessionStorage, _user$info, _state4, _user$info2, _user$info2$userName, _user$info3, _user$info4, _details$applicationD, _applicationDetails$a, _applicationDetails$a2, _applicationDetails$a4, _applicationDetails$a8, _applicationDetails$a9;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const _useRouteMatch = useRouteMatch(),
@@ -53520,14 +53859,45 @@ const MutationApplication = () => {
     authActiveConnection = _Digit$Hooks$useSessi6[0],
     setAuthActiveConnection = _Digit$Hooks$useSessi6[1],
     clearAuthActiveConnection = _Digit$Hooks$useSessi6[2];
+  const _Digit$Hooks$useSessi7 = Digit.Hooks.useSessionStorage("MUTATION_EDIT_PARAMS", {}),
+    persistedEditParams = _Digit$Hooks$useSessi7[0],
+    setPersistedEditParams = _Digit$Hooks$useSessi7[1];
   const user = Digit.UserService.getUser();
-  let tenantId = (filters === null || filters === void 0 ? void 0 : filters.tenantId) || ((_Digit$SessionStorage = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.code) || (user === null || user === void 0 ? void 0 : (_user$info = user.info) === null || _user$info === void 0 ? void 0 : _user$info.permanentCity) || Digit.ULBService.getCurrentTenantId();
-  const applicationNumber = filters === null || filters === void 0 ? void 0 : filters.applicationNumber;
-  const serviceType = filters === null || filters === void 0 ? void 0 : filters.service;
-  const details = cloneDeep_1((_state = state) === null || _state === void 0 ? void 0 : _state.data);
+  const urlParams = new URLSearchParams(location.search);
+  const urlAppNo = (filters === null || filters === void 0 ? void 0 : filters.applicationNumber) || urlParams.get("applicationNumber") || ((_state = state) === null || _state === void 0 ? void 0 : _state.id);
+  const urlTenantId = (filters === null || filters === void 0 ? void 0 : filters.tenantId) || urlParams.get("tenantId") || ((_state2 = state) === null || _state2 === void 0 ? void 0 : _state2.tenantId);
+  const urlService = (filters === null || filters === void 0 ? void 0 : filters.service) || urlParams.get("service") || ((_state3 = state) === null || _state3 === void 0 ? void 0 : _state3.service);
+  useEffect(() => {
+    if (location.pathname.endsWith("/search-connection") && !urlAppNo) {
+      setPersistedEditParams({});
+    } else if (urlAppNo || urlTenantId || urlService) {
+      setPersistedEditParams({
+        applicationNumber: urlAppNo || (persistedEditParams === null || persistedEditParams === void 0 ? void 0 : persistedEditParams.applicationNumber),
+        tenantId: urlTenantId || (persistedEditParams === null || persistedEditParams === void 0 ? void 0 : persistedEditParams.tenantId),
+        service: urlService || (persistedEditParams === null || persistedEditParams === void 0 ? void 0 : persistedEditParams.service)
+      });
+    }
+  }, [urlAppNo, urlTenantId, urlService, location.pathname]);
+  const applicationNumber = urlAppNo || (persistedEditParams === null || persistedEditParams === void 0 ? void 0 : persistedEditParams.applicationNumber);
+  const serviceType = urlService || (persistedEditParams === null || persistedEditParams === void 0 ? void 0 : persistedEditParams.service);
+  let tenantId = urlTenantId || (persistedEditParams === null || persistedEditParams === void 0 ? void 0 : persistedEditParams.tenantId) || ((_Digit$SessionStorage = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.code) || (user === null || user === void 0 ? void 0 : (_user$info = user.info) === null || _user$info === void 0 ? void 0 : _user$info.permanentCity) || Digit.ULBService.getCurrentTenantId();
+  const details = cloneDeep_1((_state4 = state) === null || _state4 === void 0 ? void 0 : _state4.data);
   const mobileNumber = user !== null && user !== void 0 && (_user$info2 = user.info) !== null && _user$info2 !== void 0 && (_user$info2$userName = _user$info2.userName) !== null && _user$info2$userName !== void 0 && _user$info2$userName.match(/^[0-9]{10}$/) ? user === null || user === void 0 ? void 0 : (_user$info3 = user.info) === null || _user$info3 === void 0 ? void 0 : _user$info3.userName : user === null || user === void 0 ? void 0 : (_user$info4 = user.info) === null || _user$info4 === void 0 ? void 0 : _user$info4.mobileNumber;
   const hasStateData = !!(details !== null && details !== void 0 && (_details$applicationD = details.applicationData) !== null && _details$applicationD !== void 0 && _details$applicationD.id);
+  useEffect(() => {
+    if (location.pathname === path) {
+      if (typeof clearFormData === "function") clearFormData();
+      if (typeof clearSessionFormData === "function") clearSessionFormData();
+      if (typeof clearCompletedSteps === "function") clearCompletedSteps();
+      if (typeof clearAuthKNumber === "function") clearAuthKNumber();
+      if (typeof clearAuthMobileNumber === "function") clearAuthMobileNumber();
+      if (typeof clearAuthServiceType === "function") clearAuthServiceType();
+      if (typeof clearAuthActiveConnection === "function") clearAuthActiveConnection();
+      if (typeof setPersistedEditParams === "function") setPersistedEditParams({});
+    }
+  }, [location.pathname, path]);
   const editApplicationNumber = (details === null || details === void 0 ? void 0 : details.applicationNo) || applicationNumber;
+  console.log(editApplicationNumber, "editApplicationNumber");
   const _useQuery = useQuery(["WORKFLOW_SEARCH", editApplicationNumber, tenantId], function () {
       try {
         return Promise.resolve(Digit.WorkflowService.getByBusinessId(tenantId, editApplicationNumber)).then(function (res) {
@@ -53542,8 +53912,9 @@ const MutationApplication = () => {
     }),
     isWorkflowLoading = _useQuery.isLoading,
     workflowData = _useQuery.data;
+  console.log(workflowData, "workflowData");
   const isEmployee = window.location.href.includes("/employee/");
-  const isEditFlow = !!editApplicationNumber && (isEmployee || (workflowData === null || workflowData === void 0 ? void 0 : workflowData.action) === "SEND_BACK_TO_CITIZEN");
+  const isEditFlow = !!editApplicationNumber && (!!urlAppNo || (workflowData === null || workflowData === void 0 ? void 0 : workflowData.businessService) === "mutationWSConnection" || (workflowData === null || workflowData === void 0 ? void 0 : workflowData.action) === "SEND_BACK_TO_CITIZEN");
   const querySearchParam = isEditFlow ? editApplicationNumber : authKNumber;
   const fallbackServiceType = serviceType || authServiceType;
   const businessService = (fallbackServiceType === null || fallbackServiceType === void 0 ? void 0 : fallbackServiceType.toUpperCase()) === "SEWERAGE" ? "SW" : "WS";
@@ -53572,8 +53943,8 @@ const MutationApplication = () => {
           }
           return wsData ? {
             applicationData: wsData,
-            WaterConnection: rawData === null || rawData === void 0 ? void 0 : rawData.WaterConnection,
-            SewerageConnections: rawData === null || rawData === void 0 ? void 0 : rawData.SewerageConnections,
+            WaterConnection: [wsData],
+            SewerageConnections: [wsData],
             propertyDetails: null,
             processInstancesDetails: []
           } : null;
@@ -53604,10 +53975,10 @@ const MutationApplication = () => {
     }),
     propertyDetails = _Digit$Hooks$pt$usePr.data,
     isPropertyLoading = _Digit$Hooks$pt$usePr.isLoading;
-  const _Digit$Hooks$useSessi7 = Digit.Hooks.useSessionStorage("PT_CREATE_EMP_WS_NEW_FORM", {}),
-    sessionFormData = _Digit$Hooks$useSessi7[0],
-    setSessionFormData = _Digit$Hooks$useSessi7[1],
-    clearSessionFormData = _Digit$Hooks$useSessi7[2];
+  const _Digit$Hooks$useSessi8 = Digit.Hooks.useSessionStorage("PT_CREATE_EMP_WS_NEW_FORM", {}),
+    sessionFormData = _Digit$Hooks$useSessi8[0],
+    setSessionFormData = _Digit$Hooks$useSessi8[1],
+    clearSessionFormData = _Digit$Hooks$useSessi8[2];
   useEffect(() => {
     var _applicationDetails$a3;
     const fetchAppData = function () {
@@ -53805,6 +54176,7 @@ const MutationApplication = () => {
             let updatePayload = _extends({}, convertAppData, {
               id: applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a6 = applicationDetails.applicationData) === null || _applicationDetails$a6 === void 0 ? void 0 : _applicationDetails$a6.id,
               applicationNo: editApplicationNumber,
+              action: "RESUBMIT_APPLICATION",
               processInstance: _extends({}, applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a7 = applicationDetails.applicationData) === null || _applicationDetails$a7 === void 0 ? void 0 : _applicationDetails$a7.processInstance, convertAppData === null || convertAppData === void 0 ? void 0 : convertAppData.processInstance, {
                 action: "RESUBMIT_APPLICATION"
               })
@@ -54070,7 +54442,13 @@ const MutationApplication = () => {
     }
   }, /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(Route, {
     path: path + "/search-connection"
-  }, /*#__PURE__*/React.createElement(Step1_SearchConnection, {
+  }, isEditFlow ? /*#__PURE__*/React.createElement(Redirect, {
+    to: {
+      pathname: path + "/consumer-details",
+      search: location.search,
+      state: location.state
+    }
+  }) : /*#__PURE__*/React.createElement(Step1_SearchConnection, {
     t: t,
     defaultKNumber: isEditFlow ? applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a8 = applicationDetails.applicationData) === null || _applicationDetails$a8 === void 0 ? void 0 : _applicationDetails$a8.connectionNo : "",
     isEditFlow: isEditFlow,
@@ -54088,7 +54466,13 @@ const MutationApplication = () => {
     }
   })), /*#__PURE__*/React.createElement(Route, {
     path: path + "/existing-connection"
-  }, /*#__PURE__*/React.createElement(Fragment$2, null, /*#__PURE__*/React.createElement(Step1_ExistingConnection, {
+  }, isEditFlow ? /*#__PURE__*/React.createElement(Redirect, {
+    to: {
+      pathname: path + "/consumer-details",
+      search: location.search,
+      state: location.state
+    }
+  }) : /*#__PURE__*/React.createElement(Fragment$2, null, /*#__PURE__*/React.createElement(Step1_ExistingConnection, {
     t: t,
     applicationDetails: authActiveConnection ? {
       applicationData: authActiveConnection
@@ -54143,7 +54527,11 @@ const MutationApplication = () => {
     exact: true,
     path: path
   }, /*#__PURE__*/React.createElement(Redirect, {
-    to: path + "/search-connection"
+    to: {
+      pathname: isEditFlow ? path + "/consumer-details" : path + "/search-connection",
+      search: location.search,
+      state: location.state
+    }
   }))), showToast && /*#__PURE__*/React.createElement(Toast, {
     error: (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error",
     warning: (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "warning",
@@ -55928,7 +56316,7 @@ const openFilePDF = fileId => {
   }).catch(error => console.error("Error fetching file:", error));
 };
 const CheckPage$4 = _ref2 => {
-  var _data$cpt, _data$ConnectionDetai, _data$connectionDetai, _data$ConnectionHolde, _data$connectionHolde, _data$useDetails, _data$bankDetails, _data$DocumentsRequir, _data$documents, _data$djbEmployee, _connectionDetails, _connectionDetails$se, _connectionDetails2, _connectionDetails2$s, _connectionDetails3, _connectionDetails4, _connectionDetails4$c, _connectionDetails5, _connectionDetails5$c, _connectionDetails6, _connectionDetails7, _connectionDetails7$w, _connectionDetails8, _connectionDetails8$w, _connectionDetails9, _connectionDetails0, _connectionDetails0$a, _connectionDetails1, _connectionDetails1$a, _connectionDetails10, _connectionDetails11, _connectionDetails11$, _connectionDetails12, _connectionDetails12$, _connectionDetails13, _connectionDetails14, _connectionDetails14$, _connectionDetails15, _connectionDetails15$, _connectionDetails16, _connectionDetails16$, _connectionDetails17, _connectionDetails18, _connectionDetails19, _connectionDetails20, _holderDetails, _holderDetails2, _holderDetails3, _holderDetails4, _holderDetails4$gende, _holderDetails5, _holderDetails5$gende, _holderDetails6, _holderDetails7, _holderDetails8, _holderDetails8$relat, _holderDetails9, _holderDetails9$relat, _holderDetails0, _holderDetails1, _holderDetails10, _holderDetails11, _propertyAddress, _propertyAddress$zro, _propertyAddress2, _propertyAddress3, _propertyAddress4, _propertyAddress4$add, _propertyAddress5, _propertyAddress5$add, _propertyAddress6, _propertyAddress6$add, _propertyAddress7, _propertyAddress8, _propertyAddress8$cit, _propertyAddress9, _propertyAddress9$cit, _propertyAddress0, _propertyAddress1, _propertyAddress10, _propertyAddress11, _propertyAddress11$lo, _propertyAddress12, _propertyAddress12$lo, _propertyAddress13, _propertyAddress14, _propertyAddress14$su, _propertyAddress15, _propertyAddress15$su, _propertyAddress16, _propertyAddress17, _propertyAddress18, _propertyAddress19, _propertyAddress20, _propertyAddress21, _propertyAddress22, _propertyAddress23, _propertyAddress24, _propertyAddress25, _propertyAddress26, _propertyAddress26$as, _propertyAddress27, _propertyAddress27$as, _propertyAddress28, _propertyAddress29, _propertyAddress29$bl, _propertyAddress30, _propertyAddress30$bl, _propertyAddress31, _propertyAddress32, _propertyAddress32$wa, _propertyAddress33, _propertyAddress33$wa, _propertyAddress34, _propertyAddress35, _propertyAddress35$zo, _propertyAddress36, _propertyAddress36$zo, _propertyAddress37, _propertyAddress38, _propertyAddress39, _propertyAddress40, _propertyAddress41, _useDetails$categoryT, _useDetails$categoryT2, _useDetails$propertyC, _useDetails$propertyC2, _useDetails$propertyT, _useDetails$propertyT2, _useDetails$WaterConn, _useDetails$WaterConn2, _useDetails$waterConn, _useDetails$waterConn2, _useDetails$noOfFloor, _useDetails$noOfFloor2, _useDetails$SelectYea, _useDetails$SelectYea2, _useDetails$SelectYea3, _useDetails$construct, _useDetails$construct2, _declaration$submitte, _declaration$submitte2, _declaration$signatur;
+  var _data$cpt, _data$ConnectionDetai, _data$connectionDetai, _data$ConnectionHolde, _data$connectionHolde, _data$useDetails, _data$bankDetails, _data$DocumentsRequir, _data$documents, _data$djbEmployee, _data$disability, _connectionDetails, _connectionDetails$se, _connectionDetails2, _connectionDetails2$s, _connectionDetails3, _connectionDetails4, _connectionDetails4$c, _connectionDetails5, _connectionDetails5$c, _connectionDetails6, _connectionDetails7, _connectionDetails7$w, _connectionDetails8, _connectionDetails8$w, _connectionDetails9, _connectionDetails0, _connectionDetails0$a, _connectionDetails1, _connectionDetails1$a, _connectionDetails10, _connectionDetails11, _connectionDetails11$, _connectionDetails12, _connectionDetails12$, _connectionDetails13, _connectionDetails14, _connectionDetails14$, _connectionDetails15, _connectionDetails15$, _connectionDetails16, _connectionDetails16$, _connectionDetails17, _connectionDetails18, _connectionDetails19, _connectionDetails20, _holderDetails, _holderDetails2, _holderDetails3, _holderDetails4, _holderDetails4$gende, _holderDetails5, _holderDetails5$gende, _holderDetails6, _holderDetails7, _holderDetails8, _holderDetails8$relat, _holderDetails9, _holderDetails9$relat, _holderDetails0, _holderDetails1, _holderDetails10, _holderDetails11, _propertyAddress, _propertyAddress$zro, _propertyAddress2, _propertyAddress3, _propertyAddress4, _propertyAddress4$add, _propertyAddress5, _propertyAddress5$add, _propertyAddress6, _propertyAddress6$add, _propertyAddress7, _propertyAddress8, _propertyAddress8$cit, _propertyAddress9, _propertyAddress9$cit, _propertyAddress0, _propertyAddress1, _propertyAddress10, _propertyAddress11, _propertyAddress11$lo, _propertyAddress12, _propertyAddress12$lo, _propertyAddress13, _propertyAddress14, _propertyAddress14$su, _propertyAddress15, _propertyAddress15$su, _propertyAddress16, _propertyAddress17, _propertyAddress18, _propertyAddress19, _propertyAddress20, _propertyAddress21, _propertyAddress22, _propertyAddress23, _propertyAddress24, _propertyAddress25, _propertyAddress26, _propertyAddress26$as, _propertyAddress27, _propertyAddress27$as, _propertyAddress28, _propertyAddress29, _propertyAddress29$bl, _propertyAddress30, _propertyAddress30$bl, _propertyAddress31, _propertyAddress32, _propertyAddress32$wa, _propertyAddress33, _propertyAddress33$wa, _propertyAddress34, _propertyAddress35, _propertyAddress35$zo, _propertyAddress36, _propertyAddress36$zo, _propertyAddress37, _propertyAddress38, _propertyAddress39, _propertyAddress40, _propertyAddress41, _useDetails$categoryT, _useDetails$categoryT2, _useDetails$propertyC, _useDetails$propertyC2, _useDetails$propertyT, _useDetails$propertyT2, _useDetails$WaterConn, _useDetails$WaterConn2, _useDetails$waterConn, _useDetails$waterConn2, _useDetails$noOfFloor, _useDetails$noOfFloor2, _useDetails$SelectYea, _useDetails$SelectYea2, _useDetails$SelectYea3, _useDetails$construct, _useDetails$construct2, _declaration$submitte, _declaration$submitte2, _declaration$signatur;
   let data = _ref2.data,
     onSubmit = _ref2.onSubmit,
     onEdit = _ref2.onEdit;
@@ -56008,6 +56396,7 @@ const CheckPage$4 = _ref2 => {
   const documents = (data === null || data === void 0 ? void 0 : (_data$DocumentsRequir = data.DocumentsRequired) === null || _data$DocumentsRequir === void 0 ? void 0 : _data$DocumentsRequir.documents) || (data === null || data === void 0 ? void 0 : (_data$documents = data.documents) === null || _data$documents === void 0 ? void 0 : _data$documents.documents) || [];
   const declaration = (data === null || data === void 0 ? void 0 : data.declarationData) || (data === null || data === void 0 ? void 0 : data.declaration) || {};
   const djbEmployee = (data === null || data === void 0 ? void 0 : (_data$djbEmployee = data.djbEmployee) === null || _data$djbEmployee === void 0 ? void 0 : _data$djbEmployee.djbEmployee) || (data === null || data === void 0 ? void 0 : data.djbEmployee) || {};
+  const disability = (data === null || data === void 0 ? void 0 : (_data$disability = data.disability) === null || _data$disability === void 0 ? void 0 : _data$disability.disability) || (data === null || data === void 0 ? void 0 : data.disability) || (data === null || data === void 0 ? void 0 : data.additionalDetails) || {};
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Card, {
     className: "overflow-y-scroll"
   }, /*#__PURE__*/React.createElement(CardHeader, null, t("WS_COMMON_SUMMARY")), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardSubHeader, null, t("WS_COMMON_PROPERTY_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, {
@@ -56235,7 +56624,15 @@ const CheckPage$4 = _ref2 => {
       },
       onClick: () => openFilePDF(djbEmployee === null || djbEmployee === void 0 ? void 0 : djbEmployee.document)
     }, /*#__PURE__*/React.createElement(GenericFileIcon, null), " ", t("CS_COMMON_VIEW"))
-  }))), /*#__PURE__*/React.createElement(CardSubHeader, null, t("WS_BANK_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, {
+  }))), /*#__PURE__*/React.createElement(CardSubHeader, null, "Divyangjan/Person with Disability?"), /*#__PURE__*/React.createElement(StatusTable, {
+    style: {
+      marginTop: "10px",
+      marginBottom: "30px"
+    }
+  }, /*#__PURE__*/React.createElement(Row, {
+    label: "Divyangjan/Person with Disability?",
+    text: disability !== null && disability !== void 0 && disability.isDivyangjan ? t("CORE_COMMON_YES") : t("CORE_COMMON_NO")
+  })), /*#__PURE__*/React.createElement(CardSubHeader, null, t("WS_BANK_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, {
     style: {
       marginTop: "10px",
       marginBottom: "30px"
@@ -56378,6 +56775,7 @@ const OLDApplication = () => {
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const history = useHistory();
+  const location = useLocation();
   const _useState = useState(false),
     isEnableLoader = _useState[0],
     setIsEnableLoader = _useState[1];
@@ -56426,9 +56824,12 @@ const OLDApplication = () => {
   let _Digit$Hooks$ws$useWS = Digit.Hooks.ws.useWSConfigMDMS.WSCreateConfig(stateId, {}),
     newConfig = _Digit$Hooks$ws$useWS.data,
     isLoading = _Digit$Hooks$ws$useWS.isLoading;
-  const _useState5 = useState(new URLSearchParams(useLocation().search).get("propertyId")),
+  const requestedPropertyId = new URLSearchParams(location.search).get("propertyId");
+  const _useState5 = useState(requestedPropertyId),
     propertyId = _useState5[0],
     setPropertyId = _useState5[1];
+  const initialPropertyId = useRef(requestedPropertyId);
+  const verifiedPropertyId = useRef(sessionStorage.getItem("WS_OTP_VERIFIED_PROPERTY_ID"));
   const _Digit$Hooks$useSessi = Digit.Hooks.useSessionStorage("PT_CREATE_EMP_WS_NEW_FORM", {}),
     sessionFormData = _Digit$Hooks$useSessi[0],
     setSessionFormData = _Digit$Hooks$useSessi[1],
@@ -56443,9 +56844,16 @@ const OLDApplication = () => {
         propertyIds: propertyId
       },
       tenantId: tenantId,
-      enabled: propertyId && propertyId !== "" ? true : false
+      enabled: propertyId && propertyId === requestedPropertyId && propertyId === verifiedPropertyId.current
     }),
     propertyDetails = _Digit$Hooks$pt$usePr.data;
+  useEffect(() => {
+    if (requestedPropertyId !== initialPropertyId.current || requestedPropertyId && requestedPropertyId !== verifiedPropertyId.current) {
+      clearSessionFormData();
+      sessionStorage.removeItem("WS_OTP_VERIFIED_PROPERTY_ID");
+      history.replace("/digit-ui/employee/ws/info");
+    }
+  }, [clearSessionFormData, history, requestedPropertyId]);
   useEffect(() => {
     sessionStorage.removeItem("FORMSTATE_ERRORS");
   }, []);
@@ -56455,7 +56863,7 @@ const OLDApplication = () => {
       if (config) {
         var _config$body;
         const allCreateSections = (config === null || config === void 0 ? void 0 : (_config$body = config.body) === null || _config$body === void 0 ? void 0 : _config$body.filter(section => section === null || section === void 0 ? void 0 : section.isCreateConnection)) || [];
-        const desiredComponentOrder = ["CPTPropertySearchNSummary", "WSConnectionDetails", "WSConnectionHolderDetails", "WSPropertyLocationDetails", "PropertyWaterConnection", "WSDjbEmployee", "WSActivationPlumberDetails", "WSRoadCuttingDetails", "WSBankDetails", "WSDocumentsEmployee", "WSDeclaration"];
+        const desiredComponentOrder = ["CPTPropertySearchNSummary", "WSConnectionDetails", "WSConnectionHolderDetails", "WSPropertyLocationDetails", "PropertyWaterConnection", "WSDjbEmployee", "WSDivyangjan", "WSActivationPlumberDetails", "WSRoadCuttingDetails", "WSBankDetails", "WSDocumentsEmployee", "WSDeclaration"];
         const reorderedBody = [];
         desiredComponentOrder.forEach(compName => {
           const section = allCreateSections.find(s => {
@@ -56521,6 +56929,19 @@ const OLDApplication = () => {
                 withoutLabel: true
               }]
             });
+          } else if (compName === "WSDivyangjan") {
+            reorderedBody.push({
+              isCreateConnection: true,
+              body: [{
+                type: "component",
+                key: "disability",
+                component: "WSDivyangjan",
+                withoutLabel: true,
+                texts: {
+                  header: "Divyangjan/Person with Disability?"
+                }
+              }]
+            });
           }
         });
         allCreateSections.forEach(section => {
@@ -56785,6 +57206,7 @@ const OLDApplication = () => {
                                           try {
                                             var _waterUpdateData$Wate, _waterUpdateData$Wate2, _sewerageUpdateData$S, _sewerageUpdateData$S2;
                                             clearSessionFormData();
+                                            sessionStorage.removeItem("WS_OTP_VERIFIED_PROPERTY_ID");
                                             history.push(basePath + "/ws-response?applicationNumber=" + (waterUpdateData === null || waterUpdateData === void 0 ? void 0 : (_waterUpdateData$Wate = waterUpdateData.WaterConnection) === null || _waterUpdateData$Wate === void 0 ? void 0 : (_waterUpdateData$Wate2 = _waterUpdateData$Wate[0]) === null || _waterUpdateData$Wate2 === void 0 ? void 0 : _waterUpdateData$Wate2.applicationNo) + "&applicationNumber1=" + (sewerageUpdateData === null || sewerageUpdateData === void 0 ? void 0 : (_sewerageUpdateData$S = sewerageUpdateData.SewerageConnections) === null || _sewerageUpdateData$S === void 0 ? void 0 : (_sewerageUpdateData$S2 = _sewerageUpdateData$S[0]) === null || _sewerageUpdateData$S2 === void 0 ? void 0 : _sewerageUpdateData$S2.applicationNo));
                                             return Promise.resolve();
                                           } catch (e) {
@@ -56848,6 +57270,7 @@ const OLDApplication = () => {
                               onSuccess: data => {
                                 var _data$WaterConnection2, _data$WaterConnection3;
                                 clearSessionFormData();
+                                sessionStorage.removeItem("WS_OTP_VERIFIED_PROPERTY_ID");
                                 history.push(basePath + "/ws-response?applicationNumber=" + (data === null || data === void 0 ? void 0 : (_data$WaterConnection2 = data.WaterConnection) === null || _data$WaterConnection2 === void 0 ? void 0 : (_data$WaterConnection3 = _data$WaterConnection2[0]) === null || _data$WaterConnection3 === void 0 ? void 0 : _data$WaterConnection3.applicationNo));
                               }
                             });
@@ -56896,6 +57319,7 @@ const OLDApplication = () => {
                                   onSuccess: data => {
                                     var _data$SewerageConnect2, _data$SewerageConnect3;
                                     clearSessionFormData();
+                                    sessionStorage.removeItem("WS_OTP_VERIFIED_PROPERTY_ID");
                                     history.push(basePath + "/ws-response?applicationNumber1=" + (data === null || data === void 0 ? void 0 : (_data$SewerageConnect2 = data.SewerageConnections) === null || _data$SewerageConnect2 === void 0 ? void 0 : (_data$SewerageConnect3 = _data$SewerageConnect2[0]) === null || _data$SewerageConnect3 === void 0 ? void 0 : _data$SewerageConnect3.applicationNo));
                                   }
                                 })).then(function () {});
@@ -57121,7 +57545,8 @@ const componentsToRegister = {
   WSSearchIntegrated: SearchIntegrated,
   WSSearchWaterConnectionViewIntegrated: SearchWaterConnectionViewIntegrated,
   WSBulkBillGeneration: BulkBillGeneration,
-  WSOLDApplication: OLDApplication
+  WSOLDApplication: OLDApplication,
+  WSDivyangjan: WSDivyangjan
 };
 const initWSComponents = () => {
   Object.entries(componentsToRegister).forEach(_ref3 => {