@mseva/digit-ui-module-obps 1.0.65 → 1.0.67

package/dist/index.modern.js

@@ -1,7 +1,7 @@
 import React, { Fragment, useMemo, useState, useEffect, useCallback, useReducer, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link as Link$1, useLocation, useHistory, useParams, Switch, Route, useRouteMatch, Redirect } from 'react-router-dom';
-import { SearchField, TextInput, MobileNumber, CardLabelError, Dropdown, DatePicker, SubmitBar, Loader, SearchAction, PopUp, Card, DetailsCard, Header, SearchForm, Table, Toast as Toast$1, CloseSvg, KeyNote, TelePhone, DisplayPhotos, CardSectionHeader, CheckPoint, ConnectingCheckPoints, LinkButton, MultiLink, CardLabel, Banner, CardText, ActionBar, FilterFormField, RadioButtons, RemoveableTag, MultiSelectDropdown, CheckBox, CaseIcon, InboxComposer, BackButton, PrivateRoute, BPAHomeIcon, EDCRIcon, BPAIcon, CitizenHomeCard, FormStep, UploadFile, TickMark, Label, SearchIconSvg, CardHeader, StatusTable, Row, CitizenInfoLabel, LabelFieldPair, CardSubHeader, SearchIcon, DeleteIcon, RadioOrSelect, PDFSvg as PDFSvg$1, MultiUploadWrapper, LocationSearchCard, CardCaption, Modal, FormComposer, ButtonSelector, ImageViewer, Menu, OTPInput, TextArea, BreadCrumb, OBPSIconSolidBg, EmployeeModuleCard as EmployeeModuleCard$1, Close as Close$d, BreakLine, EditIcon, OBPSIcon } from '@mseva/digit-ui-react-components';
+import { SearchField, TextInput, MobileNumber, CardLabelError, Dropdown, DatePicker, SubmitBar, Loader, SearchAction, PopUp, Card, DetailsCard, Header, SearchForm, Table, Toast as Toast$1, CloseSvg, KeyNote, TelePhone, DisplayPhotos, CardSectionHeader, CheckPoint, ConnectingCheckPoints, LinkButton, MultiLink, CardLabel, Banner, CardText, ActionBar, FilterFormField, RadioButtons, RemoveableTag, MultiSelectDropdown, CheckBox, CaseIcon, InboxComposer, BackButton, PrivateRoute, BPAHomeIcon, EDCRIcon, BPAIcon, CitizenHomeCard, FormStep, UploadFile, TickMark, Label, SearchIconSvg, CardHeader, StatusTable, Row, CitizenInfoLabel, LabelFieldPair, CardSubHeader, SearchIcon, DeleteIcon, RadioOrSelect, PDFSvg as PDFSvg$1, MultiUploadWrapper, LocationSearchCard, CardCaption, Modal, FormComposer, ButtonSelector, ImageViewer, Menu, OTPInput, TextArea, BreadCrumb, OBPSIconSolidBg, EmployeeModuleCard as EmployeeModuleCard$1, ArrowDown, Close as Close$d, BreakLine, EditIcon, OBPSIcon } from '@mseva/digit-ui-react-components';
 import { useWatch, useForm, Controller, useFormContext, useFieldArray } from 'react-hook-form';
 import { useDispatch, useSelector } from 'react-redux';
 import 'react-dom';
@@ -1736,7 +1736,7 @@ const getCheckBoxLabelData = (t, appData) => {
   }
 };
 const scrutinyDetailsData = async (edcrNumber, tenantId) => {
-  var _bpaDetails$BPA, _bpaDetails$BPA2, _bpaDetails$BPA3, _bpaDetails$BPA3$, _bpaDetails$BPA4, _bpaDetails$BPA4$, _bpaDetails$BPA5, _bpaDetails$BPA5$;
+  var _bpaDetails$BPA, _bpaDetails$BPA2, _bpaDetails$BPA3, _bpaDetails$BPA3$, _bpaDetails$BPA4, _bpaDetails$BPA4$, _bpaDetails$BPA5, _bpaDetails$BPA5$, _bpaDetails$BPA6, _bpaDetails$BPA6$;
   const scrutinyDetails = await Digit.OBPSService.scrutinyDetails(tenantId, {
     edcrNumber: edcrNumber
   });
@@ -1749,7 +1749,7 @@ const scrutinyDetailsData = async (edcrNumber, tenantId) => {
       type: "ERROR",
       message: "BPA_NO_RECORD_FOUND"
     };
-  } else if ((bpaDetails === null || bpaDetails === void 0 ? void 0 : (_bpaDetails$BPA2 = bpaDetails.BPA) === null || _bpaDetails$BPA2 === void 0 ? void 0 : _bpaDetails$BPA2.length) > 0 && ((bpaDetails === null || bpaDetails === void 0 ? void 0 : (_bpaDetails$BPA3 = bpaDetails.BPA) === null || _bpaDetails$BPA3 === void 0 ? void 0 : (_bpaDetails$BPA3$ = _bpaDetails$BPA3[0]) === null || _bpaDetails$BPA3$ === void 0 ? void 0 : _bpaDetails$BPA3$.status) == "INITIATED" || (bpaDetails === null || bpaDetails === void 0 ? void 0 : (_bpaDetails$BPA4 = bpaDetails.BPA) === null || _bpaDetails$BPA4 === void 0 ? void 0 : (_bpaDetails$BPA4$ = _bpaDetails$BPA4[0]) === null || _bpaDetails$BPA4$ === void 0 ? void 0 : _bpaDetails$BPA4$.status) == "REJECTED" || (bpaDetails === null || bpaDetails === void 0 ? void 0 : (_bpaDetails$BPA5 = bpaDetails.BPA) === null || _bpaDetails$BPA5 === void 0 ? void 0 : (_bpaDetails$BPA5$ = _bpaDetails$BPA5[0]) === null || _bpaDetails$BPA5$ === void 0 ? void 0 : _bpaDetails$BPA5$.status) == "PERMIT REVOCATION")) {
+  } else if ((bpaDetails === null || bpaDetails === void 0 ? void 0 : (_bpaDetails$BPA2 = bpaDetails.BPA) === null || _bpaDetails$BPA2 === void 0 ? void 0 : _bpaDetails$BPA2.length) > 0 && ((bpaDetails === null || bpaDetails === void 0 ? void 0 : (_bpaDetails$BPA3 = bpaDetails.BPA) === null || _bpaDetails$BPA3 === void 0 ? void 0 : (_bpaDetails$BPA3$ = _bpaDetails$BPA3[0]) === null || _bpaDetails$BPA3$ === void 0 ? void 0 : _bpaDetails$BPA3$.status) == "INITIATED" || (bpaDetails === null || bpaDetails === void 0 ? void 0 : (_bpaDetails$BPA4 = bpaDetails.BPA) === null || _bpaDetails$BPA4 === void 0 ? void 0 : (_bpaDetails$BPA4$ = _bpaDetails$BPA4[0]) === null || _bpaDetails$BPA4$ === void 0 ? void 0 : _bpaDetails$BPA4$.status) == "REJECTED" || (bpaDetails === null || bpaDetails === void 0 ? void 0 : (_bpaDetails$BPA5 = bpaDetails.BPA) === null || _bpaDetails$BPA5 === void 0 ? void 0 : (_bpaDetails$BPA5$ = _bpaDetails$BPA5[0]) === null || _bpaDetails$BPA5$ === void 0 ? void 0 : _bpaDetails$BPA5$.status) == "PERMIT REVOCATION" || (bpaDetails === null || bpaDetails === void 0 ? void 0 : (_bpaDetails$BPA6 = bpaDetails.BPA) === null || _bpaDetails$BPA6 === void 0 ? void 0 : (_bpaDetails$BPA6$ = _bpaDetails$BPA6[0]) === null || _bpaDetails$BPA6$ === void 0 ? void 0 : _bpaDetails$BPA6$.status) == "BLOCKED")) {
     var _scrutinyDetails$edcr3, _scrutinyDetails$edcr4;
     return scrutinyDetails !== null && scrutinyDetails !== void 0 && (_scrutinyDetails$edcr3 = scrutinyDetails.edcrDetail) !== null && _scrutinyDetails$edcr3 !== void 0 && _scrutinyDetails$edcr3[0] ? scrutinyDetails === null || scrutinyDetails === void 0 ? void 0 : (_scrutinyDetails$edcr4 = scrutinyDetails.edcrDetail) === null || _scrutinyDetails$edcr4 === void 0 ? void 0 : _scrutinyDetails$edcr4[0] : {
       type: "ERROR",
@@ -1774,7 +1774,7 @@ const getOCEDCRDetails = async (edcrNumber, tenantId) => {
   }
 };
 const ocScrutinyDetailsData = async (edcrNumber, tenantId) => {
-  var _scrutinyDetails$edcr5, _scrutinyDetails$edcr6, _scrutinyDetails$edcr7, _scrutinyDetails$edcr8, _bpaDetails$BPA6, _bpaDetails$BPA6$, _bpaDetails$BPA7, _bpaDetails$BPA7$, _scrutinyDetails$edcr9, _scrutinyDetails$edcr0, _scrutinyDetails$edcr1, _scrutinyDetails$edcr10;
+  var _scrutinyDetails$edcr5, _scrutinyDetails$edcr6, _scrutinyDetails$edcr7, _scrutinyDetails$edcr8, _bpaDetails$BPA7, _bpaDetails$BPA7$, _bpaDetails$BPA8, _bpaDetails$BPA8$, _scrutinyDetails$edcr9, _scrutinyDetails$edcr0, _scrutinyDetails$edcr1, _scrutinyDetails$edcr10;
   const scrutinyDetails = await getOCEDCRDetails(edcrNumber, tenantId);
   console.log(scrutinyDetails, "OOOO*****");
   if (!(scrutinyDetails !== null && scrutinyDetails !== void 0 && (_scrutinyDetails$edcr5 = scrutinyDetails.edcrDetail) !== null && _scrutinyDetails$edcr5 !== void 0 && (_scrutinyDetails$edcr6 = _scrutinyDetails$edcr5[0]) !== null && _scrutinyDetails$edcr6 !== void 0 && _scrutinyDetails$edcr6.edcrNumber)) {
@@ -1786,8 +1786,8 @@ const ocScrutinyDetailsData = async (edcrNumber, tenantId) => {
   const bpaDetails = await Digit.OBPSService.BPASearch(tenantId, {
     approvalNo: scrutinyDetails === null || scrutinyDetails === void 0 ? void 0 : (_scrutinyDetails$edcr7 = scrutinyDetails.edcrDetail) === null || _scrutinyDetails$edcr7 === void 0 ? void 0 : (_scrutinyDetails$edcr8 = _scrutinyDetails$edcr7[0]) === null || _scrutinyDetails$edcr8 === void 0 ? void 0 : _scrutinyDetails$edcr8.permitNumber
   });
-  const bpaEdcrNumber = bpaDetails === null || bpaDetails === void 0 ? void 0 : (_bpaDetails$BPA6 = bpaDetails.BPA) === null || _bpaDetails$BPA6 === void 0 ? void 0 : (_bpaDetails$BPA6$ = _bpaDetails$BPA6[0]) === null || _bpaDetails$BPA6$ === void 0 ? void 0 : _bpaDetails$BPA6$.edcrNumber;
-  tenantId = bpaDetails === null || bpaDetails === void 0 ? void 0 : (_bpaDetails$BPA7 = bpaDetails.BPA) === null || _bpaDetails$BPA7 === void 0 ? void 0 : (_bpaDetails$BPA7$ = _bpaDetails$BPA7[0]) === null || _bpaDetails$BPA7$ === void 0 ? void 0 : _bpaDetails$BPA7$.tenantId;
+  const bpaEdcrNumber = bpaDetails === null || bpaDetails === void 0 ? void 0 : (_bpaDetails$BPA7 = bpaDetails.BPA) === null || _bpaDetails$BPA7 === void 0 ? void 0 : (_bpaDetails$BPA7$ = _bpaDetails$BPA7[0]) === null || _bpaDetails$BPA7$ === void 0 ? void 0 : _bpaDetails$BPA7$.edcrNumber;
+  tenantId = bpaDetails === null || bpaDetails === void 0 ? void 0 : (_bpaDetails$BPA8 = bpaDetails.BPA) === null || _bpaDetails$BPA8 === void 0 ? void 0 : (_bpaDetails$BPA8$ = _bpaDetails$BPA8[0]) === null || _bpaDetails$BPA8$ === void 0 ? void 0 : _bpaDetails$BPA8$.tenantId;
   const edcrDetails = await Digit.OBPSService.scrutinyDetails(tenantId, {
     edcrNumber: bpaEdcrNumber
   });
@@ -3489,10 +3489,13 @@ const OBPSResponse = props => {
     id: bpaData === null || bpaData === void 0 ? void 0 : bpaData.applicationNo,
     moduleCode: "BPA"
   });
-  console.log(workflowDetails, "OOOOO");
   useEffect(async () => {
     var _bpaResponse$BPA, _bpaResponse$BPA$, _bpaResponse$BPA2, _bpaResponse$BPA2$, _bpaResponse$BPA3, _bpaResponse$BPA3$, _bpaResponse$BPA4, _bpaResponse$BPA4$, _fetchBill$Bill, _fetchBill$Bill2, _fetchBill$Bill2$, _bpaResponse$BPA5;
     setIsLoader(true);
+    window.scrollTo({
+      top: 0,
+      behavior: "smooth"
+    });
     const bpaResponse = await Digit.OBPSService.BPASearch(tenantId, {
       applicationNo: bpaData === null || bpaData === void 0 ? void 0 : bpaData.applicationNo
     });
@@ -3541,7 +3544,6 @@ const OBPSResponse = props => {
       if (data.action == "PAY" && !isPayButtonEnable) isPayButtonEnable = true;
     });
   }
-  console.log("}}}}}");
   return /*#__PURE__*/React.createElement("div", null, isLoader || workflowDetails !== null && workflowDetails !== void 0 && workflowDetails.isLoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(Banner, {
     message: getHeaderMessage(),
     applicationNumber: applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationNo,
@@ -5437,6 +5439,7 @@ const useInboxTableConfig = ({
         row
       }) => {
         var _row$original3, _row$original4;
+        console.log("row.original", row.original);
         return (_row$original3 = row.original) !== null && _row$original3 !== void 0 && _row$original3["submissionDate"] ? GetCell(format(new Date((_row$original4 = row.original) === null || _row$original4 === void 0 ? void 0 : _row$original4["submissionDate"]), 'dd/MM/yyyy')) : "NA";
       }
     }, {
@@ -14099,7 +14102,7 @@ const PlotDetails = ({
   currentStepData,
   onGoBack
 }) => {
-  var _formData$uiFlow, _userInfo$info, _userInfo$info$roles, _userInfo$info2, _currentStepData$Basi, _LicenseData$Licenses, _LicenseData$Licenses2, _LicenseData$Licenses3, _LicenseData$Licenses4, _LicenseData$Licenses5, _LicenseData$Licenses6, _currentStepData$Basi2, _currentStepData$cpt5, _currentStepData$cpt6, _currentStepData$cpt10, _currentStepData$cpt11, _data$planDetail1, _data$planDetail1$pla, _data$planDetail10, _data$planDetail10$pl, _data$planDetail11, _data$planDetail11$pl, _data$planDetail12, _data$planDetail12$pl, _currentStepData$cpt29, _currentStepData$cpt30, _currentStepData$cpt31, _currentStepData$cpt32;
+  var _formData$uiFlow, _userInfo$info, _userInfo$info$roles, _userInfo$info2, _currentStepData$Basi, _LicenseData$Licenses, _LicenseData$Licenses2, _LicenseData$Licenses3, _LicenseData$Licenses4, _LicenseData$Licenses5, _LicenseData$Licenses6, _currentStepData$crea5, _currentStepData$crea6, _currentStepData$Basi2, _currentStepData$cpt5, _currentStepData$cpt6, _currentStepData$cpt10, _currentStepData$cpt11, _data$planDetail1, _data$planDetail1$pla, _data$planDetail10, _data$planDetail10$pl, _data$planDetail11, _data$planDetail11$pl, _data$planDetail12, _data$planDetail12$pl, _currentStepData$cpt29, _currentStepData$cpt30, _currentStepData$cpt31, _currentStepData$cpt32;
   const isEditApplication = window.location.href.includes("editApplication");
   const [editConfig, setEditConfig] = useState(config);
   const {
@@ -14108,6 +14111,7 @@ const PlotDetails = ({
   const [registrationDetails, setRegistrationDetails] = useState("");
   const [boundaryWallLength, setBoundaryWallLength] = useState("");
   const [wardnumber, setWardNumber] = useState("");
+  const [isClubbedPlot, setIsClubbedPlot] = useState({});
   const [zonenumber, setZoneNumber] = useState("");
   const [khasraNumber, setKhasraNumber] = useState("");
   const [architectid, setArchitectId] = useState("");
@@ -14145,6 +14149,15 @@ const PlotDetails = ({
   } = Digit.Hooks.useCustomMDMS(tenantId, "egov-location", [{
     name: "TenantBoundary"
   }]);
+  const common = [{
+    code: "YES",
+    i18nKey: "YES",
+    value: true
+  }, {
+    code: "NO",
+    i18nKey: "NO",
+    value: false
+  }];
   const data = currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$Basi = currentStepData.BasicDetails) === null || _currentStepData$Basi === void 0 ? void 0 : _currentStepData$Basi.edcrDetails;
   console.log("sessionStorageData", userInfo, LicenseData === null || LicenseData === void 0 ? void 0 : (_LicenseData$Licenses = LicenseData.Licenses) === null || _LicenseData$Licenses === void 0 ? void 0 : (_LicenseData$Licenses2 = _LicenseData$Licenses[0]) === null || _LicenseData$Licenses2 === void 0 ? void 0 : _LicenseData$Licenses2.licenseNumber, LicenseData === null || LicenseData === void 0 ? void 0 : (_LicenseData$Licenses3 = LicenseData.Licenses) === null || _LicenseData$Licenses3 === void 0 ? void 0 : (_LicenseData$Licenses4 = _LicenseData$Licenses3[0]) === null || _LicenseData$Licenses4 === void 0 ? void 0 : (_LicenseData$Licenses5 = _LicenseData$Licenses4.tradeLicenseDetail) === null || _LicenseData$Licenses5 === void 0 ? void 0 : (_LicenseData$Licenses6 = _LicenseData$Licenses5.additionalDetail) === null || _LicenseData$Licenses6 === void 0 ? void 0 : _LicenseData$Licenses6.counsilForArchNo);
   const pageStyle = {
@@ -14198,12 +14211,24 @@ const PlotDetails = ({
       }
     }
   }, [LicenseData]);
+  useEffect(() => {
+    if (typeof isClubbedPlot === "boolean") {
+      const plan = common.find(item => item.value === isClubbedPlot);
+      if (plan) setIsClubbedPlot(plan);
+    } else if (isClubbedPlot === null) {
+      var _currentStepData$crea, _currentStepData$crea2;
+      if (currentStepData !== null && currentStepData !== void 0 && (_currentStepData$crea = currentStepData.createdResponse) !== null && _currentStepData$crea !== void 0 && (_currentStepData$crea2 = _currentStepData$crea.additionalDetails) !== null && _currentStepData$crea2 !== void 0 && _currentStepData$crea2.isClubbedPlot) {
+        var _currentStepData$crea3, _currentStepData$crea4;
+        setmasterPlan(currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea3 = currentStepData.createdResponse) === null || _currentStepData$crea3 === void 0 ? void 0 : (_currentStepData$crea4 = _currentStepData$crea3.additionalDetails) === null || _currentStepData$crea4 === void 0 ? void 0 : _currentStepData$crea4.isClubbedPlot);
+      }
+    }
+  }, [isClubbedPlot, currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea5 = currentStepData.createdResponse) === null || _currentStepData$crea5 === void 0 ? void 0 : (_currentStepData$crea6 = _currentStepData$crea5.additionalDetails) === null || _currentStepData$crea6 === void 0 ? void 0 : _currentStepData$crea6.isClubbedPlot]);
   useEffect(() => {
     if (LicenseData) {
       var _LicenseData$Licenses1, _LicenseData$Licenses10;
       if (LicenseData !== null && LicenseData !== void 0 && (_LicenseData$Licenses1 = LicenseData.Licenses) !== null && _LicenseData$Licenses1 !== void 0 && (_LicenseData$Licenses10 = _LicenseData$Licenses1[0]) !== null && _LicenseData$Licenses10 !== void 0 && _LicenseData$Licenses10.tradeLicenseDetail) {
         var _LicenseData$Licenses11, _LicenseData$Licenses12, _LicenseData$Licenses13, _LicenseData$Licenses14, _LicenseData$Licenses15, _LicenseData$Licenses16, _LicenseData$Licenses17, _LicenseData$Licenses18, _LicenseData$Licenses19, _LicenseData$Licenses20, _LicenseData$Licenses21, _LicenseData$Licenses22, _LicenseData$Licenses23, _LicenseData$Licenses24;
-        const architectNo = (LicenseData === null || LicenseData === void 0 ? void 0 : (_LicenseData$Licenses11 = LicenseData.Licenses) === null || _LicenseData$Licenses11 === void 0 ? void 0 : (_LicenseData$Licenses12 = _LicenseData$Licenses11[0]) === null || _LicenseData$Licenses12 === void 0 ? void 0 : (_LicenseData$Licenses13 = _LicenseData$Licenses12.tradeLicenseDetail) === null || _LicenseData$Licenses13 === void 0 ? void 0 : (_LicenseData$Licenses14 = _LicenseData$Licenses13.additionalDetail) === null || _LicenseData$Licenses14 === void 0 ? void 0 : _LicenseData$Licenses14.counsilForArchNo) === null || (LicenseData === null || LicenseData === void 0 ? void 0 : (_LicenseData$Licenses15 = LicenseData.Licenses) === null || _LicenseData$Licenses15 === void 0 ? void 0 : (_LicenseData$Licenses16 = _LicenseData$Licenses15[0]) === null || _LicenseData$Licenses16 === void 0 ? void 0 : (_LicenseData$Licenses17 = _LicenseData$Licenses16.tradeLicenseDetail) === null || _LicenseData$Licenses17 === void 0 ? void 0 : (_LicenseData$Licenses18 = _LicenseData$Licenses17.additionalDetail) === null || _LicenseData$Licenses18 === void 0 ? void 0 : _LicenseData$Licenses18.counsilForArchNo) === "" ? LicenseData === null || LicenseData === void 0 ? void 0 : (_LicenseData$Licenses19 = LicenseData.Licenses) === null || _LicenseData$Licenses19 === void 0 ? void 0 : (_LicenseData$Licenses20 = _LicenseData$Licenses19[0]) === null || _LicenseData$Licenses20 === void 0 ? void 0 : _LicenseData$Licenses20.licenseNumber : LicenseData === null || LicenseData === void 0 ? void 0 : (_LicenseData$Licenses21 = LicenseData.Licenses) === null || _LicenseData$Licenses21 === void 0 ? void 0 : (_LicenseData$Licenses22 = _LicenseData$Licenses21[0]) === null || _LicenseData$Licenses22 === void 0 ? void 0 : (_LicenseData$Licenses23 = _LicenseData$Licenses22.tradeLicenseDetail) === null || _LicenseData$Licenses23 === void 0 ? void 0 : (_LicenseData$Licenses24 = _LicenseData$Licenses23.additionalDetail) === null || _LicenseData$Licenses24 === void 0 ? void 0 : _LicenseData$Licenses24.counsilForArchNo;
+        const architectNo = (LicenseData === null || LicenseData === void 0 ? void 0 : (_LicenseData$Licenses11 = LicenseData.Licenses) === null || _LicenseData$Licenses11 === void 0 ? void 0 : (_LicenseData$Licenses12 = _LicenseData$Licenses11.find(item => (item === null || item === void 0 ? void 0 : item.status) === "APPROVED")) === null || _LicenseData$Licenses12 === void 0 ? void 0 : (_LicenseData$Licenses13 = _LicenseData$Licenses12.tradeLicenseDetail) === null || _LicenseData$Licenses13 === void 0 ? void 0 : (_LicenseData$Licenses14 = _LicenseData$Licenses13.additionalDetail) === null || _LicenseData$Licenses14 === void 0 ? void 0 : _LicenseData$Licenses14.counsilForArchNo) === null || (LicenseData === null || LicenseData === void 0 ? void 0 : (_LicenseData$Licenses15 = LicenseData.Licenses) === null || _LicenseData$Licenses15 === void 0 ? void 0 : (_LicenseData$Licenses16 = _LicenseData$Licenses15[0]) === null || _LicenseData$Licenses16 === void 0 ? void 0 : (_LicenseData$Licenses17 = _LicenseData$Licenses16.tradeLicenseDetail) === null || _LicenseData$Licenses17 === void 0 ? void 0 : (_LicenseData$Licenses18 = _LicenseData$Licenses17.additionalDetail) === null || _LicenseData$Licenses18 === void 0 ? void 0 : _LicenseData$Licenses18.counsilForArchNo) === "" ? LicenseData === null || LicenseData === void 0 ? void 0 : (_LicenseData$Licenses19 = LicenseData.Licenses) === null || _LicenseData$Licenses19 === void 0 ? void 0 : (_LicenseData$Licenses20 = _LicenseData$Licenses19[0]) === null || _LicenseData$Licenses20 === void 0 ? void 0 : _LicenseData$Licenses20.licenseNumber : LicenseData === null || LicenseData === void 0 ? void 0 : (_LicenseData$Licenses21 = LicenseData.Licenses) === null || _LicenseData$Licenses21 === void 0 ? void 0 : (_LicenseData$Licenses22 = _LicenseData$Licenses21[0]) === null || _LicenseData$Licenses22 === void 0 ? void 0 : (_LicenseData$Licenses23 = _LicenseData$Licenses22.tradeLicenseDetail) === null || _LicenseData$Licenses23 === void 0 ? void 0 : (_LicenseData$Licenses24 = _LicenseData$Licenses23.additionalDetail) === null || _LicenseData$Licenses24 === void 0 ? void 0 : _LicenseData$Licenses24.counsilForArchNo;
         setArchitectId(architectNo);
       }
     }
@@ -14216,12 +14241,13 @@ const PlotDetails = ({
     }
   }, [currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$Basi2 = currentStepData.BasicDetails) === null || _currentStepData$Basi2 === void 0 ? void 0 : _currentStepData$Basi2.edcrDetails]);
   useEffect(() => {
-    var _currentStepData$crea;
-    if (currentStepData !== null && currentStepData !== void 0 && (_currentStepData$crea = currentStepData.createdResponse) !== null && _currentStepData$crea !== void 0 && _currentStepData$crea.additionalDetails) {
+    var _currentStepData$crea7;
+    if (currentStepData !== null && currentStepData !== void 0 && (_currentStepData$crea7 = currentStepData.createdResponse) !== null && _currentStepData$crea7 !== void 0 && _currentStepData$crea7.additionalDetails) {
       const details = currentStepData.createdResponse.additionalDetails;
       setRegistrationDetails((details === null || details === void 0 ? void 0 : details.registrationDetails) || "");
       setBoundaryWallLength((details === null || details === void 0 ? void 0 : details.boundaryWallLength) || "");
       setWardNumber((details === null || details === void 0 ? void 0 : details.wardnumber) || "");
+      setIsClubbedPlot((details === null || details === void 0 ? void 0 : details.isClubbedPlot) !== null ? details === null || details === void 0 ? void 0 : details.isClubbedPlot : {});
       setZoneNumber((details === null || details === void 0 ? void 0 : details.zonenumber) || "");
       setKhasraNumber((details === null || details === void 0 ? void 0 : details.khasraNumber) || "");
       setArchitectId((details === null || details === void 0 ? void 0 : details.architectid) || "");
@@ -14237,15 +14263,15 @@ const PlotDetails = ({
     }
   }, [currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.createdResponse]);
   useEffect(() => {
-    var _currentStepData$cpt, _currentStepData$cpt$, _currentStepData$crea2, _currentStepData$crea3;
-    if (currentStepData !== null && currentStepData !== void 0 && (_currentStepData$cpt = currentStepData.cpt) !== null && _currentStepData$cpt !== void 0 && (_currentStepData$cpt$ = _currentStepData$cpt.zonalMapping) !== null && _currentStepData$cpt$ !== void 0 && _currentStepData$cpt$.zone && !(currentStepData !== null && currentStepData !== void 0 && (_currentStepData$crea2 = currentStepData.createdResponse) !== null && _currentStepData$crea2 !== void 0 && (_currentStepData$crea3 = _currentStepData$crea2.additionalDetails) !== null && _currentStepData$crea3 !== void 0 && _currentStepData$crea3.zonenumber)) {
+    var _currentStepData$cpt, _currentStepData$cpt$, _currentStepData$crea8, _currentStepData$crea9;
+    if (currentStepData !== null && currentStepData !== void 0 && (_currentStepData$cpt = currentStepData.cpt) !== null && _currentStepData$cpt !== void 0 && (_currentStepData$cpt$ = _currentStepData$cpt.zonalMapping) !== null && _currentStepData$cpt$ !== void 0 && _currentStepData$cpt$.zone && !(currentStepData !== null && currentStepData !== void 0 && (_currentStepData$crea8 = currentStepData.createdResponse) !== null && _currentStepData$crea8 !== void 0 && (_currentStepData$crea9 = _currentStepData$crea8.additionalDetails) !== null && _currentStepData$crea9 !== void 0 && _currentStepData$crea9.zonenumber)) {
       var _currentStepData$cpt2, _currentStepData$cpt3, _currentStepData$cpt4;
       setZoneNumber((currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$cpt2 = currentStepData.cpt) === null || _currentStepData$cpt2 === void 0 ? void 0 : (_currentStepData$cpt3 = _currentStepData$cpt2.zonalMapping) === null || _currentStepData$cpt3 === void 0 ? void 0 : (_currentStepData$cpt4 = _currentStepData$cpt3.zone) === null || _currentStepData$cpt4 === void 0 ? void 0 : _currentStepData$cpt4.code) || "");
     }
   }, [currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$cpt5 = currentStepData.cpt) === null || _currentStepData$cpt5 === void 0 ? void 0 : (_currentStepData$cpt6 = _currentStepData$cpt5.zonalMapping) === null || _currentStepData$cpt6 === void 0 ? void 0 : _currentStepData$cpt6.zone]);
   useEffect(() => {
-    var _currentStepData$cpt7, _currentStepData$cpt8, _currentStepData$crea4, _currentStepData$crea5;
-    if (currentStepData !== null && currentStepData !== void 0 && (_currentStepData$cpt7 = currentStepData.cpt) !== null && _currentStepData$cpt7 !== void 0 && (_currentStepData$cpt8 = _currentStepData$cpt7.zonalMapping) !== null && _currentStepData$cpt8 !== void 0 && _currentStepData$cpt8.ward && !(currentStepData !== null && currentStepData !== void 0 && (_currentStepData$crea4 = currentStepData.createdResponse) !== null && _currentStepData$crea4 !== void 0 && (_currentStepData$crea5 = _currentStepData$crea4.additionalDetails) !== null && _currentStepData$crea5 !== void 0 && _currentStepData$crea5.wardnumber)) {
+    var _currentStepData$cpt7, _currentStepData$cpt8, _currentStepData$crea0, _currentStepData$crea1;
+    if (currentStepData !== null && currentStepData !== void 0 && (_currentStepData$cpt7 = currentStepData.cpt) !== null && _currentStepData$cpt7 !== void 0 && (_currentStepData$cpt8 = _currentStepData$cpt7.zonalMapping) !== null && _currentStepData$cpt8 !== void 0 && _currentStepData$cpt8.ward && !(currentStepData !== null && currentStepData !== void 0 && (_currentStepData$crea0 = currentStepData.createdResponse) !== null && _currentStepData$crea0 !== void 0 && (_currentStepData$crea1 = _currentStepData$crea0.additionalDetails) !== null && _currentStepData$crea1 !== void 0 && _currentStepData$crea1.wardnumber)) {
       var _currentStepData$cpt9, _currentStepData$cpt0, _currentStepData$cpt1;
       setWardNumber((currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$cpt9 = currentStepData.cpt) === null || _currentStepData$cpt9 === void 0 ? void 0 : (_currentStepData$cpt0 = _currentStepData$cpt9.zonalMapping) === null || _currentStepData$cpt0 === void 0 ? void 0 : (_currentStepData$cpt1 = _currentStepData$cpt0.ward) === null || _currentStepData$cpt1 === void 0 ? void 0 : _currentStepData$cpt1.code) || "");
     }
@@ -14255,6 +14281,9 @@ const PlotDetails = ({
     if (!registrationDetails.trim()) {
       newErrors.registrationDetails = t("BPA_REGISTRATION_DETAILS_REQUIRED");
     }
+    if (!(isClubbedPlot !== null && isClubbedPlot !== void 0 && isClubbedPlot.code)) {
+      newErrors.isClubbedPlot = t("BPA_IS_CLUBBED_PLOT_REQUIRED");
+    }
     if (!boundaryWallLength) {
       newErrors.boundaryWallLength = t("BPA_BOUNDARY_WALL_LENGTH_REQUIRED");
     } else if (isNaN(boundaryWallLength)) {
@@ -14311,7 +14340,7 @@ const PlotDetails = ({
     return Object.keys(newErrors).length === 0;
   };
   const handleSubmit = async () => {
-    var _userInfo$info3, _currentStepData$cpt12, _currentStepData$cpt13, _currentStepData$cpt14, _currentStepData$cpt15, _currentStepData$cpt16, _currentStepData$cpt17, _currentStepData$cpt18, _currentStepData$cpt19, _currentStepData$cpt20, _currentStepData$cpt21, _currentStepData$cpt22, _currentStepData$crea6, _currentStepData$crea7, _currentStepData$cpt23, _currentStepData$cpt24, _currentStepData$crea8, _currentStepData$crea9, _currentStepData$cpt25, _currentStepData$cpt26, _currentStepData$cpt27, _currentStepData$crea0, _currentStepData$crea1, _currentStepData$Basi3, _currentStepData$Basi4, _currentStepData$Basi5, _currentStepData$Basi6, _currentStepData$Basi7, _currentStepData$Basi8, _currentStepData$Basi9, _formData$data, _currentStepData$crea10, _data$planDetail3, _data$planDetail3$pla, _data$planDetail3$pla2, _data$planDetail4, _data$planDetail4$blo, _data$planDetail4$blo2, _data$planDetail4$blo3, _data$planDetail4$blo4, _data$planDetail5, _data$planDetail5$pla, _data$planDetail6, _data$planDetail6$blo, _data$planDetail6$blo2, _data$planDetail6$blo3, _data$planDetail6$blo4, _approvedLicense$trad, _approvedLicense$trad2, _approvedLicense$trad3, _data$planDetail7, _data$planDetail7$pla, _data$planDetail7$pla2, _data$planDetail8, _data$planDetail8$blo, _data$planDetail8$blo2, _data$planDetail8$blo3, _data$planDetail8$blo4, _data$planDetail9, _data$planDetail9$pla, _data$planDetail0, _data$planDetail0$blo, _data$planDetail0$blo2, _data$planDetail0$blo3, _data$planDetail0$blo4, _approvedLicense$trad4, _approvedLicense$trad5, _approvedLicense$trad6, _currentStepData$Basi0, _userInfo$info4, _formData$data2, _formData$data3;
+    var _userInfo$info3, _currentStepData$cpt12, _currentStepData$cpt13, _currentStepData$cpt14, _currentStepData$cpt15, _currentStepData$cpt16, _currentStepData$cpt17, _currentStepData$cpt18, _currentStepData$cpt19, _currentStepData$cpt20, _currentStepData$cpt21, _currentStepData$cpt22, _currentStepData$crea10, _currentStepData$crea11, _currentStepData$cpt23, _currentStepData$cpt24, _currentStepData$crea12, _currentStepData$crea13, _currentStepData$cpt25, _currentStepData$cpt26, _currentStepData$cpt27, _currentStepData$crea14, _currentStepData$crea15, _currentStepData$Basi3, _currentStepData$Basi4, _currentStepData$Basi5, _currentStepData$Basi6, _currentStepData$Basi7, _currentStepData$Basi8, _currentStepData$Basi9, _formData$data, _currentStepData$crea16, _data$planDetail3, _data$planDetail3$pla, _data$planDetail3$pla2, _data$planDetail4, _data$planDetail4$blo, _data$planDetail4$blo2, _data$planDetail4$blo3, _data$planDetail4$blo4, _data$planDetail5, _data$planDetail5$pla, _data$planDetail6, _data$planDetail6$blo, _data$planDetail6$blo2, _data$planDetail6$blo3, _data$planDetail6$blo4, _approvedLicense$trad, _approvedLicense$trad2, _approvedLicense$trad3, _data$planDetail7, _data$planDetail7$pla, _data$planDetail7$pla2, _data$planDetail8, _data$planDetail8$blo, _data$planDetail8$blo2, _data$planDetail8$blo3, _data$planDetail8$blo4, _data$planDetail9, _data$planDetail9$pla, _data$planDetail0, _data$planDetail0$blo, _data$planDetail0$blo2, _data$planDetail0$blo3, _data$planDetail0$blo4, _approvedLicense$trad4, _approvedLicense$trad5, _approvedLicense$trad6, _currentStepData$Basi0, _userInfo$info4, _formData$data2, _formData$data3;
     if (!validate()) return;
     const userInfo = Digit.UserService.getUser();
     const applicationType = (data === null || data === void 0 ? void 0 : data.appliactionType) || "";
@@ -14334,15 +14363,15 @@ const PlotDetails = ({
       ...(currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$cpt15 = currentStepData.cpt) === null || _currentStepData$cpt15 === void 0 ? void 0 : (_currentStepData$cpt16 = _currentStepData$cpt15.details) === null || _currentStepData$cpt16 === void 0 ? void 0 : _currentStepData$cpt16.address),
       city: (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$cpt17 = currentStepData.cpt) === null || _currentStepData$cpt17 === void 0 ? void 0 : (_currentStepData$cpt18 = _currentStepData$cpt17.details) === null || _currentStepData$cpt18 === void 0 ? void 0 : (_currentStepData$cpt19 = _currentStepData$cpt18.address) === null || _currentStepData$cpt19 === void 0 ? void 0 : _currentStepData$cpt19.tenantId) || (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$cpt20 = currentStepData.cpt) === null || _currentStepData$cpt20 === void 0 ? void 0 : (_currentStepData$cpt21 = _currentStepData$cpt20.details) === null || _currentStepData$cpt21 === void 0 ? void 0 : (_currentStepData$cpt22 = _currentStepData$cpt21.address) === null || _currentStepData$cpt22 === void 0 ? void 0 : _currentStepData$cpt22.city) || "",
       id: null
-    } || (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea6 = currentStepData.createdResponse) === null || _currentStepData$crea6 === void 0 ? void 0 : (_currentStepData$crea7 = _currentStepData$crea6.landInfo) === null || _currentStepData$crea7 === void 0 ? void 0 : _currentStepData$crea7.address) || undefined;
-    const ownershipCategory = (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$cpt23 = currentStepData.cpt) === null || _currentStepData$cpt23 === void 0 ? void 0 : (_currentStepData$cpt24 = _currentStepData$cpt23.details) === null || _currentStepData$cpt24 === void 0 ? void 0 : _currentStepData$cpt24.ownershipCategory) || (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea8 = currentStepData.createdResponse) === null || _currentStepData$crea8 === void 0 ? void 0 : (_currentStepData$crea9 = _currentStepData$crea8.landInfo) === null || _currentStepData$crea9 === void 0 ? void 0 : _currentStepData$crea9.ownershipCategory) || undefined;
+    } || (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea10 = currentStepData.createdResponse) === null || _currentStepData$crea10 === void 0 ? void 0 : (_currentStepData$crea11 = _currentStepData$crea10.landInfo) === null || _currentStepData$crea11 === void 0 ? void 0 : _currentStepData$crea11.address) || undefined;
+    const ownershipCategory = (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$cpt23 = currentStepData.cpt) === null || _currentStepData$cpt23 === void 0 ? void 0 : (_currentStepData$cpt24 = _currentStepData$cpt23.details) === null || _currentStepData$cpt24 === void 0 ? void 0 : _currentStepData$cpt24.ownershipCategory) || (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea12 = currentStepData.createdResponse) === null || _currentStepData$crea12 === void 0 ? void 0 : (_currentStepData$crea13 = _currentStepData$crea12.landInfo) === null || _currentStepData$crea13 === void 0 ? void 0 : _currentStepData$crea13.ownershipCategory) || undefined;
     const owners = (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$cpt25 = currentStepData.cpt) === null || _currentStepData$cpt25 === void 0 ? void 0 : (_currentStepData$cpt26 = _currentStepData$cpt25.details) === null || _currentStepData$cpt26 === void 0 ? void 0 : (_currentStepData$cpt27 = _currentStepData$cpt26.owners) === null || _currentStepData$cpt27 === void 0 ? void 0 : _currentStepData$cpt27.map(data => {
       var _data$status;
       return {
         ...data,
         status: (data === null || data === void 0 ? void 0 : (_data$status = data.status) === null || _data$status === void 0 ? void 0 : _data$status.trim()) === "ACTIVE" ? true : false
       };
-    })) || (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea0 = currentStepData.createdResponse) === null || _currentStepData$crea0 === void 0 ? void 0 : (_currentStepData$crea1 = _currentStepData$crea0.landInfo) === null || _currentStepData$crea1 === void 0 ? void 0 : _currentStepData$crea1.owners) || undefined;
+    })) || (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea14 = currentStepData.createdResponse) === null || _currentStepData$crea14 === void 0 ? void 0 : (_currentStepData$crea15 = _currentStepData$crea14.landInfo) === null || _currentStepData$crea15 === void 0 ? void 0 : _currentStepData$crea15.owners) || undefined;
     const landInfo = {
       address,
       ownershipCategory,
@@ -14353,7 +14382,7 @@ const PlotDetails = ({
     const farDetails = currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$Basi3 = currentStepData.BasicDetails) === null || _currentStepData$Basi3 === void 0 ? void 0 : (_currentStepData$Basi4 = _currentStepData$Basi3.edcrDetails) === null || _currentStepData$Basi4 === void 0 ? void 0 : (_currentStepData$Basi5 = _currentStepData$Basi4.planDetail) === null || _currentStepData$Basi5 === void 0 ? void 0 : _currentStepData$Basi5.farDetails;
     const roadType = currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$Basi6 = currentStepData.BasicDetails) === null || _currentStepData$Basi6 === void 0 ? void 0 : (_currentStepData$Basi7 = _currentStepData$Basi6.edcrDetails) === null || _currentStepData$Basi7 === void 0 ? void 0 : (_currentStepData$Basi8 = _currentStepData$Basi7.planDetail) === null || _currentStepData$Basi8 === void 0 ? void 0 : (_currentStepData$Basi9 = _currentStepData$Basi8.planInformation) === null || _currentStepData$Basi9 === void 0 ? void 0 : _currentStepData$Basi9.roadType;
     const additionalDetails = formData !== null && formData !== void 0 && (_formData$data = formData.data) !== null && _formData$data !== void 0 && _formData$data.applicationNo ? {
-      ...(currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea10 = currentStepData.createdResponse) === null || _currentStepData$crea10 === void 0 ? void 0 : _currentStepData$crea10.additionalDetails),
+      ...(currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea16 = currentStepData.createdResponse) === null || _currentStepData$crea16 === void 0 ? void 0 : _currentStepData$crea16.additionalDetails),
       registrationDetails,
       boundaryWallLength,
       wardnumber,
@@ -14383,7 +14412,8 @@ const PlotDetails = ({
       stakeholderRegistrationNumber,
       stakeholderAddress,
       isSelfCertificationRequired,
-      architectPhoto: (approvedLicense === null || approvedLicense === void 0 ? void 0 : (_approvedLicense$trad = approvedLicense.tradeLicenseDetail) === null || _approvedLicense$trad === void 0 ? void 0 : (_approvedLicense$trad2 = _approvedLicense$trad.applicationDocuments) === null || _approvedLicense$trad2 === void 0 ? void 0 : (_approvedLicense$trad3 = _approvedLicense$trad2.find(item => (item === null || item === void 0 ? void 0 : item.documentType) === "APPL.BPAREG_PASS_PORT_SIZE_PHOTO")) === null || _approvedLicense$trad3 === void 0 ? void 0 : _approvedLicense$trad3.fileStoreId) || null
+      architectPhoto: (approvedLicense === null || approvedLicense === void 0 ? void 0 : (_approvedLicense$trad = approvedLicense.tradeLicenseDetail) === null || _approvedLicense$trad === void 0 ? void 0 : (_approvedLicense$trad2 = _approvedLicense$trad.applicationDocuments) === null || _approvedLicense$trad2 === void 0 ? void 0 : (_approvedLicense$trad3 = _approvedLicense$trad2.find(item => (item === null || item === void 0 ? void 0 : item.documentType) === "APPL.BPAREG_PASS_PORT_SIZE_PHOTO")) === null || _approvedLicense$trad3 === void 0 ? void 0 : _approvedLicense$trad3.fileStoreId) || null,
+      isClubbedPlot: isClubbedPlot === null || isClubbedPlot === void 0 ? void 0 : isClubbedPlot.value
     } : {
       registrationDetails,
       boundaryWallLength,
@@ -14416,7 +14446,8 @@ const PlotDetails = ({
       isSelfCertificationRequired,
       architectPhoto: (approvedLicense === null || approvedLicense === void 0 ? void 0 : (_approvedLicense$trad4 = approvedLicense.tradeLicenseDetail) === null || _approvedLicense$trad4 === void 0 ? void 0 : (_approvedLicense$trad5 = _approvedLicense$trad4.applicationDocuments) === null || _approvedLicense$trad5 === void 0 ? void 0 : (_approvedLicense$trad6 = _approvedLicense$trad5.find(item => (item === null || item === void 0 ? void 0 : item.documentType) === "APPL.BPAREG_PASS_PORT_SIZE_PHOTO")) === null || _approvedLicense$trad6 === void 0 ? void 0 : _approvedLicense$trad6.fileStoreId) || null,
       roadType,
-      farDetails
+      farDetails,
+      isClubbedPlot: isClubbedPlot === null || isClubbedPlot === void 0 ? void 0 : isClubbedPlot.value
     };
     const edcrNumber = data === null || data === void 0 ? void 0 : data.edcrNumber;
     const riskType = currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$Basi0 = currentStepData.BasicDetails) === null || _currentStepData$Basi0 === void 0 ? void 0 : _currentStepData$Basi0.riskType;
@@ -14528,6 +14559,9 @@ const PlotDetails = ({
   if (apiLoading || LicenseDataLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
+  function setClubbedPlot(option) {
+    setIsClubbedPlot(option);
+  }
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     style: {
       paddingBottom: isMobile ? "0px" : "8px"
@@ -14567,7 +14601,19 @@ const PlotDetails = ({
       fontSize: "12px",
       color: "red"
     }
-  }, errors["propertyuid"]), renderField(t("BPA_BOUNDARY_LAND_REG_DETAIL_LABEL") + "*", registrationDetails, setRegistrationDetails, "registrationDetails", "Enter Proposed Site Address ..."), renderField(t("BPA_BOUNDARY_WALL_LENGTH_LABEL_INPUT") + "*", boundaryWallLength, setBoundaryWallLength, "boundaryWallLength", "Enter boundary wall length (in meters)"), renderField(t("BPA_WARD_NUMBER_LABEL") + "*", wardnumber, setWardNumber, "wardnumber", "Ward Number", currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$cpt29 = currentStepData.cpt) === null || _currentStepData$cpt29 === void 0 ? void 0 : (_currentStepData$cpt30 = _currentStepData$cpt29.zonalMapping) === null || _currentStepData$cpt30 === void 0 ? void 0 : _currentStepData$cpt30.ward), renderField(t("BPA_ZONE_NUMBER_LABEL") + "*", zonenumber, setZoneNumber, "zonenumber", "Zone Number", currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$cpt31 = currentStepData.cpt) === null || _currentStepData$cpt31 === void 0 ? void 0 : (_currentStepData$cpt32 = _currentStepData$cpt31.zonalMapping) === null || _currentStepData$cpt32 === void 0 ? void 0 : _currentStepData$cpt32.zone), renderField(t("BPA_KHASRA_NUMBER_LABEL") + "*", khasraNumber, setKhasraNumber, "khasraNumber", "Khasra Number", true), renderField(t("BPA_ARCHITECT_ID") + "*", architectid, setArchitectId, "architectid", "Architect ID", true), renderField(t("BPA_NUMBER_OF_BATHS") + "*", bathnumber, setBathNumber, "bathnumber", "Number of Bathrooms"), renderField(t("BPA_NUMBER_OF_KITCHENS") + "*", kitchenNumber, setKitchenNumber, "kitchenNumber", "Number of Kitchens"), renderField(t("BPA_APPROX_INHABITANTS_FOR_ACCOMODATION") + "*", approxinhabitants, setApproxInhabitants, "approxinhabitants", "Approximate inhabitants"), renderField(t("BPA_DISTANCE_FROM_SEWER") + "*", distancefromsewer, setDistanceFromSewer, "distancefromsewer", "Distance from sewer (in meters)"), renderField(t("BPA_SOURCE_OF_WATER") + "*", sourceofwater, setSourceOfWater, "sourceofwater", "Source of Water"), renderField(t("BPA_NUMBER_OF_WATER_CLOSETS") + "*", watercloset, setWaterCloset, "watercloset", "Water Closet"), renderField(t("BPA_MATERIAL_TO-BE_USED_IN_WALLS") + "*", materialused, setMaterialUsed, "materialused", "e.g. Cement, Bricks, etc"), renderField(t("BPA_MATERIAL_TO-BE_USED_IN_FLOOR") + "*", materialusedinfloor, setMaterialUsedInFloor, "materialusedinfloor", "e.g. Cement, Bricks, etc"), renderField(t("BPA_MATERIAL_TO-BE_USED_IN_ROOFS") + "*", materialusedinroofs, setMaterialUsedInRoofs, "materialusedinroofs", "e.g. Cement, Bricks, etc"), /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar, {
+  }, errors["propertyuid"]), /*#__PURE__*/React.createElement(CardLabel, null, `${t("BPA_IS_CLUBBED_PLOT_LABEL")} *`), /*#__PURE__*/React.createElement(Dropdown, {
+    placeholder: t("IS_CLUBBED_PLOT"),
+    selected: isClubbedPlot,
+    select: setClubbedPlot,
+    option: common,
+    optionKey: "i18nKey",
+    t: t
+  }), errors["isClubbedPlot"] && /*#__PURE__*/React.createElement(CardLabelError, {
+    style: {
+      fontSize: "12px",
+      color: "red"
+    }
+  }, errors["isClubbedPlot"]), renderField(t("BPA_BOUNDARY_LAND_REG_DETAIL_LABEL") + "*", registrationDetails, setRegistrationDetails, "registrationDetails", "Enter Proposed Site Address ..."), renderField(t("BPA_BOUNDARY_WALL_LENGTH_LABEL_INPUT") + "*", boundaryWallLength, setBoundaryWallLength, "boundaryWallLength", "Enter boundary wall length (in meters)"), renderField(t("BPA_WARD_NUMBER_LABEL") + "*", wardnumber, setWardNumber, "wardnumber", "Ward Number", currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$cpt29 = currentStepData.cpt) === null || _currentStepData$cpt29 === void 0 ? void 0 : (_currentStepData$cpt30 = _currentStepData$cpt29.zonalMapping) === null || _currentStepData$cpt30 === void 0 ? void 0 : _currentStepData$cpt30.ward), renderField(t("BPA_ZONE_NUMBER_LABEL") + "*", zonenumber, setZoneNumber, "zonenumber", "Zone Number", currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$cpt31 = currentStepData.cpt) === null || _currentStepData$cpt31 === void 0 ? void 0 : (_currentStepData$cpt32 = _currentStepData$cpt31.zonalMapping) === null || _currentStepData$cpt32 === void 0 ? void 0 : _currentStepData$cpt32.zone), renderField(t("BPA_KHASRA_NUMBER_LABEL") + "*", khasraNumber, setKhasraNumber, "khasraNumber", "Khasra Number", true), renderField(t("BPA_ARCHITECT_ID") + "*", architectid, setArchitectId, "architectid", "Architect ID", true), renderField(t("BPA_NUMBER_OF_BATHS") + "*", bathnumber, setBathNumber, "bathnumber", "Number of Bathrooms"), renderField(t("BPA_NUMBER_OF_KITCHENS") + "*", kitchenNumber, setKitchenNumber, "kitchenNumber", "Number of Kitchens"), renderField(t("BPA_APPROX_INHABITANTS_FOR_ACCOMODATION") + "*", approxinhabitants, setApproxInhabitants, "approxinhabitants", "Approximate inhabitants"), renderField(t("BPA_DISTANCE_FROM_SEWER") + "*", distancefromsewer, setDistanceFromSewer, "distancefromsewer", "Distance from sewer (in meters)"), renderField(t("BPA_SOURCE_OF_WATER") + "*", sourceofwater, setSourceOfWater, "sourceofwater", "Source of Water"), renderField(t("BPA_NUMBER_OF_WATER_CLOSETS") + "*", watercloset, setWaterCloset, "watercloset", "Water Closet"), renderField(t("BPA_MATERIAL_TO-BE_USED_IN_WALLS") + "*", materialused, setMaterialUsed, "materialused", "e.g. Cement, Bricks, etc"), renderField(t("BPA_MATERIAL_TO-BE_USED_IN_FLOOR") + "*", materialusedinfloor, setMaterialUsedInFloor, "materialusedinfloor", "e.g. Cement, Bricks, etc"), renderField(t("BPA_MATERIAL_TO-BE_USED_IN_ROOFS") + "*", materialusedinroofs, setMaterialUsedInRoofs, "materialusedinroofs", "e.g. Cement, Bricks, etc"), /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar, {
     label: "Back",
     style: {
       border: "1px solid",
@@ -14655,17 +14701,21 @@ const ScrutinyDetails = ({
     const floors = [];
     let totalBuiltUpArea = 0;
     let totalFloorArea = 0;
+    let totalDeduction = 0;
     block === null || block === void 0 ? void 0 : (_block$building = block.building) === null || _block$building === void 0 ? void 0 : (_block$building$floor = _block$building.floors) === null || _block$building$floor === void 0 ? void 0 : _block$building$floor.forEach(ob => {
-      var _ob$occupancies, _ob$occupancies$, _ob$occupancies2, _ob$occupancies2$, _ob$occupancies3, _ob$occupancies3$;
+      var _ob$occupancies, _ob$occupancies$, _ob$occupancies2, _ob$occupancies2$, _ob$occupancies3, _ob$occupancies3$, _ob$occupancies4, _ob$occupancies4$;
       const builtUp = Number((_ob$occupancies = ob.occupancies) === null || _ob$occupancies === void 0 ? void 0 : (_ob$occupancies$ = _ob$occupancies[0]) === null || _ob$occupancies$ === void 0 ? void 0 : _ob$occupancies$.builtUpArea) || 0;
       const floor = Number((_ob$occupancies2 = ob.occupancies) === null || _ob$occupancies2 === void 0 ? void 0 : (_ob$occupancies2$ = _ob$occupancies2[0]) === null || _ob$occupancies2$ === void 0 ? void 0 : _ob$occupancies2$.floorArea) || 0;
+      const deduction = Number((_ob$occupancies3 = ob.occupancies) === null || _ob$occupancies3 === void 0 ? void 0 : (_ob$occupancies3$ = _ob$occupancies3[0]) === null || _ob$occupancies3$ === void 0 ? void 0 : _ob$occupancies3$.deduction) || 0;
       totalBuiltUpArea += builtUp;
       totalFloorArea += floor;
+      totalDeduction += deduction;
       floors.push({
         Floor: t(`BPA_FLOOR_NAME_${ob.number}`),
         Level: ob.number,
-        Occupancy: t(`${(_ob$occupancies3 = ob.occupancies) === null || _ob$occupancies3 === void 0 ? void 0 : (_ob$occupancies3$ = _ob$occupancies3[0]) === null || _ob$occupancies3$ === void 0 ? void 0 : _ob$occupancies3$.type}`),
+        Occupancy: t(`${(_ob$occupancies4 = ob.occupancies) === null || _ob$occupancies4 === void 0 ? void 0 : (_ob$occupancies4$ = _ob$occupancies4[0]) === null || _ob$occupancies4$ === void 0 ? void 0 : _ob$occupancies4$.type}`),
         BuildupArea: Number(builtUp).toFixed(2),
+        Deduction: Number(deduction).toFixed(2),
         FloorArea: Number(floor).toFixed(2)
       });
     });
@@ -14674,6 +14724,7 @@ const ScrutinyDetails = ({
       Level: "",
       Occupancy: "",
       BuildupArea: `${Number(totalBuiltUpArea).toFixed(2)} ${t("BPA_SQ_MTRS_LABEL")}`,
+      Deduction: `${Number(totalDeduction).toFixed(2)} ${t("BPA_SQ_MTRS_LABEL")}`,
       FloorArea: `${Number(totalFloorArea).toFixed(2)} ${t("BPA_SQ_MTRS_LABEL")}`
     });
     return floors;
@@ -14693,6 +14744,9 @@ const ScrutinyDetails = ({
   }, {
     name: "BPA_TABLE_COL_BUILDUPAREA",
     id: "BuildupArea"
+  }, {
+    name: "BPA_TABLE_COL_DEDUCTION",
+    id: "Deduction"
   }, {
     name: "BPA_TABLE_COL_FLOORAREA",
     id: "FloorArea"
@@ -14718,6 +14772,16 @@ const ScrutinyDetails = ({
             return `${t("BPA_TOTAL_BUILDUPAREA")} : ${Number(total).toFixed(2)} ${t("BPA_SQ_MTRS_LABEL")}`;
           }
         };
+      } else if (ob.id === "Deduction") {
+        return {
+          Header: t(`${ob.name}`),
+          accessor: accessData(ob.id),
+          id: ob.id,
+          Footer: info => {
+            const total = info.rows.reduce((sum, row) => sum + (Number(row.values.FloorArea) || 0), 0);
+            return `${t("BPA_TOTAL_Deduction")} : ${Number(total).toFixed(2)} ${t("BPA_SQ_MTRS_LABEL")}`;
+          }
+        };
       } else if (ob.id === "FloorArea") {
         return {
           Header: t(`${ob.name}`),
@@ -14972,7 +15036,7 @@ const ScrutinyDetails = ({
   }, /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("BPA_PERMISSIBLE_FAR"),
-    text: data !== null && data !== void 0 && (_data$planDetail6 = data.planDetail) !== null && _data$planDetail6 !== void 0 && (_data$planDetail6$far = _data$planDetail6.farDetails) !== null && _data$planDetail6$far !== void 0 && _data$planDetail6$far.permissableFar ? data === null || data === void 0 ? void 0 : (_data$planDetail7 = data.planDetail) === null || _data$planDetail7 === void 0 ? void 0 : (_data$planDetail7$far = _data$planDetail7.farDetails) === null || _data$planDetail7$far === void 0 ? void 0 : _data$planDetail7$far.permissableFar : "N?A"
+    text: (data === null || data === void 0 ? void 0 : (_data$planDetail6 = data.planDetail) === null || _data$planDetail6 === void 0 ? void 0 : (_data$planDetail6$far = _data$planDetail6.farDetails) === null || _data$planDetail6$far === void 0 ? void 0 : _data$planDetail6$far.permissableFar) !== null ? data === null || data === void 0 ? void 0 : (_data$planDetail7 = data.planDetail) === null || _data$planDetail7 === void 0 ? void 0 : (_data$planDetail7$far = _data$planDetail7.farDetails) === null || _data$planDetail7$far === void 0 ? void 0 : _data$planDetail7$far.permissableFar : "N/A"
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("BPA_FAR_ACHIEVED"),
@@ -15168,7 +15232,6 @@ const BPANewBuildingdetails = ({
     if (!Ulblisttype) newErrors.Ulblisttype = t("ULB Type is required");
     if (!approvedColony) newErrors.approvedColony = t("Approved Colony is required");
     if (!masterPlan) newErrors.masterPlan = t("Master Plan is required");
-    if (!buildingStatus) newErrors.buildingStatus = t("Building Status is required");
     if (!purchasedFAR) newErrors.purchasedFAR = t("Purchased FAR is required");
     if (!greenbuilding) newErrors.greenbuilding = t("Green Building is required");
     if (!restrictedArea) newErrors.restrictedArea = t("Restricted Area is required");
@@ -15633,13 +15696,6 @@ const BPANewBuildingdetails = ({
       masterPlan: ""
     }));
   }
-  function setBuildingStatus(option) {
-    setbuildingStatus(option);
-    setErrors(prev => ({
-      ...prev,
-      buildingStatus: ""
-    }));
-  }
   function setPurchasedFAR(option) {
     setpurchasedFAR(option);
     setErrors(prev => ({
@@ -15750,7 +15806,7 @@ const BPANewBuildingdetails = ({
       District,
       rating: typeof rating === "string" ? rating : rating === null || rating === void 0 ? void 0 : rating.code,
       masterPlan: masterPlan === null || masterPlan === void 0 ? void 0 : masterPlan.code,
-      buildingStatus: buildingStatus === null || buildingStatus === void 0 ? void 0 : buildingStatus.code,
+      buildingStatus: "",
       purchasedFAR: purchasedFAR === null || purchasedFAR === void 0 ? void 0 : purchasedFAR.value,
       providedFAR,
       greenbuilding: greenbuilding === null || greenbuilding === void 0 ? void 0 : greenbuilding.code,
@@ -15817,7 +15873,8 @@ const BPANewBuildingdetails = ({
   const sectionStyle = {
     backgroundColor: "#ffffff",
     borderRadius: "8px",
-    boxShadow: "0 2px 4px rgba(0, 0, 0, 0.05)"
+    boxShadow: "0 2px 4px rgba(0, 0, 0, 0.05)",
+    paddingBottom: "50px"
   };
   const headingStyle = {
     fontSize: "1.5rem",
@@ -15976,21 +16033,7 @@ const BPANewBuildingdetails = ({
     })
   }), errors.use && /*#__PURE__*/React.createElement(ErrorMessage, {
     error: errors.use
-  })), /*#__PURE__*/React.createElement(CardLabel, null, `${t("BPA_BUILDING_STATUS")} *`), /*#__PURE__*/React.createElement(Controller, {
-    control: control,
-    name: "buildingStatus",
-    defaultValue: buildingStatus,
-    render: props => /*#__PURE__*/React.createElement(Dropdown, {
-      selected: buildingStatus,
-      select: setBuildingStatus,
-      option: building_status,
-      placeholder: "Building Status",
-      optionKey: "i18nKey",
-      t: t
-    })
-  }), /*#__PURE__*/React.createElement(ErrorMessage, {
-    error: errors.buildingStatus
-  }), /*#__PURE__*/React.createElement(CardLabel, null, `${t("BPA_PURCHASED_FAR")} *`), /*#__PURE__*/React.createElement(Controller, {
+  })), /*#__PURE__*/React.createElement(CardLabel, null, `${t("BPA_PURCHASED_FAR")} *`), /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "purchasedFAR",
     defaultValue: purchasedFAR,
@@ -16481,6 +16524,7 @@ const OwnerDetails = ({
     sessionStorage.setItem("ownerFields", JSON.stringify(fields));
   }, [fields]);
   useEffect(() => {
+    var _ownershipCategory$co2;
     var flag = 0;
     fields.map(ob => {
       if (ob !== null && ob !== void 0 && ob.isPrimaryOwner) flag = 1;
@@ -16490,7 +16534,7 @@ const OwnerDetails = ({
         setCanmovenext(true);
       }
     });
-    if (!canmovenext && ownershipCategory && !(ownershipCategory !== null && ownershipCategory !== void 0 && ownershipCategory.code.includes("SINGLEOWNER"))) {
+    if (!canmovenext && ownershipCategory && !(ownershipCategory !== null && ownershipCategory !== void 0 && (_ownershipCategory$co2 = ownershipCategory.code) !== null && _ownershipCategory$co2 !== void 0 && _ownershipCategory$co2.includes("SINGLEOWNER"))) {
       if (flag == 1) setCanmovenext(false);else setCanmovenext(true);
     }
   }, [fields]);
@@ -16653,12 +16697,11 @@ const OwnerDetails = ({
       });
       return;
     } else {
-      var _fields$indexValue, _usersResponse$user, _usersResponse$user$, _usersResponse$user$$, _usersResponse$user$$2, _usersResponse$user2;
+      var _fields$indexValue, _usersResponse$user;
       const usersResponse = await Digit.UserService.userSearch(Digit.ULBService.getStateId(), {
         userName: fields === null || fields === void 0 ? void 0 : (_fields$indexValue = fields[indexValue]) === null || _fields$indexValue === void 0 ? void 0 : _fields$indexValue.mobileNumber
       }, {});
-      const found = usersResponse === null || usersResponse === void 0 ? void 0 : (_usersResponse$user = usersResponse.user) === null || _usersResponse$user === void 0 ? void 0 : (_usersResponse$user$ = _usersResponse$user[0]) === null || _usersResponse$user$ === void 0 ? void 0 : (_usersResponse$user$$ = _usersResponse$user$.roles) === null || _usersResponse$user$$ === void 0 ? void 0 : (_usersResponse$user$$2 = _usersResponse$user$$.filter(el => el.code === "BPA_ARCHITECT" || el.code === "BPA_SUPERVISOR")) === null || _usersResponse$user$$2 === void 0 ? void 0 : _usersResponse$user$$2[0];
-      if ((usersResponse === null || usersResponse === void 0 ? void 0 : (_usersResponse$user2 = usersResponse.user) === null || _usersResponse$user2 === void 0 ? void 0 : _usersResponse$user2.length) === 0) {
+      if ((usersResponse === null || usersResponse === void 0 ? void 0 : (_usersResponse$user = usersResponse.user) === null || _usersResponse$user === void 0 ? void 0 : _usersResponse$user.length) === 0) {
         setShowToast({
           key: "true",
           warning: true,
@@ -16666,8 +16709,8 @@ const OwnerDetails = ({
         });
         return;
       } else {
-        var _usersResponse$user3, _values$indexValue, _values$indexValue2, _values$indexValue3, _values$indexValue3$g;
-        const userData = usersResponse === null || usersResponse === void 0 ? void 0 : (_usersResponse$user3 = usersResponse.user) === null || _usersResponse$user3 === void 0 ? void 0 : _usersResponse$user3[0];
+        var _usersResponse$user2, _values$indexValue, _values$indexValue2, _values$indexValue3, _values$indexValue3$g, _user$info;
+        const userData = usersResponse === null || usersResponse === void 0 ? void 0 : (_usersResponse$user2 = usersResponse.user) === null || _usersResponse$user2 === void 0 ? void 0 : _usersResponse$user2[0];
         userData.gender = userData.gender ? {
           code: userData.gender,
           active: true,
@@ -16700,12 +16743,12 @@ const OwnerDetails = ({
         });
         setFeilds(updatedValues);
         if ((_values$indexValue = values[indexValue]) !== null && _values$indexValue !== void 0 && _values$indexValue.mobileNumber && (_values$indexValue2 = values[indexValue]) !== null && _values$indexValue2 !== void 0 && _values$indexValue2.name && (_values$indexValue3 = values[indexValue]) !== null && _values$indexValue3 !== void 0 && (_values$indexValue3$g = _values$indexValue3.gender) !== null && _values$indexValue3$g !== void 0 && _values$indexValue3$g.code) setCanmovenext(true);else setCanmovenext(false);
-        if (found) {
+        if (ownerNo === (user === null || user === void 0 ? void 0 : (_user$info = user.info) === null || _user$info === void 0 ? void 0 : _user$info.mobileNumber)) {
           setCanmovenext(false);
           setShowToast({
             key: "true",
             error: true,
-            message: `BPA_OWNER_VALIDATION_${found === null || found === void 0 ? void 0 : found.code}`
+            message: `BPA_OWNER_VALIDATION`
           });
           return;
         }
@@ -16750,6 +16793,7 @@ const OwnerDetails = ({
   const validateOwners = (owners, ownershipCategory, setErrors) => {
     let isValid = true;
     let newErrors = {};
+    console.log("ownersss", owners);
     if (!(ownershipCategory !== null && ownershipCategory !== void 0 && ownershipCategory.code)) {
       newErrors["ownershipCategory"] = "Ownership category is mandatory";
       isValid = false;
@@ -16820,12 +16864,6 @@ const OwnerDetails = ({
       setApiLoading(false);
       return;
     }
-    if (ismultiple === true && fields.length === 1) {
-      window.scrollTo(0, 0);
-      setApiLoading(false);
-      setError("BPA_ERROR_MULTIPLE_OWNER");
-      return;
-    }
     setIsDisable(true);
     const conversionOwners = [];
     fields === null || fields === void 0 ? void 0 : fields.map(owner => {
@@ -16981,7 +17019,7 @@ const OwnerDetails = ({
         position: "relative",
         zIndex: "100",
         left: "35px",
-        marginTop: "-24.5px",
+        marginTop: "-22.5px",
         marginLeft: Webview ? "-25px" : "-25px"
       }
     }, "+91"), /*#__PURE__*/React.createElement(TextInput, Object.assign({
@@ -17192,7 +17230,7 @@ const OwnerDetails = ({
         resize: "vertical"
       },
       placeholder: "Enter complete address",
-      value: field.permanentAddress,
+      value: (field === null || field === void 0 ? void 0 : field.permanentAddress) || "",
       onChange: e => setOwnerAddress(index, e)
     }), /*#__PURE__*/React.createElement(ErrorMessage, {
       message: errors[`address_${index}`]
@@ -18383,12 +18421,6 @@ const LocationDetails = ({
       setSelectedLocality(propertyData === null || propertyData === void 0 ? void 0 : (_propertyData$address4 = propertyData.address) === null || _propertyData$address4 === void 0 ? void 0 : _propertyData$address4.locality);
     }
   }, [selectedCity, formData === null || formData === void 0 ? void 0 : formData.pincode, fetchedLocalities, pincode, geoLocation]);
-  const handleGIS = () => {
-    setIsOpen(!isOpen);
-  };
-  const handleRemove = () => {
-    setIsOpen(!isOpen);
-  };
   const closeToast = () => {
     setError(null);
   };
@@ -18477,14 +18509,6 @@ const LocationDetails = ({
       setApiLoading(false);
     }
   };
-  function onSave(geoLocation, pincode, placeName) {
-    selectPincode(pincode);
-    sessionStorage.setItem("currentPincode", pincode);
-    setgeoLocation(geoLocation);
-    setplaceName(placeName);
-    setIsOpen(false);
-    setPinerror(null);
-  }
   function selectPincode(e) {
     const val = typeof e === "object" && e !== null ? e.target.value : e;
     setPinerror(null);
@@ -18499,16 +18523,6 @@ const LocationDetails = ({
     setSelectedLocality(null);
     setLocalities(null);
   }
-  function selectGeolocation(e) {
-    formData.address["geoLocation"] = typeof e === "object" && e !== null ? e.target.value : e;
-    setgeoLocation(typeof e === "object" && e !== null ? e.target.value : e);
-    setplaceName(typeof e === "object" && e !== null ? e.target.value : e);
-    sessionStorage.setItem("currentPincode", "");
-    sessionStorage.setItem("currentCity", JSON.stringify({}));
-    sessionStorage.setItem("currLocality", JSON.stringify({}));
-    setPincode("");
-    setSelectedLocality(null);
-  }
   function selectLocality(locality) {
     console.log("Locality", locality);
     setSelectedLocality(locality);
@@ -18603,13 +18617,7 @@ const LocationDetails = ({
   if (apiLoading || isLoading) return /*#__PURE__*/React.createElement(Loader, null);
   return /*#__PURE__*/React.createElement("div", {
     style: pageStyle
-  }, isOpen && /*#__PURE__*/React.createElement(GIS, {
-    t: t,
-    onSelect: onSelect,
-    formData: formData,
-    handleRemove: handleRemove,
-    onSave: onSave
-  }), !isOpen && /*#__PURE__*/React.createElement(FormStep, {
+  }, !isOpen && /*#__PURE__*/React.createElement(FormStep, {
     t: t,
     config: {
       ...config,
@@ -18625,43 +18633,6 @@ const LocationDetails = ({
     style: sectionStyle
   }, /*#__PURE__*/React.createElement("h2", {
     style: headingStyle
-  }, t("BPA_GIS_LABEL")), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(TextInput, {
-    style: {},
-    isMandatory: false,
-    optionKey: "i18nKey",
-    t: t,
-    name: "gis",
-    value: isEditApplication || isSendBackTOCitizen ? geoLocation.latitude !== null ? `${geoLocation.latitude}, ${geoLocation.longitude}` : "" : placeName,
-    onChange: selectGeolocation
-  }), /*#__PURE__*/React.createElement(LinkButton, {
-    label: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("svg", {
-      style: !isMobile ? {
-        position: "relative",
-        left: "515px",
-        bottom: "25px",
-        marginTop: "-20px"
-      } : {
-        float: "right",
-        position: "relative",
-        bottom: "25px",
-        marginTop: "-20px",
-        marginRight: "5px"
-      },
-      width: "24",
-      height: "24",
-      viewBox: "0 0 24 24",
-      fill: "none",
-      xmlns: "http://www.w3.org/2000/svg"
-    }, /*#__PURE__*/React.createElement("path", {
-      d: "M11 7C8.79 7 7 8.79 7 11C7 13.21 8.79 15 11 15C13.21 15 15 13.21 15 11C15 8.79 13.21 7 11 7ZM19.94 10C19.48 5.83 16.17 2.52 12 2.06V0H10V2.06C5.83 2.52 2.52 5.83 2.06 10H0V12H2.06C2.52 16.17 5.83 19.48 10 19.94V22H12V19.94C16.17 19.48 19.48 16.17 19.94 12H22V10H19.94ZM11 18C7.13 18 4 14.87 4 11C4 7.13 7.13 4 11 4C14.87 4 18 7.13 18 11C18 14.87 14.87 18 11 18Z",
-      fill: "#505A5F"
-    })))),
-    style: {},
-    onClick: e => handleGIS()
-  }))), /*#__PURE__*/React.createElement("div", {
-    style: sectionStyle
-  }, /*#__PURE__*/React.createElement("h2", {
-    style: headingStyle
   }, t("BPA_DETAILS_PIN_LABEL")), !isOpen && /*#__PURE__*/React.createElement(TextInput, {
     isMandatory: false,
     optionKey: "i18nKey",
@@ -21232,6 +21203,7 @@ const BPAApplicationTimeline = props => {
       OpenImage: OpenImage
     });
   };
+  console.log("WFData", data);
   if (isLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
@@ -21247,7 +21219,7 @@ const BPAApplicationTimeline = props => {
     isCompleted: true,
     label: t((data === null || data === void 0 ? void 0 : (_data$timeline$ = data.timeline[0]) === null || _data$timeline$ === void 0 ? void 0 : _data$timeline$.state) && `WF_${businessService}_${data.timeline[0].state}` || "NA"),
     customChild: getTimelineCaptions(data === null || data === void 0 ? void 0 : data.timeline[0])
-  }) : /*#__PURE__*/React.createElement(ConnectingCheckPoints, null, (data === null || data === void 0 ? void 0 : data.timeline) && (data === null || data === void 0 ? void 0 : data.timeline.slice(0, showAllTimeline ? data.timeline.length : 2).map((checkpoint, index, arr) => {
+  }) : /*#__PURE__*/React.createElement(ConnectingCheckPoints, null, (data === null || data === void 0 ? void 0 : data.timeline) && (data === null || data === void 0 ? void 0 : data.timeline.slice(0, showAllTimeline ? data.timeline.length : 2).filter(item => (item === null || item === void 0 ? void 0 : item.performedAction) !== "SAVE_AS_DRAFT").map((checkpoint, index, arr) => {
     let timelineStatusPostfix = "";
     if (window.location.href.includes("/obps")) {
       var _data$timeline3, _data$timeline3$state, _data$timeline4, _data$timeline4$state;
@@ -21576,6 +21548,9 @@ const SubOccupancyTable = ({
   }, {
     name: "BPA_TABLE_COL_BUILDUPAREA",
     id: "BuildupArea"
+  }, {
+    name: "BPA_TABLE_COL_DEDUCTION",
+    id: "Deduction"
   }, {
     name: "BPA_TABLE_COL_FLOORAREA",
     id: "FloorArea"
@@ -21596,17 +21571,35 @@ const SubOccupancyTable = ({
   function getFloorData(block) {
     var _block$building;
     let floors = [];
+    let totalBuiltUpArea = 0;
+    let totalFloorArea = 0;
+    let totalDeduction = 0;
     block === null || block === void 0 ? void 0 : (_block$building = block.building) === null || _block$building === void 0 ? void 0 : _block$building.floors.map(ob => {
-      var _ob$occupancies, _ob$occupancies$, _ob$occupancies2, _ob$occupancies2$, _ob$occupancies3, _ob$occupancies3$;
+      var _ob$occupancies, _ob$occupancies$, _ob$occupancies2, _ob$occupancies2$, _ob$occupancies3, _ob$occupancies3$, _ob$occupancies4, _ob$occupancies4$, _ob$occupancies5, _ob$occupancies5$, _ob$occupancies6, _ob$occupancies6$, _ob$occupancies7, _ob$occupancies7$;
+      const builtUp = Number((_ob$occupancies = ob.occupancies) === null || _ob$occupancies === void 0 ? void 0 : (_ob$occupancies$ = _ob$occupancies[0]) === null || _ob$occupancies$ === void 0 ? void 0 : _ob$occupancies$.builtUpArea) || 0;
+      const floor = Number((_ob$occupancies2 = ob.occupancies) === null || _ob$occupancies2 === void 0 ? void 0 : (_ob$occupancies2$ = _ob$occupancies2[0]) === null || _ob$occupancies2$ === void 0 ? void 0 : _ob$occupancies2$.floorArea) || 0;
+      const deduction = Number((_ob$occupancies3 = ob.occupancies) === null || _ob$occupancies3 === void 0 ? void 0 : (_ob$occupancies3$ = _ob$occupancies3[0]) === null || _ob$occupancies3$ === void 0 ? void 0 : _ob$occupancies3$.deduction) || 0;
+      totalBuiltUpArea += builtUp;
+      totalFloorArea += floor;
+      totalDeduction += deduction;
       floors.push({
         Floor: t(`BPA_FLOOR_NAME_${ob.number}`),
         Level: ob.number,
-        Occupancy: t(`${(_ob$occupancies = ob.occupancies) === null || _ob$occupancies === void 0 ? void 0 : (_ob$occupancies$ = _ob$occupancies[0]) === null || _ob$occupancies$ === void 0 ? void 0 : _ob$occupancies$.type}`),
-        BuildupArea: Number((_ob$occupancies2 = ob.occupancies) === null || _ob$occupancies2 === void 0 ? void 0 : (_ob$occupancies2$ = _ob$occupancies2[0]) === null || _ob$occupancies2$ === void 0 ? void 0 : _ob$occupancies2$.builtUpArea).toFixed(2),
-        FloorArea: Number((_ob$occupancies3 = ob.occupancies) === null || _ob$occupancies3 === void 0 ? void 0 : (_ob$occupancies3$ = _ob$occupancies3[0]) === null || _ob$occupancies3$ === void 0 ? void 0 : _ob$occupancies3$.floorArea).toFixed(2) || 0,
+        Occupancy: t(`${(_ob$occupancies4 = ob.occupancies) === null || _ob$occupancies4 === void 0 ? void 0 : (_ob$occupancies4$ = _ob$occupancies4[0]) === null || _ob$occupancies4$ === void 0 ? void 0 : _ob$occupancies4$.type}`),
+        BuildupArea: Number((_ob$occupancies5 = ob.occupancies) === null || _ob$occupancies5 === void 0 ? void 0 : (_ob$occupancies5$ = _ob$occupancies5[0]) === null || _ob$occupancies5$ === void 0 ? void 0 : _ob$occupancies5$.builtUpArea).toFixed(2),
+        Deduction: Number((_ob$occupancies6 = ob.occupancies) === null || _ob$occupancies6 === void 0 ? void 0 : (_ob$occupancies6$ = _ob$occupancies6[0]) === null || _ob$occupancies6$ === void 0 ? void 0 : _ob$occupancies6$.deduction).toFixed(2),
+        FloorArea: Number((_ob$occupancies7 = ob.occupancies) === null || _ob$occupancies7 === void 0 ? void 0 : (_ob$occupancies7$ = _ob$occupancies7[0]) === null || _ob$occupancies7$ === void 0 ? void 0 : _ob$occupancies7$.floorArea).toFixed(2) || 0,
         key: t(`BPA_FLOOR_NAME_${ob.number}`)
       });
     });
+    floors.push({
+      Floor: t("BPA_TOTAL"),
+      Level: "",
+      Occupancy: "",
+      BuildupArea: `${Number(totalBuiltUpArea).toFixed(2)} ${t("BPA_SQ_MTRS_LABEL")}`,
+      Deduction: `${Number(totalDeduction).toFixed(2)} ${t("BPA_SQ_MTRS_LABEL")}`,
+      FloorArea: `${Number(totalFloorArea).toFixed(2)} ${t("BPA_SQ_MTRS_LABEL")}`
+    });
     return floors;
   }
   const stringReplaceAll = (str = "", searcher = "", replaceWith = "") => {
@@ -21695,8 +21688,8 @@ const SubOccupancyTable = ({
     }, /*#__PURE__*/React.createElement(Table, {
       className: "customTable table-fixed-first-column table-border-style",
       t: t,
-      disableSort: false,
-      autoSort: true,
+      disableSort: true,
+      autoSort: false,
       manualPagination: false,
       isPaginationRequired: false,
       initSortId: "S N ",
@@ -22224,6 +22217,99 @@ const tdStyle = {
   textAlign: "left",
   verticalAlign: "middle"
 };
+const PayTwoTable = ({
+  sanctionFeeDataWithTotal,
+  disable,
+  isEmployee,
+  sanctionFeeData,
+  handleAdjustedAmountChange,
+  onAdjustedAmountBlur,
+  handleFileUpload,
+  handleFileDelete,
+  routeTo,
+  t
+}) => {
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      overflowX: "auto"
+    }
+  }, /*#__PURE__*/React.createElement(CardSubHeader, {
+    style: {
+      fontSize: "20px",
+      color: "#3f4351",
+      marginTop: "24px"
+    }
+  }, t("BPA_SANCTION_FEE")), /*#__PURE__*/React.createElement("table", {
+    className: "sanction-fee-table",
+    style: {
+      borderCollapse: "collapse",
+      width: "100%",
+      fontSize: "16px"
+    }
+  }, /*#__PURE__*/React.createElement("thead", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("th", {
+    style: thStyle
+  }, t("BPA_TAXHEAD_CODE")), /*#__PURE__*/React.createElement("th", {
+    style: thStyle
+  }, t("BPA_AMOUNT")), /*#__PURE__*/React.createElement("th", {
+    style: thStyle
+  }, t("BPA_ADJUSTED_AMOUNT")), disable || isEmployee ? null : /*#__PURE__*/React.createElement("th", {
+    style: thStyle
+  }, t("BPA_FILE_UPLOAD")), /*#__PURE__*/React.createElement("th", {
+    style: thStyle
+  }, t("BPA_VIEW_DOCUMENT")), " ")), /*#__PURE__*/React.createElement("tbody", null, sanctionFeeDataWithTotal.map((row, i) => {
+    var _sanctionFeeData$row$, _sanctionFeeData$row$2, _sanctionFeeData$row$3, _sanctionFeeData$row$4, _sanctionFeeData$row$5;
+    return /*#__PURE__*/React.createElement("tr", {
+      key: row.index
+    }, /*#__PURE__*/React.createElement("td", {
+      style: tdStyle
+    }, row.title || t("CS_NA")), /*#__PURE__*/React.createElement("td", {
+      style: tdStyle
+    }, row.amount !== null && row.amount !== undefined ? `₹ ${row.amount.toLocaleString()}` : t("CS_NA")), /*#__PURE__*/React.createElement("td", {
+      style: tdStyle
+    }, (row === null || row === void 0 ? void 0 : row.taxHeadCode) === "BPA_TOTAL" ? row.adjustedAmount !== null && row.adjustedAmount !== undefined ? `₹ ${row.adjustedAmount.toLocaleString()}` : t("CS_NA") : /*#__PURE__*/React.createElement(TextInput, {
+      t: t,
+      type: "number",
+      isMandatory: false,
+      value: ((_sanctionFeeData$row$ = sanctionFeeData[row.index]) === null || _sanctionFeeData$row$ === void 0 ? void 0 : _sanctionFeeData$row$.adjustedAmount) || "",
+      onChange: e => handleAdjustedAmountChange(row.index, e.target.value, row.amount),
+      onBlur: onAdjustedAmountBlur,
+      disable: disable,
+      style: {
+        width: "100%",
+        padding: "4px",
+        border: "1px solid #ccc",
+        borderRadius: "4px"
+      }
+    })), disable || isEmployee ? null : /*#__PURE__*/React.createElement("td", {
+      style: tdStyle
+    }, (row === null || row === void 0 ? void 0 : row.taxHeadCode) === "BPA_TOTAL" ? null : /*#__PURE__*/React.createElement(UploadFile, {
+      key: row.index,
+      id: `file-${row.id}`,
+      onUpload: file => handleFileUpload(row.index, file || null),
+      onDelete: () => handleFileDelete(row.index),
+      message: row.filestoreId ? `1 ${t("FILEUPLOADED")}` : t("ES_NO_FILE_SELECTED_LABEL"),
+      disabled: disable
+    })), /*#__PURE__*/React.createElement("td", {
+      style: tdStyle
+    }, (row === null || row === void 0 ? void 0 : row.taxHeadCode) === "BPA_TOTAL" ? (row === null || row === void 0 ? void 0 : row.grandTotal) !== null && (row === null || row === void 0 ? void 0 : row.grandTotal) !== undefined ? `₹ ${row.grandTotal.toLocaleString()}` : t("CS_NA") : /*#__PURE__*/React.createElement("div", null, (_sanctionFeeData$row$2 = sanctionFeeData[row.index]) !== null && _sanctionFeeData$row$2 !== void 0 && _sanctionFeeData$row$2.onDocumentLoading ? /*#__PURE__*/React.createElement(Loader, null) : (_sanctionFeeData$row$3 = sanctionFeeData[row.index]) !== null && _sanctionFeeData$row$3 !== void 0 && _sanctionFeeData$row$3.documentError ? /*#__PURE__*/React.createElement("div", {
+      style: {
+        fontSize: "12px",
+        color: "red"
+      }
+    }, (_sanctionFeeData$row$4 = sanctionFeeData[row.index]) === null || _sanctionFeeData$row$4 === void 0 ? void 0 : _sanctionFeeData$row$4.documentError) : /*#__PURE__*/React.createElement("div", null, (_sanctionFeeData$row$5 = sanctionFeeData[row.index]) !== null && _sanctionFeeData$row$5 !== void 0 && _sanctionFeeData$row$5.filestoreId ? /*#__PURE__*/React.createElement(LinkButton, {
+      onClick: () => {
+        var _sanctionFeeData$row$6;
+        routeTo((_sanctionFeeData$row$6 = sanctionFeeData[row.index]) === null || _sanctionFeeData$row$6 === void 0 ? void 0 : _sanctionFeeData$row$6.filestoreId, row.index);
+      },
+      style: {
+        textDecoration: "underline",
+        padding: 0
+      },
+      label: t("BPA_VIEW_DOCUMENT")
+    }) : t("CS_NA")))));
+  }))));
+};
+
 const FeeEstimation = ({
   currentStepData,
   development: _development = "0",
@@ -22249,7 +22335,6 @@ const FeeEstimation = ({
   const [BPA, setBPA] = useState({
     ...((currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.createdResponse) || {})
   });
-  const [recalculate, setRecalculate] = useState(false);
   const [sanctionFeeData, setSanctionFeeData] = useState(adjustedAmounts || []);
   const closeToast = () => {
     setShowToast(null);
@@ -22257,7 +22342,6 @@ const FeeEstimation = ({
   const isCitizen = window.location.href.includes("citizen");
   const isEmployee = window.location.href.includes("employee");
   const isNewConstructionPage = window.location.href.includes("bpa/building_plan_scrutiny/new_construction/");
-  const isEditable = isCitizen && isNewConstructionPage || isEmployee;
   const {
     isLoading: bpaCalculatorLoading,
     error,
@@ -22374,12 +22458,6 @@ const FeeEstimation = ({
     }));
     setAdjustedAmounts(mappedData);
   }, [dataSan, t]);
-  useEffect(() => {
-    if (recalculate) {
-      refetchSanctionFee();
-      setRecalculate(false);
-    }
-  }, [recalculate, refetchSanctionFee]);
   const handleAdjustedAmountChange = (index, value, ammount) => {
     if (Number(value) > ammount) {
       setShowToast({
@@ -22397,14 +22475,13 @@ const FeeEstimation = ({
     const file = e.target.files[0];
     try {
       var _response$data, _response$data$files;
-      setSanctionFeeData(prev => prev.map((item, i) => i === index ? {
+      setAdjustedAmounts(prev => prev.map((item, i) => i === index ? {
         ...item,
         onDocumentLoading: true
       } : item));
       const response = await Digit.UploadServices.Filestorage("property-upload", file, stateCode);
-      console.log("Uploading file for row index:", index, file, response);
       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) {
-        setSanctionFeeData(prev => prev.map((item, i) => {
+        setAdjustedAmounts(prev => prev.map((item, i) => {
           var _response$data2, _response$data2$files;
           return i === index ? {
             ...item,
@@ -22414,7 +22491,7 @@ const FeeEstimation = ({
           } : item;
         }));
       } else {
-        setSanctionFeeData(prev => prev.map((item, i) => i === index ? {
+        setAdjustedAmounts(prev => prev.map((item, i) => i === index ? {
           ...item,
           filestoreId: null,
           documentError: t("PT_FILE_UPLOAD_ERROR"),
@@ -22426,7 +22503,7 @@ const FeeEstimation = ({
         });
       }
     } catch (err) {
-      setSanctionFeeData(prev => prev.map((item, i) => i === index ? {
+      setAdjustedAmounts(prev => prev.map((item, i) => i === index ? {
         ...item,
         filestoreId: null,
         documentError: t("PT_FILE_UPLOAD_ERROR"),
@@ -22439,7 +22516,7 @@ const FeeEstimation = ({
     }
   };
   const handleFileDelete = index => {
-    setSanctionFeeData(prev => prev.map((item, i) => i === index ? {
+    setAdjustedAmounts(prev => prev.map((item, i) => i === index ? {
       ...item,
       filestoreId: null
     } : item));
@@ -22458,7 +22535,6 @@ const FeeEstimation = ({
     }) => value !== null && value !== undefined ? `₹ ${value.toLocaleString()}` : t("CS_NA")
   }];
   const getUrlForDocumentView = async (filestoreId, index) => {
-    console.log("Fetching URL for filestoreId:", filestoreId, "at index:", index);
     if ((filestoreId === null || filestoreId === void 0 ? void 0 : filestoreId.length) === 0) return;
     try {
       setSanctionFeeData(prev => prev.map((item, i) => i === index ? {
@@ -22467,7 +22543,6 @@ const FeeEstimation = ({
       } : item));
       const result = await Digit.UploadServices.Filefetch([filestoreId], stateCode);
       if (result !== null && result !== void 0 && result.data) {
-        console.log("Fetched document URL:", result.data);
         const fileUrl = result.data[filestoreId];
         if (fileUrl) {
           setSanctionFeeData(prev => prev.map((item, i) => i === index ? {
@@ -22498,7 +22573,12 @@ const FeeEstimation = ({
     const jumpTo = await getUrlForDocumentView(filestoreId, index);
     if (jumpTo) window.open(jumpTo);
   }
-  console.log("sanctionFeeData", sanctionFeeData);
+  const onAdjustedAmountBlur = () => {
+    if (JSON.stringify(sanctionFeeData) === JSON.stringify(adjustedAmounts)) {
+      return;
+    }
+    refetchSanctionFee();
+  };
   if (isLoading) return /*#__PURE__*/React.createElement(Loader, null);
   return /*#__PURE__*/React.createElement("div", null, bpaCalculatorLoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardSubHeader, {
     style: {
@@ -22516,95 +22596,18 @@ const FeeEstimation = ({
     disableSort: true,
     manualPagination: false,
     isPaginationRequired: false
-  })), /*#__PURE__*/React.createElement("div", {
-    style: {
-      overflowX: "auto"
-    }
-  }, /*#__PURE__*/React.createElement(CardSubHeader, {
-    style: {
-      fontSize: "20px",
-      color: "#3f4351",
-      marginTop: "24px"
-    }
-  }, t("BPA_SANCTION_FEE")), /*#__PURE__*/React.createElement("table", {
-    className: "sanction-fee-table",
-    style: {
-      borderCollapse: "collapse",
-      width: "100%",
-      fontSize: "16px"
-    }
-  }, /*#__PURE__*/React.createElement("thead", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("th", {
-    style: thStyle
-  }, t("BPA_TAXHEAD_CODE")), /*#__PURE__*/React.createElement("th", {
-    style: thStyle
-  }, t("BPA_AMOUNT")), /*#__PURE__*/React.createElement("th", {
-    style: thStyle
-  }, t("BPA_ADJUSTED_AMOUNT")), _disable || isEmployee ? null : /*#__PURE__*/React.createElement("th", {
-    style: thStyle
-  }, t("BPA_FILE_UPLOAD")), /*#__PURE__*/React.createElement("th", {
-    style: thStyle
-  }, t("BPA_VIEW_DOCUMENT")), " ")), /*#__PURE__*/React.createElement("tbody", null, sanctionFeeDataWithTotal.map((row, i) => {
-    var _sanctionFeeData$row$, _sanctionFeeData$row$2, _sanctionFeeData$row$3, _sanctionFeeData$row$4, _sanctionFeeData$row$5;
-    return /*#__PURE__*/React.createElement("tr", {
-      key: row.index
-    }, /*#__PURE__*/React.createElement("td", {
-      style: tdStyle
-    }, row.title || t("CS_NA")), /*#__PURE__*/React.createElement("td", {
-      style: tdStyle
-    }, row.amount !== null && row.amount !== undefined ? `₹ ${row.amount.toLocaleString()}` : t("CS_NA")), /*#__PURE__*/React.createElement("td", {
-      style: tdStyle
-    }, (row === null || row === void 0 ? void 0 : row.taxHeadCode) === "BPA_TOTAL" ? row.adjustedAmount !== null && row.adjustedAmount !== undefined ? `₹ ${row.adjustedAmount.toLocaleString()}` : t("CS_NA") : /*#__PURE__*/React.createElement(TextInput, {
-      t: t,
-      type: "number",
-      isMandatory: false,
-      value: ((_sanctionFeeData$row$ = sanctionFeeData[row.index]) === null || _sanctionFeeData$row$ === void 0 ? void 0 : _sanctionFeeData$row$.adjustedAmount) || "",
-      onChange: e => handleAdjustedAmountChange(row.index, e.target.value, row.amount),
-      disable: _disable,
-      style: {
-        width: "100%",
-        padding: "4px",
-        border: "1px solid #ccc",
-        borderRadius: "4px"
-      }
-    })), _disable || isEmployee ? null : /*#__PURE__*/React.createElement("td", {
-      style: tdStyle
-    }, (row === null || row === void 0 ? void 0 : row.taxHeadCode) === "BPA_TOTAL" ? null : /*#__PURE__*/React.createElement(UploadFile, {
-      key: row.index,
-      id: `file-${row.id}`,
-      onUpload: file => handleFileUpload(row.index, file || null),
-      onDelete: () => handleFileDelete(row.index),
-      message: row.filestoreId ? `1 ${t("FILEUPLOADED")}` : t("ES_NO_FILE_SELECTED_LABEL"),
-      disabled: _disable
-    })), /*#__PURE__*/React.createElement("td", {
-      style: tdStyle
-    }, (row === null || row === void 0 ? void 0 : row.taxHeadCode) === "BPA_TOTAL" ? (row === null || row === void 0 ? void 0 : row.grandTotal) !== null && (row === null || row === void 0 ? void 0 : row.grandTotal) !== undefined ? `₹ ${row.grandTotal.toLocaleString()}` : t("CS_NA") : /*#__PURE__*/React.createElement("div", null, (_sanctionFeeData$row$2 = sanctionFeeData[row.index]) !== null && _sanctionFeeData$row$2 !== void 0 && _sanctionFeeData$row$2.onDocumentLoading ? /*#__PURE__*/React.createElement(Loader, null) : (_sanctionFeeData$row$3 = sanctionFeeData[row.index]) !== null && _sanctionFeeData$row$3 !== void 0 && _sanctionFeeData$row$3.documentError ? /*#__PURE__*/React.createElement("div", {
-      style: {
-        fontSize: "12px",
-        color: "red"
-      }
-    }, (_sanctionFeeData$row$4 = sanctionFeeData[row.index]) === null || _sanctionFeeData$row$4 === void 0 ? void 0 : _sanctionFeeData$row$4.documentError) : /*#__PURE__*/React.createElement("div", null, (_sanctionFeeData$row$5 = sanctionFeeData[row.index]) !== null && _sanctionFeeData$row$5 !== void 0 && _sanctionFeeData$row$5.filestoreId ? /*#__PURE__*/React.createElement(LinkButton, {
-      onClick: () => {
-        var _sanctionFeeData$row$6;
-        routeTo((_sanctionFeeData$row$6 = sanctionFeeData[row.index]) === null || _sanctionFeeData$row$6 === void 0 ? void 0 : _sanctionFeeData$row$6.filestoreId, row.index);
-      },
-      style: {
-        textDecoration: "underline",
-        padding: 0
-      },
-      label: t("BPA_VIEW_DOCUMENT")
-    }) : t("CS_NA")))));
-  })))), _disable ? null : /*#__PURE__*/React.createElement("div", {
-    style: {
-      paddingTop: "16px",
-      textAlign: isMobile ? "center" : "right"
-    }
-  }, /*#__PURE__*/React.createElement(SubmitBar, {
-    onSubmit: () => {
-      setRecalculate(true);
-    },
-    label: t("Recalculate"),
-    disabled: !isEditable
-  })), showToast && /*#__PURE__*/React.createElement(Toast$1, {
+  })), /*#__PURE__*/React.createElement(PayTwoTable, {
+    sanctionFeeDataWithTotal,
+    disable: _disable,
+    isEmployee,
+    sanctionFeeData,
+    handleAdjustedAmountChange,
+    onAdjustedAmountBlur,
+    handleFileUpload,
+    handleFileDelete,
+    routeTo,
+    t
+  }), showToast && /*#__PURE__*/React.createElement(Toast$1, {
     error: true,
     label: t(`${showToast === null || showToast === void 0 ? void 0 : showToast.message}`),
     onClose: closeToast,
@@ -22700,7 +22703,7 @@ const CitizenAndArchitectPhoto = ({
 };
 
 const BpaApplicationDetail = () => {
-  var _user$info, _data$applicationData, _data$applicationData2, _data$applicationData3, _data$applicationData4, _data$applicationData5, _data$applicationData6, _data$applicationData7, _pdfDetails$pdfFiles, _data$applicationData19, _data$applicationData34, _data$applicationData35, _user$info4, _user$info5, _data$applicationData44, _data$applicationData47, _data$applicationData59, _data$applicationData62, _data$applicationData63, _workflowDetails8, _workflowDetails8$dat, _workflowDetails8$dat2, _data$applicationData67, _workflowDetails1, _workflowDetails1$dat, _workflowDetails1$dat2, _workflowDetails1$dat3, _data$collectionBillD, _data$applicationData80, _data$collectionBillD2, _data$applicationData85, _data$collectionBillD3, _workflowDetails12, _workflowDetails12$da, _workflowDetails12$da2, _data$applicationDeta, _data$applicationDeta4, _data$applicationDeta5, _workflowDetails30, _workflowDetails30$da, _workflowDetails30$da2, _workflowDetails31, _workflowDetails31$da;
+  var _user$info, _data$applicationData, _data$applicationData2, _data$applicationData3, _data$applicationData4, _data$applicationData5, _data$applicationData6, _data$applicationData7, _pdfDetails$pdfFiles, _data$applicationData19, _data$applicationData34, _data$applicationData35, _user$info4, _user$info5, _data$applicationData44, _data$applicationData47, _data$applicationData59, _data$applicationData62, _data$applicationData63, _workflowDetails8, _workflowDetails8$dat, _workflowDetails8$dat2, _data$applicationData67, _workflowDetails1, _workflowDetails1$dat, _workflowDetails1$dat2, _workflowDetails1$dat3, _data$collectionBillD, _data$applicationData80, _data$collectionBillD2, _data$applicationData84, _data$collectionBillD3, _workflowDetails12, _workflowDetails12$da, _workflowDetails12$da2, _data$applicationDeta, _data$applicationDeta4, _data$applicationDeta5, _workflowDetails30, _workflowDetails30$da, _workflowDetails30$da2, _workflowDetails31, _workflowDetails31$da;
   const {
     id
   } = useParams();
@@ -23201,19 +23204,6 @@ const BpaApplicationDetail = () => {
     });
     window.open(fileStore[response === null || response === void 0 ? void 0 : response.filestoreIds[0]], "_blank");
     requestData["applicationType"] = data === null || data === void 0 ? void 0 : (_data$applicationData48 = data.applicationData) === null || _data$applicationData48 === void 0 ? void 0 : (_data$applicationData49 = _data$applicationData48.additionalDetails) === null || _data$applicationData49 === void 0 ? void 0 : _data$applicationData49.applicationType;
-    const edcrResponse = await Digit.OBPSService.edcr_report_download({
-      BPA: {
-        ...requestData
-      }
-    });
-    const responseStatus = Number.parseInt(edcrResponse.status, 10);
-    if (responseStatus === 201 || responseStatus === 200) {
-      mode == "print" ? printPdf(new Blob([edcrResponse.data], {
-        type: "application/pdf"
-      })) : downloadPdf(new Blob([edcrResponse.data], {
-        type: "application/pdf"
-      }), `edcrReport.pdf`);
-    }
   }
   async function getRevocationPDFSearch({
     tenantId,
@@ -23355,7 +23345,7 @@ const BpaApplicationDetail = () => {
     if (action === "SAVE_AS_DRAFT") {
       getBPAFormData(data === null || data === void 0 ? void 0 : data.applicationData, mdmsData, history);
     }
-    if (action === "SEND_TO_CITIZEN") {
+    if (action === "SEND_TO_CITIZEN" || action === "RESUBMIT" || action === "APPROVE_AND_PAY") {
       saveAsDraft(data === null || data === void 0 ? void 0 : data.applicationData, action);
     }
     setSelectedAction(action);
@@ -23383,7 +23373,7 @@ const BpaApplicationDetail = () => {
           riskType: data === null || data === void 0 ? void 0 : (_data$additionalDetai2 = data.additionalDetails) === null || _data$additionalDetai2 === void 0 ? void 0 : _data$additionalDetai2.riskType,
           workflow: {
             action: workflowAction,
-            assignes: [accountId]
+            assignes: workflowAction === "RESUBMIT" ? [] : [accountId]
           }
         }
       }, tenantId);
@@ -23697,51 +23687,45 @@ const BpaApplicationDetail = () => {
     });
   }
   if (data && (data === null || data === void 0 ? void 0 : (_data$applicationData80 = data.applicationData) === null || _data$applicationData80 === void 0 ? void 0 : _data$applicationData80.businessService) === "BPA_LOW" && (data === null || data === void 0 ? void 0 : (_data$collectionBillD2 = data.collectionBillDetails) === null || _data$collectionBillD2 === void 0 ? void 0 : _data$collectionBillD2.length) > 0) {
-    var _data$applicationData81, _data$applicationData83;
+    var _data$applicationData81, _data$applicationData82;
     !(data !== null && data !== void 0 && (_data$applicationData81 = data.applicationData) !== null && _data$applicationData81 !== void 0 && _data$applicationData81.status.includes("REVOCATION")) && dowloadOptions.push({
       order: 3,
       label: t("BPA_PERMIT_ORDER"),
-      onClick: () => {
-        var _data$applicationData82;
-        return getPermitOccupancyOrderSearch({
-          tenantId: data === null || data === void 0 ? void 0 : (_data$applicationData82 = data.applicationData) === null || _data$applicationData82 === void 0 ? void 0 : _data$applicationData82.tenantId
-        }, "buildingpermit-low");
-      }
+      onClick: () => getPermitOccupancyOrderSearch({
+        tenantId: stateCode
+      }, "buildingpermit")
     });
-    (data === null || data === void 0 ? void 0 : (_data$applicationData83 = data.applicationData) === null || _data$applicationData83 === void 0 ? void 0 : _data$applicationData83.status.includes("REVOCATION")) && dowloadOptions.push({
+    (data === null || data === void 0 ? void 0 : (_data$applicationData82 = data.applicationData) === null || _data$applicationData82 === void 0 ? void 0 : _data$applicationData82.status.includes("REVOCATION")) && dowloadOptions.push({
       order: 3,
       label: t("BPA_REVOCATION_PDF_LABEL"),
       onClick: () => {
-        var _data$applicationData84;
+        var _data$applicationData83;
         return getRevocationPDFSearch({
-          tenantId: data === null || data === void 0 ? void 0 : (_data$applicationData84 = data.applicationData) === null || _data$applicationData84 === void 0 ? void 0 : _data$applicationData84.tenantId
+          tenantId: data === null || data === void 0 ? void 0 : (_data$applicationData83 = data.applicationData) === null || _data$applicationData83 === void 0 ? void 0 : _data$applicationData83.tenantId
         });
       }
     });
-  } else if (data && (data === null || data === void 0 ? void 0 : (_data$applicationData85 = data.applicationData) === null || _data$applicationData85 === void 0 ? void 0 : _data$applicationData85.businessService) === "BPA" && (data === null || data === void 0 ? void 0 : (_data$collectionBillD3 = data.collectionBillDetails) === null || _data$collectionBillD3 === void 0 ? void 0 : _data$collectionBillD3.length) > 0) {
-    var _data$applicationData86;
-    if ((data === null || data === void 0 ? void 0 : (_data$applicationData86 = data.applicationData) === null || _data$applicationData86 === void 0 ? void 0 : _data$applicationData86.status) === "APPROVED") {
+  } else if (data && (data === null || data === void 0 ? void 0 : (_data$applicationData84 = data.applicationData) === null || _data$applicationData84 === void 0 ? void 0 : _data$applicationData84.businessService) === "BPA" && (data === null || data === void 0 ? void 0 : (_data$collectionBillD3 = data.collectionBillDetails) === null || _data$collectionBillD3 === void 0 ? void 0 : _data$collectionBillD3.length) > 0) {
+    var _data$applicationData85;
+    if ((data === null || data === void 0 ? void 0 : (_data$applicationData85 = data.applicationData) === null || _data$applicationData85 === void 0 ? void 0 : _data$applicationData85.status) === "APPROVED") {
       dowloadOptions.push({
         order: 3,
         label: t("BPA_PERMIT_ORDER"),
-        onClick: () => {
-          var _data$applicationData87;
-          return getPermitOccupancyOrderSearch({
-            tenantId: data === null || data === void 0 ? void 0 : (_data$applicationData87 = data.applicationData) === null || _data$applicationData87 === void 0 ? void 0 : _data$applicationData87.tenantId
-          }, "buildingpermit");
-        }
+        onClick: () => getPermitOccupancyOrderSearch({
+          tenantId: stateCode
+        }, "buildingpermit")
       });
     }
   } else {
-    var _data$applicationData88;
-    if ((data === null || data === void 0 ? void 0 : (_data$applicationData88 = data.applicationData) === null || _data$applicationData88 === void 0 ? void 0 : _data$applicationData88.status) === "APPROVED") {
+    var _data$applicationData86;
+    if ((data === null || data === void 0 ? void 0 : (_data$applicationData86 = data.applicationData) === null || _data$applicationData86 === void 0 ? void 0 : _data$applicationData86.status) === "APPROVED") {
       dowloadOptions.push({
         order: 3,
         label: t("BPA_OC_CERTIFICATE"),
         onClick: () => {
-          var _data$applicationData89;
+          var _data$applicationData87;
           return getPermitOccupancyOrderSearch({
-            tenantId: data === null || data === void 0 ? void 0 : (_data$applicationData89 = data.applicationData) === null || _data$applicationData89 === void 0 ? void 0 : _data$applicationData89.tenantId
+            tenantId: data === null || data === void 0 ? void 0 : (_data$applicationData87 = data.applicationData) === null || _data$applicationData87 === void 0 ? void 0 : _data$applicationData87.tenantId
           }, "buildingpermit");
         }
       });
@@ -23836,7 +23820,7 @@ const BpaApplicationDetail = () => {
     var _Object$keys3;
     return ((_Object$keys3 = Object.keys(ob)) === null || _Object$keys3 === void 0 ? void 0 : _Object$keys3.length) > 0;
   }).map((detail, index, arr) => {
-    var _detail$additionalDet, _detail$values, _detail$values2, _detail$additionalDet2, _detail$additionalDet3, _detail$additionalDet4, _detail$additionalDet5, _detail$additionalDet6, _detail$additionalDet7, _detail$additionalDet8, _detail$additionalDet9, _detail$additionalDet0, _detail$additionalDet1, _detail$additionalDet10, _data$applicationData90, _data$applicationData91, _data$applicationData92, _data$applicationData93, _data$applicationData94, _detail$additionalDet15, _detail$additionalDet16, _detail$additionalDet17, _detail$additionalDet20, _detail$additionalDet21, _detail$additionalDet22, _detail$additionalDet23, _detail$additionalDet24, _detail$additionalDet25, _workflowDetails16, _workflowDetails16$da, _workflowDetails16$da2, _workflowDetails16$da3, _workflowDetails16$da4, _workflowDetails17, _workflowDetails17$da, _workflowDetails17$da2, _workflowDetails18, _workflowDetails18$da, _workflowDetails18$da2, _workflowDetails19, _workflowDetails20, _workflowDetails20$da, _workflowDetails20$da2, _workflowDetails21, _workflowDetails22, _workflowDetails22$da, _workflowDetails22$da2, _workflowDetails23, _workflowDetails23$da, _workflowDetails24, _workflowDetails24$da, _workflowDetails25, _workflowDetails26, _workflowDetails26$da, _workflowDetails26$da2, _workflowDetails27, _workflowDetails27$da, _workflowDetails27$da2, _workflowDetails27$da3, _workflowDetails28, _workflowDetails28$da, _workflowDetails28$da2, _workflowDetails28$da3, _workflowDetails29, _workflowDetails29$da, _workflowDetails29$da2, _workflowDetails29$da3;
+    var _detail$additionalDet, _detail$values, _detail$values2, _detail$additionalDet2, _detail$additionalDet3, _detail$additionalDet4, _detail$additionalDet5, _detail$additionalDet6, _detail$additionalDet7, _detail$additionalDet8, _detail$additionalDet9, _detail$additionalDet0, _detail$additionalDet1, _detail$additionalDet10, _data$applicationData88, _data$applicationData89, _data$applicationData90, _data$applicationData91, _data$applicationData92, _detail$additionalDet15, _detail$additionalDet16, _detail$additionalDet17, _detail$additionalDet20, _detail$additionalDet21, _detail$additionalDet22, _detail$additionalDet23, _detail$additionalDet24, _detail$additionalDet25, _workflowDetails16, _workflowDetails16$da, _workflowDetails16$da2, _workflowDetails16$da3, _workflowDetails16$da4, _workflowDetails17, _workflowDetails17$da, _workflowDetails17$da2, _workflowDetails18, _workflowDetails18$da, _workflowDetails18$da2, _workflowDetails19, _workflowDetails20, _workflowDetails20$da, _workflowDetails20$da2, _workflowDetails21, _workflowDetails22, _workflowDetails22$da, _workflowDetails22$da2, _workflowDetails23, _workflowDetails23$da, _workflowDetails24, _workflowDetails24$da, _workflowDetails25, _workflowDetails26, _workflowDetails26$da, _workflowDetails26$da2, _workflowDetails27, _workflowDetails27$da, _workflowDetails27$da2, _workflowDetails27$da3, _workflowDetails28, _workflowDetails28$da, _workflowDetails28$da2, _workflowDetails28$da3, _workflowDetails29, _workflowDetails29$da, _workflowDetails29$da2, _workflowDetails29$da3;
     console.log("detailforme", detail);
     return /*#__PURE__*/React.createElement("div", {
       key: index
@@ -23994,9 +23978,9 @@ const BpaApplicationDetail = () => {
       autoSort: true,
       manualPagination: false,
       isPaginationRequired: false
-    }))), detail !== null && detail !== void 0 && detail.isFieldInspection && (data === null || data === void 0 ? void 0 : (_data$applicationData90 = data.applicationData) === null || _data$applicationData90 === void 0 ? void 0 : (_data$applicationData91 = _data$applicationData90.additionalDetails) === null || _data$applicationData91 === void 0 ? void 0 : (_data$applicationData92 = _data$applicationData91.fieldinspection_pending) === null || _data$applicationData92 === void 0 ? void 0 : _data$applicationData92.length) > 0 ? /*#__PURE__*/React.createElement(InspectionReport, {
+    }))), detail !== null && detail !== void 0 && detail.isFieldInspection && (data === null || data === void 0 ? void 0 : (_data$applicationData88 = data.applicationData) === null || _data$applicationData88 === void 0 ? void 0 : (_data$applicationData89 = _data$applicationData88.additionalDetails) === null || _data$applicationData89 === void 0 ? void 0 : (_data$applicationData90 = _data$applicationData89.fieldinspection_pending) === null || _data$applicationData90 === void 0 ? void 0 : _data$applicationData90.length) > 0 ? /*#__PURE__*/React.createElement(InspectionReport, {
       isCitizen: true,
-      fiReport: data === null || data === void 0 ? void 0 : (_data$applicationData93 = data.applicationData) === null || _data$applicationData93 === void 0 ? void 0 : (_data$applicationData94 = _data$applicationData93.additionalDetails) === null || _data$applicationData94 === void 0 ? void 0 : _data$applicationData94.fieldinspection_pending
+      fiReport: data === null || data === void 0 ? void 0 : (_data$applicationData91 = data.applicationData) === null || _data$applicationData91 === void 0 ? void 0 : (_data$applicationData92 = _data$applicationData91.additionalDetails) === null || _data$applicationData92 === void 0 ? void 0 : _data$applicationData92.fieldinspection_pending
     }) : null, (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet15 = detail.additionalDetails) === null || _detail$additionalDet15 === void 0 ? void 0 : (_detail$additionalDet16 = _detail$additionalDet15.noc) === null || _detail$additionalDet16 === void 0 ? void 0 : _detail$additionalDet16.length) > 0 ? detail === null || detail === void 0 ? void 0 : (_detail$additionalDet17 = detail.additionalDetails) === null || _detail$additionalDet17 === void 0 ? void 0 : _detail$additionalDet17.noc.map((nocob, ind) => {
       var _detail$additionalDet18, _detail$additionalDet19, _detail$values3, _detail$values3$, _detail$values4, _detail$values4$, _detail$values5, _detail$values5$, _detail$values6, _detail$values6$, _detail$values7, _detail$values7$, _detail$values8, _detail$values8$, _detail$values9, _detail$values9$, _detail$values0, _detail$values0$, _detail$values1, _detail$values1$, _detail$values10, _detail$values10$, _detail$values11, _detail$values11$, _detail$values12, _detail$values12$, _detail$values13, _detail$values13$, _detail$values14, _detail$values14$, _detail$values15, _detail$values15$, _detail$values16, _detail$values16$, _detail$values17, _detail$values17$, _detail$values18, _detail$values18$, _detail$values19, _detail$values19$, _detail$values20, _detail$values20$;
       return /*#__PURE__*/React.createElement("div", {
@@ -24117,6 +24101,9 @@ const BpaApplicationDetail = () => {
         width: "100%"
       }
     }, displayMenu && (_workflowDetails23 = workflowDetails) !== null && _workflowDetails23 !== void 0 && (_workflowDetails23$da = _workflowDetails23.data) !== null && _workflowDetails23$da !== void 0 && _workflowDetails23$da.nextActions ? /*#__PURE__*/React.createElement(Menu, {
+      style: {
+        minWidth: "310px"
+      },
       localeKeyPrefix: "WF_BPA_ACTION",
       options: (_workflowDetails24 = workflowDetails) === null || _workflowDetails24 === void 0 ? void 0 : (_workflowDetails24$da = _workflowDetails24.data) === null || _workflowDetails24$da === void 0 ? void 0 : _workflowDetails24$da.nextActions.map(action => action.action),
       t: t,
@@ -28238,6 +28225,240 @@ const configBPAREGApproverApplication = ({
   };
 };
 
+const TextField = props => {
+  const [value, setValue] = useState(props.selectedVal ? props.selectedVal : "");
+  useEffect(() => {
+    if (!props.keepNull) {
+      if (props.selectedVal) setValue(props.selectedVal);else {
+        setValue("");
+        props.setFilter("");
+      }
+    } else setValue("");
+  }, [props.selectedVal, props.forceSet]);
+  function inputChange(e) {
+    if (props.freeze) return;
+    setValue(e.target.value);
+    props.setFilter(e.target.value);
+  }
+  function broadcastToOpen() {
+    if (!props.disable) {
+      props.dropdownDisplay(true);
+    }
+  }
+  function broadcastToClose() {
+    props.dropdownDisplay(false);
+  }
+  const keyChange = e => {
+    if (e.key == "ArrowDown") {
+      props.setOptionIndex(state => state + 1 == props.addProps.length ? 0 : state + 1);
+      if (props.addProps.currentIndex + 1 == props.addProps.length) {
+        var _e$target, _e$target$parentEleme, _e$target$parentEleme2, _e$target$parentEleme3, _e$target$parentEleme4, _e$target$parentEleme5;
+        e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : (_e$target$parentEleme = _e$target.parentElement) === null || _e$target$parentEleme === void 0 ? void 0 : (_e$target$parentEleme2 = _e$target$parentEleme.parentElement) === null || _e$target$parentEleme2 === void 0 ? void 0 : (_e$target$parentEleme3 = _e$target$parentEleme2.children) === null || _e$target$parentEleme3 === void 0 ? void 0 : (_e$target$parentEleme4 = _e$target$parentEleme3.namedItem("jk-dropdown-unique")) === null || _e$target$parentEleme4 === void 0 ? void 0 : (_e$target$parentEleme5 = _e$target$parentEleme4.scrollTo) === null || _e$target$parentEleme5 === void 0 ? void 0 : _e$target$parentEleme5.call(_e$target$parentEleme4, 0, 0);
+      } else {
+        var _props$addProps, _e$target2, _e$target2$parentElem, _e$target2$parentElem2, _e$target2$parentElem3, _e$target2$parentElem4, _e$target2$parentElem5;
+        (props === null || props === void 0 ? void 0 : (_props$addProps = props.addProps) === null || _props$addProps === void 0 ? void 0 : _props$addProps.currentIndex) > 2 && (e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : (_e$target2$parentElem = _e$target2.parentElement) === null || _e$target2$parentElem === void 0 ? void 0 : (_e$target2$parentElem2 = _e$target2$parentElem.parentElement) === null || _e$target2$parentElem2 === void 0 ? void 0 : (_e$target2$parentElem3 = _e$target2$parentElem2.children) === null || _e$target2$parentElem3 === void 0 ? void 0 : (_e$target2$parentElem4 = _e$target2$parentElem3.namedItem("jk-dropdown-unique")) === null || _e$target2$parentElem4 === void 0 ? void 0 : (_e$target2$parentElem5 = _e$target2$parentElem4.scrollBy) === null || _e$target2$parentElem5 === void 0 ? void 0 : _e$target2$parentElem5.call(_e$target2$parentElem4, 0, 45));
+      }
+      e.preventDefault();
+    } else if (e.key == "ArrowUp") {
+      props.setOptionIndex(state => state !== 0 ? state - 1 : props.addProps.length - 1);
+      if (props.addProps.currentIndex == 0) {
+        var _e$target3, _e$target3$parentElem, _e$target3$parentElem2, _e$target3$parentElem3, _e$target3$parentElem4, _e$target3$parentElem5;
+        e === null || e === void 0 ? void 0 : (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : (_e$target3$parentElem = _e$target3.parentElement) === null || _e$target3$parentElem === void 0 ? void 0 : (_e$target3$parentElem2 = _e$target3$parentElem.parentElement) === null || _e$target3$parentElem2 === void 0 ? void 0 : (_e$target3$parentElem3 = _e$target3$parentElem2.children) === null || _e$target3$parentElem3 === void 0 ? void 0 : (_e$target3$parentElem4 = _e$target3$parentElem3.namedItem("jk-dropdown-unique")) === null || _e$target3$parentElem4 === void 0 ? void 0 : (_e$target3$parentElem5 = _e$target3$parentElem4.scrollTo) === null || _e$target3$parentElem5 === void 0 ? void 0 : _e$target3$parentElem5.call(_e$target3$parentElem4, 100000, 100000);
+      } else {
+        var _props$addProps2, _e$target4, _e$target4$parentElem, _e$target4$parentElem2, _e$target4$parentElem3, _e$target4$parentElem4, _e$target4$parentElem5;
+        (props === null || props === void 0 ? void 0 : (_props$addProps2 = props.addProps) === null || _props$addProps2 === void 0 ? void 0 : _props$addProps2.currentIndex) > 2 && (e === null || e === void 0 ? void 0 : (_e$target4 = e.target) === null || _e$target4 === void 0 ? void 0 : (_e$target4$parentElem = _e$target4.parentElement) === null || _e$target4$parentElem === void 0 ? void 0 : (_e$target4$parentElem2 = _e$target4$parentElem.parentElement) === null || _e$target4$parentElem2 === void 0 ? void 0 : (_e$target4$parentElem3 = _e$target4$parentElem2.children) === null || _e$target4$parentElem3 === void 0 ? void 0 : (_e$target4$parentElem4 = _e$target4$parentElem3.namedItem("jk-dropdown-unique")) === null || _e$target4$parentElem4 === void 0 ? void 0 : (_e$target4$parentElem5 = _e$target4$parentElem4.scrollBy) === null || _e$target4$parentElem5 === void 0 ? void 0 : _e$target4$parentElem5.call(_e$target4$parentElem4, 0, -45));
+      }
+      e.preventDefault();
+    } else if (e.key == "Enter") {
+      props.addProps.selectOption(props.addProps.currentIndex);
+    }
+  };
+  return /*#__PURE__*/React.createElement("input", {
+    ref: props.inputRef,
+    className: `employee-select-wrap--elipses ${props.disable && "disabled"}`,
+    type: "text",
+    value: value,
+    onChange: inputChange,
+    onClick: props.onClick,
+    onFocus: broadcastToOpen,
+    onBlur: e => {
+      var _props$onBlur;
+      broadcastToClose();
+      props === null || props === void 0 ? void 0 : (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 ? void 0 : _props$onBlur.call(props, e);
+      if (props.selectedVal !== props.filterVal) {
+        setTimeout(() => {
+          props.setforceSet(val => val + 1);
+        }, 1000);
+      }
+    },
+    onKeyDown: keyChange,
+    readOnly: props.disable,
+    autoFocus: props.autoFocus,
+    placeholder: props.placeholder,
+    autoComplete: "off",
+    style: {
+      ...props.style,
+      zIndex: "auto"
+    }
+  });
+};
+const translateDummy = text => {
+  return text;
+};
+const DropdownWithDesignation = props => {
+  var _props$option, _props$option2, _props$option2$;
+  const user_type = Digit.SessionStorage.get("userType");
+  const [dropdownStatus, setDropdownStatus] = useState(false);
+  const [selectedOption, setSelectedOption] = useState(props.selected ? props.selected : null);
+  const [filterVal, setFilterVal] = useState("");
+  const [forceSet, setforceSet] = useState(0);
+  const [optionIndex, setOptionIndex] = useState(-1);
+  const optionRef = useRef(null);
+  const hasCustomSelector = props.customSelector ? true : false;
+  const t = props.t || translateDummy;
+  useEffect(() => {
+    setSelectedOption(props.selected);
+  }, [props.selected]);
+  function dropdownSwitch() {
+    if (!props.disable) {
+      var _props$onBlur2;
+      var current = dropdownStatus;
+      if (!current) {
+        document.addEventListener("mousedown", handleClick, false);
+      }
+      setDropdownStatus(!current);
+      props === null || props === void 0 ? void 0 : (_props$onBlur2 = props.onBlur) === null || _props$onBlur2 === void 0 ? void 0 : _props$onBlur2.call(props);
+    }
+  }
+  function handleClick(e) {
+    if (!optionRef.current || !optionRef.current.contains(e.target)) {
+      document.removeEventListener("mousedown", handleClick, false);
+      setDropdownStatus(false);
+    }
+  }
+  console.log("option", props.option);
+  function dropdownOn(val) {
+    const waitForOptions = () => setTimeout(() => setDropdownStatus(val), 500);
+    const timerId = waitForOptions();
+    return () => {
+      clearTimeout(timerId);
+    };
+  }
+  function onSelect(val) {
+    if (val !== selectedOption || props.allowMultiselect) {
+      props.select(val);
+      setSelectedOption(val);
+      setDropdownStatus(false);
+    } else {
+      setSelectedOption(val);
+      setforceSet(forceSet + 1);
+    }
+  }
+  function setFilter(val) {
+    setFilterVal(val);
+  }
+  let filteredOption = props.option && ((_props$option = props.option) === null || _props$option === void 0 ? void 0 : _props$option.filter(option => {
+    var _t, _t$toUpperCase;
+    return ((_t = t(option[props.optionKey])) === null || _t === void 0 ? void 0 : (_t$toUpperCase = _t.toUpperCase()) === null || _t$toUpperCase === void 0 ? void 0 : _t$toUpperCase.indexOf(filterVal === null || filterVal === void 0 ? void 0 : filterVal.toUpperCase())) > -1;
+  })) || [];
+  function selectOption(ind) {
+    onSelect(filteredOption[ind]);
+  }
+  if ((props === null || props === void 0 ? void 0 : (_props$option2 = props.option) === null || _props$option2 === void 0 ? void 0 : (_props$option2$ = _props$option2[0]) === null || _props$option2$ === void 0 ? void 0 : _props$option2$.label) == "PropertyType") {
+    filteredOption = props.option;
+  }
+  if (props.isBPAREG && selectedOption) {
+    var _props$option3, _props$option3$filter;
+    let isSelectedSameAsOptions = ((_props$option3 = props.option) === null || _props$option3 === void 0 ? void 0 : (_props$option3$filter = _props$option3.filter(ob => (ob === null || ob === void 0 ? void 0 : ob.code) === (selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.code))) === null || _props$option3$filter === void 0 ? void 0 : _props$option3$filter.length) > 0;
+    if (!isSelectedSameAsOptions) setSelectedOption(null);
+  }
+  return /*#__PURE__*/React.createElement("div", {
+    className: `${user_type === "employee" ? "employee-select-wrap" : "select-wrap"} ${props !== null && props !== void 0 && props.className ? props === null || props === void 0 ? void 0 : props.className : ""}`,
+    style: {
+      ...props.style
+    }
+  }, hasCustomSelector && /*#__PURE__*/React.createElement("div", {
+    className: props.showArrow ? "cp flex-right column-gap-5" : "cp",
+    onClick: dropdownSwitch
+  }, props.customSelector, props.showArrow && /*#__PURE__*/React.createElement(ArrowDown, {
+    onClick: dropdownSwitch,
+    className: props.disable && "disabled"
+  })), !hasCustomSelector && /*#__PURE__*/React.createElement("div", {
+    className: `${dropdownStatus ? "select-active" : "select"} ${props.disable && "disabled"}`,
+    style: props.errorStyle ? {
+      border: "1px solid red"
+    } : {}
+  }, /*#__PURE__*/React.createElement(TextField, {
+    autoComplete: props.autoComplete,
+    setFilter: setFilter,
+    forceSet: forceSet,
+    setforceSet: setforceSet,
+    setOptionIndex: setOptionIndex,
+    keepNull: props.keepNull,
+    selectedVal: selectedOption ? props.t ? props.isMultiSelectEmp ? `${selectedOption} ${t("BPA_SELECTED_TEXT")}` : props.t(props.optionKey ? selectedOption[props.optionKey] : selectedOption) : props.optionKey ? selectedOption[props.optionKey] : selectedOption : null,
+    filterVal: filterVal,
+    addProps: {
+      length: filteredOption.length,
+      currentIndex: optionIndex,
+      selectOption: selectOption
+    },
+    dropdownDisplay: dropdownOn,
+    handleClick: handleClick,
+    disable: props.disable,
+    freeze: props.freeze ? true : false,
+    autoFocus: props.autoFocus,
+    placeholder: props.placeholder,
+    onBlur: props === null || props === void 0 ? void 0 : props.onBlur,
+    inputRef: props.ref
+  }), /*#__PURE__*/React.createElement(ArrowDown, {
+    onClick: dropdownSwitch,
+    className: "cp",
+    disable: props.disable
+  })), dropdownStatus ? props.optionKey ? /*#__PURE__*/React.createElement("div", {
+    id: "jk-dropdown-unique",
+    className: `${hasCustomSelector ? "margin-top-10 display: table" : ""} options-card`,
+    style: {
+      ...props.optionCardStyles
+    },
+    ref: optionRef
+  }, filteredOption && filteredOption.map((option, index) => {
+    console.log("option", option);
+    return /*#__PURE__*/React.createElement("div", {
+      className: `cp profile-dropdown--item display: flex `,
+      style: index === optionIndex ? {
+        opacity: 1,
+        backgroundColor: "rgba(238, 238, 238, var(--bg-opacity))"
+      } : {},
+      key: index,
+      onClick: () => onSelect(option)
+    }, option.icon && /*#__PURE__*/React.createElement("span", {
+      className: "icon"
+    }, " ", option.icon, " "), props.isPropertyAssess ? /*#__PURE__*/React.createElement("div", null, props.t ? props.t(option[props.optionKey]) : option[props.optionKey]) : /*#__PURE__*/React.createElement("span", null, " ", props.t ? props.t(option[props.optionKey]) : option[props.optionKey]), /*#__PURE__*/React.createElement("div", null, "(", props.t("COMMON_MASTERS_DESIGNATION_" + option["designation"]), ")"));
+  }), filteredOption && filteredOption.length === 0 && /*#__PURE__*/React.createElement("div", {
+    className: `cp profile-dropdown--item display: flex `,
+    key: "-1",
+    onClick: () => {}
+  }, /*#__PURE__*/React.createElement("span", null, " ", props.t ? props.t("CMN_NOOPTION") : "CMN_NOOPTION"))) : /*#__PURE__*/React.createElement("div", {
+    className: "options-card",
+    style: {
+      ...props.optionCardStyles,
+      overflow: "scroll",
+      maxHeight: "350px"
+    },
+    id: "jk-dropdown-unique",
+    ref: optionRef
+  }, props.option.filter(option => (option === null || option === void 0 ? void 0 : option.toUpperCase().indexOf(filterVal === null || filterVal === void 0 ? void 0 : filterVal.toUpperCase())) > -1).map((option, index) => {
+    return /*#__PURE__*/React.createElement("p", {
+      key: index,
+      style: index === optionIndex ? {
+        opacity: 1,
+        backgroundColor: "rgba(238, 238, 238, var(--bg-opacity))"
+      } : {},
+      onClick: () => onSelect(option)
+    }, option);
+  })) : null);
+};
+
 const configBPAApproverApplication = ({
   t,
   action,
@@ -28254,7 +28475,7 @@ const configBPAApproverApplication = ({
   error,
   blockReasonFiltered
 }) => {
-  var _action$state, _action$state2, _action$assigneeRoles, _action$state3, _action$state4, _action$state5, _action$state6;
+  var _action$state, _action$assigneeRoles, _action$state2;
   let isRejectOrRevocate = false;
   if ((action === null || action === void 0 ? void 0 : action.action) == "REVOCATE" || (action === null || action === void 0 ? void 0 : action.action) == "REJECT" || action.action == "SKIP_PAYMENT" || (action === null || action === void 0 ? void 0 : action.action) == "SEND_BACK_TO_CITIZEN" || (action === null || action === void 0 ? void 0 : action.action) == "APPROVE") {
     isRejectOrRevocate = true;
@@ -28267,20 +28488,21 @@ const configBPAApproverApplication = ({
     },
     form: [{
       body: [{
-        label: action.isTerminateState || isRejectOrRevocate || (action === null || action === void 0 ? void 0 : action.action) == "BLOCK" && (action === null || action === void 0 ? void 0 : (_action$state = action.state) === null || _action$state === void 0 ? void 0 : _action$state.state) == "PENDINGAPPROVAL" || (action === null || action === void 0 ? void 0 : action.action) == "FORWARD" && (action === null || action === void 0 ? void 0 : (_action$state2 = action.state) === null || _action$state2 === void 0 ? void 0 : _action$state2.state) == "FIELDINSPECTION_PENDING" ? null : t(assigneeLabel || `WF_ROLE_${(_action$assigneeRoles = action.assigneeRoles) === null || _action$assigneeRoles === void 0 ? void 0 : _action$assigneeRoles[0]}`),
+        label: action.isTerminateState || isRejectOrRevocate || (action === null || action === void 0 ? void 0 : action.action) == "BLOCK" || (action === null || action === void 0 ? void 0 : action.action) == "VERIFY" || (action === null || action === void 0 ? void 0 : action.action) == "FORWARD" && (action === null || action === void 0 ? void 0 : (_action$state = action.state) === null || _action$state === void 0 ? void 0 : _action$state.state) == "FIELDINSPECTION_PENDING" ? null : t(assigneeLabel || `WF_ROLE_${(_action$assigneeRoles = action.assigneeRoles) === null || _action$assigneeRoles === void 0 ? void 0 : _action$assigneeRoles[0]}`),
         type: "dropdown",
-        populators: action.isTerminateState || isRejectOrRevocate || (action === null || action === void 0 ? void 0 : action.action) == "BLOCK" && (action === null || action === void 0 ? void 0 : (_action$state3 = action.state) === null || _action$state3 === void 0 ? void 0 : _action$state3.state) == "PENDINGAPPROVAL" || (action === null || action === void 0 ? void 0 : action.action) == "FORWARD" && (action === null || action === void 0 ? void 0 : (_action$state4 = action.state) === null || _action$state4 === void 0 ? void 0 : _action$state4.state) == "FIELDINSPECTION_PENDING" ? null : /*#__PURE__*/React.createElement(Dropdown, {
+        populators: action.isTerminateState || isRejectOrRevocate || (action === null || action === void 0 ? void 0 : action.action) == "BLOCK" || (action === null || action === void 0 ? void 0 : action.action) == "VERIFY" || (action === null || action === void 0 ? void 0 : action.action) == "FORWARD" && (action === null || action === void 0 ? void 0 : (_action$state2 = action.state) === null || _action$state2 === void 0 ? void 0 : _action$state2.state) == "FIELDINSPECTION_PENDING" ? null : /*#__PURE__*/React.createElement(DropdownWithDesignation, {
           option: approvers,
           autoComplete: "off",
           optionKey: "name",
           id: "fieldInspector",
           select: setSelectedApprover,
-          selected: selectedApprover
+          selected: selectedApprover,
+          t: t
         })
       }, {
-        label: (action === null || action === void 0 ? void 0 : action.action) == "BLOCK" && (action === null || action === void 0 ? void 0 : (_action$state5 = action.state) === null || _action$state5 === void 0 ? void 0 : _action$state5.state) == "PENDINGAPPROVAL" ? t(`BLOCK_REASON`) : null,
+        label: (action === null || action === void 0 ? void 0 : action.action) == "BLOCK" ? t(`BLOCK_REASON`) : null,
         type: "dropdown",
-        populators: (action === null || action === void 0 ? void 0 : action.action) == "BLOCK" && (action === null || action === void 0 ? void 0 : (_action$state6 = action.state) === null || _action$state6 === void 0 ? void 0 : _action$state6.state) == "PENDINGAPPROVAL" ? /*#__PURE__*/React.createElement(Dropdown, {
+        populators: (action === null || action === void 0 ? void 0 : action.action) == "BLOCK" ? /*#__PURE__*/React.createElement(Dropdown, {
           option: blockReasonFiltered,
           autoComplete: "off",
           optionKey: "name",
@@ -29315,21 +29537,23 @@ const ActionModal$4 = ({
   workflowDetails,
   blockReason
 }) => {
-  var _applicationData, _applicationData$land, _applicationData$land2, _applicationData2, _applicationData2$lan, _applicationData2$lan2, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6;
+  var _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _applicationData, _applicationData$land, _applicationData$land2, _applicationData2, _applicationData2$lan, _applicationData2$lan2;
   console.log("applicationData_BPAACTIONMODAL", applicationData);
-  console.log("workflowDetails_BPAACTIONMODAL", workflowDetails);
+  const uniqueRoles = [...new Set(workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : (_workflowDetails$data2 = _workflowDetails$data.initialActionState) === null || _workflowDetails$data2 === void 0 ? void 0 : (_workflowDetails$data3 = _workflowDetails$data2.nextActions) === null || _workflowDetails$data3 === void 0 ? void 0 : (_workflowDetails$data4 = _workflowDetails$data3.find(ele => (ele === null || ele === void 0 ? void 0 : ele.action) === (action === null || action === void 0 ? void 0 : action.action))) === null || _workflowDetails$data4 === void 0 ? void 0 : (_workflowDetails$data5 = _workflowDetails$data4.actions) === null || _workflowDetails$data5 === void 0 ? void 0 : _workflowDetails$data5.flatMap(e => e.roles || []))];
+  console.log("workflowDetails_BPAACTIONMODAL", workflowDetails, uniqueRoles, action);
   const mutation1 = Digit.Hooks.obps.useObpsAPI((_applicationData = applicationData) !== null && _applicationData !== void 0 && (_applicationData$land = _applicationData.landInfo) !== null && _applicationData$land !== void 0 && (_applicationData$land2 = _applicationData$land.address) !== null && _applicationData$land2 !== void 0 && _applicationData$land2.city ? (_applicationData2 = applicationData) === null || _applicationData2 === void 0 ? void 0 : (_applicationData2$lan = _applicationData2.landInfo) === null || _applicationData2$lan === void 0 ? void 0 : (_applicationData2$lan2 = _applicationData2$lan.address) === null || _applicationData2$lan2 === void 0 ? void 0 : _applicationData2$lan2.city : tenantId, false);
   const {
     data: approverData,
     isLoading: PTALoading
   } = Digit.Hooks.useEmployeeSearch(tenantId, {
-    roles: workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : (_workflowDetails$data2 = _workflowDetails$data.initialActionState) === null || _workflowDetails$data2 === void 0 ? void 0 : (_workflowDetails$data3 = _workflowDetails$data2.nextActions) === null || _workflowDetails$data3 === void 0 ? void 0 : (_workflowDetails$data4 = _workflowDetails$data3.filter(ele => (ele === null || ele === void 0 ? void 0 : ele.action) == (action === null || action === void 0 ? void 0 : action.action))) === null || _workflowDetails$data4 === void 0 ? void 0 : (_workflowDetails$data5 = _workflowDetails$data4[0]) === null || _workflowDetails$data5 === void 0 ? void 0 : (_workflowDetails$data6 = _workflowDetails$data5.assigneeRoles) === null || _workflowDetails$data6 === void 0 ? void 0 : _workflowDetails$data6.map(role => ({
+    roles: uniqueRoles === null || uniqueRoles === void 0 ? void 0 : uniqueRoles.map(role => ({
       code: role
     })),
     isActive: true
   }, {
     enabled: !(action !== null && action !== void 0 && action.isTerminateState)
   });
+  console.log("approverData", approverData);
   const queryClient = useQueryClient();
   const [config, setConfig] = useState({});
   const [defaultValues, setDefaultValues] = useState({});
@@ -29345,10 +29569,11 @@ const ActionModal$4 = ({
   useEffect(() => {
     var _approverData$Employe;
     setApprovers(approverData === null || approverData === void 0 ? void 0 : (_approverData$Employe = approverData.Employees) === null || _approverData$Employe === void 0 ? void 0 : _approverData$Employe.map(employee => {
-      var _employee$user;
+      var _employee$user, _employee$assignments, _employee$assignments2;
       return {
         uuid: employee === null || employee === void 0 ? void 0 : employee.uuid,
-        name: employee === null || employee === void 0 ? void 0 : (_employee$user = employee.user) === null || _employee$user === void 0 ? void 0 : _employee$user.name
+        name: employee === null || employee === void 0 ? void 0 : (_employee$user = employee.user) === null || _employee$user === void 0 ? void 0 : _employee$user.name,
+        designation: employee === null || employee === void 0 ? void 0 : (_employee$assignments = employee.assignments) === null || _employee$assignments === void 0 ? void 0 : (_employee$assignments2 = _employee$assignments[0]) === null || _employee$assignments2 === void 0 ? void 0 : _employee$assignments2.designation
       };
     }));
   }, [approverData]);
@@ -29452,7 +29677,7 @@ const ActionModal$4 = ({
     return result;
   };
   async function submit(data) {
-    var _applicationData3, _applicationData4, _data$comments, _data$comments2, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _workflowDetails$data15, _workflowDetails$data16, _workflowDetails$data17, _workflowDetails$data18, _workflowDetails$data19, _workflowDetails$data20, _applicationData5, _applicationData5$add, _workflowDetails$data21, _workflowDetails$data22, _workflowDetails$data23, _workflowDetails$data24, _workflowDetails$data25, _workflowDetails$data26, _workflowDetails$data27, _workflowDetails$data28, _applicationData6, _applicationData6$add, _applicationData6$add2, _applicationData7, _applicationData7$add, _applicationData7$add2, _applicationData8, _applicationData8$add, _applicationData8$add2, _applicationData9, _applicationData9$add, _applicationData9$add2;
+    var _applicationData3, _applicationData4, _data$comments, _data$comments2, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _workflowDetails$data15, _workflowDetails$data16, _workflowDetails$data17, _workflowDetails$data18, _workflowDetails$data19, _applicationData5, _applicationData5$add, _workflowDetails$data20, _workflowDetails$data21, _workflowDetails$data22, _workflowDetails$data23, _workflowDetails$data24, _workflowDetails$data25, _workflowDetails$data26, _workflowDetails$data27, _applicationData6, _applicationData6$add, _applicationData6$add2, _applicationData7, _applicationData7$add, _applicationData7$add2, _applicationData8, _applicationData8$add, _applicationData8$add2, _applicationData9, _applicationData9$add, _applicationData9$add2;
     applicationData = {
       ...applicationData,
       documents: (_applicationData3 = applicationData) === null || _applicationData3 === void 0 ? void 0 : _applicationData3.documents,
@@ -29464,10 +29689,10 @@ const ActionModal$4 = ({
       },
       workflow: {
         action: action === null || action === void 0 ? void 0 : action.action,
-        comment: (data === null || data === void 0 ? void 0 : (_data$comments = data.comments) === null || _data$comments === void 0 ? void 0 : _data$comments.length) > 0 ? data === null || data === void 0 ? void 0 : data.comments : null,
-        comments: (data === null || data === void 0 ? void 0 : (_data$comments2 = data.comments) === null || _data$comments2 === void 0 ? void 0 : _data$comments2.length) > 0 ? data === null || data === void 0 ? void 0 : data.comments : null,
-        assignee: (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data7 = workflowDetails.data) === null || _workflowDetails$data7 === void 0 ? void 0 : (_workflowDetails$data8 = _workflowDetails$data7.processInstances) === null || _workflowDetails$data8 === void 0 ? void 0 : (_workflowDetails$data9 = _workflowDetails$data8[0]) === null || _workflowDetails$data9 === void 0 ? void 0 : (_workflowDetails$data0 = _workflowDetails$data9.state) === null || _workflowDetails$data0 === void 0 ? void 0 : _workflowDetails$data0.applicationStatus) === "FIELDINSPECTION_INPROGRESS" ? [workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data1 = workflowDetails.data) === null || _workflowDetails$data1 === void 0 ? void 0 : (_workflowDetails$data10 = _workflowDetails$data1.processInstances) === null || _workflowDetails$data10 === void 0 ? void 0 : (_workflowDetails$data11 = _workflowDetails$data10[0]) === null || _workflowDetails$data11 === void 0 ? void 0 : (_workflowDetails$data12 = _workflowDetails$data11.assigner) === null || _workflowDetails$data12 === void 0 ? void 0 : _workflowDetails$data12.uuid] : !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? null : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
-        assignes: (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data13 = workflowDetails.data) === null || _workflowDetails$data13 === void 0 ? void 0 : (_workflowDetails$data14 = _workflowDetails$data13.processInstances) === null || _workflowDetails$data14 === void 0 ? void 0 : (_workflowDetails$data15 = _workflowDetails$data14[0]) === null || _workflowDetails$data15 === void 0 ? void 0 : (_workflowDetails$data16 = _workflowDetails$data15.state) === null || _workflowDetails$data16 === void 0 ? void 0 : _workflowDetails$data16.applicationStatus) === "FIELDINSPECTION_INPROGRESS" ? [workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data17 = workflowDetails.data) === null || _workflowDetails$data17 === void 0 ? void 0 : (_workflowDetails$data18 = _workflowDetails$data17.processInstances) === null || _workflowDetails$data18 === void 0 ? void 0 : (_workflowDetails$data19 = _workflowDetails$data18[0]) === null || _workflowDetails$data19 === void 0 ? void 0 : (_workflowDetails$data20 = _workflowDetails$data19.assigner) === null || _workflowDetails$data20 === void 0 ? void 0 : _workflowDetails$data20.uuid] : !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? null : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
+        comment: (data === null || data === void 0 ? void 0 : (_data$comments = data.comments) === null || _data$comments === void 0 ? void 0 : _data$comments.length) > 0 ? selectedBlockReason !== null && selectedBlockReason !== void 0 && selectedBlockReason.name ? (selectedBlockReason === null || selectedBlockReason === void 0 ? void 0 : selectedBlockReason.name) + " - " + (data === null || data === void 0 ? void 0 : data.comments) : data === null || data === void 0 ? void 0 : data.comments : null,
+        comments: (data === null || data === void 0 ? void 0 : (_data$comments2 = data.comments) === null || _data$comments2 === void 0 ? void 0 : _data$comments2.length) > 0 ? selectedBlockReason !== null && selectedBlockReason !== void 0 && selectedBlockReason.name ? (selectedBlockReason === null || selectedBlockReason === void 0 ? void 0 : selectedBlockReason.name) + " - " + (data === null || data === void 0 ? void 0 : data.comments) : data === null || data === void 0 ? void 0 : data.comments : null,
+        assignee: (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data6 = workflowDetails.data) === null || _workflowDetails$data6 === void 0 ? void 0 : (_workflowDetails$data7 = _workflowDetails$data6.processInstances) === null || _workflowDetails$data7 === void 0 ? void 0 : (_workflowDetails$data8 = _workflowDetails$data7[0]) === null || _workflowDetails$data8 === void 0 ? void 0 : (_workflowDetails$data9 = _workflowDetails$data8.state) === null || _workflowDetails$data9 === void 0 ? void 0 : _workflowDetails$data9.applicationStatus) === "FIELDINSPECTION_INPROGRESS" ? [workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data0 = workflowDetails.data) === null || _workflowDetails$data0 === void 0 ? void 0 : (_workflowDetails$data1 = _workflowDetails$data0.processInstances) === null || _workflowDetails$data1 === void 0 ? void 0 : (_workflowDetails$data10 = _workflowDetails$data1[0]) === null || _workflowDetails$data10 === void 0 ? void 0 : (_workflowDetails$data11 = _workflowDetails$data10.assigner) === null || _workflowDetails$data11 === void 0 ? void 0 : _workflowDetails$data11.uuid] : !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? null : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
+        assignes: (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data12 = workflowDetails.data) === null || _workflowDetails$data12 === void 0 ? void 0 : (_workflowDetails$data13 = _workflowDetails$data12.processInstances) === null || _workflowDetails$data13 === void 0 ? void 0 : (_workflowDetails$data14 = _workflowDetails$data13[0]) === null || _workflowDetails$data14 === void 0 ? void 0 : (_workflowDetails$data15 = _workflowDetails$data14.state) === null || _workflowDetails$data15 === void 0 ? void 0 : _workflowDetails$data15.applicationStatus) === "FIELDINSPECTION_INPROGRESS" ? [workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data16 = workflowDetails.data) === null || _workflowDetails$data16 === void 0 ? void 0 : (_workflowDetails$data17 = _workflowDetails$data16.processInstances) === null || _workflowDetails$data17 === void 0 ? void 0 : (_workflowDetails$data18 = _workflowDetails$data17[0]) === null || _workflowDetails$data18 === void 0 ? void 0 : (_workflowDetails$data19 = _workflowDetails$data18.assigner) === null || _workflowDetails$data19 === void 0 ? void 0 : _workflowDetails$data19.uuid] : !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? null : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
         varificationDocuments: uploadedFile ? [{
           documentType: (action === null || action === void 0 ? void 0 : action.action) + " DOC",
           fileName: file === null || file === void 0 ? void 0 : file.name,
@@ -29477,7 +29702,7 @@ const ActionModal$4 = ({
       action: action === null || action === void 0 ? void 0 : action.action,
       riskType: (_applicationData5 = applicationData) === null || _applicationData5 === void 0 ? void 0 : (_applicationData5$add = _applicationData5.additionalDetails) === null || _applicationData5$add === void 0 ? void 0 : _applicationData5$add.riskType,
       comment: data === null || data === void 0 ? void 0 : data.comments,
-      assignee: (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data21 = workflowDetails.data) === null || _workflowDetails$data21 === void 0 ? void 0 : (_workflowDetails$data22 = _workflowDetails$data21.processInstances) === null || _workflowDetails$data22 === void 0 ? void 0 : (_workflowDetails$data23 = _workflowDetails$data22[0]) === null || _workflowDetails$data23 === void 0 ? void 0 : (_workflowDetails$data24 = _workflowDetails$data23.state) === null || _workflowDetails$data24 === void 0 ? void 0 : _workflowDetails$data24.applicationStatus) === "FIELDINSPECTION_INPROGRESS" ? [workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data25 = workflowDetails.data) === null || _workflowDetails$data25 === void 0 ? void 0 : (_workflowDetails$data26 = _workflowDetails$data25.processInstances) === null || _workflowDetails$data26 === void 0 ? void 0 : (_workflowDetails$data27 = _workflowDetails$data26[0]) === null || _workflowDetails$data27 === void 0 ? void 0 : (_workflowDetails$data28 = _workflowDetails$data27.assigner) === null || _workflowDetails$data28 === void 0 ? void 0 : _workflowDetails$data28.uuid] : !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? null : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
+      assignee: (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data20 = workflowDetails.data) === null || _workflowDetails$data20 === void 0 ? void 0 : (_workflowDetails$data21 = _workflowDetails$data20.processInstances) === null || _workflowDetails$data21 === void 0 ? void 0 : (_workflowDetails$data22 = _workflowDetails$data21[0]) === null || _workflowDetails$data22 === void 0 ? void 0 : (_workflowDetails$data23 = _workflowDetails$data22.state) === null || _workflowDetails$data23 === void 0 ? void 0 : _workflowDetails$data23.applicationStatus) === "FIELDINSPECTION_INPROGRESS" ? [workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data24 = workflowDetails.data) === null || _workflowDetails$data24 === void 0 ? void 0 : (_workflowDetails$data25 = _workflowDetails$data24.processInstances) === null || _workflowDetails$data25 === void 0 ? void 0 : (_workflowDetails$data26 = _workflowDetails$data25[0]) === null || _workflowDetails$data26 === void 0 ? void 0 : (_workflowDetails$data27 = _workflowDetails$data26.assigner) === null || _workflowDetails$data27 === void 0 ? void 0 : _workflowDetails$data27.uuid] : !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? null : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
       wfDocuments: uploadedFile ? [{
         documentType: (action === null || action === void 0 ? void 0 : action.action) + " DOC",
         fileName: file === null || file === void 0 ? void 0 : file.name,
@@ -36190,7 +36415,7 @@ const BpaApplicationDetail$1 = () => {
     window.open(thumbnailsToShow === null || thumbnailsToShow === void 0 ? void 0 : (_thumbnailsToShow$ful = thumbnailsToShow.fullImage) === null || _thumbnailsToShow$ful === void 0 ? void 0 : _thumbnailsToShow$ful[0], "_blank");
   }
   const getTimelineCaptions = (checkpoint, index = 0, timeline) => {
-    var _checkpoint$assignes, _checkpoint$assignes$, _checkpoint$auditDeta, _checkpoint$assignes2, _checkpoint$assignes3;
+    var _checkpoint$assignes, _checkpoint$assignes$, _checkpoint$auditDeta, _checkpoint$auditDeta2, _checkpoint$assignes2, _checkpoint$assignes3;
     const privacy = {
       uuid: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$assignes = checkpoint.assignes) === null || _checkpoint$assignes === void 0 ? void 0 : (_checkpoint$assignes$ = _checkpoint$assignes[0]) === null || _checkpoint$assignes$ === void 0 ? void 0 : _checkpoint$assignes$.uuid,
       fieldName: "mobileNumber",
@@ -36215,7 +36440,7 @@ const BpaApplicationDetail$1 = () => {
     };
     const previousCheckpoint = timeline === null || timeline === void 0 ? void 0 : timeline[index - 1];
     const caption = {
-      date: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$auditDeta = checkpoint.auditDetails) === null || _checkpoint$auditDeta === void 0 ? void 0 : _checkpoint$auditDeta.lastModified,
+      date: (checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$auditDeta = checkpoint.auditDetails) === null || _checkpoint$auditDeta === void 0 ? void 0 : _checkpoint$auditDeta.lastModified) + " " + (checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$auditDeta2 = checkpoint.auditDetails) === null || _checkpoint$auditDeta2 === void 0 ? void 0 : _checkpoint$auditDeta2.timing),
       name: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$assignes2 = checkpoint.assignes) === null || _checkpoint$assignes2 === void 0 ? void 0 : (_checkpoint$assignes3 = _checkpoint$assignes2[0]) === null || _checkpoint$assignes3 === void 0 ? void 0 : _checkpoint$assignes3.name,
       comment: t(checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.comment),
       wfComment: previousCheckpoint ? previousCheckpoint === null || previousCheckpoint === void 0 ? void 0 : previousCheckpoint.wfComment : [],
@@ -36677,7 +36902,7 @@ const BpaApplicationDetail$1 = () => {
     isCompleted: true,
     label: t(`${timelineStatusPrefix}${workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data45 = workflowDetails.data) === null || _workflowDetails$data45 === void 0 ? void 0 : (_workflowDetails$data46 = _workflowDetails$data45.timeline[0]) === null || _workflowDetails$data46 === void 0 ? void 0 : _workflowDetails$data46.state}`),
     customChild: getTimelineCaptions(workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data47 = workflowDetails.data) === null || _workflowDetails$data47 === void 0 ? void 0 : _workflowDetails$data47.timeline[0], workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data48 = workflowDetails.data) === null || _workflowDetails$data48 === void 0 ? void 0 : _workflowDetails$data48.timeline)
-  }) : /*#__PURE__*/React.createElement(ConnectingCheckPoints, null, (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data49 = workflowDetails.data) === null || _workflowDetails$data49 === void 0 ? void 0 : _workflowDetails$data49.timeline) && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data50 = workflowDetails.data) === null || _workflowDetails$data50 === void 0 ? void 0 : _workflowDetails$data50.timeline.slice(0, showAllTimeline ? workflowDetails === null || workflowDetails === void 0 ? void 0 : workflowDetails.data.timeline.length : 2).map((checkpoint, index, arr) => {
+  }) : /*#__PURE__*/React.createElement(ConnectingCheckPoints, null, (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data49 = workflowDetails.data) === null || _workflowDetails$data49 === void 0 ? void 0 : _workflowDetails$data49.timeline) && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data50 = workflowDetails.data) === null || _workflowDetails$data50 === void 0 ? void 0 : _workflowDetails$data50.timeline.slice(0, showAllTimeline ? workflowDetails === null || workflowDetails === void 0 ? void 0 : workflowDetails.data.timeline.length : 2).filter(item => (item === null || item === void 0 ? void 0 : item.performedAction) !== "SAVE_AS_DRAFT").map((checkpoint, index, arr) => {
     var _workflowDetails$data57;
     let timelineStatusPostfix = "";
     if (window.location.href.includes("/obps/")) {
@@ -36810,7 +37035,13 @@ const Architectconcent = ({
   const area = (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea19 = currentStepData.createdResponse) === null || _currentStepData$crea19 === void 0 ? void 0 : (_currentStepData$crea20 = _currentStepData$crea19.additionalDetails) === null || _currentStepData$crea20 === void 0 ? void 0 : _currentStepData$crea20.area) || "";
   const zone = (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea21 = currentStepData.createdResponse) === null || _currentStepData$crea21 === void 0 ? void 0 : (_currentStepData$crea22 = _currentStepData$crea21.additionalDetails) === null || _currentStepData$crea22 === void 0 ? void 0 : _currentStepData$crea22.zonenumber) || "";
   const TimeStamp = otpVerifiedTimestamp || (params === null || params === void 0 ? void 0 : (_params$additionalDet = params.additionalDetails) === null || _params$additionalDet === void 0 ? void 0 : _params$additionalDet.TimeStamp) || "";
-  const DateOnly = TimeStamp ? new Date(TimeStamp).toISOString().split("T")[0] : "";
+  const DateOnly = TimeStamp ? (() => {
+    const d = new Date(TimeStamp);
+    const month = String(d.getMonth() + 1).padStart(2, "0");
+    const day = String(d.getDate()).padStart(2, "0");
+    const year = d.getFullYear();
+    return `${day}/${month}/${year}`;
+  })() : "";
   const isArchitectDeclared = sessionStorage.getItem("ArchitectConsentdocFilestoreid");
   console.log(params, "PARAM");
   useEffect(() => {
@@ -38151,7 +38382,7 @@ const Urls = {
   },
   challangeneration: {
     search: "/echallan-services/eChallan/v1/_search",
-    create: "/echallan-services/eChallan/v1/_create?",
+    create: "/challan-services/Challan/v1/_create",
     fetch_bill: "/billing-service/bill/v2/_fetchbill?",
     search_bill: "/egov-searcher/bill-genie/mcollectbills/_get",
     search_bill_pt: "/egov-searcher/bill-genie/billswithaddranduser/_get",
@@ -49019,7 +49250,7 @@ const SummaryDetails = ({
   currentStepData,
   onGoBack
 }) => {
-  var _user$info, _currentStepData$crea12, _currentStepData$crea33, _currentStepData$crea36, _currentStepData$crea37, _currentStepData$crea38, _currentStepData$crea39, _currentStepData$crea40, _pdfDetails$pdfFiles, _user$info4, _user$info5, _currentStepData$crea41, _currentStepData$crea42, _user$info6, _user$info6$roles, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _currentStepData$crea58, _currentStepData$crea61, _currentStepData$crea62, _currentStepData$crea63, _currentStepData$Basi, _currentStepData$Basi2, _currentStepData$Basi3, _currentStepData$Basi4, _currentStepData$Basi5, _currentStepData$Basi6, _currentStepData$Basi7, _currentStepData$Basi8, _currentStepData$Basi9, _currentStepData$Basi0, _currentStepData$Basi1, _currentStepData$Basi10, _currentStepData$Basi11, _currentStepData$Basi12, _currentStepData$Basi13, _currentStepData$Basi14, _currentStepData$Basi15, _currentStepData$Basi16, _currentStepData$Basi17, _currentStepData$Basi18, _currentStepData$Basi19, _currentStepData$crea64, _currentStepData$crea65, _currentStepData$crea66, _currentStepData$crea67, _currentStepData$Basi20, _currentStepData$Basi21, _currentStepData$Basi22, _currentStepData$Basi23, _currentStepData$crea68, _currentStepData$crea69, _currentStepData$crea70, _currentStepData$crea71, _currentStepData$Basi24, _currentStepData$Basi25, _currentStepData$Basi26, _currentStepData$Basi27, _currentStepData$Basi28, _currentStepData$Basi29, _currentStepData$Basi32, _currentStepData$Basi33, _currentStepData$Basi36, _currentStepData$Basi37, _currentStepData$Basi38, _currentStepData$Basi39, _currentStepData$Basi40, _currentStepData$Basi41, _currentStepData$Basi42, _currentStepData$Basi43, _currentStepData$Basi44, _currentStepData$Basi45, _currentStepData$Basi46, _currentStepData$Basi47, _currentStepData$Basi48, _currentStepData$Basi49, _currentStepData$Basi50, _currentStepData$Basi51, _currentStepData$Basi52, _currentStepData$Basi53, _currentStepData$Basi54, _currentStepData$Basi55, _currentStepData$Basi56, _currentStepData$Basi57, _currentStepData$Basi58, _currentStepData$Basi59, _currentStepData$Basi60, _currentStepData$Basi61, _currentStepData$Basi62, _currentStepData$Basi63, _currentStepData$Basi64, _currentStepData$Basi65, _currentStepData$Basi66, _currentStepData$Basi67, _currentStepData$Basi68, _currentStepData$Basi69, _currentStepData$Basi70, _currentStepData$Basi71, _currentStepData$Basi72, _currentStepData$Basi73, _currentStepData$Basi74, _currentStepData$Basi75, _currentStepData$Basi76, _currentStepData$Basi77, _currentStepData$Basi78, _currentStepData$Basi79, _currentStepData$Basi80, _currentStepData$Basi81, _currentStepData$Basi82, _currentStepData$Basi83, _currentStepData$Basi84, _currentStepData$Basi85, _currentStepData$Basi86, _currentStepData$Basi87, _currentStepData$Basi88, _currentStepData$Basi89, _currentStepData$Basi90, _currentStepData$Basi91, _currentStepData$Basi92, _currentStepData$Basi93, _currentStepData$Basi94, _currentStepData$Basi95, _currentStepData$Basi100, _currentStepData$Basi101, _currentStepData$Basi102, _currentStepData$Basi103, _currentStepData$Basi104, _currentStepData$Basi105, _currentStepData$Basi106, _currentStepData$Basi107, _currentStepData$crea72, _currentStepData$crea73, _currentStepData$crea74, _currentStepData$crea75, _currentStepData$crea76, _currentStepData$crea77, _currentStepData$crea78, _currentStepData$crea79, _currentStepData$crea80, _currentStepData$Loca, _currentStepData$Loca2, _currentStepData$crea81, _currentStepData$crea82, _currentStepData$crea83, _currentStepData$crea84, _currentStepData$crea85, _currentStepData$crea86, _currentStepData$crea87, _currentStepData$crea88, _currentStepData$crea89, _currentStepData$crea90, _currentStepData$crea91, _currentStepData$crea92, _currentStepData$crea97, _currentStepData$crea98, _currentStepData$crea99, _currentStepData$crea100, _currentStepData$crea101, _currentStepData$crea102, _currentStepData$crea103, _currentStepData$crea104, _currentStepData$crea105, _currentStepData$crea106, _currentStepData$Basi108, _currentStepData$Basi109, _currentStepData$Basi110, _currentStepData$crea107, _currentStepData$crea108, _currentStepData$crea109, _currentStepData$crea110, _currentStepData$crea111, _currentStepData$crea112, _currentStepData$crea113, _currentStepData$crea114, _currentStepData$crea115, _currentStepData$crea116, _currentStepData$crea117, _currentStepData$crea118, _currentStepData$crea119, _currentStepData$crea120, _currentStepData$crea121, _currentStepData$crea122, _currentStepData$crea123, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8;
+  var _user$info, _currentStepData$crea12, _currentStepData$crea33, _currentStepData$crea36, _currentStepData$crea37, _currentStepData$crea38, _currentStepData$crea39, _currentStepData$crea40, _pdfDetails$pdfFiles, _user$info4, _user$info5, _currentStepData$crea41, _currentStepData$crea42, _user$info6, _user$info6$roles, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _currentStepData$crea58, _currentStepData$crea61, _currentStepData$crea62, _currentStepData$crea63, _currentStepData$Basi, _currentStepData$Basi2, _currentStepData$Basi3, _currentStepData$Basi4, _currentStepData$Basi5, _currentStepData$Basi6, _currentStepData$Basi7, _currentStepData$Basi8, _currentStepData$Basi9, _currentStepData$Basi0, _currentStepData$Basi1, _currentStepData$Basi10, _currentStepData$Basi11, _currentStepData$Basi12, _currentStepData$Basi13, _currentStepData$Basi14, _currentStepData$Basi15, _currentStepData$Basi16, _currentStepData$Basi17, _currentStepData$Basi18, _currentStepData$Basi19, _currentStepData$crea64, _currentStepData$crea65, _currentStepData$crea66, _currentStepData$crea67, _currentStepData$Basi20, _currentStepData$Basi21, _currentStepData$Basi22, _currentStepData$Basi23, _currentStepData$crea68, _currentStepData$crea69, _currentStepData$crea70, _currentStepData$crea71, _currentStepData$Basi24, _currentStepData$Basi25, _currentStepData$Basi26, _currentStepData$Basi27, _currentStepData$Basi28, _currentStepData$Basi29, _currentStepData$Basi32, _currentStepData$Basi33, _currentStepData$Basi36, _currentStepData$Basi37, _currentStepData$Basi38, _currentStepData$Basi39, _currentStepData$Basi40, _currentStepData$Basi41, _currentStepData$Basi42, _currentStepData$Basi43, _currentStepData$Basi44, _currentStepData$Basi45, _currentStepData$Basi46, _currentStepData$Basi47, _currentStepData$Basi48, _currentStepData$Basi49, _currentStepData$Basi50, _currentStepData$Basi51, _currentStepData$Basi52, _currentStepData$Basi53, _currentStepData$Basi54, _currentStepData$Basi55, _currentStepData$Basi56, _currentStepData$Basi57, _currentStepData$Basi58, _currentStepData$Basi59, _currentStepData$Basi60, _currentStepData$Basi61, _currentStepData$Basi62, _currentStepData$Basi63, _currentStepData$Basi64, _currentStepData$Basi65, _currentStepData$Basi66, _currentStepData$Basi67, _currentStepData$Basi68, _currentStepData$Basi69, _currentStepData$Basi70, _currentStepData$Basi71, _currentStepData$Basi72, _currentStepData$Basi73, _currentStepData$Basi74, _currentStepData$Basi75, _currentStepData$Basi76, _currentStepData$Basi77, _currentStepData$Basi78, _currentStepData$Basi79, _currentStepData$Basi80, _currentStepData$Basi81, _currentStepData$Basi82, _currentStepData$Basi83, _currentStepData$Basi84, _currentStepData$Basi85, _currentStepData$Basi86, _currentStepData$Basi87, _currentStepData$Basi88, _currentStepData$Basi89, _currentStepData$Basi90, _currentStepData$Basi91, _currentStepData$Basi92, _currentStepData$Basi93, _currentStepData$Basi94, _currentStepData$Basi95, _currentStepData$Basi100, _currentStepData$Basi101, _currentStepData$Basi102, _currentStepData$Basi103, _currentStepData$Basi104, _currentStepData$Basi105, _currentStepData$Basi106, _currentStepData$Basi107, _currentStepData$crea72, _currentStepData$crea73, _currentStepData$crea74, _currentStepData$crea75, _currentStepData$crea76, _currentStepData$crea77, _currentStepData$crea78, _currentStepData$crea79, _currentStepData$crea80, _currentStepData$Loca, _currentStepData$Loca2, _currentStepData$crea81, _currentStepData$crea82, _currentStepData$crea83, _currentStepData$crea84, _currentStepData$crea85, _currentStepData$crea86, _currentStepData$crea87, _currentStepData$crea88, _currentStepData$crea89, _currentStepData$crea90, _currentStepData$crea91, _currentStepData$crea92, _currentStepData$crea97, _currentStepData$crea98, _currentStepData$crea99, _currentStepData$crea100, _currentStepData$crea101, _currentStepData$crea102, _currentStepData$crea103, _currentStepData$crea104, _currentStepData$crea105, _currentStepData$crea106, _currentStepData$Basi108, _currentStepData$Basi109, _currentStepData$Basi110, _currentStepData$crea107, _currentStepData$crea108, _currentStepData$crea109, _currentStepData$crea110, _currentStepData$crea111, _currentStepData$crea112, _currentStepData$crea113, _currentStepData$crea114, _currentStepData$crea115, _currentStepData$crea116, _currentStepData$crea117, _currentStepData$crea118, _currentStepData$crea119, _currentStepData$crea120, _currentStepData$crea121, _currentStepData$crea122, _currentStepData$crea123, _currentStepData$crea124, _currentStepData$crea125, _currentStepData$crea126, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8;
   const {
     t
   } = useTranslation();
@@ -49048,6 +49279,7 @@ const SummaryDetails = ({
     return (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea = currentStepData.createdResponse) === null || _currentStepData$crea === void 0 ? void 0 : (_currentStepData$crea2 = _currentStepData$crea.additionalDetails) === null || _currentStepData$crea2 === void 0 ? void 0 : (_currentStepData$crea3 = _currentStepData$crea2.selfCertificationCharges) === null || _currentStepData$crea3 === void 0 ? void 0 : _currentStepData$crea3.BPA_DEVELOPMENT_CHARGES) || "0";
   });
   const [userSelected, setUser] = useState(null);
+  const [showToast, setShowToast] = useState(null);
   const [otherCharges, setOtherCharges] = useState(() => {
     var _currentStepData$crea4, _currentStepData$crea5, _currentStepData$crea6;
     return (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea4 = currentStepData.createdResponse) === null || _currentStepData$crea4 === void 0 ? void 0 : (_currentStepData$crea5 = _currentStepData$crea4.additionalDetails) === null || _currentStepData$crea5 === void 0 ? void 0 : (_currentStepData$crea6 = _currentStepData$crea5.selfCertificationCharges) === null || _currentStepData$crea6 === void 0 ? void 0 : _currentStepData$crea6.BPA_OTHER_CHARGES) || "0";
@@ -49271,17 +49503,21 @@ const SummaryDetails = ({
     const floors = [];
     let totalBuiltUpArea = 0;
     let totalFloorArea = 0;
+    let totalDeduction = 0;
     block === null || block === void 0 ? void 0 : (_block$building = block.building) === null || _block$building === void 0 ? void 0 : (_block$building$floor = _block$building.floors) === null || _block$building$floor === void 0 ? void 0 : _block$building$floor.forEach(ob => {
-      var _ob$occupancies, _ob$occupancies$, _ob$occupancies2, _ob$occupancies2$, _ob$occupancies3, _ob$occupancies3$;
+      var _ob$occupancies, _ob$occupancies$, _ob$occupancies2, _ob$occupancies2$, _ob$occupancies3, _ob$occupancies3$, _ob$occupancies4, _ob$occupancies4$;
       const builtUp = Number((_ob$occupancies = ob.occupancies) === null || _ob$occupancies === void 0 ? void 0 : (_ob$occupancies$ = _ob$occupancies[0]) === null || _ob$occupancies$ === void 0 ? void 0 : _ob$occupancies$.builtUpArea) || 0;
       const floor = Number((_ob$occupancies2 = ob.occupancies) === null || _ob$occupancies2 === void 0 ? void 0 : (_ob$occupancies2$ = _ob$occupancies2[0]) === null || _ob$occupancies2$ === void 0 ? void 0 : _ob$occupancies2$.floorArea) || 0;
+      const deduction = Number((_ob$occupancies3 = ob.occupancies) === null || _ob$occupancies3 === void 0 ? void 0 : (_ob$occupancies3$ = _ob$occupancies3[0]) === null || _ob$occupancies3$ === void 0 ? void 0 : _ob$occupancies3$.deduction) || 0;
       totalBuiltUpArea += builtUp;
       totalFloorArea += floor;
+      totalDeduction += deduction;
       floors.push({
         Floor: t(`BPA_FLOOR_NAME_${ob.number}`),
         Level: ob.number,
-        Occupancy: t(`${(_ob$occupancies3 = ob.occupancies) === null || _ob$occupancies3 === void 0 ? void 0 : (_ob$occupancies3$ = _ob$occupancies3[0]) === null || _ob$occupancies3$ === void 0 ? void 0 : _ob$occupancies3$.type}`),
+        Occupancy: t(`${(_ob$occupancies4 = ob.occupancies) === null || _ob$occupancies4 === void 0 ? void 0 : (_ob$occupancies4$ = _ob$occupancies4[0]) === null || _ob$occupancies4$ === void 0 ? void 0 : _ob$occupancies4$.type}`),
         BuildupArea: Number(builtUp).toFixed(2),
+        Deduction: Number(deduction).toFixed(2),
         FloorArea: Number(floor).toFixed(2)
       });
     });
@@ -49290,6 +49526,7 @@ const SummaryDetails = ({
       Level: "",
       Occupancy: "",
       BuildupArea: `${Number(totalBuiltUpArea).toFixed(2)} ${t("BPA_SQ_MTRS_LABEL")}`,
+      Deduction: `${Number(totalDeduction).toFixed(2)} ${t("BPA_SQ_MTRS_LABEL")}`,
       FloorArea: `${Number(totalFloorArea).toFixed(2)} ${t("BPA_SQ_MTRS_LABEL")}`
     });
     return floors;
@@ -49306,6 +49543,9 @@ const SummaryDetails = ({
   }, {
     name: "BPA_TABLE_COL_BUILDUPAREA",
     id: "BuildupArea"
+  }, {
+    name: "BPA_TABLE_COL_DEDUCTION",
+    id: "Deduction"
   }, {
     name: "BPA_TABLE_COL_FLOORAREA",
     id: "FloorArea"
@@ -49355,8 +49595,8 @@ const SummaryDetails = ({
     }
   };
   const setdeclarationhandler = e => {
-    console.log("setdeclarationhandler", e);
     if (!isOTPVerified) {
+      console.log("setdeclarationhandler", e, isOTPVerified);
       setShowMobileInput(true);
     } else {
       setAgree(!agree);
@@ -49515,10 +49755,6 @@ const SummaryDetails = ({
   }));
   async function onSubmitCheck(action) {
     var _userInfo$info, _currentStepData$crea43, _currentStepData$crea44, _currentStepData$crea45, _currentStepData$crea46;
-    if (!isArchitectDeclared) {
-      alert(t("Please_declare_and_upload_architect_consent"));
-      return;
-    }
     if (!action) {
       alert(t("Something_went_wrong"));
       return;
@@ -49566,7 +49802,7 @@ const SummaryDetails = ({
           documents,
           workflow: {
             action: workflowAction,
-            assignes: [accountId]
+            assignes: workflowAction === "RESUBMIT" ? [] : [accountId]
           }
         }
       }, tenantId);
@@ -49587,6 +49823,32 @@ const SummaryDetails = ({
   }
   async function onActionSelect(action) {
     console.log("Selected Action", action === null || action === void 0 ? void 0 : action.action);
+    if ((action === null || action === void 0 ? void 0 : action.action) !== "SAVE_AS_DRAFT" && (!agree || !isOTPVerified || !isArchitectDeclared)) {
+      if (!isOTPVerified) {
+        setShowToast({
+          key: "true",
+          error: true,
+          message: t("User OTP Not Verified")
+        });
+        return;
+      }
+      if (!isArchitectDeclared) {
+        setShowToast({
+          key: "true",
+          error: true,
+          message: t("Professinal Undertaking is not Uploaded")
+        });
+        return;
+      }
+      if (!agree) {
+        setShowToast({
+          key: "true",
+          error: true,
+          message: t("Professinal Undertaking is not Agreed")
+        });
+        return;
+      }
+    }
     setIsSubmitting(true);
     try {
       await onSubmitCheck(action === null || action === void 0 ? void 0 : action.action);
@@ -49689,6 +49951,9 @@ const SummaryDetails = ({
   useEffect(() => {
     console.log("ECBCDocs", fileUrls);
   }, [fileUrls]);
+  const closeToast = () => {
+    setShowToast(null);
+  };
   if (apiLoading || isFileLoading) return /*#__PURE__*/React.createElement(Loader, null);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Header, null, t("BPA_STEPPER_SUMMARY_HEADER")), /*#__PURE__*/React.createElement("div", {
     style: {
@@ -50275,7 +50540,7 @@ const SummaryDetails = ({
       border: "1px solid #f0f0f0",
       background: "#fff"
     }
-  }, (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea123 = currentStepData.createdResponse) === null || _currentStepData$crea123 === void 0 ? void 0 : _currentStepData$crea123.status) === "INITIATED" && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("br", null), showMobileInput && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(CardLabel, null, t("BPA_ARCHITECT_MOBILE_NUMBER")), /*#__PURE__*/React.createElement(TextInput, Object.assign({
+  }, ((currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea123 = currentStepData.createdResponse) === null || _currentStepData$crea123 === void 0 ? void 0 : _currentStepData$crea123.status) === "INITIATED" || (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea124 = currentStepData.createdResponse) === null || _currentStepData$crea124 === void 0 ? void 0 : _currentStepData$crea124.status) === "BLOCKED") && /*#__PURE__*/React.createElement(CardHeader, null, t("BPA_Profesion_Consent_Form")), ((currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea125 = currentStepData.createdResponse) === null || _currentStepData$crea125 === void 0 ? void 0 : _currentStepData$crea125.status) === "INITIATED" || (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$crea126 = currentStepData.createdResponse) === null || _currentStepData$crea126 === void 0 ? void 0 : _currentStepData$crea126.status) === "BLOCKED") && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("br", null), showMobileInput && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(CardLabel, null, t("BPA_ARCHITECT_MOBILE_NUMBER")), /*#__PURE__*/React.createElement(TextInput, Object.assign({
     t: t,
     type: "tel",
     isMandatory: true,
@@ -50349,8 +50614,14 @@ const SummaryDetails = ({
     ref: menuRef,
     label: t("WF_TAKE_ACTION"),
     onSubmit: () => setDisplayMenu(!displayMenu),
-    disabled: !agree || !isOTPVerified || isSubmitting || !isArchitectDeclared
-  }))));
+    disabled: isSubmitting
+  }))), showToast && /*#__PURE__*/React.createElement(Toast$1, {
+    error: showToast === null || showToast === void 0 ? void 0 : showToast.error,
+    warning: showToast === null || showToast === void 0 ? void 0 : showToast.warning,
+    label: t(showToast === null || showToast === void 0 ? void 0 : showToast.message),
+    isDleteBtn: true,
+    onClose: closeToast
+  }));
 };
 
 const NewSelfCertificationStepFormEight = ({
@@ -50446,7 +50717,14 @@ const SelfCertificationResponse = props => {
   const selfCertificationCode = pathname.split("/").pop();
   const onSubmit = () => {
     history.push(`/digit-ui/citizen`);
+    window.location.reload();
   };
+  useEffect(() => {
+    window.scrollTo({
+      top: 0,
+      behavior: "smooth"
+    });
+  }, []);
   useEffect(async () => {
     if (selfCertificationCode) {
       try {