@djb25/digit-ui-module-ekyc 1.0.24 → 1.0.26

package/dist/index.modern.js

@@ -1,12 +1,11 @@
 import React, { useRef, useEffect, useMemo, useState, createContext, isValidElement, cloneElement, createElement, useContext, useCallback, useReducer, Fragment } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useHistory, Link, useLocation, useParams, useRouteMatch, Switch, Route, Redirect } from 'react-router-dom';
-import { PersonIcon, EmployeeModuleCard, Loader, Card, InboxLinks, Table, HomeIcon, TextInput, Header, SubmitBar, DetailsCard, FilterForm, FilterFormField, Dropdown, Label, CustomTooltip, CardLabelError, InboxComposer, EditIcon, DeleteIcon, CardHeader, CardText, LabelFieldPair, CardLabel, ActionBar, Modal, Toast, RadioButtons, CardSubHeader, StatusTable, Row, GenericFileIcon, CheckBox, LinkButton, FormStep, UploadFile, VerticalTimeline, Close, Menu, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, ModuleLinksView, CitizenHomeCard, DocumentIcon } from '@djb25/digit-ui-react-components';
+import { PersonIcon, EmployeeModuleCard, Loader, Card, InboxLinks, Table, HomeIcon, TextInput, Header, SubmitBar, DetailsCard, FilterForm, FilterFormField, Dropdown, Label, CustomTooltip, CardLabelError, InboxComposer, EditIcon, DeleteIcon, CardHeader, CardText, LabelFieldPair, CardLabel, ActionBar, Modal, Toast, RadioButtons, CardSubHeader, StatusTable, Row, GenericFileIcon, CheckBox, Menu, LinkButton, UploadFile, FormComposer, VerticalTimeline, Close, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, ModuleLinksView, CitizenHomeCard, DocumentIcon } from '@djb25/digit-ui-react-components';
 import * as Chartjs from 'chart.js/auto';
 import Chartjs__default, { Chart } from 'chart.js/auto';
 import { FaUsers, FaCheckCircle, FaClock, FaExclamationTriangle, FaUserTie, FaChartLine, FaSearch, FaArrowRight, FaMapMarkedAlt, FaArrowLeft } from 'react-icons/fa';
 import { ResponsiveContainer, LineChart, CartesianGrid, XAxis, YAxis, Tooltip, Legend, Line, BarChart, Bar, PieChart, Pie, Cell } from 'recharts';
-import 'react-dom';
 
 const EKYCCard = () => {
   const {
@@ -21,14 +20,11 @@ const EKYCCard = () => {
       link: `/digit-ui/employee/ekyc/dashboard`
     }],
     links: [{
-      label: t("EKYC_DASHBOARD"),
-      link: `/digit-ui/employee/ekyc/dashboard`
+      label: t("CEO_M.F_DOR_FINANCE_VIEW"),
+      link: `/digit-ui/employee/ekyc/ceo-dashboard`
     }, {
       label: t("EKYC_INBOX"),
       link: `/digit-ui/employee/ekyc/inbox`
-    }, {
-      label: t("CEO_M.F_DOR_FINANCE_VIEW"),
-      link: `/digit-ui/employee/ekyc/ceo-dashboard`
     }, {
       label: t("EKYC_ASSIGN"),
       link: `/digit-ui/employee/ekyc/assign`
@@ -323,8 +319,8 @@ const DesktopInbox = ({
     Cell: ({
       row
     }) => {
-      var _row$original5;
-      const ekycStatus = ((_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : _row$original5.ekycstatus) || "NA";
+      var _row$original5, _row$original6;
+      const ekycStatus = ((_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : _row$original5.ekycStatus) || ((_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : _row$original6.ekycstatus) || "NA";
       return /*#__PURE__*/React.createElement("span", {
         className: `ekyc-status-tag ${ekycStatus}`
       }, t(`${ekycStatus}`));
@@ -335,8 +331,8 @@ const DesktopInbox = ({
     Cell: ({
       row
     }) => {
-      var _row$original6, _row$original7;
-      const kno = ((_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : _row$original6.kno) || ((_row$original7 = row.original) === null || _row$original7 === void 0 ? void 0 : _row$original7.applicationNumber) || "NA";
+      var _row$original7, _row$original8;
+      const kno = ((_row$original7 = row.original) === null || _row$original7 === void 0 ? void 0 : _row$original7.kno) || ((_row$original8 = row.original) === null || _row$original8 === void 0 ? void 0 : _row$original8.applicationNumber) || "NA";
       return /*#__PURE__*/React.createElement("span", {
         className: "ekyc-application-link",
         style: {
@@ -1849,8 +1845,8 @@ const useInboxTableConfig = ({
     Cell: ({
       row
     }) => {
-      var _row$original5;
-      const ekycStatus = ((_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : _row$original5.ekycstatus) || "NA";
+      var _row$original5, _row$original6;
+      const ekycStatus = ((_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : _row$original5.ekycStatus) || ((_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : _row$original6.ekycstatus) || "NA";
       return /*#__PURE__*/React.createElement("span", {
         className: `ekyc-status-tag ${ekycStatus}`
       }, t(`${ekycStatus}`));
@@ -1861,8 +1857,8 @@ const useInboxTableConfig = ({
     Cell: ({
       row
     }) => {
-      var _row$original6, _row$original7;
-      const kno = ((_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : _row$original6.kno) || ((_row$original7 = row.original) === null || _row$original7 === void 0 ? void 0 : _row$original7.applicationNumber) || "NA";
+      var _row$original7, _row$original8;
+      const kno = ((_row$original7 = row.original) === null || _row$original7 === void 0 ? void 0 : _row$original7.kno) || ((_row$original8 = row.original) === null || _row$original8 === void 0 ? void 0 : _row$original8.applicationNumber) || "NA";
       return /*#__PURE__*/React.createElement("span", {
         className: "ekyc-application-link",
         style: {
@@ -1888,25 +1884,25 @@ const useInboxTableConfig = ({
     manualPagination: true,
     initSortId: "applicationDate",
     onPageSizeChange: onPageSizeChange,
-    currentPage: Math.floor(offset / limit),
+    currentPage: offset,
     onNextPage: () => {
-      var _formState$tableForm3, _formState$tableForm4;
+      var _formState$tableForm3;
       return dispatch({
         action: "mutateTableForm",
         data: {
           ...formState.tableForm,
-          offset: parseInt((_formState$tableForm3 = formState.tableForm) === null || _formState$tableForm3 === void 0 ? void 0 : _formState$tableForm3.offset) + parseInt((_formState$tableForm4 = formState.tableForm) === null || _formState$tableForm4 === void 0 ? void 0 : _formState$tableForm4.limit)
+          offset: parseInt((_formState$tableForm3 = formState.tableForm) === null || _formState$tableForm3 === void 0 ? void 0 : _formState$tableForm3.offset) + 10
         },
         checkPathName
       });
     },
     onPrevPage: () => {
-      var _formState$tableForm5, _formState$tableForm6;
+      var _formState$tableForm4;
       return dispatch({
         action: "mutateTableForm",
         data: {
           ...formState.tableForm,
-          offset: parseInt((_formState$tableForm5 = formState.tableForm) === null || _formState$tableForm5 === void 0 ? void 0 : _formState$tableForm5.offset) - parseInt((_formState$tableForm6 = formState.tableForm) === null || _formState$tableForm6 === void 0 ? void 0 : _formState$tableForm6.limit)
+          offset: parseInt((_formState$tableForm4 = formState.tableForm) === null || _formState$tableForm4 === void 0 ? void 0 : _formState$tableForm4.offset) - 10
         },
         checkPathName
       });
@@ -1915,17 +1911,14 @@ const useInboxTableConfig = ({
     onSort: onSortingByData,
     totalRecords: totalCount,
     onSearch: formState === null || formState === void 0 ? void 0 : (_formState$searchForm = formState.searchForm) === null || _formState$searchForm === void 0 ? void 0 : _formState$searchForm.message,
-    onLastPage: () => {
-      var _formState$tableForm7;
-      return dispatch({
-        action: "mutateTableForm",
-        data: {
-          ...formState.tableForm,
-          offset: Math.ceil(totalCount / 10) * 10 - parseInt((_formState$tableForm7 = formState.tableForm) === null || _formState$tableForm7 === void 0 ? void 0 : _formState$tableForm7.limit)
-        },
-        checkPathName
-      });
-    },
+    onLastPage: () => dispatch({
+      action: "mutateTableForm",
+      data: {
+        ...formState.tableForm,
+        offset: Math.max(0, Math.ceil(totalCount / limit) - 10)
+      },
+      checkPathName
+    }),
     onFirstPage: () => dispatch({
       action: "mutateTableForm",
       data: {
@@ -2192,16 +2185,16 @@ const SearchFormFieldsComponents = ({
     className: "mobile-input"
   }, /*#__PURE__*/React.createElement(Label, {
     className: "flex-roww flex-gap-2"
-  }, t("EKYC_MOBILE_NUMBER") || "Mobile Number", /*#__PURE__*/React.createElement(CustomTooltip, {
+  }, t("EKYC_K.NUMBER") || "K Number", /*#__PURE__*/React.createElement(CustomTooltip, {
     message: t("EKYC_MOBILE_NUMBER_MESSAGE")
   })), /*#__PURE__*/React.createElement(Controller, {
-    name: "mobileNumber",
+    name: "kNumber",
     control: controlSearchForm,
     defaultValue: "",
     rules: {
       pattern: {
         value: /^[0-9]{10}$/,
-        message: t("ERR_INVALID_MOBILE_NO")
+        message: t("ERR_INVALID_KNO")
       }
     },
     render: ({
@@ -2211,7 +2204,7 @@ const SearchFormFieldsComponents = ({
       value: value || "",
       onChange: e => onChange(e.target.value)
     })
-  }), (errors === null || errors === void 0 ? void 0 : errors.mobileNumber) && /*#__PURE__*/React.createElement(CardLabelError, null, errors.mobileNumber.message)));
+  }), (errors === null || errors === void 0 ? void 0 : errors.kNumber) && /*#__PURE__*/React.createElement(CardLabelError, null, errors.kNumber.message)));
 };
 
 const Inbox = ({
@@ -2236,7 +2229,13 @@ const Inbox = ({
   };
   const [formState, dispatch] = useReducer(formReducer, formInitValue);
   const filters = useMemo(() => {
-    return (formState === null || formState === void 0 ? void 0 : formState.searchForm) || {};
+    const searchForm = (formState === null || formState === void 0 ? void 0 : formState.searchForm) || {};
+    return {
+      ...searchForm,
+      ...(searchForm.kNumber && {
+        kno: searchForm.kNumber
+      })
+    };
   }, [formState === null || formState === void 0 ? void 0 : formState.searchForm]);
   const queryParams = useMemo(() => {
     var _formState$tableForm, _formState$tableForm2;
@@ -2282,7 +2281,7 @@ const Inbox = ({
     return (sourceData || []).map(item => {
       const isSearchItem = !!item.connectionDetails;
       if (isSearchItem) {
-        var _item$propertyInfo, _item$propertyInfo2, _item$connectionDetai, _item$propertyInfo3, _item$connectionDetai2, _item$connectionDetai3;
+        var _item$propertyInfo, _item$propertyInfo2, _item$connectionDetai, _item$propertyInfo3, _item$connectionDetai2, _item$connectionDetai3, _item$connectionDetai4, _item$connectionDetai5;
         return {
           applicationNo: ((_item$propertyInfo = item.propertyInfo) === null || _item$propertyInfo === void 0 ? void 0 : _item$propertyInfo.kno) || "",
           connectionNo: ((_item$propertyInfo2 = item.propertyInfo) === null || _item$propertyInfo2 === void 0 ? void 0 : _item$propertyInfo2.kno) || "",
@@ -2290,6 +2289,7 @@ const Inbox = ({
           applicationNumber: ((_item$propertyInfo3 = item.propertyInfo) === null || _item$propertyInfo3 === void 0 ? void 0 : _item$propertyInfo3.kno) || "",
           citizenName: ((_item$connectionDetai2 = item.connectionDetails) === null || _item$connectionDetai2 === void 0 ? void 0 : _item$connectionDetai2.consumerName) || "",
           status: ((_item$connectionDetai3 = item.connectionDetails) === null || _item$connectionDetai3 === void 0 ? void 0 : _item$connectionDetai3.statusflag) || "",
+          ekycStatus: ((_item$connectionDetai4 = item.connectionDetails) === null || _item$connectionDetai4 === void 0 ? void 0 : _item$connectionDetai4.ekycStatus) || ((_item$connectionDetai5 = item.connectionDetails) === null || _item$connectionDetai5 === void 0 ? void 0 : _item$connectionDetai5.ekycstatus) || item.ekycStatus || item.ekycstatus || "NA",
           sla: 0
         };
       }
@@ -2302,15 +2302,13 @@ const Inbox = ({
         applicationNumber: item.kno || item.applicationNumber || "",
         citizenName: fullName || item.consumerName || item.citizenName || "",
         status: item.status || "",
+        ekycStatus: item.ekycStatus || item.ekycstatus || "NA",
         sla: item.sla ?? 0
       };
     });
   }, [sourceData]);
   const totalRecords = (listData === null || listData === void 0 ? void 0 : listData.totalCount) || 0;
   const checkPathName = location.pathname.includes("ekyc/inbox");
-  const PropsForInboxLinks = {
-    headerText: checkPathName ? "EKYC_MODULE" : "MODULE_SW"
-  };
   const SearchFormFields = useCallback(({
     registerRef,
     searchFormState,
@@ -2344,12 +2342,12 @@ const Inbox = ({
     });
   };
   const searchFormDefaultValues = {
-    mobileNumber: "",
+    kNumber: "",
     applicationNumber: "",
     consumerNo: ""
   };
   const onSearchFormReset = setSearchFormValue => {
-    setSearchFormValue("mobileNumber", null);
+    setSearchFormValue("kNumber", null);
     setSearchFormValue("applicationNumber", null);
     setSearchFormValue("consumerNo", null);
     dispatch({
@@ -2371,13 +2369,6 @@ const Inbox = ({
     setFilterFormValue,
     getFilterFormValue
   }) => /*#__PURE__*/React.createElement(React.Fragment, null), []);
-  const propsForFilterForm = {
-    FilterFormFields,
-    onFilterFormSubmit: () => {},
-    filterFormDefaultValues: "",
-    resetFilterFormDefaultValues: "",
-    onFilterFormReset: () => {}
-  };
   function formReducer(state, payload) {
     const storageKey = payload.checkPathName ? "EKYC.INBOX" : "EKYC.SW.INBOX";
     switch (payload.action) {
@@ -2469,9 +2460,8 @@ const Inbox = ({
   return /*#__PURE__*/React.createElement("div", {
     className: "app-container"
   }, /*#__PURE__*/React.createElement(InboxComposer, _extends({
-    isInboxLoading,
-    PropsForInboxLinks
-  }, propsForSearchForm, propsForFilterForm, {
+    isInboxLoading
+  }, propsForSearchForm, {
     propsForInboxTable,
     formState,
     countData: listData
@@ -3228,7 +3218,6 @@ const boolToYesNo = (value, t) => {
   if (value === false || value === "false" || String(value).toLowerCase() === "no") return t("CORE_COMMON_NO");
   if (value === "true") return t("CORE_COMMON_YES");
   if (value === "false") return t("CORE_COMMON_NO");
-  return "N/A";
 };
 const extractReviewData = (searchData, flowState) => {
   const rawData = searchData && Object.keys(searchData).length > 0 ? searchData : (flowState === null || flowState === void 0 ? void 0 : flowState.reviewData) || {};
@@ -3377,6 +3366,17 @@ const Review = () => {
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [showPreview, setShowPreview] = useState(false);
   const [previewUrl, setPreviewUrl] = useState("");
+  const [showOptions, setShowOptions] = useState(false);
+  const [showToast, setShowToast] = useState(false);
+  const [toastData, setToastData] = useState({
+    error: false,
+    label: ""
+  });
+  const options = [{
+    action: t("Approve")
+  }, {
+    action: t("Reject")
+  }];
   const flowState = location.state || {};
   const {
     edits = {}
@@ -3655,6 +3655,7 @@ const Review = () => {
         apiId: "Rainmaker",
         ver: "1.0",
         msgId: "message-id",
+        tenantId: tenantId,
         authToken: (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.access_token
       },
       kno: activeKno,
@@ -3682,6 +3683,7 @@ const Review = () => {
         apiId: "Rainmaker",
         ver: "1.0",
         msgId: "message-id",
+        tenantId: tenantId,
         authToken: (_Digit$UserService$ge4 = Digit.UserService.getUser()) === null || _Digit$UserService$ge4 === void 0 ? void 0 : _Digit$UserService$ge4.access_token
       },
       kno: activeKno,
@@ -3693,13 +3695,23 @@ const Review = () => {
     try {
       const result = await workflowMutation.mutateAsync(payload);
       if (result) {
-        history.push("/digit-ui/employee/ekyc/response", {
-          success: true,
-          result
+        setToastData({
+          error: false,
+          label: t("EKYC_APPLICATION_APPROVE_SUCCESSFUL") || "Application Approved Successfully"
         });
+        setShowToast(true);
+        setTimeout(() => {
+          history.push("/digit-ui/employee/ekyc/inbox");
+        }, 2000);
       }
     } catch (err) {
+      var _err$response, _err$response$data;
       console.error("Approve Error:", err);
+      setToastData({
+        error: true,
+        label: (err === null || err === void 0 ? void 0 : err.message) || (err === null || err === void 0 ? void 0 : (_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : _err$response$data.message) || "Approve Error"
+      });
+      setShowToast(true);
     }
   };
   const handleViewDocument = fileStoreId => {
@@ -3708,6 +3720,14 @@ const Review = () => {
     setPreviewUrl(documentUrl);
     setShowPreview(true);
   };
+  const handleMenuSelect = option => {
+    setShowOptions(false);
+    if (option.action === t("Approve")) {
+      handleApprove();
+    } else if (option.action === t("Reject")) {
+      handleReject();
+    }
+  };
   if (isSearchLoading || isSubmitting) return /*#__PURE__*/React.createElement(Loader, null);
   const baseUrl = "/digit-ui/employee/ekyc";
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Card, {
@@ -3718,9 +3738,11 @@ const Review = () => {
     newData: connectionData,
     oldData: oldDataRaw === null || oldDataRaw === void 0 ? void 0 : oldDataRaw.connection,
     t: t,
-    jumpTo: `${baseUrl}/consumer-details`,
+    jumpTo: `${baseUrl}/consumer-details?kno=${kno}`,
     state: {
       ...flowState,
+      kNumber: kno,
+      kno,
       reviewData: searchData,
       edits
     }
@@ -3730,9 +3752,11 @@ const Review = () => {
     newData: addressData,
     oldData: oldDataRaw === null || oldDataRaw === void 0 ? void 0 : oldDataRaw.address,
     t: t,
-    jumpTo: `${baseUrl}/address-details`,
+    jumpTo: `${baseUrl}/address-details?kno=${kno}`,
     state: {
       ...flowState,
+      kNumber: kno,
+      kno,
       reviewData: searchData,
       edits
     }
@@ -3742,9 +3766,11 @@ const Review = () => {
     newData: propertyData,
     oldData: oldDataRaw === null || oldDataRaw === void 0 ? void 0 : oldDataRaw.property,
     t: t,
-    jumpTo: `${baseUrl}/property-info`,
+    jumpTo: `${baseUrl}/property-info?kno=${kno}`,
     state: {
       ...flowState,
+      kNumber: kno,
+      kno,
       reviewData: searchData,
       edits
     }
@@ -3754,9 +3780,11 @@ const Review = () => {
     newData: meterData,
     oldData: oldDataRaw === null || oldDataRaw === void 0 ? void 0 : oldDataRaw.meter,
     t: t,
-    jumpTo: `${baseUrl}/meter-details`,
+    jumpTo: `${baseUrl}/meter-details?kno=${kno}`,
     state: {
       ...flowState,
+      kNumber: kno,
+      kno,
       reviewData: searchData,
       edits
     }
@@ -3834,13 +3862,18 @@ const Review = () => {
     onChange: handleDeclaration,
     checked: agree
   })), /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar, {
-    label: t("EKYC_REJECT"),
-    onSubmit: handleReject,
-    disabled: !agree
-  }), /*#__PURE__*/React.createElement(SubmitBar, {
-    label: t("EKYC_APPROVE"),
-    onSubmit: handleApprove,
+    label: t("TAKE_ACTION_FOR_APPROVE_REJECT"),
+    onSubmit: () => setShowOptions(prev => !prev),
     disabled: !agree
+  }), showOptions && /*#__PURE__*/React.createElement(Menu, {
+    options: options,
+    optionKey: "action",
+    t: t,
+    onSelect: handleMenuSelect,
+    style: {
+      color: "#FFFFFF",
+      fontSize: "18px"
+    }
   }))), showPreview && /*#__PURE__*/React.createElement("div", {
     style: {
       position: "fixed",
@@ -3905,26 +3938,346 @@ const Review = () => {
   }, /*#__PURE__*/React.createElement("p", null, t("EKYC_DOCUMENT_PREVIEW_NOT_AVAILABLE")), /*#__PURE__*/React.createElement(LinkButton, {
     label: t("EKYC_OPEN_IN_NEW_TAB"),
     onClick: () => window.open(previewUrl, "_blank")
-  })))));
+  })))), showToast && /*#__PURE__*/React.createElement(Toast, {
+    error: toastData.error,
+    label: toastData.label,
+    onClose: () => setShowToast(false)
+  }));
 };
 
-var QueryClientContext = function () {
-  var context = /*#__PURE__*/React.createContext(undefined);
-  if (typeof window !== 'undefined') {
-    window.ReactQueryClientContext = context;
+const AadhaarVerificationConfig = (t, formData = {}, uploadFile, setDocumentId, documentId) => {
+  var _formData$consumerTyp, _formData$occupantTyp;
+  const consumerType = (formData === null || formData === void 0 ? void 0 : (_formData$consumerTyp = formData.consumerType) === null || _formData$consumerTyp === void 0 ? void 0 : _formData$consumerTyp.name) || (formData === null || formData === void 0 ? void 0 : formData.consumerType);
+  const occupantType = (formData === null || formData === void 0 ? void 0 : (_formData$occupantTyp = formData.occupantType) === null || _formData$occupantTyp === void 0 ? void 0 : _formData$occupantTyp.name) || (formData === null || formData === void 0 ? void 0 : formData.occupantType);
+  const informantIsConsumer = (formData === null || formData === void 0 ? void 0 : formData.informantIsConsumer) ?? true;
+  const fields = [{
+    label: t("Consumer Type"),
+    isMandatory: true,
+    type: "custom",
+    key: "consumerType",
+    populators: {
+      name: "consumerType",
+      component: props => /*#__PURE__*/React.createElement(Dropdown, {
+        option: [{
+          name: "Individual"
+        }, {
+          name: "Govt"
+        }, {
+          name: "Company_Society_Org"
+        }],
+        optionKey: "name",
+        selected: props.value,
+        select: props.onChange
+      })
+    }
+  }, {
+    label: t("Occupant Type"),
+    isMandatory: true,
+    type: "custom",
+    key: "occupantType",
+    populators: {
+      name: "occupantType",
+      component: props => /*#__PURE__*/React.createElement(Dropdown, {
+        option: [{
+          name: "Self"
+        }, {
+          name: "Tenanted"
+        }],
+        optionKey: "name",
+        selected: props.value,
+        select: props.onChange
+      })
+    }
+  }, {
+    label: t("Category Type"),
+    isMandatory: true,
+    type: "custom",
+    key: "categoryType",
+    populators: {
+      name: "categoryType",
+      component: props => /*#__PURE__*/React.createElement(Dropdown, {
+        option: [{
+          name: "Bulk"
+        }, {
+          name: "Non-Bulk"
+        }],
+        optionKey: "name",
+        selected: props.value,
+        select: props.onChange
+      })
+    }
+  }, {
+    label: t("First Name"),
+    isMandatory: true,
+    type: "text",
+    populators: {
+      name: "firstName",
+      validation: {
+        required: true
+      }
+    }
+  }, {
+    label: t("Middle Name"),
+    isMandatory: false,
+    type: "text",
+    populators: {
+      name: "middleName"
+    }
+  }, {
+    label: t("Last Name"),
+    isMandatory: false,
+    type: "text",
+    populators: {
+      name: "lastName"
+    }
+  }, {
+    label: t("Gender"),
+    isMandatory: false,
+    type: "custom",
+    key: "gender",
+    populators: {
+      name: "gender",
+      component: props => /*#__PURE__*/React.createElement(Dropdown, {
+        option: [{
+          name: "Male"
+        }, {
+          name: "Female"
+        }, {
+          name: "Others"
+        }, {
+          name: "Not prefer to say"
+        }],
+        optionKey: "name",
+        selected: props.value,
+        select: props.onChange
+      })
+    }
+  }, {
+    label: t("Parent/Spouse Name"),
+    isMandatory: false,
+    type: "text",
+    populators: {
+      name: "parentSpouseName"
+    }
+  }, {
+    label: t("Mobile"),
+    isMandatory: true,
+    type: "text",
+    populators: {
+      name: "mobile",
+      validation: {
+        required: true,
+        pattern: /^[6-9]\d{9}$/
+      },
+      error: t("Invalid mobile number")
+    }
+  }, {
+    label: t("WhatsApp"),
+    isMandatory: false,
+    type: "text",
+    populators: {
+      name: "whatsapp"
+    }
+  }, {
+    label: t("Email"),
+    isMandatory: false,
+    type: "text",
+    populators: {
+      name: "email",
+      validation: {
+        pattern: /^[a-zA-Z0-9+_.-]+@[a-zA-Z0-9.-]+\.[a-zA-Z0-9.-]+$/
+      },
+      error: t("Invalid email address")
+    }
+  }, {
+    label: t("No. of Residents"),
+    isMandatory: true,
+    type: "text",
+    populators: {
+      name: "residents",
+      validation: {
+        required: true,
+        min: 1
+      }
+    }
+  }, {
+    label: t("Type of Identity"),
+    isMandatory: true,
+    type: "custom",
+    key: "identityType",
+    populators: {
+      name: "identityType",
+      component: props => /*#__PURE__*/React.createElement(Dropdown, {
+        option: [{
+          name: "Aadhaar Card"
+        }, {
+          name: "Driving License"
+        }, {
+          name: "Passport"
+        }, {
+          name: "Voter ID"
+        }],
+        optionKey: "name",
+        selected: props.value,
+        select: props.onChange
+      })
+    }
+  }, {
+    label: t("Proof of Identity"),
+    isMandatory: false,
+    type: "custom",
+    key: "idFile",
+    populators: {
+      name: "idFile",
+      component: props => /*#__PURE__*/React.createElement(UploadFile, {
+        onUpload: e => uploadFile(e, props.onChange),
+        onDelete: () => {
+          props.onChange(null);
+          setDocumentId(null);
+        },
+        message: props.value ? t("Uploaded") : t("No file selected")
+      })
+    }
+  }, {
+    label: t("Document Number"),
+    isMandatory: false,
+    type: "text",
+    populators: {
+      name: "documentNumber"
+    }
+  }, {
+    label: t("Informant Is Consumer"),
+    isMandatory: false,
+    type: "custom",
+    key: "informantIsConsumer",
+    populators: {
+      name: "informantIsConsumer",
+      component: props => /*#__PURE__*/React.createElement(CheckBox, {
+        label: t("Yes, the informant is the consumer"),
+        checked: props.value ?? true,
+        onChange: e => props.onChange(e.target.checked)
+      })
+    }
+  }];
+  if (!informantIsConsumer) {
+    fields.push({
+      label: t("Informant Name"),
+      isMandatory: false,
+      type: "text",
+      populators: {
+        name: "informantName"
+      }
+    }, {
+      label: t("Informant Relation"),
+      isMandatory: false,
+      type: "text",
+      populators: {
+        name: "informantRelation"
+      }
+    });
   }
-  return context;
-}();
-function getQueryClientContext() {
-  var _ref;
-  return typeof window !== 'undefined' ? (_ref = window.ReactQueryClientContext) != null ? _ref : QueryClientContext : QueryClientContext;
-}
-var useQueryClient = function useQueryClient() {
-  var queryClient = React.useContext(getQueryClientContext());
-  if (!queryClient) {
-    throw new Error('No QueryClient set, use QueryClientProvider to set one');
+  if (occupantType === "Tenanted") {
+    fields.push({
+      label: t("Document Proof"),
+      isMandatory: false,
+      type: "custom",
+      key: "documentProof",
+      populators: {
+        name: "documentProof",
+        component: props => /*#__PURE__*/React.createElement(UploadFile, {
+          onUpload: e => uploadFile(e, props.onChange),
+          onDelete: () => {
+            props.onChange(null);
+            setDocumentId(null);
+          },
+          message: props.value ? t("Uploaded") : t("No file selected")
+        })
+      }
+    });
+    if (!documentId) {
+      fields.push({
+        label: t("Owner Mobile"),
+        isMandatory: true,
+        type: "text",
+        populators: {
+          name: "ownerMobile",
+          validation: {
+            required: true,
+            pattern: /^[6-9]\d{9}$/
+          }
+        }
+      }, {
+        label: t("Tenant Verification"),
+        isMandatory: false,
+        type: "text",
+        populators: {
+          name: "tenantVerification"
+        }
+      });
+    }
+  }
+  if (consumerType === "Govt") {
+    fields.push({
+      label: t("Designation"),
+      isMandatory: false,
+      type: "text",
+      populators: {
+        name: "designation"
+      }
+    }, {
+      label: t("Department"),
+      isMandatory: false,
+      type: "text",
+      populators: {
+        name: "department"
+      }
+    }, {
+      label: t("Employee ID"),
+      isMandatory: false,
+      type: "text",
+      populators: {
+        name: "employeeId"
+      }
+    });
+  }
+  if (consumerType === "Company_Society_Org") {
+    fields.push({
+      label: t("Entity Name"),
+      isMandatory: false,
+      type: "text",
+      populators: {
+        name: "entityName"
+      }
+    }, {
+      label: t("Contact Person"),
+      isMandatory: false,
+      type: "text",
+      populators: {
+        name: "contactPerson"
+      }
+    });
   }
-  return queryClient;
+  fields.push({
+    label: t("Consent"),
+    isMandatory: true,
+    type: "custom",
+    key: "consent",
+    populators: {
+      name: "consent",
+      validation: {
+        required: true
+      },
+      component: props => /*#__PURE__*/React.createElement(CheckBox, {
+        label: t("I hereby consent to verify my Aadhaar details."),
+        checked: props.value ?? false,
+        onChange: e => props.onChange(e.target.checked)
+      })
+    }
+  });
+  return [{
+    head: t("EKYC_CONSUMER_CONNECTION"),
+    body: fields
+  }];
 };
 
 const AadhaarVerification = ({
@@ -3932,17 +4285,23 @@ const AadhaarVerification = ({
   onSelect,
   formData
 }) => {
+  const {
+    t
+  } = useTranslation();
   const location = useLocation();
   const flowState = location.state || {};
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const searchKno = (flowState === null || flowState === void 0 ? void 0 : flowState.kNumber) || (flowState === null || flowState === void 0 ? void 0 : flowState.kno) || (formData === null || formData === void 0 ? void 0 : formData.kNumber) || (formData === null || formData === void 0 ? void 0 : formData.kno) || sessionStorage.getItem("EKYC_K_NUMBER");
+  const queryParams = new URLSearchParams(location.search);
+  const urlKno = queryParams.get("kno");
+  const searchKno = urlKno || (flowState === null || flowState === void 0 ? void 0 : flowState.kNumber) || (flowState === null || flowState === void 0 ? void 0 : flowState.kno) || (formData === null || formData === void 0 ? void 0 : formData.kNumber) || (formData === null || formData === void 0 ? void 0 : formData.kno) || sessionStorage.getItem("EKYC_K_NUMBER") || "";
   const {
     isLoading,
     data: searchData
   } = Digit.Hooks.ekyc.useSearchConnection({
     tenantId,
     details: {
-      kno: searchKno
+      kno: searchKno,
+      fetchType: "CONNECTION"
     }
   }, {
     enabled: !!searchKno,
@@ -3950,297 +4309,277 @@ const AadhaarVerification = ({
   });
   const updateMutation = Digit.Hooks.ekyc.useEkycUpdate(tenantId);
   const savedData = (formData === null || formData === void 0 ? void 0 : formData.aadhaarVerification) || {};
-  const [kno, setKno] = useState(savedData.kno || searchKno || "");
-  const [consumerType, setConsumerType] = useState(savedData.consumerType ? {
-    name: savedData.consumerType
-  } : null);
-  const [occupantType, setOccupantType] = useState(savedData.occupantType ? {
-    name: savedData.occupantType
-  } : null);
-  const [categoryType, setCategoryType] = useState(savedData.categoryType ? {
-    name: savedData.categoryType
-  } : null);
-  const [consumerName, setConsumerName] = useState(savedData.consumerName || "");
-  const [firstName, setFirstName] = useState(savedData.firstName || "");
-  const [middleName, setMiddleName] = useState(savedData.middleName || "");
-  const [lastName, setLastName] = useState(savedData.lastName || "");
-  const [gender, setGender] = useState(savedData.gender ? {
-    name: savedData.gender
-  } : null);
-  const [parentSpouseName, setParentSpouseName] = useState(savedData.parentSpouseName || "");
-  const [relation, setRelation] = useState(savedData.relation || "");
-  const [mobile, setMobile] = useState(savedData.mobile || "");
-  const [whatsapp, setWhatsapp] = useState(savedData.whatsapp || "");
-  const [email, setEmail] = useState(savedData.email || "");
-  const [residents, setResidents] = useState(savedData.residents || "");
-  const [documentProof, setDocumentProof] = useState(savedData.documentProof || null);
   const [documentId, setDocumentId] = useState(savedData.documentId || null);
-  const [ownerMobile, setOwnerMobile] = useState(savedData.ownerMobile || "");
-  const [tenantVerification, setTenantVerification] = useState(savedData.tenantVerification || "");
-  const [designation, setDesignation] = useState(savedData.designation || "");
-  const [department, setDepartment] = useState(savedData.department || "");
-  const [employeeId, setEmployeeId] = useState(savedData.employeeId || "");
-  const [landline, setLandline] = useState(savedData.landline || "");
-  const [entityRelation, setEntityRelation] = useState(savedData.entityRelation || "");
-  const [contactPerson, setContactPerson] = useState(savedData.contactPerson || "");
-  const [entityName, setEntityName] = useState(savedData.entityName || "");
-  const [idProof, setIdProof] = useState(savedData.idProof ? {
-    name: savedData.idProof
-  } : null);
-  const [idNumber, setIdNumber] = useState(savedData.idNumber || "");
-  const [documentNumber, setDocumentNumber] = useState(savedData.documentNumber || "");
-  const [identityType, setIdentityType] = useState(savedData.identityType ? {
-    name: savedData.identityType
-  } : null);
-  const [idFile, setIdFile] = useState(savedData.idFile || null);
-  const [consent, setConsent] = useState(savedData.consent || false);
-  const [informantIsConsumer, setInformantIsConsumer] = useState(savedData.informantIsConsumer ?? true);
-  const [informantName, setInformantName] = useState(savedData.informantName || "");
-  const [informantRelation, setInformantRelation] = useState(savedData.informantRelation || "");
+  const [documentProof, setDocumentProof] = useState(savedData.documentProof || null);
   const [toast, setToast] = useState(null);
+  const [isDataLoaded, setIsDataLoaded] = useState(false);
+  const [canSubmit, setCanSubmit] = useState(false);
+  const [defaultValues, setDefaultValues] = useState(() => ({
+    kno: savedData.kno || searchKno || "",
+    consumerType: savedData.consumerType ? {
+      name: savedData.consumerType
+    } : null,
+    occupantType: savedData.occupantType ? {
+      name: savedData.occupantType
+    } : null,
+    categoryType: savedData.categoryType ? {
+      name: savedData.categoryType
+    } : null,
+    firstName: savedData.firstName || "",
+    middleName: savedData.middleName || "",
+    lastName: savedData.lastName || "",
+    gender: savedData.gender ? {
+      name: savedData.gender
+    } : null,
+    parentSpouseName: savedData.parentSpouseName || "",
+    mobile: savedData.mobile || "",
+    whatsapp: savedData.whatsapp || "",
+    email: savedData.email || "",
+    residents: savedData.residents || "",
+    identityType: savedData.identityType ? {
+      name: savedData.identityType
+    } : null,
+    documentNumber: savedData.documentNumber || "",
+    informantIsConsumer: savedData.informantIsConsumer ?? true,
+    informantName: savedData.informantName || "",
+    informantRelation: savedData.informantRelation || "",
+    documentId: savedData.documentId || null,
+    documentProof: savedData.documentProof || null,
+    idFile: savedData.idFile || null,
+    ownerMobile: savedData.ownerMobile || "",
+    tenantVerification: savedData.tenantVerification || "",
+    designation: savedData.designation || "",
+    department: savedData.department || "",
+    employeeId: savedData.employeeId || "",
+    entityName: savedData.entityName || "",
+    contactPerson: savedData.contactPerson || "",
+    consent: savedData.consent || false
+  }));
+  const [localFormData, setLocalFormData] = useState(defaultValues);
+  const extractApplicationData = searchData => {
+    if (!searchData) return null;
+    const reviewWrapper = (searchData === null || searchData === void 0 ? void 0 : searchData.applicationReviewInfo) || (searchData === null || searchData === void 0 ? void 0 : searchData.applicationReview) || searchData;
+    const applicationData = (Array.isArray(reviewWrapper) ? reviewWrapper[0] : reviewWrapper) || {};
+    return (applicationData === null || applicationData === void 0 ? void 0 : applicationData.newData) || applicationData;
+  };
   useEffect(() => {
-    const rawData = searchData || (formData === null || formData === void 0 ? void 0 : formData.connectionDetails);
+    const appData = extractApplicationData(searchData);
+    const rawData = appData || (formData === null || formData === void 0 ? void 0 : formData.connectionDetails);
     const details = (rawData === null || rawData === void 0 ? void 0 : rawData.connectionDetails) || rawData || {};
     const addrDetails = (rawData === null || rawData === void 0 ? void 0 : rawData.addressDetails) || {};
-    if (details && Object.keys(details).length > 0 && !savedData.firstName) {
-      if (!kno && searchKno) setKno(searchKno);
+    if (details && Object.keys(details).length > 0 && !isDataLoaded) {
+      let fName = "";
+      let mName = "";
+      let lName = "";
       if (details.firstName) {
-        setFirstName(details.firstName);
-        if (details.middleName) setMiddleName(details.middleName);
-        if (details.lastName) setLastName(details.lastName);
+        fName = details.firstName;
+        mName = details.middleName || "";
+        lName = details.lastName || "";
       } else if (details.consumerName) {
-        setConsumerName(details.consumerName);
         const parts = details.consumerName.trim().split(/\s+/);
-        setFirstName(parts[0] || "");
-        if (parts.length === 2) setLastName(parts[1]);
+        fName = parts[0] || "";
+        if (parts.length === 2) lName = parts[1];
         if (parts.length > 2) {
-          setMiddleName(parts.slice(1, -1).join(" "));
-          setLastName(parts[parts.length - 1]);
+          mName = parts.slice(1, -1).join(" ");
+          lName = parts[parts.length - 1];
         }
       }
-      if (details.phoneNumber || addrDetails.mobileNo) setMobile(details.phoneNumber || addrDetails.mobileNo);
-      if (details.email || addrDetails.email) setEmail(details.email || addrDetails.email);
-      if (addrDetails.whatsappNo) setWhatsapp(addrDetails.whatsappNo);
-      if (addrDetails.noOfPerson) setResidents(String(addrDetails.noOfPerson));
-      if (details.consumerType) setConsumerType({
-        name: details.consumerType
-      });
-      if (details.occupantType) setOccupantType({
-        name: details.occupantType
-      });
-      if (details.gender) setGender({
-        name: details.gender
-      });
-      if (details.parentSpouse) setParentSpouseName(details.parentSpouse);
-      if (details.documentNumber) {
-        setDocumentId(details.documentNumber);
-        setIdNumber(details.documentNumber);
+      const updatedDefaults = {
+        kno: savedData.kno || searchKno || "",
+        consumerType: savedData.consumerType ? {
+          name: savedData.consumerType
+        } : details.consumerType ? {
+          name: details.consumerType
+        } : null,
+        occupantType: savedData.occupantType ? {
+          name: savedData.occupantType
+        } : details.occupantType ? {
+          name: details.occupantType
+        } : null,
+        categoryType: savedData.categoryType ? {
+          name: savedData.categoryType
+        } : null,
+        firstName: savedData.firstName || fName,
+        middleName: savedData.middleName || mName,
+        lastName: savedData.lastName || lName,
+        gender: savedData.gender ? {
+          name: savedData.gender
+        } : details.gender ? {
+          name: details.gender
+        } : null,
+        parentSpouseName: savedData.parentSpouseName || details.parentSpouse || "",
+        mobile: savedData.mobile || details.phoneNumber || addrDetails.mobileNo || "",
+        whatsapp: savedData.whatsapp || addrDetails.whatsappNo || "",
+        email: savedData.email || details.email || addrDetails.email || "",
+        residents: savedData.residents || (addrDetails.noOfPerson ? String(addrDetails.noOfPerson) : ""),
+        identityType: savedData.identityType ? {
+          name: savedData.identityType
+        } : null,
+        documentNumber: savedData.documentNumber || "",
+        informantIsConsumer: savedData.informantIsConsumer ?? true,
+        informantName: savedData.informantName || details.informantName || "",
+        informantRelation: savedData.informantRelation || details.informantRelation || "",
+        documentId: savedData.documentId || details.documentNumber || null,
+        documentProof: savedData.documentProof || null,
+        idFile: savedData.idFile || null,
+        ownerMobile: savedData.ownerMobile || "",
+        tenantVerification: savedData.tenantVerification || "",
+        designation: savedData.designation || "",
+        department: savedData.department || "",
+        employeeId: savedData.employeeId || "",
+        entityName: savedData.entityName || "",
+        contactPerson: savedData.contactPerson || "",
+        consent: savedData.consent || false
+      };
+      setDefaultValues(updatedDefaults);
+      setLocalFormData(updatedDefaults);
+      if (updatedDefaults.documentId) {
+        setDocumentId(updatedDefaults.documentId);
       }
-      if (details.informantName) setInformantName(details.informantName);
-      if (details.informantRelation) setInformantRelation(details.informantRelation);
+      if (updatedDefaults.documentProof) {
+        setDocumentProof(updatedDefaults.documentProof);
+      }
+      setIsDataLoaded(true);
     }
-  }, [searchData, formData === null || formData === void 0 ? void 0 : formData.connectionDetails, searchKno]);
-  const consumerTypeOptions = [{
-    name: "Individual"
-  }, {
-    name: "Govt"
-  }, {
-    name: "Company_Society_Org"
-  }];
-  const occupantOptions = [{
-    name: "Self"
-  }, {
-    name: "Tenanted"
-  }];
-  const genderOptions = [{
-    name: "Male"
-  }, {
-    name: "Female"
-  }, {
-    name: "Others"
-  }, {
-    name: "Not prefer to say"
-  }];
-  const identityTypeOptions = [{
-    name: "Aadhaar Card"
-  }, {
-    name: "Driving License"
-  }, {
-    name: "Passport"
-  }, {
-    name: "Voter ID"
-  }];
-  const uploadFile = async (e, setter, idSetter) => {
+  }, [searchData, formData === null || formData === void 0 ? void 0 : formData.connectionDetails, isDataLoaded]);
+  const handleUploadProof = async (e, onChange) => {
     const file = e.target.files[0];
     if (!file) return;
+    if (file.size > 2000000) {
+      setToast({
+        type: "error",
+        message: t("Max size 2MB exceeded")
+      });
+      return;
+    }
     try {
       var _res$data, _res$data$files, _res$data$files$;
-      const res = await Digit.UploadServices.Filestorage("EKYC", file);
-      const id = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$files = _res$data.files) === null || _res$data$files === void 0 ? void 0 : (_res$data$files$ = _res$data$files[0]) === null || _res$data$files$ === void 0 ? void 0 : _res$data$files$.fileStoreId;
-      if (id) {
-        setter(file.name);
-        idSetter(id);
+      const res = await Digit.UploadServices.Filestorage("EKYC", file, tenantId);
+      const fileStoreId = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$files = _res$data.files) === null || _res$data$files === void 0 ? void 0 : (_res$data$files$ = _res$data$files[0]) === null || _res$data$files$ === void 0 ? void 0 : _res$data$files$.fileStoreId;
+      if (fileStoreId) {
+        onChange(file.name);
+        setDocumentProof(file.name);
+        setDocumentId(fileStoreId);
+        setToast({
+          type: "success",
+          message: t("Upload successful")
+        });
       }
     } catch {
       setToast({
         type: "error",
-        message: "Upload failed"
+        message: t("Upload failed")
       });
     }
   };
-  const isValid = () => {
-    if (!kno) return false;
-    if (!consumerType) return false;
-    if (!occupantType) return false;
-    if (!categoryType) return false;
-    if (!firstName) return false;
-    if (!mobile) return false;
-    if (!residents || Number(residents) <= 0) return false;
-    if ((occupantType === null || occupantType === void 0 ? void 0 : occupantType.name) === "Tenanted" && !documentId && !ownerMobile) return false;
-    return consent;
+  const onFormValueChange = (setValue, data) => {
+    var _data$consumerType, _localFormData$consum, _data$occupantType, _localFormData$occupa;
+    const consumerTypeChanged = ((data === null || data === void 0 ? void 0 : (_data$consumerType = data.consumerType) === null || _data$consumerType === void 0 ? void 0 : _data$consumerType.name) || (data === null || data === void 0 ? void 0 : data.consumerType)) !== ((localFormData === null || localFormData === void 0 ? void 0 : (_localFormData$consum = localFormData.consumerType) === null || _localFormData$consum === void 0 ? void 0 : _localFormData$consum.name) || (localFormData === null || localFormData === void 0 ? void 0 : localFormData.consumerType));
+    const occupantTypeChanged = ((data === null || data === void 0 ? void 0 : (_data$occupantType = data.occupantType) === null || _data$occupantType === void 0 ? void 0 : _data$occupantType.name) || (data === null || data === void 0 ? void 0 : data.occupantType)) !== ((localFormData === null || localFormData === void 0 ? void 0 : (_localFormData$occupa = localFormData.occupantType) === null || _localFormData$occupa === void 0 ? void 0 : _localFormData$occupa.name) || (localFormData === null || localFormData === void 0 ? void 0 : localFormData.occupantType));
+    const informantIsConsumerChanged = (data === null || data === void 0 ? void 0 : data.informantIsConsumer) !== (localFormData === null || localFormData === void 0 ? void 0 : localFormData.informantIsConsumer);
+    if (consumerTypeChanged || occupantTypeChanged || informantIsConsumerChanged) {
+      setLocalFormData(prev => ({
+        ...prev,
+        ...data
+      }));
+    }
+    const knoVal = (data === null || data === void 0 ? void 0 : data.kno) || searchKno;
+    const consumerTypeVal = data === null || data === void 0 ? void 0 : data.consumerType;
+    const occupantTypeVal = data === null || data === void 0 ? void 0 : data.occupantType;
+    const categoryTypeVal = data === null || data === void 0 ? void 0 : data.categoryType;
+    const firstNameVal = data === null || data === void 0 ? void 0 : data.firstName;
+    const mobileVal = data === null || data === void 0 ? void 0 : data.mobile;
+    const residentsVal = data === null || data === void 0 ? void 0 : data.residents;
+    const consentVal = data === null || data === void 0 ? void 0 : data.consent;
+    const docId = (data === null || data === void 0 ? void 0 : data.documentId) || documentId;
+    const ownerMobileVal = data === null || data === void 0 ? void 0 : data.ownerMobile;
+    let valid = true;
+    if (!knoVal) valid = false;
+    if (!consumerTypeVal) valid = false;
+    if (!occupantTypeVal) valid = false;
+    if (!categoryTypeVal) valid = false;
+    if (!firstNameVal) valid = false;
+    if (!mobileVal || !/^[6-9]\d{9}$/.test(mobileVal)) valid = false;
+    if (!residentsVal || Number(residentsVal) <= 0) valid = false;
+    if ((occupantTypeVal === null || occupantTypeVal === void 0 ? void 0 : occupantTypeVal.name) === "Tenanted" && !docId && !ownerMobileVal) valid = false;
+    if (!consentVal) valid = false;
+    if (valid !== canSubmit) {
+      setCanSubmit(valid);
+    }
   };
-  const onStepSelect = async () => {
-    const data = {
-      kno,
-      consumerType: consumerType === null || consumerType === void 0 ? void 0 : consumerType.name,
-      occupantType: occupantType === null || occupantType === void 0 ? void 0 : occupantType.name,
-      categoryType: categoryType === null || categoryType === void 0 ? void 0 : categoryType.name,
-      consumerName,
-      firstName,
-      middleName,
-      lastName,
-      gender: gender === null || gender === void 0 ? void 0 : gender.name,
-      parentSpouseName,
-      relation,
-      mobile,
-      whatsapp,
-      email,
-      residents,
-      documentId,
-      ownerMobile,
-      tenantVerification,
-      designation,
-      department,
-      employeeId,
-      landline,
-      entityRelation,
-      contactPerson,
-      entityName,
-      idProof: idProof === null || idProof === void 0 ? void 0 : idProof.name,
-      idNumber,
-      consent,
-      informantIsConsumer,
-      informantName,
-      informantRelation
+  const onSubmit = async data => {
+    var _data$consumerType2, _data$occupantType2, _data$categoryType, _data$gender, _data$identityType;
+    const submitData = {
+      kno: data.kno || searchKno,
+      consumerType: ((_data$consumerType2 = data.consumerType) === null || _data$consumerType2 === void 0 ? void 0 : _data$consumerType2.name) || data.consumerType,
+      occupantType: ((_data$occupantType2 = data.occupantType) === null || _data$occupantType2 === void 0 ? void 0 : _data$occupantType2.name) || data.occupantType,
+      categoryType: ((_data$categoryType = data.categoryType) === null || _data$categoryType === void 0 ? void 0 : _data$categoryType.name) || data.categoryType,
+      consumerName: data.consumerName || `${data.firstName || ""} ${data.middleName || ""} ${data.lastName || ""}`.trim(),
+      firstName: data.firstName,
+      middleName: data.middleName,
+      lastName: data.lastName,
+      gender: ((_data$gender = data.gender) === null || _data$gender === void 0 ? void 0 : _data$gender.name) || data.gender,
+      parentSpouseName: data.parentSpouseName,
+      relation: data.relation || savedData.relation || "",
+      mobile: data.mobile,
+      whatsapp: data.whatsapp,
+      email: data.email,
+      residents: data.residents,
+      documentId: documentId,
+      documentProof: documentProof,
+      ownerMobile: data.ownerMobile,
+      tenantVerification: data.tenantVerification,
+      designation: data.designation,
+      department: data.department,
+      employeeId: data.employeeId,
+      landline: data.landline || savedData.landline || "",
+      entityRelation: data.entityRelation || savedData.entityRelation || "",
+      contactPerson: data.contactPerson,
+      entityName: data.entityName,
+      idProof: ((_data$identityType = data.identityType) === null || _data$identityType === void 0 ? void 0 : _data$identityType.name) || data.identityType,
+      idNumber: data.documentNumber,
+      consent: data.consent,
+      informantIsConsumer: data.informantIsConsumer ?? true,
+      informantName: data.informantName,
+      informantRelation: data.informantRelation
     };
     try {
       await updateMutation.mutateAsync({
         RequestInfo: {},
         updateType: "CONSUMER",
-        ...data
+        ...submitData
       });
       setToast({
         type: "success",
-        message: "Data updated successfully!"
+        message: t("Data updated successfully!")
       });
-      onSelect(config.key, data);
+      onSelect(config.key, submitData);
     } catch (error) {
       setToast({
         type: "error",
-        message: "Failed to update consumer details"
+        message: t("Failed to update consumer details")
       });
     }
   };
   if (isLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
-  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(FormStep, {
-    onSelect: onStepSelect,
-    config: config,
-    isDisabled: !isValid()
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Consumer Type *"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: consumerTypeOptions,
-    selected: consumerType,
-    select: setConsumerType
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Occupant Type *"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: occupantOptions,
-    selected: occupantType,
-    select: setOccupantType
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Category Type *"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: [],
-    selected: categoryType,
-    select: setCategoryType
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "First Name *"), /*#__PURE__*/React.createElement(TextInput, {
-    value: firstName,
-    onChange: e => setFirstName(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Middle Name"), /*#__PURE__*/React.createElement(TextInput, {
-    value: middleName,
-    onChange: e => setMiddleName(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Last Name"), /*#__PURE__*/React.createElement(TextInput, {
-    value: lastName,
-    onChange: e => setLastName(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Gender"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: genderOptions,
-    selected: gender,
-    select: setGender
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Parent/Spouse Name "), /*#__PURE__*/React.createElement(TextInput, {
-    value: parentSpouseName,
-    onChange: e => setParentSpouseName(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Mobile *"), /*#__PURE__*/React.createElement(TextInput, {
-    value: mobile,
-    onChange: e => setMobile(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "WhatsApp"), /*#__PURE__*/React.createElement(TextInput, {
-    value: whatsapp,
-    onChange: e => setWhatsapp(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Email"), /*#__PURE__*/React.createElement(TextInput, {
-    value: email,
-    onChange: e => setEmail(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "No. of Residents *"), /*#__PURE__*/React.createElement(TextInput, {
-    value: residents,
-    onChange: e => setResidents(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, console.log("identityType", identityType), /*#__PURE__*/React.createElement(CardLabel, null, "Type of Identity *"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: identityTypeOptions,
-    selected: identityType,
-    select: setIdentityType
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Proof of Identity"), /*#__PURE__*/React.createElement(UploadFile, {
-    onUpload: e => uploadFile(e, setDocumentProof, setDocumentId)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Document Number"), /*#__PURE__*/React.createElement(TextInput, {
-    value: documentNumber,
-    onChange: e => setDocumentNumber(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Informant Is Consumer"), /*#__PURE__*/React.createElement(CheckBox, {
-    label: "Yes, the informant is the consumer",
-    checked: informantIsConsumer,
-    onChange: e => setInformantIsConsumer(e.target.checked)
-  })), !informantIsConsumer && /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Informant Name"), /*#__PURE__*/React.createElement(TextInput, {
-    value: informantName,
-    onChange: e => setInformantName(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Informant Relation"), /*#__PURE__*/React.createElement(TextInput, {
-    value: informantRelation,
-    onChange: e => setInformantRelation(e.target.value)
-  }))), (occupantType === null || occupantType === void 0 ? void 0 : occupantType.name) === "Tenanted" && /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Document Proof"), /*#__PURE__*/React.createElement(UploadFile, {
-    onUpload: e => uploadFile(e, setDocumentProof, setDocumentId)
-  })), !documentId && /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Owner Mobile *"), /*#__PURE__*/React.createElement(TextInput, {
-    value: ownerMobile,
-    onChange: e => setOwnerMobile(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Tenant Verification"), /*#__PURE__*/React.createElement(TextInput, {
-    value: tenantVerification,
-    onChange: e => setTenantVerification(e.target.value)
-  })))), (consumerType === null || consumerType === void 0 ? void 0 : consumerType.name) === "Govt" && /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Designation"), /*#__PURE__*/React.createElement(TextInput, {
-    value: designation,
-    onChange: e => setDesignation(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Department"), /*#__PURE__*/React.createElement(TextInput, {
-    value: department,
-    onChange: e => setDepartment(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Employee ID"), /*#__PURE__*/React.createElement(TextInput, {
-    value: employeeId,
-    onChange: e => setEmployeeId(e.target.value)
-  }))), (consumerType === null || consumerType === void 0 ? void 0 : consumerType.name) === "Company_Society_Org" && /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Entity Name"), /*#__PURE__*/React.createElement(TextInput, {
-    value: entityName,
-    onChange: e => setEntityName(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Contact Person"), /*#__PURE__*/React.createElement(TextInput, {
-    value: contactPerson,
-    onChange: e => setContactPerson(e.target.value)
-  })))), toast && /*#__PURE__*/React.createElement(Toast, {
+  const Config = AadhaarVerificationConfig(t, localFormData, handleUploadProof, setDocumentId, documentId);
+  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(FormComposer, {
+    key: isDataLoaded ? "loaded" : "loading",
+    isDisabled: !canSubmit,
+    label: t("ES_COMMON_CONTINUE"),
+    config: Config.map(item => ({
+      ...item,
+      isCollapsible: true,
+      isDefaultOpen: true
+    })),
+    onSubmit: onSubmit,
+    defaultValues: defaultValues,
+    onFormValueChange: onFormValueChange,
+    noCard: false,
+    submitInForm: true
+  }), toast && /*#__PURE__*/React.createElement(Toast, {
     error: toast.type === "error",
     label: toast.message,
     onClose: () => setToast(null)
@@ -4265,6 +4604,7 @@ const ekycConfig = [{
     component: "AddressDetails",
     key: "addressDetails",
     doorImage: true,
+    showMapActualLocation: false,
     texts: {
       header: "EKYC_ADDRESS_DETAILS",
       submitBarLabel: "COMMON_SAVE_NEXT"
@@ -4303,7 +4643,6 @@ const ekycConfig = [{
 const EKYCForm = ({
   path: passedPath
 }) => {
-  const queryClient = useQueryClient();
   const match = useRouteMatch();
   const {
     t
@@ -4314,9 +4653,7 @@ const EKYCForm = ({
   } = location;
   const history = useHistory();
   let config = [];
-  const [params, setParams, clearParams] = Digit.Hooks.useSessionStorage("EKYC_CREATE", {});
-  const userInfo = Digit.UserService.getUser();
-  const tenantId = Digit.ULBService.getCurrentTenantId();
+  const [params, setParams] = Digit.Hooks.useSessionStorage("EKYC_CREATE", {});
   useEffect(() => {
     if (location.state && Object.keys(location.state).length > 0) {
       const {
@@ -4343,7 +4680,7 @@ const EKYCForm = ({
     if (skipStep) {
       redirectWithHistory = history.replace;
     }
-    const base = passedPath || match.path.split('/').slice(0, -1).join('/');
+    const base = passedPath || match.path.split("/").slice(0, -1).join("/");
     if (nextStep === null) {
       return redirectWithHistory(`${base}/review`, {
         ...params,
@@ -4354,17 +4691,17 @@ const EKYCForm = ({
       ...params
     });
   };
-  function handleSelect(key, data, skipStep, index, isAddMultiple = false) {
-    setParams({
-      ...params,
-      ...{
-        [key]: {
-          ...params[key],
-          ...data
-        }
+  function handleSelect(key, data, skipStep, index, isAddMultiple = false, silent = false) {
+    setParams(prev => ({
+      ...prev,
+      [key]: {
+        ...params[key],
+        ...data
       }
-    });
-    goNext(skipStep, index, isAddMultiple, key);
+    }));
+    if (!silent) {
+      goNext(skipStep, index, isAddMultiple, key);
+    }
   }
   ekycConfig.forEach(obj => {
     config = config.concat(obj.body);
@@ -4392,13 +4729,12 @@ const EKYCForm = ({
   }), /*#__PURE__*/React.createElement("div", {
     className: "employee-form-section"
   }, /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(Route, {
-    path: formStepRoutes.map(route => `${passedPath || match.path.split('/').slice(0, -1).join('/')}/${route}`)
+    path: formStepRoutes.map(route => `${passedPath || match.path.split("/").slice(0, -1).join("/")}/${route}`)
   }, /*#__PURE__*/React.createElement("div", {
     className: "single-page-form-container"
   }, config.map((routeObj, index) => {
     const {
-      component,
-      key
+      component
     } = routeObj;
     const Component = typeof component === "string" ? Digit.ComponentRegistryService.getComponent(component) : component;
     return /*#__PURE__*/React.createElement("div", {
@@ -4416,13 +4752,14 @@ const EKYCForm = ({
       formData: params
     }));
   }))), /*#__PURE__*/React.createElement(Route, null, /*#__PURE__*/React.createElement(Redirect, {
-    to: `${passedPath || match.path.split('/').slice(0, -1).join('/')}/${config.indexRoute}`
+    to: `${passedPath || match.path.split("/").slice(0, -1).join("/")}/${config.indexRoute}`
   }))))));
 };
 
 const AssignEkycModal = ({
   surveyor,
-  closeModal
+  closeModal,
+  refetchDashboard
 }) => {
   const [selectedKnos, setSelectedKnos] = useState([]);
   const [isBulkSelection, setIsBulkSelection] = useState(false);
@@ -4500,7 +4837,8 @@ const AssignEkycModal = ({
         label: "Assignment successful"
       });
       setShowToast(true);
-      setTimeout(() => {
+      setTimeout(async () => {
+        await refetchDashboard();
         closeModal();
       }, 1000);
     },
@@ -4657,34 +4995,7 @@ const AssignEkycModal = ({
     placeholder: "Zone",
     value: filters.zoneName,
     onChange: e => handleFilterChange("zoneName", e.target.value)
-  }), /*#__PURE__*/React.createElement("input", {
-    className: "form-control",
-    placeholder: "Ward",
-    value: filters.ward,
-    onChange: e => handleFilterChange("ward", e.target.value)
-  }), /*#__PURE__*/React.createElement("input", {
-    className: "form-control",
-    placeholder: "Assembly",
-    value: filters.assembly,
-    onChange: e => handleFilterChange("assembly", e.target.value)
-  }), /*#__PURE__*/React.createElement("input", {
-    className: "form-control",
-    placeholder: "MR Key",
-    value: filters.mrkey,
-    onChange: e => handleFilterChange("mrkey", e.target.value)
-  }), /*#__PURE__*/React.createElement("select", {
-    className: "form-control",
-    value: filters.ekycStatus,
-    onChange: e => handleFilterChange("ekycStatus", e.target.value)
-  }, /*#__PURE__*/React.createElement("option", {
-    value: ""
-  }, "All eKYC Status"), /*#__PURE__*/React.createElement("option", {
-    value: "PENDING"
-  }, "Pending"), /*#__PURE__*/React.createElement("option", {
-    value: "APPROVED"
-  }, "Approved"), /*#__PURE__*/React.createElement("option", {
-    value: "REJECTED"
-  }, "Rejected"))), /*#__PURE__*/React.createElement(Table, {
+  })), /*#__PURE__*/React.createElement(Table, {
     tableTitle: "eKYC Applications",
     tableClass: "ekycTable",
     data: tableData,
@@ -4722,8 +5033,79 @@ const AssignEkycModal = ({
   }));
 };
 
+const downloadSurveyorPDF = async ({
+  rows,
+  surveyorName,
+  employeeId,
+  mobileNumber,
+  vendorName,
+  supervisorName,
+  dashboardInfo,
+  t
+}) => {
+  const tenantId = Digit.ULBService.getCurrentTenantId();
+  const initData = Digit.SessionStorage.get("initData");
+  const tenants = (initData === null || initData === void 0 ? void 0 : initData.tenants) || [];
+  const tenantInfo = tenants.find(tenant => tenant.code === tenantId);
+  const name = "Delhi Jal Board";
+  const email = "contact@delhijalboard.nic.in";
+  const phoneNumber = "+91-11-23538416";
+  const details = [{
+    title: t("SURVEYOR_DETAILS"),
+    asSectionHeader: true,
+    values: [{
+      title: t("SURVEYOR_NAME"),
+      value: surveyorName
+    }, {
+      title: t("EMPLOYEE_ID"),
+      value: employeeId
+    }, {
+      title: t("MOBILE_NUMBER"),
+      value: mobileNumber
+    }, {
+      title: t("VENDOR_NAME"),
+      value: vendorName
+    }, {
+      title: t("SUPERVISOR_NAME"),
+      value: supervisorName
+    }].filter(item => item.value)
+  }, {
+    title: t("SUMMARY_STATISTICS"),
+    asSectionHeader: true,
+    values: [{
+      title: t("TOTAL_ASSIGNED"),
+      value: (dashboardInfo === null || dashboardInfo === void 0 ? void 0 : dashboardInfo.total) || 0
+    }, {
+      title: t("COMPLETED"),
+      value: (dashboardInfo === null || dashboardInfo === void 0 ? void 0 : dashboardInfo.completed) || 0
+    }, {
+      title: t("PENDING"),
+      value: (dashboardInfo === null || dashboardInfo === void 0 ? void 0 : dashboardInfo.pending) || 0
+    }, {
+      title: t("SUBMITTED"),
+      value: (dashboardInfo === null || dashboardInfo === void 0 ? void 0 : dashboardInfo.submittedCount) || 0
+    }].filter(item => item.value)
+  }];
+  if (window.Digit && window.Digit.Utils && window.Digit.Utils.pdf && window.Digit.Utils.pdf.generateSurveyorReport) {
+    window.Digit.Utils.pdf.generateSurveyorReport({
+      tenantId,
+      logo: null,
+      name,
+      email,
+      phoneNumber,
+      heading: t("EKYC_SURVEYOR_REPORT"),
+      details,
+      applicationNumber: employeeId,
+      rows,
+      t
+    });
+  } else {
+    console.error("Digit.Utils.pdf.generateSurveyorReport is not available");
+  }
+};
+
 const SurveyorDetailsDashboard = () => {
-  var _Digit$SessionStorage, _Digit$SessionStorage2, _Digit$SessionStorage3, _Digit$SessionStorage4, _surveyor$owner, _surveyor$owner2, _surveyor$owner3, _fullName$charAt, _dashboardData$dashbo, _dashboardData$dashbo2, _dashboardData$dashbo3, _dashboardData$dashbo4, _surveyor$owner4, _surveyor$owner5, _surveyor$owner6, _surveyor$additionalD, _dashboardData$dashbo5, _dashboardData$dashbo6;
+  var _Digit$SessionStorage, _Digit$SessionStorage2, _Digit$SessionStorage3, _Digit$SessionStorage4, _surveyor$owner, _surveyor$owner2, _surveyor$owner3, _surveyor$owner4, _fullName$charAt, _dashboardData$dashbo3, _dashboardData$dashbo4, _dashboardData$dashbo5, _dashboardData$dashbo6, _surveyor$owner5, _surveyor$owner6, _surveyor$owner7, _surveyor$additionalD, _dashboardData$dashbo7, _dashboardData$dashbo8;
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const [showModal, setShowModal] = useState(false);
   const [showOptions, setShowOptions] = useState(false);
@@ -4750,13 +5132,48 @@ const SurveyorDetailsDashboard = () => {
     var _surveyorSearchRespon;
     return (surveyorSearchResponse === null || surveyorSearchResponse === void 0 ? void 0 : (_surveyorSearchRespon = surveyorSearchResponse.surveyors) === null || _surveyorSearchRespon === void 0 ? void 0 : _surveyorSearchRespon[0]) || null;
   }, [surveyorSearchResponse]);
+  const {
+    data: vendorData
+  } = Digit.Hooks.fsm.useDsoSearch(tenantId, {
+    status: "ACTIVE"
+  }, {
+    enabled: !!tenantId
+  });
+  const {
+    data: supervisorSearchResponse
+  } = Digit.Hooks.fsm.useSupervisorSearch(tenantId, {
+    status: "ACTIVE"
+  }, {
+    enabled: !!tenantId
+  });
+  const vendorName = useMemo(() => {
+    var _mappedVendor$dsoDeta;
+    if (!vendorData || !(surveyor !== null && surveyor !== void 0 && surveyor.vendorId)) return "N/A";
+    const mappedVendor = vendorData.find(v => {
+      var _v$dsoDetails, _v$dsoDetails2;
+      return ((_v$dsoDetails = v.dsoDetails) === null || _v$dsoDetails === void 0 ? void 0 : _v$dsoDetails.id) === surveyor.vendorId || ((_v$dsoDetails2 = v.dsoDetails) === null || _v$dsoDetails2 === void 0 ? void 0 : _v$dsoDetails2.vendorId) === surveyor.vendorId;
+    });
+    return (mappedVendor === null || mappedVendor === void 0 ? void 0 : (_mappedVendor$dsoDeta = mappedVendor.dsoDetails) === null || _mappedVendor$dsoDeta === void 0 ? void 0 : _mappedVendor$dsoDeta.name) || surveyor.vendorId || "N/A";
+  }, [vendorData, surveyor === null || surveyor === void 0 ? void 0 : surveyor.vendorId]);
+  const supervisorName = useMemo(() => {
+    var _mappedSupervisor$own;
+    if (!(supervisorSearchResponse !== null && supervisorSearchResponse !== void 0 && supervisorSearchResponse.supervisors) || !(surveyor !== null && surveyor !== void 0 && surveyor.supervisorId)) return "N/A";
+    const mappedSupervisor = supervisorSearchResponse.supervisors.find(s => {
+      var _s$owner;
+      return s.id === surveyor.supervisorId || ((_s$owner = s.owner) === null || _s$owner === void 0 ? void 0 : _s$owner.uuid) === surveyor.supervisorId;
+    });
+    return (mappedSupervisor === null || mappedSupervisor === void 0 ? void 0 : mappedSupervisor.name) || (mappedSupervisor === null || mappedSupervisor === void 0 ? void 0 : (_mappedSupervisor$own = mappedSupervisor.owner) === null || _mappedSupervisor$own === void 0 ? void 0 : _mappedSupervisor$own.name) || surveyor.supervisorId || "N/A";
+  }, [supervisorSearchResponse, surveyor === null || surveyor === void 0 ? void 0 : surveyor.supervisorId]);
+  const fullName = (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner = surveyor.owner) === null || _surveyor$owner === void 0 ? void 0 : _surveyor$owner.name) || (surveyor === null || surveyor === void 0 ? void 0 : surveyor.name) || "N/A";
+  const employeeId = (surveyor === null || surveyor === void 0 ? void 0 : surveyor.employeeId) || (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner2 = surveyor.owner) === null || _surveyor$owner2 === void 0 ? void 0 : _surveyor$owner2.uuid) || (surveyor === null || surveyor === void 0 ? void 0 : surveyor.id);
+  const mobileNumber = (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner3 = surveyor.owner) === null || _surveyor$owner3 === void 0 ? void 0 : _surveyor$owner3.mobileNumber) || (surveyor === null || surveyor === void 0 ? void 0 : surveyor.mobileNo) || "N/A";
   const [currentPage, setCurrentPage] = useState(0);
   const [pageSize, setPageSize] = useState(20);
   const queryParams = {
     tenantId: "dl.djb",
     offset: currentPage * pageSize,
     limit: pageSize,
-    surveyorId: surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner = surveyor.owner) === null || _surveyor$owner === void 0 ? void 0 : _surveyor$owner.uuid
+    surveyorId: surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner4 = surveyor.owner) === null || _surveyor$owner4 === void 0 ? void 0 : _surveyor$owner4.uuid
   };
   const {
     isFetching: isDashboardLoading,
@@ -4794,6 +5211,23 @@ const SurveyorDetailsDashboard = () => {
       value
     }) => value || "-"
   }], []);
+  const [showReportMenu, setShowReportMenu] = useState(false);
+  const [customDate, setCustomDate] = useState({
+    from: "",
+    to: ""
+  });
+  const [showCustomPicker, setShowCustomPicker] = useState(false);
+  const reportMenuRef = useRef(null);
+  useEffect(() => {
+    const handler = e => {
+      if (reportMenuRef.current && !reportMenuRef.current.contains(e.target)) {
+        setShowReportMenu(false);
+        setShowCustomPicker(false);
+      }
+    };
+    document.addEventListener("mousedown", handler);
+    return () => document.removeEventListener("mousedown", handler);
+  }, []);
   if (isLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
@@ -4839,6 +5273,83 @@ const SurveyorDetailsDashboard = () => {
     value: (surveyor === null || surveyor === void 0 ? void 0 : surveyor.rejectedCases) || 0,
     color: "#EF4444"
   }];
+  const getDateRange = filter => {
+    const now = new Date();
+    const start = new Date(now);
+    if (filter === "today") {
+      start.setHours(0, 0, 0, 0);
+      return {
+        from: start,
+        to: now
+      };
+    }
+    if (filter === "week") {
+      start.setDate(now.getDate() - now.getDay());
+      start.setHours(0, 0, 0, 0);
+      return {
+        from: start,
+        to: now
+      };
+    }
+    if (filter === "month") {
+      start.setDate(1);
+      start.setHours(0, 0, 0, 0);
+      return {
+        from: start,
+        to: now
+      };
+    }
+    return null;
+  };
+  const handlePresetDownload = filter => {
+    var _dashboardData$dashbo;
+    const allRows = (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo = dashboardData.dashboardInfo) === null || _dashboardData$dashbo === void 0 ? void 0 : _dashboardData$dashbo.consumerList) || [];
+    const range = getDateRange(filter);
+    if (!range) return;
+    const filtered = allRows.filter(r => {
+      const ts = r.submittedAt || r.createdTime || r.lastModifiedTime || 0;
+      return ts >= range.from.getTime() && ts <= range.to.getTime();
+    });
+    downloadSurveyorPDF({
+      rows: filtered.length ? filtered : allRows,
+      surveyorName: fullName,
+      vendorName,
+      supervisorName,
+      employeeId,
+      mobileNumber,
+      dashboardInfo: dashboardData === null || dashboardData === void 0 ? void 0 : dashboardData.dashboardInfo,
+      t
+    });
+    setShowReportMenu(false);
+    setShowCustomPicker(false);
+  };
+  const handleCustomDownload = () => {
+    var _dashboardData$dashbo2;
+    if (!customDate.from || !customDate.to) {
+      alert(t("SELECT_DATE_RANGE") || "Please select both From and To dates.");
+      return;
+    }
+    const from = new Date(customDate.from);
+    const to = new Date(customDate.to);
+    to.setHours(23, 59, 59, 999);
+    const allRows = (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo2 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo2 === void 0 ? void 0 : _dashboardData$dashbo2.consumerList) || [];
+    const filtered = allRows.filter(r => {
+      const ts = r.createdTime || r.lastModifiedTime || 0;
+      return ts >= from.getTime() && ts <= to.getTime();
+    });
+    downloadSurveyorPDF({
+      rows: filtered.length ? filtered : allRows,
+      surveyorName: fullName,
+      vendorName,
+      supervisorName,
+      employeeId,
+      mobileNumber,
+      dashboardInfo: dashboardData === null || dashboardData === void 0 ? void 0 : dashboardData.dashboardInfo,
+      t
+    });
+    setShowReportMenu(false);
+    setShowCustomPicker(false);
+  };
   const StatCard = ({
     title,
     value,
@@ -4858,14 +5369,11 @@ const SurveyorDetailsDashboard = () => {
   const options = [{
     action: "Assign"
   }];
-  const fullName = (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner2 = surveyor.owner) === null || _surveyor$owner2 === void 0 ? void 0 : _surveyor$owner2.name) || (surveyor === null || surveyor === void 0 ? void 0 : surveyor.name) || "N/A";
-  const employeeId = (surveyor === null || surveyor === void 0 ? void 0 : surveyor.employeeId) || (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner3 = surveyor.owner) === null || _surveyor$owner3 === void 0 ? void 0 : _surveyor$owner3.uuid) || (surveyor === null || surveyor === void 0 ? void 0 : surveyor.id);
   const handleMenuSelect = option => {
     setShowOptions(false);
     setShowModal(true);
   };
   const closeModal = async () => {
-    await refetchDashboard();
     setShowModal(false);
   };
   return /*#__PURE__*/React.createElement(Card, {
@@ -4884,26 +5392,85 @@ const SurveyorDetailsDashboard = () => {
     className: "designation"
   }, (surveyor === null || surveyor === void 0 ? void 0 : surveyor.description) || t("FIELD_SURVEYOR")), /*#__PURE__*/React.createElement("div", {
     className: "employee-id"
-  }, t("EMPLOYEE_ID"), ": ", employeeId)))), /*#__PURE__*/React.createElement("div", {
+  }, t("EMPLOYEE_ID"), ": ", employeeId))), /*#__PURE__*/React.createElement("div", {
+    className: "report-download",
+    ref: reportMenuRef
+  }, /*#__PURE__*/React.createElement("button", {
+    className: "download-btn",
+    onClick: () => {
+      setShowReportMenu(p => !p);
+      setShowCustomPicker(false);
+    }
+  }, t("DOWNLOAD_REPORT") || "Download Report"), showReportMenu && /*#__PURE__*/React.createElement("div", {
+    className: "report-menu"
+  }, [{
+    label: t("TODAY") || "Today",
+    key: "today"
+  }, {
+    label: t("THIS_WEEK") || "This Week",
+    key: "week"
+  }, {
+    label: t("THIS_MONTH") || "This Month",
+    key: "month"
+  }].map(({
+    label,
+    key
+  }) => /*#__PURE__*/React.createElement("div", {
+    key: key,
+    className: "menu-item",
+    onClick: () => handlePresetDownload(key)
+  }, label)), /*#__PURE__*/React.createElement("div", {
+    className: "custom-date-trigger",
+    onClick: () => setShowCustomPicker(p => !p)
+  }, t("CUSTOM_DATE") || "Custom Date"), showCustomPicker && /*#__PURE__*/React.createElement("div", {
+    className: "custom-picker"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "date-field"
+  }, /*#__PURE__*/React.createElement("label", {
+    className: "date-label"
+  }, t("FROM_DATE") || "From"), /*#__PURE__*/React.createElement("input", {
+    type: "date",
+    className: "date-input",
+    value: customDate.from,
+    onChange: e => setCustomDate(d => ({
+      ...d,
+      from: e.target.value
+    }))
+  })), /*#__PURE__*/React.createElement("div", {
+    className: "date-field"
+  }, /*#__PURE__*/React.createElement("label", {
+    className: "date-label"
+  }, t("TO_DATE") || "To"), /*#__PURE__*/React.createElement("input", {
+    type: "date",
+    className: "date-input",
+    value: customDate.to,
+    onChange: e => setCustomDate(d => ({
+      ...d,
+      to: e.target.value
+    }))
+  })), /*#__PURE__*/React.createElement("button", {
+    className: "download-action-btn",
+    onClick: handleCustomDownload
+  }, t("DOWNLOAD") || "Download"))))), /*#__PURE__*/React.createElement("div", {
     className: "stats-wrapper"
   }, /*#__PURE__*/React.createElement(StatCard, {
     title: t("TOTAL_ASSIGNED"),
-    value: (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo = dashboardData.dashboardInfo) === null || _dashboardData$dashbo === void 0 ? void 0 : _dashboardData$dashbo.total) || 0,
+    value: (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo3 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo3 === void 0 ? void 0 : _dashboardData$dashbo3.total) || 0,
     type: "today",
     isLoading: isDashboardLoading
   }), /*#__PURE__*/React.createElement(StatCard, {
     title: t("COMPLETED"),
-    value: (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo2 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo2 === void 0 ? void 0 : _dashboardData$dashbo2.completed) || 0,
+    value: (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo4 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo4 === void 0 ? void 0 : _dashboardData$dashbo4.completed) || 0,
     type: "week",
     isLoading: isDashboardLoading
   }), /*#__PURE__*/React.createElement(StatCard, {
     title: t("PENDING"),
-    value: (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo3 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo3 === void 0 ? void 0 : _dashboardData$dashbo3.pending) || 0,
+    value: (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo5 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo5 === void 0 ? void 0 : _dashboardData$dashbo5.pending) || 0,
     type: "pending",
     isLoading: isDashboardLoading
   }), /*#__PURE__*/React.createElement(StatCard, {
     title: t("SUBMITTED"),
-    value: (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo4 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo4 === void 0 ? void 0 : _dashboardData$dashbo4.submittedCount) || 0,
+    value: (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo6 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo6 === void 0 ? void 0 : _dashboardData$dashbo6.submittedCount) || 0,
     type: "month",
     isLoading: isDashboardLoading
   })), /*#__PURE__*/React.createElement("div", {
@@ -4951,19 +5518,19 @@ const SurveyorDetailsDashboard = () => {
     className: "label"
   }, t("MOBILE"), ":"), /*#__PURE__*/React.createElement("span", {
     className: "value"
-  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner4 = surveyor.owner) === null || _surveyor$owner4 === void 0 ? void 0 : _surveyor$owner4.mobileNumber) || (surveyor === null || surveyor === void 0 ? void 0 : surveyor.mobileNo) || "N/A")), /*#__PURE__*/React.createElement("div", {
+  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner5 = surveyor.owner) === null || _surveyor$owner5 === void 0 ? void 0 : _surveyor$owner5.mobileNumber) || (surveyor === null || surveyor === void 0 ? void 0 : surveyor.mobileNo) || "N/A")), /*#__PURE__*/React.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
   }, t("EMAIL"), ":"), /*#__PURE__*/React.createElement("span", {
     className: "value"
-  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner5 = surveyor.owner) === null || _surveyor$owner5 === void 0 ? void 0 : _surveyor$owner5.emailId) || "N/A")), /*#__PURE__*/React.createElement("div", {
+  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner6 = surveyor.owner) === null || _surveyor$owner6 === void 0 ? void 0 : _surveyor$owner6.emailId) || "N/A")), /*#__PURE__*/React.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
   }, t("GENDER"), ":"), /*#__PURE__*/React.createElement("span", {
     className: "value"
-  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner6 = surveyor.owner) === null || _surveyor$owner6 === void 0 ? void 0 : _surveyor$owner6.gender) || "N/A")), /*#__PURE__*/React.createElement("div", {
+  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner7 = surveyor.owner) === null || _surveyor$owner7 === void 0 ? void 0 : _surveyor$owner7.gender) || "N/A")), /*#__PURE__*/React.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
@@ -4987,16 +5554,16 @@ const SurveyorDetailsDashboard = () => {
     t: t,
     tableTitle: t("ASSIGNED_KNOS"),
     tableClass: "ekycTable",
-    data: (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo5 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo5 === void 0 ? void 0 : _dashboardData$dashbo5.consumerList) || [],
+    data: (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo7 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo7 === void 0 ? void 0 : _dashboardData$dashbo7.consumerList) || [],
     columns: knoColumns,
     isLoading: isDashboardLoading,
-    totalRecords: dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo6 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo6 === void 0 ? void 0 : _dashboardData$dashbo6.total,
+    totalRecords: dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo8 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo8 === void 0 ? void 0 : _dashboardData$dashbo8.total,
     currentPage: currentPage,
     pageSizeLimit: pageSize,
     isPaginationRequired: true,
     onNextPage: () => {
-      var _dashboardData$dashbo7;
-      if (currentPage < ((dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo7 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo7 === void 0 ? void 0 : _dashboardData$dashbo7.totalPages) || 1) - 1) {
+      var _dashboardData$dashbo9;
+      if (currentPage < ((dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo9 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo9 === void 0 ? void 0 : _dashboardData$dashbo9.totalPages) || 1) - 1) {
         setCurrentPage(prev => prev + 1);
       }
     },
@@ -5009,8 +5576,8 @@ const SurveyorDetailsDashboard = () => {
       setCurrentPage(0);
     },
     onLastPage: () => {
-      var _dashboardData$dashbo8;
-      setCurrentPage(Math.max(((dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo8 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo8 === void 0 ? void 0 : _dashboardData$dashbo8.totalPages) || 1) - 1, 0));
+      var _dashboardData$dashbo0;
+      setCurrentPage(Math.max(((dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo0 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo0 === void 0 ? void 0 : _dashboardData$dashbo0.totalPages) || 1) - 1, 0));
     },
     onPageSizeChange: e => {
       setPageSize(Number(e.target.value));
@@ -5030,17 +5597,111 @@ const SurveyorDetailsDashboard = () => {
     }
   })), showModal && /*#__PURE__*/React.createElement(AssignEkycModal, {
     surveyor: surveyor,
-    closeModal: closeModal
+    closeModal: closeModal,
+    refetchDashboard: refetchDashboard
   }));
 };
 
+function formReducer(state, payload) {
+  const storageKey = "EKYC.SW.INBOX";
+  switch (payload.action) {
+    case "mutateSearchForm":
+      Digit.SessionStorage.set(storageKey, {
+        ...state,
+        searchForm: payload.data
+      });
+      return {
+        ...state,
+        searchForm: payload.data
+      };
+    case "mutateFilterForm":
+      Digit.SessionStorage.set(storageKey, {
+        ...state,
+        filterForm: payload.data
+      });
+      return {
+        ...state,
+        filterForm: payload.data
+      };
+    case "mutateTableForm":
+      Digit.SessionStorage.set(storageKey, {
+        ...state,
+        tableForm: payload.data
+      });
+      return {
+        ...state,
+        tableForm: payload.data
+      };
+    default:
+      return state;
+  }
+}
+const formInitValue = {
+  filterForm: {},
+  searchForm: {},
+  tableForm: {
+    limit: 10,
+    offset: 0,
+    sortBy: "createdTime",
+    sortOrder: "DESC"
+  }
+};
+const tableColumnConfig = (t, handleReview) => [{
+  Header: t("SURVEYOR_NAME"),
+  accessor: "surveyorName",
+  Cell: ({
+    row
+  }) => {
+    var _row$original, _row$original2, _row$original3;
+    const id = (_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.id;
+    return /*#__PURE__*/React.createElement("span", {
+      className: "ekyc-application-link",
+      style: {
+        color: "#add8f7",
+        cursor: "pointer",
+        fontWeight: "bold"
+      },
+      onClick: () => handleReview(id)
+    }, ((_row$original2 = row.original) === null || _row$original2 === void 0 ? void 0 : _row$original2.surveyorName) || ((_row$original3 = row.original) === null || _row$original3 === void 0 ? void 0 : _row$original3.name) || "NA");
+  }
+}, {
+  Header: t("MOBILE_NUMBER"),
+  accessor: "mobileNo",
+  Cell: ({
+    row
+  }) => {
+    var _row$original4, _row$original5, _row$original5$owner;
+    return /*#__PURE__*/React.createElement("span", null, ((_row$original4 = row.original) === null || _row$original4 === void 0 ? void 0 : _row$original4.mobileNo) || ((_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : (_row$original5$owner = _row$original5.owner) === null || _row$original5$owner === void 0 ? void 0 : _row$original5$owner.mobileNumber) || "NA");
+  }
+}, {
+  Header: t("STATUS"),
+  accessor: "status",
+  Cell: ({
+    row
+  }) => {
+    var _row$original6;
+    const status = ((_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : _row$original6.status) || "DEFAULT";
+    return /*#__PURE__*/React.createElement("span", {
+      className: `ekyc-status-tag ${status}`
+    }, t(status));
+  }
+}, {
+  Header: t("SERVICE_TYPE"),
+  accessor: "serviceType",
+  Cell: ({
+    row
+  }) => {
+    var _row$original7;
+    return /*#__PURE__*/React.createElement("span", null, ((_row$original7 = row.original) === null || _row$original7 === void 0 ? void 0 : _row$original7.serviceType) || "NA");
+  }
+}];
+
 const SupervisorInboxTableConfig = ({
   onPageSizeChange,
   formState,
   totalCount,
   table,
   dispatch,
-  checkPathName,
   onSortingByData,
   inboxStyles: _inboxStyles = {},
   tableStyle: _tableStyle = {}
@@ -5056,64 +5717,6 @@ const SupervisorInboxTableConfig = ({
   };
   const limit = (formState === null || formState === void 0 ? void 0 : (_formState$tableForm = formState.tableForm) === null || _formState$tableForm === void 0 ? void 0 : _formState$tableForm.limit) || 10;
   const offset = (formState === null || formState === void 0 ? void 0 : (_formState$tableForm2 = formState.tableForm) === null || _formState$tableForm2 === void 0 ? void 0 : _formState$tableForm2.offset) || 0;
-  const tableColumnConfig = [{
-    Header: t("SURVEYOR_ID"),
-    accessor: "id",
-    Cell: ({
-      row
-    }) => {
-      var _row$original;
-      const id = (_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.id;
-      return /*#__PURE__*/React.createElement("span", {
-        className: "ekyc-application-link",
-        style: {
-          color: "#add8f7",
-          cursor: "pointer",
-          fontWeight: "bold"
-        },
-        onClick: () => handleReview(id)
-      }, id || "NA");
-    }
-  }, {
-    Header: t("SURVEYOR_NAME"),
-    accessor: "surveyorName",
-    Cell: ({
-      row
-    }) => {
-      var _row$original2, _row$original3;
-      return /*#__PURE__*/React.createElement("span", null, ((_row$original2 = row.original) === null || _row$original2 === void 0 ? void 0 : _row$original2.surveyorName) || ((_row$original3 = row.original) === null || _row$original3 === void 0 ? void 0 : _row$original3.name) || "NA");
-    }
-  }, {
-    Header: t("MOBILE_NUMBER"),
-    accessor: "mobileNo",
-    Cell: ({
-      row
-    }) => {
-      var _row$original4, _row$original5, _row$original5$owner;
-      return /*#__PURE__*/React.createElement("span", null, ((_row$original4 = row.original) === null || _row$original4 === void 0 ? void 0 : _row$original4.mobileNo) || ((_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : (_row$original5$owner = _row$original5.owner) === null || _row$original5$owner === void 0 ? void 0 : _row$original5$owner.mobileNumber) || "NA");
-    }
-  }, {
-    Header: t("STATUS"),
-    accessor: "status",
-    Cell: ({
-      row
-    }) => {
-      var _row$original6;
-      const status = ((_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : _row$original6.status) || "DEFAULT";
-      return /*#__PURE__*/React.createElement("span", {
-        className: `ekyc-status-tag ${status}`
-      }, t(status));
-    }
-  }, {
-    Header: t("SERVICE_TYPE"),
-    accessor: "serviceType",
-    Cell: ({
-      row
-    }) => {
-      var _row$original7;
-      return /*#__PURE__*/React.createElement("span", null, ((_row$original7 = row.original) === null || _row$original7 === void 0 ? void 0 : _row$original7.serviceType) || "NA");
-    }
-  }];
   return {
     getCellProps: () => ({
       style: {
@@ -5131,37 +5734,33 @@ const SupervisorInboxTableConfig = ({
       data: {
         ...formState.tableForm,
         offset: Number(offset) + Number(limit)
-      },
-      checkPathName
+      }
     }),
     onPrevPage: () => dispatch({
       action: "mutateTableForm",
       data: {
         ...formState.tableForm,
         offset: Number(offset) - Number(limit)
-      },
-      checkPathName
+      }
     }),
     onLastPage: () => dispatch({
       action: "mutateTableForm",
       data: {
         ...formState.tableForm,
         offset: Math.ceil(totalCount / limit) * limit - Number(limit)
-      },
-      checkPathName
+      }
     }),
     onFirstPage: () => dispatch({
       action: "mutateTableForm",
       data: {
         ...formState.tableForm,
         offset: 0
-      },
-      checkPathName
+      }
     }),
     totalRecords: totalCount,
     onSort: onSortingByData,
     data: table,
-    columns: tableColumnConfig,
+    columns: tableColumnConfig(t, handleReview),
     inboxStyles: {
       ..._inboxStyles
     },
@@ -5177,19 +5776,7 @@ const AssignEkyc = () => {
   if (!tenantId || tenantId === "dl") {
     tenantId = "dl.djb";
   }
-  const location = useLocation();
-  const formInitValue = {
-    filterForm: {},
-    searchForm: {},
-    tableForm: {
-      limit: 10,
-      offset: 0,
-      sortBy: "createdTime",
-      sortOrder: "DESC"
-    }
-  };
   const [formState, dispatch] = useReducer(formReducer, formInitValue);
-  const userDetails = Digit.SessionStorage.get("User");
   let paginationParms = {
     limit: (formState === null || formState === void 0 ? void 0 : (_formState$tableForm = formState.tableForm) === null || _formState$tableForm === void 0 ? void 0 : _formState$tableForm.limit) || 10,
     offset: (formState === null || formState === void 0 ? void 0 : (_formState$tableForm2 = formState.tableForm) === null || _formState$tableForm2 === void 0 ? void 0 : _formState$tableForm2.offset) || 0,
@@ -5247,10 +5834,6 @@ const AssignEkyc = () => {
     });
   }, [sourceData]);
   const totalRecords = (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo = dashboardData.dashboardInfo) === null || _dashboardData$dashbo === void 0 ? void 0 : _dashboardData$dashbo.totalRecords) || (dashboardData === null || dashboardData === void 0 ? void 0 : dashboardData.totalCount) || 0;
-  const checkPathName = location.pathname.includes("ekyc/inbox");
-  const PropsForInboxLinks = {
-    headerText: checkPathName ? "EKYC_MODULE" : "MODULE_SW"
-  };
   const SearchFormFields = useCallback(({
     registerRef,
     searchFormState,
@@ -5274,13 +5857,11 @@ const AssignEkyc = () => {
       action: "mutateTableForm",
       data: {
         ...tableOrderFormDefaultValues
-      },
-      checkPathName
+      }
     });
     dispatch({
       action: "mutateSearchForm",
-      data,
-      checkPathName
+      data
     });
   };
   const searchFormDefaultValues = {
@@ -5311,47 +5892,6 @@ const AssignEkyc = () => {
     setFilterFormValue,
     getFilterFormValue
   }) => /*#__PURE__*/React.createElement(React.Fragment, null), []);
-  const propsForFilterForm = {
-    FilterFormFields,
-    onFilterFormSubmit: () => {},
-    filterFormDefaultValues: "",
-    resetFilterFormDefaultValues: "",
-    onFilterFormReset: () => {}
-  };
-  function formReducer(state, payload) {
-    const storageKey = payload.checkPathName ? "EKYC.INBOX" : "EKYC.SW.INBOX";
-    switch (payload.action) {
-      case "mutateSearchForm":
-        Digit.SessionStorage.set(storageKey, {
-          ...state,
-          searchForm: payload.data
-        });
-        return {
-          ...state,
-          searchForm: payload.data
-        };
-      case "mutateFilterForm":
-        Digit.SessionStorage.set(storageKey, {
-          ...state,
-          filterForm: payload.data
-        });
-        return {
-          ...state,
-          filterForm: payload.data
-        };
-      case "mutateTableForm":
-        Digit.SessionStorage.set(storageKey, {
-          ...state,
-          tableForm: payload.data
-        });
-        return {
-          ...state,
-          tableForm: payload.data
-        };
-      default:
-        return state;
-    }
-  }
   const onPageSizeChange = e => {
     const newLimit = Number(e.target.value);
     dispatch({
@@ -5360,8 +5900,7 @@ const AssignEkyc = () => {
         ...formState.tableForm,
         limit: newLimit,
         offset: 0
-      },
-      checkPathName
+      }
     });
   };
   const onSortingByData = e => {
@@ -5379,8 +5918,7 @@ const AssignEkyc = () => {
             ...formState.tableForm,
             sortBy: id,
             sortOrder: desc ? "DESC" : "ASC"
-          },
-          checkPathName
+          }
         });
       }
     }
@@ -5394,7 +5932,6 @@ const AssignEkyc = () => {
       dispatch,
       onSortingByData,
       tenantId,
-      checkPathName,
       inboxStyles: {
         overflowX: "scroll",
         overflowY: "hidden"
@@ -5435,9 +5972,8 @@ const AssignEkyc = () => {
   return /*#__PURE__*/React.createElement("div", {
     className: "app-container"
   }, /*#__PURE__*/React.createElement(InboxComposer, _extends({
-    isInboxLoading,
-    PropsForInboxLinks
-  }, propsForSearchForm, propsForFilterForm, {
+    isInboxLoading
+  }, propsForSearchForm, {
     propsForInboxTable,
     formState,
     countData: dashboardData === null || dashboardData === void 0 ? void 0 : dashboardData.dashboardInfo,
@@ -5454,24 +5990,78 @@ const EmployeeApp = ({
   } = useTranslation();
   const location = useLocation();
   sessionStorage.removeItem("revalidateddone");
-  const getBreadcrumbLabel = () => {
+  const getDynamicBreadcrumbs = () => {
     const pathname = location.pathname;
-    if (pathname.includes("/dashboard")) return "ES_COMMON_INBOX";
-    if (pathname.includes("/create-kyc")) return "EKYC_CREATE_KYC";
-    if (pathname.includes("/k-details")) return "EKYC_K_DETAILS";
-    if (pathname.includes("/consumer-details")) return "EKYC_CONSUMER_DETAILS";
-    if (pathname.includes("/address-details")) return "EKYC_ADDRESS_DETAILS";
-    if (pathname.includes("/property-info")) return "EKYC_PROPERTY_INFO";
-    if (pathname.includes("/meter-details")) return "EKYC_METER_DETAILS";
-    if (pathname.includes("/review")) return "EKYC_REVIEW";
-    return "ES_COMMON_INBOX";
+    const crumbs = [{
+      icon: HomeIcon,
+      path: "/digit-ui/employee"
+    }, {
+      label: t("ACTION_TEST_EKYC"),
+      path: `/digit-ui/employee/module/details`
+    }];
+    if (pathname.includes("/create-kyc")) {
+      crumbs.push({
+        label: t("EKYC_CREATE_KYC")
+      });
+    } else if (pathname.includes("/consumer-details")) {
+      crumbs.push({
+        label: t("EKYC_CONSUMER_DETAILS")
+      });
+    } else if (pathname.includes("/address-details")) {
+      crumbs.push({
+        label: t("EKYC_ADDRESS_DETAILS")
+      });
+    } else if (pathname.includes("/property-info")) {
+      crumbs.push({
+        label: t("EKYC_PROPERTY_INFO")
+      });
+    } else if (pathname.includes("/meter-details")) {
+      crumbs.push({
+        label: t("EKYC_METER_DETAILS")
+      });
+    } else if (pathname.includes("/review")) {
+      crumbs.push({
+        label: t("EKYC_INBOX"),
+        path: `/digit-ui/employee/ekyc/inbox`
+      });
+      crumbs.push({
+        label: t("EKYC_REVIEW")
+      });
+    } else if (pathname.includes("/assign/surveyor-details")) {
+      crumbs.push({
+        label: t("EKYC_ASSIGN"),
+        path: `/digit-ui/employee/ekyc/assign`
+      });
+      crumbs.push({
+        label: t("EKYC_SURVEYOR_DETAILS")
+      });
+    } else if (pathname.includes("/assign")) {
+      crumbs.push({
+        label: t("EKYC_ASSIGN")
+      });
+    } else if (pathname.includes("/ceo-dashboard")) {
+      crumbs.push({
+        label: t("CEO_M.F_DOR_FINANCE_VIEW")
+      });
+    } else if (pathname.includes("/vendors/")) {
+      crumbs.push({
+        label: t("EKYC_VENDOR_DETAILS")
+      });
+    } else if (pathname.includes("/mapping")) {
+      crumbs.push({
+        label: t("EKYC_MAPPING")
+      });
+    } else if (pathname.includes("/dashboard")) {
+      crumbs.push({
+        label: t("EKYC_DASHBOARD")
+      });
+    } else if (pathname.includes("/inbox")) {
+      crumbs.push({
+        label: t("EKYC_INBOX")
+      });
+    }
+    return crumbs;
   };
-  const breadcrumbs = [{
-    icon: HomeIcon,
-    path: "/digit-ui/employee"
-  }, {
-    label: t(getBreadcrumbLabel())
-  }];
   const formStepRoutes = ["consumer-details", "address-details", "property-info", "meter-details"];
   return /*#__PURE__*/React.createElement(AppContainer, null, /*#__PURE__*/React.createElement("div", {
     className: "ground-container employee-app-container form-container"
@@ -5480,7 +6070,7 @@ const EmployeeApp = ({
       className: "icon"
     }), "Back"),
     onLeftClick: () => window.history.back(),
-    breadcrumbs: breadcrumbs
+    breadcrumbs: getDynamicBreadcrumbs()
   }), /*#__PURE__*/React.createElement("div", {
     className: "employee-form"
   }, /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(PrivateRoute, {
@@ -5550,6 +6140,139 @@ const EmployeeApp = ({
   })))));
 };
 
+const PropertyInfoConfig = (t, formData = {}, uploadFile, buildingImage, buildingImageId, setBuildingImage, setBuildingImageId) => {
+  var _formData$propertyTyp;
+  const propertyType = (formData === null || formData === void 0 ? void 0 : (_formData$propertyTyp = formData.propertyType) === null || _formData$propertyTyp === void 0 ? void 0 : _formData$propertyTyp.name) || (formData === null || formData === void 0 ? void 0 : formData.propertyType);
+  const isHotel = propertyType === "Hotel";
+  const isHospitalOrNursing = propertyType === "Hospital" || propertyType === "Nursing Home";
+  const fields = [{
+    label: t("PID Number"),
+    isMandatory: false,
+    type: "text",
+    populators: {
+      name: "pidNumber"
+    }
+  }, {
+    label: t("Property Type"),
+    isMandatory: false,
+    type: "custom",
+    key: "propertyType",
+    populators: {
+      name: "propertyType",
+      component: props => /*#__PURE__*/React.createElement(Dropdown, {
+        option: [{
+          name: "Residential"
+        }, {
+          name: "Commercial"
+        }, {
+          name: "Hotel"
+        }, {
+          name: "Hospital"
+        }, {
+          name: "Nursing Home"
+        }],
+        optionKey: "name",
+        selected: props.value,
+        select: props.onChange
+      })
+    }
+  }, {
+    label: t("Sub Property Category"),
+    isMandatory: false,
+    type: "custom",
+    key: "subPropertyCategory",
+    populators: {
+      name: "subPropertyCategory",
+      component: props => /*#__PURE__*/React.createElement(Dropdown, {
+        option: [],
+        optionKey: "name",
+        selected: props.value,
+        select: props.onChange
+      })
+    }
+  }, {
+    label: t("No. of Floors"),
+    isMandatory: true,
+    type: "number",
+    populators: {
+      name: "noOfFloors",
+      validation: {
+        required: true,
+        min: 1
+      }
+    }
+  }, {
+    label: t("Floor No. of this KNO"),
+    isMandatory: false,
+    type: "text",
+    populators: {
+      name: "floorNo"
+    }
+  }, {
+    label: isHospitalOrNursing ? t("No of Beds") : t("No of Beds"),
+    isMandatory: isHospitalOrNursing,
+    type: "number",
+    populators: {
+      name: "noOfBeds",
+      validation: isHospitalOrNursing ? {
+        required: true,
+        min: 1
+      } : {}
+    }
+  }, {
+    label: isHotel ? t("No. of Rooms") : t("No. of Rooms"),
+    isMandatory: isHotel,
+    type: "number",
+    populators: {
+      name: "noOfRooms",
+      validation: isHotel ? {
+        required: true,
+        min: 1
+      } : {}
+    }
+  }, {
+    label: t("Number of Dwelling Units"),
+    isMandatory: false,
+    type: "number",
+    populators: {
+      name: "dwellingUnits"
+    }
+  }, {
+    label: t("Building Image"),
+    isMandatory: true,
+    type: "custom",
+    key: "buildingImage",
+    populators: {
+      name: "buildingImage",
+      component: props => /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(UploadFile, {
+        onUpload: e => uploadFile(e, props.onChange),
+        onDelete: () => {
+          props.onChange(null);
+          setBuildingImage(null);
+          setBuildingImageId(null);
+        },
+        message: buildingImageId ? t("Uploaded") : t("No file selected")
+      }), buildingImage && /*#__PURE__*/React.createElement("div", {
+        style: {
+          marginTop: "10px"
+        }
+      }, /*#__PURE__*/React.createElement("img", {
+        src: buildingImage,
+        alt: "preview",
+        style: {
+          maxWidth: "100%",
+          maxHeight: "200px",
+          objectFit: "contain"
+        }
+      })))
+    }
+  }];
+  return [{
+    head: t("EKYC_PROPERTY_DETAILS"),
+    body: fields
+  }];
+};
+
 const PropertyInfo = ({
   config,
   onSelect,
@@ -5561,14 +6284,17 @@ const PropertyInfo = ({
   const location = useLocation();
   const flowState = location.state || {};
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const searchKno = (flowState === null || flowState === void 0 ? void 0 : flowState.kNumber) || (flowState === null || flowState === void 0 ? void 0 : flowState.kno) || (formData === null || formData === void 0 ? void 0 : formData.kNumber) || (formData === null || formData === void 0 ? void 0 : formData.kno) || sessionStorage.getItem("EKYC_K_NUMBER");
+  const queryParams = new URLSearchParams(location.search);
+  const urlKno = queryParams.get("kno");
+  const searchKno = urlKno || (flowState === null || flowState === void 0 ? void 0 : flowState.kNumber) || (flowState === null || flowState === void 0 ? void 0 : flowState.kno) || (formData === null || formData === void 0 ? void 0 : formData.kNumber) || (formData === null || formData === void 0 ? void 0 : formData.kno) || sessionStorage.getItem("EKYC_K_NUMBER");
   const {
     isLoading,
     data: searchData
   } = Digit.Hooks.ekyc.useSearchConnection({
     tenantId,
     details: {
-      kno: searchKno
+      kno: searchKno,
+      fetchType: "PROPERTY"
     }
   }, {
     enabled: !!searchKno,
@@ -5576,69 +6302,97 @@ const PropertyInfo = ({
   });
   const updateMutation = Digit.Hooks.ekyc.useEkycUpdate(tenantId);
   const savedData = (formData === null || formData === void 0 ? void 0 : formData.propertyDetails) || {};
-  const [pidNumber, setPidNumber] = useState(savedData.pidNumber || "");
-  const [propertyType, setPropertyType] = useState(savedData.propertyType ? {
-    name: savedData.propertyType
-  } : null);
-  const [subPropertyCategory, setSubPropertyCategory] = useState(savedData.subPropertyCategory ? {
-    name: savedData.subPropertyCategory
-  } : null);
-  const [noOfFloors, setNoOfFloors] = useState(savedData.noOfFloors || "");
-  const [floorNo, setFloorNo] = useState(savedData.floorNo || "");
-  const [noOfRooms, setNoOfRooms] = useState(savedData.noOfRooms || "");
-  const [noOfBeds, setNoOfBeds] = useState(savedData.noOfBeds || "");
-  const [dwellingUnits, setDwellingUnits] = useState(savedData.dwellingUnits || "");
   const [buildingImage, setBuildingImage] = useState(null);
   const [buildingImageId, setBuildingImageId] = useState(savedData.buildingImageId || null);
   const [toast, setToast] = useState(null);
-  const propertyTypeOptions = [{
-    name: "Residential"
-  }, {
-    name: "Commercial"
-  }, {
-    name: "Hotel"
-  }, {
-    name: "Hospital"
-  }, {
-    name: "Nursing Home"
-  }];
+  const [isDataLoaded, setIsDataLoaded] = useState(false);
+  const [canSubmit, setCanSubmit] = useState(false);
+  const [defaultValues, setDefaultValues] = useState(() => ({
+    pidNumber: savedData.pidNumber || "",
+    propertyType: savedData.propertyType ? {
+      name: savedData.propertyType
+    } : null,
+    subPropertyCategory: savedData.subPropertyCategory ? {
+      name: savedData.subPropertyCategory
+    } : null,
+    noOfFloors: savedData.noOfFloors || "",
+    floorNo: savedData.floorNo || "",
+    noOfRooms: savedData.noOfRooms || "",
+    noOfBeds: savedData.noOfBeds || "",
+    dwellingUnits: savedData.dwellingUnits || "",
+    buildingImage: savedData.buildingImageId ? "Uploaded" : null
+  }));
+  const [localFormData, setLocalFormData] = useState(defaultValues);
+  const extractApplicationData = searchData => {
+    if (!searchData) return null;
+    const reviewWrapper = (searchData === null || searchData === void 0 ? void 0 : searchData.applicationReviewInfo) || (searchData === null || searchData === void 0 ? void 0 : searchData.applicationReview) || searchData;
+    const applicationData = (Array.isArray(reviewWrapper) ? reviewWrapper[0] : reviewWrapper) || {};
+    return (applicationData === null || applicationData === void 0 ? void 0 : applicationData.newData) || applicationData;
+  };
   useEffect(() => {
-    const rawData = searchData || (formData === null || formData === void 0 ? void 0 : formData.connectionDetails);
-    const propertyInfo = (rawData === null || rawData === void 0 ? void 0 : rawData.propertyInfo) || (rawData === null || rawData === void 0 ? void 0 : rawData.propertyDetails) || {};
-    if (propertyInfo && Object.keys(propertyInfo).length > 0 && !savedData.pidNumber) {
-      if (propertyInfo.pidNumber) setPidNumber(propertyInfo.pidNumber);
-      if (propertyInfo.numberOfFloors || propertyInfo.noOfFloor) setNoOfFloors(String(propertyInfo.numberOfFloors || propertyInfo.noOfFloor));
-      if (propertyInfo.buildingImageFileStoreId) setBuildingImageId(propertyInfo.buildingImageFileStoreId);
+    const appData = extractApplicationData(searchData);
+    const rawData = appData || (formData === null || formData === void 0 ? void 0 : formData.connectionDetails);
+    const propertyInfo = (rawData === null || rawData === void 0 ? void 0 : rawData.propertyInfo) || (rawData === null || rawData === void 0 ? void 0 : rawData.propertyDetails) || rawData || {};
+    if (propertyInfo && Object.keys(propertyInfo).length > 0 && !isDataLoaded) {
+      let propType = null;
+      let subPropCat = null;
       if (propertyInfo.subPropertyCategory) {
-        const matchingType = propertyTypeOptions.find(type => type.name.toLowerCase() === propertyInfo.subPropertyCategory.toLowerCase());
-        if (matchingType) setPropertyType(matchingType);else setPropertyType({
+        const matchingType = [{
+          name: "Residential"
+        }, {
+          name: "Commercial"
+        }, {
+          name: "Hotel"
+        }, {
+          name: "Hospital"
+        }, {
+          name: "Nursing Home"
+        }].find(type => type.name.toLowerCase() === propertyInfo.subPropertyCategory.toLowerCase());
+        if (matchingType) propType = matchingType;else propType = {
           name: propertyInfo.subPropertyCategory
-        });
-        setSubPropertyCategory({
+        };
+        subPropCat = {
           name: propertyInfo.subPropertyCategory
-        });
+        };
       }
       if (propertyInfo.propertyType) {
-        setSubPropertyCategory({
+        subPropCat = {
           name: propertyInfo.propertyType
-        });
-        if (!propertyInfo.subPropertyCategory) setPropertyType({
+        };
+        if (!propertyInfo.subPropertyCategory) propType = {
           name: propertyInfo.propertyType
-        });
+        };
       }
-      if (propertyInfo.floorNo) setFloorNo(propertyInfo.floorNo);
-      if (propertyInfo.numberOfRooms !== null && propertyInfo.numberOfRooms !== undefined) setNoOfRooms(String(propertyInfo.numberOfRooms));
-      if (propertyInfo.numberOfBeds !== null && propertyInfo.numberOfBeds !== undefined) setNoOfBeds(String(propertyInfo.numberOfBeds));
-      if (propertyInfo.numberOfDwellingUnits !== null && propertyInfo.numberOfDwellingUnits !== undefined) setDwellingUnits(String(propertyInfo.numberOfDwellingUnits));
+      const updatedDefaults = {
+        pidNumber: savedData.pidNumber || propertyInfo.pidNumber || "",
+        propertyType: savedData.propertyType ? {
+          name: savedData.propertyType
+        } : propType,
+        subPropertyCategory: savedData.subPropertyCategory ? {
+          name: savedData.subPropertyCategory
+        } : subPropCat,
+        noOfFloors: savedData.noOfFloors || (propertyInfo.numberOfFloors || propertyInfo.noOfFloor ? String(propertyInfo.numberOfFloors || propertyInfo.noOfFloor) : ""),
+        floorNo: savedData.floorNo || propertyInfo.floorNo || "",
+        noOfRooms: savedData.noOfRooms || (propertyInfo.numberOfRooms !== null && propertyInfo.numberOfRooms !== undefined ? String(propertyInfo.numberOfRooms) : ""),
+        noOfBeds: savedData.noOfBeds || (propertyInfo.numberOfBeds !== null && propertyInfo.numberOfBeds !== undefined ? String(propertyInfo.numberOfBeds) : ""),
+        dwellingUnits: savedData.dwellingUnits || (propertyInfo.numberOfDwellingUnits !== null && propertyInfo.numberOfDwellingUnits !== undefined ? String(propertyInfo.numberOfDwellingUnits) : ""),
+        buildingImage: savedData.buildingImageId || propertyInfo.buildingImageFileStoreId || null
+      };
+      setDefaultValues(updatedDefaults);
+      setLocalFormData(updatedDefaults);
+      if (updatedDefaults.buildingImage) {
+        setBuildingImageId(updatedDefaults.buildingImage);
+      }
+      setIsDataLoaded(true);
     }
-  }, [searchData, formData === null || formData === void 0 ? void 0 : formData.connectionDetails]);
-  const handleUpload = async e => {
+  }, [searchData, formData === null || formData === void 0 ? void 0 : formData.connectionDetails, isDataLoaded]);
+  const handleUpload = async (e, onChange) => {
     const file = e.target.files[0];
     if (!file) return;
     if (file.size > 2000000) {
       setToast({
         type: "error",
-        message: "Max size 2MB exceeded"
+        message: t("Max size 2MB exceeded")
       });
       return;
     }
@@ -5647,132 +6401,370 @@ const PropertyInfo = ({
       const res = await Digit.UploadServices.Filestorage("EKYC", file, tenantId);
       const fileStoreId = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$files = _res$data.files) === null || _res$data$files === void 0 ? void 0 : (_res$data$files$ = _res$data$files[0]) === null || _res$data$files$ === void 0 ? void 0 : _res$data$files$.fileStoreId;
       if (fileStoreId) {
+        onChange(file.name);
         setBuildingImageId(fileStoreId);
         const reader = new FileReader();
         reader.onloadend = () => setBuildingImage(reader.result);
         reader.readAsDataURL(file);
         setToast({
           type: "success",
-          message: "Upload successful"
+          message: t("Upload successful")
         });
       }
     } catch {
       setToast({
         type: "error",
-        message: "Upload failed"
+        message: t("Upload failed")
       });
     }
   };
-  const isValid = () => {
-    if (!propertyType) return false;
-    if (!subPropertyCategory) return false;
-    if (!noOfFloors || Number(noOfFloors) < 1) return false;
-    if (!buildingImageId) return false;
-    if ((propertyType === null || propertyType === void 0 ? void 0 : propertyType.name) === "Hotel" && !noOfRooms) return false;
-    if (((propertyType === null || propertyType === void 0 ? void 0 : propertyType.name) === "Hospital" || (propertyType === null || propertyType === void 0 ? void 0 : propertyType.name) === "Nursing Home") && !noOfBeds) return false;
-    return true;
+  const onFormValueChange = (setValue, data) => {
+    var _data$propertyType, _localFormData$proper;
+    const propertyTypeChanged = ((data === null || data === void 0 ? void 0 : (_data$propertyType = data.propertyType) === null || _data$propertyType === void 0 ? void 0 : _data$propertyType.name) || (data === null || data === void 0 ? void 0 : data.propertyType)) !== ((localFormData === null || localFormData === void 0 ? void 0 : (_localFormData$proper = localFormData.propertyType) === null || _localFormData$proper === void 0 ? void 0 : _localFormData$proper.name) || (localFormData === null || localFormData === void 0 ? void 0 : localFormData.propertyType));
+    if (propertyTypeChanged) {
+      setLocalFormData(prev => ({
+        ...prev,
+        ...data
+      }));
+    }
+    const propTypeVal = data === null || data === void 0 ? void 0 : data.propertyType;
+    const subPropCatVal = data === null || data === void 0 ? void 0 : data.subPropertyCategory;
+    const noOfFloorsVal = data === null || data === void 0 ? void 0 : data.noOfFloors;
+    const buildingImgId = buildingImageId || (data === null || data === void 0 ? void 0 : data.buildingImage);
+    const noOfRoomsVal = data === null || data === void 0 ? void 0 : data.noOfRooms;
+    const noOfBedsVal = data === null || data === void 0 ? void 0 : data.noOfBeds;
+    let valid = true;
+    if (!propTypeVal) valid = false;
+    if (!subPropCatVal) valid = false;
+    if (!noOfFloorsVal || Number(noOfFloorsVal) < 1) valid = false;
+    if (!buildingImgId) valid = false;
+    if ((propTypeVal === null || propTypeVal === void 0 ? void 0 : propTypeVal.name) === "Hotel" && !noOfRoomsVal) valid = false;
+    if (((propTypeVal === null || propTypeVal === void 0 ? void 0 : propTypeVal.name) === "Hospital" || (propTypeVal === null || propTypeVal === void 0 ? void 0 : propTypeVal.name) === "Nursing Home") && !noOfBedsVal) valid = false;
+    if (valid !== canSubmit) {
+      setCanSubmit(valid);
+    }
   };
-  const onStepSelect = async () => {
-    const data = {
-      pidNumber,
-      propertyType: propertyType === null || propertyType === void 0 ? void 0 : propertyType.name,
-      subPropertyCategory: subPropertyCategory === null || subPropertyCategory === void 0 ? void 0 : subPropertyCategory.name,
-      noOfFloors,
-      floorNo,
-      noOfRooms,
-      noOfBeds,
-      dwellingUnits,
-      buildingImageId
+  const onSubmit = async data => {
+    var _data$propertyType2, _data$subPropertyCate;
+    const submitData = {
+      pidNumber: data.pidNumber,
+      propertyType: ((_data$propertyType2 = data.propertyType) === null || _data$propertyType2 === void 0 ? void 0 : _data$propertyType2.name) || data.propertyType,
+      subPropertyCategory: ((_data$subPropertyCate = data.subPropertyCategory) === null || _data$subPropertyCate === void 0 ? void 0 : _data$subPropertyCate.name) || data.subPropertyCategory,
+      noOfFloors: data.noOfFloors,
+      floorNo: data.floorNo,
+      noOfRooms: data.noOfRooms,
+      noOfBeds: data.noOfBeds,
+      dwellingUnits: data.dwellingUnits,
+      buildingImageId: buildingImageId
     };
     try {
       await updateMutation.mutateAsync({
         RequestInfo: {},
         updateType: "PROPERTY",
         kno: searchKno,
-        ...data
+        ...submitData
       });
       setToast({
         type: "success",
-        message: "Property details updated successfully!"
+        message: t("Property details updated successfully!")
       });
-      onSelect(config.key, data);
+      onSelect(config.key, submitData);
     } catch (error) {
       setToast({
         type: "error",
-        message: "Failed to update property details"
+        message: t("Failed to update property details")
       });
     }
   };
   if (isLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
-  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(FormStep, {
-    t: t,
-    onSelect: onStepSelect,
-    config: config,
+  const Config = PropertyInfoConfig(t, localFormData, handleUpload, buildingImage, buildingImageId, setBuildingImage, setBuildingImageId);
+  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(FormComposer, {
+    key: isDataLoaded ? "loaded" : "loading",
+    isDisabled: !canSubmit,
     label: t("ES_COMMON_CONTINUE"),
-    isDisabled: !isValid()
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "PID Number"), /*#__PURE__*/React.createElement(TextInput, {
-    value: pidNumber,
-    onChange: e => setPidNumber(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Property Type"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: propertyTypeOptions,
-    selected: propertyType,
-    select: setPropertyType
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Sub Property Category"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: [],
-    selected: subPropertyCategory,
-    select: setSubPropertyCategory
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "No. of Floors *"), /*#__PURE__*/React.createElement(TextInput, {
-    type: "number",
-    value: noOfFloors,
-    onChange: e => setNoOfFloors(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Floor No. of this KNO"), /*#__PURE__*/React.createElement(TextInput, {
-    value: floorNo,
-    onChange: e => setFloorNo(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "No of Beds"), /*#__PURE__*/React.createElement(TextInput, {
-    type: "number",
-    value: noOfBeds,
-    onChange: e => setNoOfBeds(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "No. of Rooms"), /*#__PURE__*/React.createElement(TextInput, {
-    type: "number",
-    value: noOfRooms,
-    onChange: e => setNoOfRooms(e.target.value)
-  })), (propertyType === null || propertyType === void 0 ? void 0 : propertyType.name) === "Hotel" && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "No. of Rooms *"), /*#__PURE__*/React.createElement(TextInput, {
-    type: "number",
-    value: noOfRooms,
-    onChange: e => setNoOfRooms(e.target.value)
-  })), ((propertyType === null || propertyType === void 0 ? void 0 : propertyType.name) === "Hospital" || (propertyType === null || propertyType === void 0 ? void 0 : propertyType.name) === "Nursing Home") && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "No. of Beds *"), /*#__PURE__*/React.createElement(TextInput, {
-    type: "number",
-    value: noOfBeds,
-    onChange: e => setNoOfBeds(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Number of Dwelling Units"), /*#__PURE__*/React.createElement(TextInput, {
-    type: "number",
-    value: dwellingUnits,
-    onChange: e => setDwellingUnits(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Building Image *"), /*#__PURE__*/React.createElement(UploadFile, {
-    onUpload: handleUpload,
-    onDelete: () => {
-      setBuildingImage(null);
-      setBuildingImageId(null);
-    },
-    message: buildingImageId ? "Uploaded" : "No file selected"
-  })), buildingImage && /*#__PURE__*/React.createElement("div", {
-    style: {
-      gridColumn: "span 2"
-    }
-  }, /*#__PURE__*/React.createElement("img", {
-    src: buildingImage,
-    alt: "preview",
-    style: {
-      width: "100%",
-      marginTop: "10px"
-    }
-  })), toast && /*#__PURE__*/React.createElement(Toast, {
-    label: toast.message,
+    config: Config.map(item => ({
+      ...item,
+      isCollapsible: true,
+      isDefaultOpen: true
+    })),
+    onSubmit: onSubmit,
+    defaultValues: defaultValues,
+    onFormValueChange: onFormValueChange,
+    noCard: false,
+    submitInForm: true
+  }), toast && /*#__PURE__*/React.createElement(Toast, {
     error: toast.type === "error",
+    label: toast.message,
     onClose: () => setToast(null)
-  })));
+  }));
+};
+
+const MeterDetailsConfig = (t, formData = {}, uploadPhoto, meterPhoto, meterPhotoId, setMeterPhoto, setMeterPhotoId) => {
+  var _formData$meterStatus, _formData$lastBillRec, _formData$sewerConnec;
+  const meterStatus = (formData === null || formData === void 0 ? void 0 : (_formData$meterStatus = formData.meterStatus) === null || _formData$meterStatus === void 0 ? void 0 : _formData$meterStatus.name) || (formData === null || formData === void 0 ? void 0 : formData.meterStatus);
+  const lastBillReceived = (formData === null || formData === void 0 ? void 0 : (_formData$lastBillRec = formData.lastBillReceived) === null || _formData$lastBillRec === void 0 ? void 0 : _formData$lastBillRec.name) || (formData === null || formData === void 0 ? void 0 : formData.lastBillReceived);
+  const sewerConnection = (formData === null || formData === void 0 ? void 0 : (_formData$sewerConnec = formData.sewerConnection) === null || _formData$sewerConnec === void 0 ? void 0 : _formData$sewerConnec.name) || (formData === null || formData === void 0 ? void 0 : formData.sewerConnection);
+  const isFrozen = meterStatus === "Can not be identified";
+  const monthYearOptions = [];
+  for (let y = 1998; y <= 2026; y++) {
+    for (let m = 1; m <= 12; m++) {
+      monthYearOptions.push({
+        name: `${m}/${y}`
+      });
+    }
+  }
+  const yesNo = [{
+    name: "Yes"
+  }, {
+    name: "No"
+  }];
+  const fields = [{
+    label: t("Connection Category"),
+    isMandatory: true,
+    type: "text",
+    populators: {
+      name: "connectionCategory",
+      validation: {
+        required: true
+      }
+    }
+  }, {
+    label: t("SA Type"),
+    isMandatory: false,
+    type: "text",
+    populators: {
+      name: "saType"
+    }
+  }, {
+    label: t("Status"),
+    isMandatory: false,
+    type: "text",
+    populators: {
+      name: "status"
+    }
+  }, {
+    label: t("MR Code"),
+    isMandatory: false,
+    type: "text",
+    populators: {
+      name: "mrCode"
+    }
+  }, {
+    label: t("Area Code"),
+    isMandatory: false,
+    type: "text",
+    populators: {
+      name: "areaCode"
+    }
+  }, {
+    label: t("MR Key"),
+    isMandatory: false,
+    type: "text",
+    populators: {
+      name: "mrKey"
+    }
+  }];
+  if (!isFrozen) {
+    fields.push({
+      label: t("Meter Number"),
+      isMandatory: false,
+      type: "text",
+      populators: {
+        name: "meterNumber"
+      }
+    }, {
+      label: t("Meter Maker"),
+      isMandatory: false,
+      type: "text",
+      populators: {
+        name: "meterMaker"
+      }
+    }, {
+      label: t("Meter Condition"),
+      isMandatory: false,
+      type: "custom",
+      key: "meterCondition",
+      populators: {
+        name: "meterCondition",
+        component: props => /*#__PURE__*/React.createElement(Dropdown, {
+          option: [{
+            name: "Damaged"
+          }, {
+            name: "Not-Damaged"
+          }],
+          optionKey: "name",
+          selected: props.value,
+          select: props.onChange
+        })
+      }
+    });
+    if (meterStatus === "Metered") {
+      fields.push({
+        label: t("Meter Photo *"),
+        isMandatory: true,
+        type: "custom",
+        key: "meterPhoto",
+        populators: {
+          name: "meterPhoto",
+          component: props => /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(UploadFile, {
+            onUpload: e => uploadPhoto(e, props.onChange),
+            onDelete: () => {
+              props.onChange(null);
+              setMeterPhoto(null);
+              setMeterPhotoId(null);
+            },
+            message: meterPhotoId ? t("Uploaded") : t("No file selected")
+          }), meterPhoto && /*#__PURE__*/React.createElement("div", {
+            style: {
+              marginTop: "10px"
+            }
+          }, /*#__PURE__*/React.createElement("img", {
+            src: meterPhoto,
+            alt: "preview",
+            style: {
+              maxWidth: "100%",
+              maxHeight: "200px",
+              objectFit: "contain"
+            }
+          })))
+        }
+      });
+    }
+  }
+  fields.push({
+    label: t("Meter Status"),
+    isMandatory: true,
+    type: "custom",
+    key: "meterStatus",
+    populators: {
+      name: "meterStatus",
+      component: props => /*#__PURE__*/React.createElement(Dropdown, {
+        option: [{
+          name: "Metered"
+        }, {
+          name: "Unmetered"
+        }, {
+          name: "Can not be identified"
+        }],
+        optionKey: "name",
+        selected: props.value,
+        select: props.onChange
+      })
+    }
+  }, {
+    label: t("Meter Location"),
+    isMandatory: true,
+    type: "custom",
+    key: "meterLocation",
+    populators: {
+      name: "meterLocation",
+      component: props => /*#__PURE__*/React.createElement(Dropdown, {
+        option: [{
+          name: "Inside"
+        }, {
+          name: "Outside"
+        }],
+        optionKey: "name",
+        selected: props.value,
+        select: props.onChange
+      })
+    }
+  }, {
+    label: t("Last Bill Received"),
+    isMandatory: true,
+    type: "custom",
+    key: "lastBillReceived",
+    populators: {
+      name: "lastBillReceived",
+      component: props => /*#__PURE__*/React.createElement(Dropdown, {
+        option: yesNo,
+        optionKey: "name",
+        selected: props.value,
+        select: props.onChange
+      })
+    }
+  });
+  if (lastBillReceived === "Yes") {
+    fields.push({
+      label: t("When was the last bill received *"),
+      isMandatory: true,
+      type: "custom",
+      key: "billMonthYear",
+      populators: {
+        name: "billMonthYear",
+        component: props => /*#__PURE__*/React.createElement(Dropdown, {
+          option: monthYearOptions,
+          optionKey: "name",
+          selected: props.value,
+          select: props.onChange
+        })
+      }
+    });
+  } else if (lastBillReceived === "No") {
+    fields.push({
+      label: t("Reason *"),
+      isMandatory: true,
+      type: "text",
+      populators: {
+        name: "reason",
+        validation: {
+          required: true
+        }
+      }
+    });
+  }
+  fields.push({
+    label: t("Access to Meter"),
+    isMandatory: false,
+    type: "custom",
+    key: "accessToMeter",
+    populators: {
+      name: "accessToMeter",
+      component: props => /*#__PURE__*/React.createElement(Dropdown, {
+        option: yesNo,
+        optionKey: "name",
+        selected: props.value,
+        select: props.onChange
+      })
+    }
+  }, {
+    label: t("Sewer Connection"),
+    isMandatory: true,
+    type: "custom",
+    key: "sewerConnection",
+    populators: {
+      name: "sewerConnection",
+      component: props => /*#__PURE__*/React.createElement(Dropdown, {
+        option: yesNo,
+        optionKey: "name",
+        selected: props.value,
+        select: props.onChange
+      })
+    }
+  });
+  if (sewerConnection === "No") {
+    fields.push({
+      label: t("Septic Tank"),
+      isMandatory: true,
+      type: "custom",
+      key: "septicTank",
+      populators: {
+        name: "septicTank",
+        component: props => /*#__PURE__*/React.createElement(Dropdown, {
+          option: yesNo,
+          optionKey: "name",
+          selected: props.value,
+          select: props.onChange
+        })
+      }
+    });
+  }
+  return [{
+    head: t("EKYC_METER_DETAILS"),
+    body: fields
+  }];
 };
 
 const MeterDetails = ({
@@ -5780,17 +6772,23 @@ const MeterDetails = ({
   onSelect,
   formData
 }) => {
+  const {
+    t
+  } = useTranslation();
   const location = useLocation();
   const flowState = location.state || {};
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const searchKno = (flowState === null || flowState === void 0 ? void 0 : flowState.kNumber) || (flowState === null || flowState === void 0 ? void 0 : flowState.kno) || (formData === null || formData === void 0 ? void 0 : formData.kNumber) || (formData === null || formData === void 0 ? void 0 : formData.kno) || sessionStorage.getItem("EKYC_K_NUMBER");
+  const queryParams = new URLSearchParams(location.search);
+  const urlKno = queryParams.get("kno");
+  const searchKno = urlKno || (flowState === null || flowState === void 0 ? void 0 : flowState.kNumber) || (flowState === null || flowState === void 0 ? void 0 : flowState.kno) || (formData === null || formData === void 0 ? void 0 : formData.kNumber) || (formData === null || formData === void 0 ? void 0 : formData.kno) || sessionStorage.getItem("EKYC_K_NUMBER");
   const {
     isLoading,
     data: searchData
   } = Digit.Hooks.ekyc.useSearchConnection({
     tenantId,
     details: {
-      kno: searchKno
+      kno: searchKno,
+      fetchType: "METER"
     }
   }, {
     enabled: !!searchKno,
@@ -5798,113 +6796,110 @@ const MeterDetails = ({
   });
   const updateMutation = Digit.Hooks.ekyc.useEkycUpdate(tenantId);
   const savedData = (formData === null || formData === void 0 ? void 0 : formData.meterDetails) || {};
-  const [connectionCategory, setConnectionCategory] = useState(savedData.connectionCategory || "");
-  const [saType, setSaType] = useState(savedData.saType || "");
-  const [status, setStatus] = useState(savedData.status || "");
-  const [mrCode, setMrCode] = useState(savedData.mrCode || "");
-  const [areaCode, setAreaCode] = useState(savedData.areaCode || "");
-  const [mrKey, setMrKey] = useState(savedData.mrKey || "");
-  const [meterNumber, setMeterNumber] = useState(savedData.meterNumber || "");
-  const [meterMaker, setMeterMaker] = useState(savedData.meterMaker || "");
-  const [meterStatus, setMeterStatus] = useState(savedData.meterStatus ? {
-    name: savedData.meterStatus
-  } : null);
-  const [meterCondition, setMeterCondition] = useState(savedData.meterCondition ? {
-    name: savedData.meterCondition
-  } : null);
-  const [meterLocation, setMeterLocation] = useState(savedData.meterLocation ? {
-    name: savedData.meterLocation
-  } : null);
-  const [lastBillReceived, setLastBillReceived] = useState(savedData.lastBillReceived ? {
-    name: savedData.lastBillReceived
-  } : null);
-  const [billMonthYear, setBillMonthYear] = useState(savedData.billMonthYear ? {
-    name: savedData.billMonthYear
-  } : null);
-  const [reason, setReason] = useState(savedData.reason || "");
-  const [accessToMeter, setAccessToMeter] = useState(savedData.accessToMeter ? {
-    name: savedData.accessToMeter
-  } : null);
-  const [sewerConnection, setSewerConnection] = useState(savedData.sewerConnection ? {
-    name: savedData.sewerConnection
-  } : null);
-  const [septicTank, setSepticTank] = useState(savedData.septicTank ? {
-    name: savedData.septicTank
-  } : null);
   const [meterPhoto, setMeterPhoto] = useState(null);
   const [meterPhotoId, setMeterPhotoId] = useState(savedData.meterPhotoId || null);
   const [toast, setToast] = useState(null);
-  const yesNo = [{
-    name: "Yes"
-  }, {
-    name: "No"
-  }];
-  const meterStatusOptions = [{
-    name: "Metered"
-  }, {
-    name: "Unmetered"
-  }, {
-    name: "Can not be identified"
-  }];
-  const meterConditionOptions = [{
-    name: "Damaged"
-  }, {
-    name: "Not-Damaged"
-  }];
-  const meterLocationOptions = [{
-    name: "Inside"
-  }, {
-    name: "Outside"
-  }];
-  const monthYearOptions = [];
-  for (let y = 1998; y <= 2026; y++) {
-    for (let m = 1; m <= 12; m++) {
-      monthYearOptions.push({
-        name: `${m}/${y}`
-      });
-    }
-  }
+  const [isDataLoaded, setIsDataLoaded] = useState(false);
+  const [canSubmit, setCanSubmit] = useState(false);
+  const [defaultValues, setDefaultValues] = useState(() => ({
+    connectionCategory: savedData.connectionCategory || "",
+    saType: savedData.saType || "",
+    status: savedData.status || "",
+    mrCode: savedData.mrCode || "",
+    areaCode: savedData.areaCode || "",
+    mrKey: savedData.mrKey || "",
+    meterNumber: savedData.meterNumber || "",
+    meterMaker: savedData.meterMaker || "",
+    meterStatus: savedData.meterStatus ? {
+      name: savedData.meterStatus
+    } : null,
+    meterCondition: savedData.meterCondition ? {
+      name: savedData.meterCondition
+    } : null,
+    meterLocation: savedData.meterLocation ? {
+      name: savedData.meterLocation
+    } : null,
+    lastBillReceived: savedData.lastBillReceived ? {
+      name: savedData.lastBillReceived
+    } : null,
+    billMonthYear: savedData.billMonthYear ? {
+      name: savedData.billMonthYear
+    } : null,
+    reason: savedData.reason || "",
+    accessToMeter: savedData.accessToMeter ? {
+      name: savedData.accessToMeter
+    } : null,
+    sewerConnection: savedData.sewerConnection ? {
+      name: savedData.sewerConnection
+    } : null,
+    septicTank: savedData.septicTank ? {
+      name: savedData.septicTank
+    } : null,
+    meterPhoto: savedData.meterPhotoId ? "Uploaded" : null
+  }));
+  const [localFormData, setLocalFormData] = useState(defaultValues);
+  const extractApplicationData = searchData => {
+    if (!searchData) return null;
+    const reviewWrapper = (searchData === null || searchData === void 0 ? void 0 : searchData.applicationReviewInfo) || (searchData === null || searchData === void 0 ? void 0 : searchData.applicationReview) || searchData;
+    const applicationData = (Array.isArray(reviewWrapper) ? reviewWrapper[0] : reviewWrapper) || {};
+    return (applicationData === null || applicationData === void 0 ? void 0 : applicationData.newData) || applicationData;
+  };
   useEffect(() => {
-    const rawData = searchData || (formData === null || formData === void 0 ? void 0 : formData.connectionDetails);
+    const appData = extractApplicationData(searchData);
+    const rawData = appData || (formData === null || formData === void 0 ? void 0 : formData.connectionDetails);
     const apiMeter = (rawData === null || rawData === void 0 ? void 0 : rawData.meterDetails) || rawData || {};
-    if (apiMeter && Object.keys(apiMeter).length > 0 && !savedData.connectionCategory) {
-      if (apiMeter.connectionCategory) setConnectionCategory(apiMeter.connectionCategory);
-      if (apiMeter.saType) setSaType(apiMeter.saType);
-      if (apiMeter.statusFlag) setStatus(apiMeter.statusFlag);
-      if (apiMeter.mrcode) setMrCode(String(apiMeter.mrcode));
-      if (apiMeter.areacode) setAreaCode(String(apiMeter.areacode));
-      if (apiMeter.mrkey) setMrKey(String(apiMeter.mrkey));
-      if (apiMeter.meterNumber) setMeterNumber(apiMeter.meterNumber);
-      if (apiMeter.meterMake) setMeterMaker(apiMeter.meterMake);
+    if (apiMeter && Object.keys(apiMeter).length > 0 && !isDataLoaded) {
+      let mStatus = null;
+      let mCondition = null;
+      let mLoc = null;
+      let billRec = null;
+      let billMonYr = null;
+      let accToMeter = null;
+      let sewerConn = null;
+      let sepTank = null;
       if (apiMeter.meterStatus) {
-        const matchingStatus = meterStatusOptions.find(o => o.name.toLowerCase() === apiMeter.meterStatus.toLowerCase());
-        if (matchingStatus) setMeterStatus(matchingStatus);else setMeterStatus({
+        const matchingStatus = [{
+          name: "Metered"
+        }, {
+          name: "Unmetered"
+        }, {
+          name: "Can not be identified"
+        }].find(o => o.name.toLowerCase() === apiMeter.meterStatus.toLowerCase());
+        if (matchingStatus) mStatus = matchingStatus;else mStatus = {
           name: apiMeter.meterStatus
-        });
+        };
       } else if (apiMeter.metered !== undefined) {
-        setMeterStatus({
+        mStatus = {
           name: apiMeter.metered ? "Metered" : "Unmetered"
-        });
+        };
       }
       if (apiMeter.meterCondition) {
-        const matchingCond = meterConditionOptions.find(o => o.name.toLowerCase() === apiMeter.meterCondition.toLowerCase());
-        if (matchingCond) setMeterCondition(matchingCond);else setMeterCondition({
+        const matchingCond = [{
+          name: "Damaged"
+        }, {
+          name: "Not-Damaged"
+        }].find(o => o.name.toLowerCase() === apiMeter.meterCondition.toLowerCase());
+        if (matchingCond) mCondition = matchingCond;else mCondition = {
           name: apiMeter.meterCondition
-        });
+        };
       }
       if (apiMeter.meterLocation) {
-        const matchingLoc = meterLocationOptions.find(o => o.name.toLowerCase() === apiMeter.meterLocation.toLowerCase() || apiMeter.meterLocation.toLowerCase().includes(o.name.toLowerCase()));
-        if (matchingLoc) setMeterLocation(matchingLoc);else setMeterLocation({
+        const matchingLoc = [{
+          name: "Inside"
+        }, {
+          name: "Outside"
+        }].find(o => o.name.toLowerCase() === apiMeter.meterLocation.toLowerCase() || apiMeter.meterLocation.toLowerCase().includes(o.name.toLowerCase()));
+        if (matchingLoc) mLoc = matchingLoc;else mLoc = {
           name: apiMeter.meterLocation
-        });
+        };
       }
       if (apiMeter.lastBillRaised !== undefined && apiMeter.lastBillRaised !== null) {
         const strVal = String(apiMeter.lastBillRaised).toLowerCase();
-        if (strVal === "true" || strVal === "yes") setLastBillReceived({
+        if (strVal === "true" || strVal === "yes") billRec = {
           name: "Yes"
-        });else setLastBillReceived({
+        };else billRec = {
           name: "No"
-        });
+        };
       }
       if (apiMeter.lastBillReceivedDate) {
         const formatted = apiMeter.lastBillReceivedDate.replace("-", "/");
@@ -5912,199 +6907,213 @@ const MeterDetails = ({
         if (parsedParts.length === 2) {
           const mon = parseInt(parsedParts[0], 10);
           const yr = parseInt(parsedParts[1], 10);
-          setBillMonthYear({
+          billMonYr = {
             name: `${mon}/${yr}`
-          });
+          };
         } else {
-          setBillMonthYear({
+          billMonYr = {
             name: apiMeter.lastBillReceivedDate
-          });
+          };
         }
       }
-      if (apiMeter.lastBillNotRaisedReason) setReason(apiMeter.lastBillNotRaisedReason);
       if (apiMeter.accessToMeter !== undefined && apiMeter.accessToMeter !== null) {
         const strVal = String(apiMeter.accessToMeter).toLowerCase();
-        if (strVal === "true" || strVal === "yes") setAccessToMeter({
+        if (strVal === "true" || strVal === "yes") accToMeter = {
           name: "Yes"
-        });else setAccessToMeter({
+        };else accToMeter = {
           name: "No"
-        });
+        };
       }
       if (apiMeter.sewerConnection !== undefined && apiMeter.sewerConnection !== null) {
         const strVal = String(apiMeter.sewerConnection).toLowerCase();
-        if (strVal === "true" || strVal === "yes") setSewerConnection({
+        if (strVal === "true" || strVal === "yes") sewerConn = {
           name: "Yes"
-        });else setSewerConnection({
+        };else sewerConn = {
           name: "No"
-        });
+        };
       }
       if (apiMeter.septicTank !== undefined && apiMeter.septicTank !== null) {
         const strVal = String(apiMeter.septicTank).toLowerCase();
-        if (strVal === "true" || strVal === "yes") setSepticTank({
+        if (strVal === "true" || strVal === "yes") sepTank = {
           name: "Yes"
-        });else setSepticTank({
+        };else sepTank = {
           name: "No"
-        });
+        };
+      }
+      const updatedDefaults = {
+        connectionCategory: savedData.connectionCategory || apiMeter.connectionCategory || "",
+        saType: savedData.saType || apiMeter.saType || "",
+        status: savedData.status || apiMeter.statusFlag || "",
+        mrCode: savedData.mrCode || (apiMeter.mrcode ? String(apiMeter.mrcode) : ""),
+        areaCode: savedData.areaCode || (apiMeter.areacode ? String(apiMeter.areacode) : ""),
+        mrKey: savedData.mrKey || (apiMeter.mrkey ? String(apiMeter.mrkey) : ""),
+        meterNumber: savedData.meterNumber || apiMeter.meterNumber || "",
+        meterMaker: savedData.meterMaker || apiMeter.meterMake || "",
+        meterStatus: savedData.meterStatus ? {
+          name: savedData.meterStatus
+        } : mStatus,
+        meterCondition: savedData.meterCondition ? {
+          name: savedData.meterCondition
+        } : mCondition,
+        meterLocation: savedData.meterLocation ? {
+          name: savedData.meterLocation
+        } : mLoc,
+        lastBillReceived: savedData.lastBillReceived ? {
+          name: savedData.lastBillReceived
+        } : billRec,
+        billMonthYear: savedData.billMonthYear ? {
+          name: savedData.billMonthYear
+        } : billMonYr,
+        reason: savedData.reason || apiMeter.lastBillNotRaisedReason || "",
+        accessToMeter: savedData.accessToMeter ? {
+          name: savedData.accessToMeter
+        } : accToMeter,
+        sewerConnection: savedData.sewerConnection ? {
+          name: savedData.sewerConnection
+        } : sewerConn,
+        septicTank: savedData.septicTank ? {
+          name: savedData.septicTank
+        } : sepTank,
+        meterPhoto: savedData.meterPhotoId || apiMeter.meterPhotoFileStoreId || null
+      };
+      setDefaultValues(updatedDefaults);
+      setLocalFormData(updatedDefaults);
+      if (updatedDefaults.meterPhoto) {
+        setMeterPhotoId(updatedDefaults.meterPhoto);
       }
-      if (apiMeter.meterPhotoFileStoreId) setMeterPhotoId(apiMeter.meterPhotoFileStoreId);
+      setIsDataLoaded(true);
     }
-  }, [searchData, formData === null || formData === void 0 ? void 0 : formData.connectionDetails]);
-  const isFrozen = (meterStatus === null || meterStatus === void 0 ? void 0 : meterStatus.name) === "Can not be identified";
-  const uploadPhoto = async e => {
+  }, [searchData, formData === null || formData === void 0 ? void 0 : formData.connectionDetails, isDataLoaded]);
+  const handleUpload = async (e, onChange) => {
     const file = e.target.files[0];
     if (!file) return;
+    if (file.size > 2000000) {
+      setToast({
+        type: "error",
+        message: t("Max size 2MB exceeded")
+      });
+      return;
+    }
     try {
       var _res$data, _res$data$files, _res$data$files$;
       const res = await Digit.UploadServices.Filestorage("EKYC", file, tenantId);
-      const id = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$files = _res$data.files) === null || _res$data$files === void 0 ? void 0 : (_res$data$files$ = _res$data$files[0]) === null || _res$data$files$ === void 0 ? void 0 : _res$data$files$.fileStoreId;
-      if (id) {
-        setMeterPhotoId(id);
+      const fileStoreId = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$files = _res$data.files) === null || _res$data$files === void 0 ? void 0 : (_res$data$files$ = _res$data$files[0]) === null || _res$data$files$ === void 0 ? void 0 : _res$data$files$.fileStoreId;
+      if (fileStoreId) {
+        onChange(file.name);
+        setMeterPhotoId(fileStoreId);
         const reader = new FileReader();
         reader.onloadend = () => setMeterPhoto(reader.result);
         reader.readAsDataURL(file);
+        setToast({
+          type: "success",
+          message: t("Upload successful")
+        });
       }
     } catch {
       setToast({
         type: "error",
-        message: "Upload failed"
+        message: t("Upload failed")
       });
     }
   };
-  const isValid = () => {
-    if (!connectionCategory) return false;
-    if (!meterStatus) return false;
-    if (!meterLocation) return false;
-    if (!lastBillReceived) return false;
-    if (!sewerConnection) return false;
-    if ((meterStatus === null || meterStatus === void 0 ? void 0 : meterStatus.name) === "Metered" && !meterPhotoId) return false;
-    if ((lastBillReceived === null || lastBillReceived === void 0 ? void 0 : lastBillReceived.name) === "No" && !reason) return false;
-    if ((lastBillReceived === null || lastBillReceived === void 0 ? void 0 : lastBillReceived.name) === "Yes" && !billMonthYear) return false;
-    if ((sewerConnection === null || sewerConnection === void 0 ? void 0 : sewerConnection.name) === "No" && !septicTank) return false;
-    return true;
+  const onFormValueChange = (setValue, data) => {
+    var _data$meterStatus, _localFormData$meterS, _data$lastBillReceive, _localFormData$lastBi, _data$sewerConnection, _localFormData$sewerC;
+    const meterStatusChanged = ((data === null || data === void 0 ? void 0 : (_data$meterStatus = data.meterStatus) === null || _data$meterStatus === void 0 ? void 0 : _data$meterStatus.name) || (data === null || data === void 0 ? void 0 : data.meterStatus)) !== ((localFormData === null || localFormData === void 0 ? void 0 : (_localFormData$meterS = localFormData.meterStatus) === null || _localFormData$meterS === void 0 ? void 0 : _localFormData$meterS.name) || (localFormData === null || localFormData === void 0 ? void 0 : localFormData.meterStatus));
+    const lastBillReceivedChanged = ((data === null || data === void 0 ? void 0 : (_data$lastBillReceive = data.lastBillReceived) === null || _data$lastBillReceive === void 0 ? void 0 : _data$lastBillReceive.name) || (data === null || data === void 0 ? void 0 : data.lastBillReceived)) !== ((localFormData === null || localFormData === void 0 ? void 0 : (_localFormData$lastBi = localFormData.lastBillReceived) === null || _localFormData$lastBi === void 0 ? void 0 : _localFormData$lastBi.name) || (localFormData === null || localFormData === void 0 ? void 0 : localFormData.lastBillReceived));
+    const sewerConnectionChanged = ((data === null || data === void 0 ? void 0 : (_data$sewerConnection = data.sewerConnection) === null || _data$sewerConnection === void 0 ? void 0 : _data$sewerConnection.name) || (data === null || data === void 0 ? void 0 : data.sewerConnection)) !== ((localFormData === null || localFormData === void 0 ? void 0 : (_localFormData$sewerC = localFormData.sewerConnection) === null || _localFormData$sewerC === void 0 ? void 0 : _localFormData$sewerC.name) || (localFormData === null || localFormData === void 0 ? void 0 : localFormData.sewerConnection));
+    if (meterStatusChanged || lastBillReceivedChanged || sewerConnectionChanged) {
+      setLocalFormData(prev => ({
+        ...prev,
+        ...data
+      }));
+    }
+    const connCatVal = data === null || data === void 0 ? void 0 : data.connectionCategory;
+    const mStatusVal = data === null || data === void 0 ? void 0 : data.meterStatus;
+    const mLocVal = data === null || data === void 0 ? void 0 : data.meterLocation;
+    const billRecVal = data === null || data === void 0 ? void 0 : data.lastBillReceived;
+    const sewerConnVal = data === null || data === void 0 ? void 0 : data.sewerConnection;
+    const mPhotoId = meterPhotoId || (data === null || data === void 0 ? void 0 : data.meterPhoto);
+    const reasonVal = data === null || data === void 0 ? void 0 : data.reason;
+    const billMonYrVal = data === null || data === void 0 ? void 0 : data.billMonthYear;
+    const sepTankVal = data === null || data === void 0 ? void 0 : data.septicTank;
+    let valid = true;
+    if (!connCatVal) valid = false;
+    if (!mStatusVal) valid = false;
+    if (!mLocVal) valid = false;
+    if (!billRecVal) valid = false;
+    if (!sewerConnVal) valid = false;
+    if ((mStatusVal === null || mStatusVal === void 0 ? void 0 : mStatusVal.name) === "Metered" && !mPhotoId) valid = false;
+    if ((billRecVal === null || billRecVal === void 0 ? void 0 : billRecVal.name) === "No" && !reasonVal) valid = false;
+    if ((billRecVal === null || billRecVal === void 0 ? void 0 : billRecVal.name) === "Yes" && !billMonYrVal) valid = false;
+    if ((sewerConnVal === null || sewerConnVal === void 0 ? void 0 : sewerConnVal.name) === "No" && !sepTankVal) valid = false;
+    if (valid !== canSubmit) {
+      setCanSubmit(valid);
+    }
   };
-  const onStepSelect = async () => {
-    const data = {
-      connectionCategory,
-      saType,
-      status,
-      mrCode,
-      areaCode,
-      mrKey,
-      meterNumber,
-      meterMaker,
-      meterStatus: meterStatus === null || meterStatus === void 0 ? void 0 : meterStatus.name,
-      meterCondition: meterCondition === null || meterCondition === void 0 ? void 0 : meterCondition.name,
-      meterLocation: meterLocation === null || meterLocation === void 0 ? void 0 : meterLocation.name,
-      lastBillReceived: lastBillReceived === null || lastBillReceived === void 0 ? void 0 : lastBillReceived.name,
-      billMonthYear: billMonthYear === null || billMonthYear === void 0 ? void 0 : billMonthYear.name,
-      reason,
-      accessToMeter: accessToMeter === null || accessToMeter === void 0 ? void 0 : accessToMeter.name,
-      sewerConnection: sewerConnection === null || sewerConnection === void 0 ? void 0 : sewerConnection.name,
-      septicTank: septicTank === null || septicTank === void 0 ? void 0 : septicTank.name,
-      meterPhotoId
+  const onSubmit = async data => {
+    var _data$meterStatus2, _data$meterCondition, _data$meterLocation, _data$lastBillReceive2, _data$billMonthYear, _data$accessToMeter, _data$sewerConnection2, _data$septicTank;
+    const submitData = {
+      connectionCategory: data.connectionCategory,
+      saType: data.saType,
+      status: data.status,
+      mrCode: data.mrCode,
+      areaCode: data.areaCode,
+      mrKey: data.mrKey,
+      meterNumber: data.meterNumber,
+      meterMaker: data.meterMaker,
+      meterStatus: ((_data$meterStatus2 = data.meterStatus) === null || _data$meterStatus2 === void 0 ? void 0 : _data$meterStatus2.name) || data.meterStatus,
+      meterCondition: ((_data$meterCondition = data.meterCondition) === null || _data$meterCondition === void 0 ? void 0 : _data$meterCondition.name) || data.meterCondition,
+      meterLocation: ((_data$meterLocation = data.meterLocation) === null || _data$meterLocation === void 0 ? void 0 : _data$meterLocation.name) || data.meterLocation,
+      lastBillReceived: ((_data$lastBillReceive2 = data.lastBillReceived) === null || _data$lastBillReceive2 === void 0 ? void 0 : _data$lastBillReceive2.name) || data.lastBillReceived,
+      billMonthYear: ((_data$billMonthYear = data.billMonthYear) === null || _data$billMonthYear === void 0 ? void 0 : _data$billMonthYear.name) || data.billMonthYear,
+      reason: data.reason,
+      accessToMeter: ((_data$accessToMeter = data.accessToMeter) === null || _data$accessToMeter === void 0 ? void 0 : _data$accessToMeter.name) || data.accessToMeter,
+      sewerConnection: ((_data$sewerConnection2 = data.sewerConnection) === null || _data$sewerConnection2 === void 0 ? void 0 : _data$sewerConnection2.name) || data.sewerConnection,
+      septicTank: ((_data$septicTank = data.septicTank) === null || _data$septicTank === void 0 ? void 0 : _data$septicTank.name) || data.septicTank,
+      meterPhotoId: meterPhotoId
     };
     try {
       await updateMutation.mutateAsync({
         RequestInfo: {},
         updateType: "METER",
         kno: searchKno,
-        ...data
+        ...submitData
       });
       setToast({
         type: "success",
-        message: "Meter details updated successfully!"
+        message: t("Meter details updated successfully!")
       });
-      onSelect(config.key, data);
+      onSelect(config.key, submitData);
     } catch (error) {
       setToast({
         type: "error",
-        message: "Failed to update meter details"
+        message: t("Failed to update meter details")
       });
     }
   };
   if (isLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
-  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(FormStep, {
-    onSelect: onStepSelect,
-    config: config,
-    isDisabled: !isValid()
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Connection Category *"), /*#__PURE__*/React.createElement(TextInput, {
-    value: connectionCategory,
-    onChange: e => setConnectionCategory(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "SA Type"), /*#__PURE__*/React.createElement(TextInput, {
-    value: saType,
-    onChange: e => setSaType(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Status"), /*#__PURE__*/React.createElement(TextInput, {
-    value: status,
-    onChange: e => setStatus(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "MR Code"), /*#__PURE__*/React.createElement(TextInput, {
-    value: mrCode,
-    onChange: e => setMrCode(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Area Code"), /*#__PURE__*/React.createElement(TextInput, {
-    value: areaCode,
-    onChange: e => setAreaCode(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "MR Key"), /*#__PURE__*/React.createElement(TextInput, {
-    value: mrKey,
-    onChange: e => setMrKey(e.target.value)
-  })), !isFrozen && /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Meter Number"), /*#__PURE__*/React.createElement(TextInput, {
-    value: meterNumber,
-    onChange: e => setMeterNumber(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Meter Maker"), /*#__PURE__*/React.createElement(TextInput, {
-    value: meterMaker,
-    onChange: e => setMeterMaker(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Meter Condition"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: meterConditionOptions,
-    selected: meterCondition,
-    select: setMeterCondition
-  })), (meterStatus === null || meterStatus === void 0 ? void 0 : meterStatus.name) === "Metered" && /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Meter Photo *"), /*#__PURE__*/React.createElement(UploadFile, {
-    onUpload: uploadPhoto,
-    message: meterPhotoId ? "Uploaded" : "No file"
-  })), meterPhoto && /*#__PURE__*/React.createElement("div", {
-    style: {
-      gridColumn: "span 2"
-    }
-  }, /*#__PURE__*/React.createElement("img", {
-    src: meterPhoto,
-    style: {
-      width: "100%"
-    }
-  })))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Meter Status *"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: meterStatusOptions,
-    selected: meterStatus,
-    select: setMeterStatus
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Meter Location *"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: meterLocationOptions,
-    selected: meterLocation,
-    select: setMeterLocation
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Last Bill Received *"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: yesNo,
-    selected: lastBillReceived,
-    select: setLastBillReceived
-  })), (lastBillReceived === null || lastBillReceived === void 0 ? void 0 : lastBillReceived.name) === "Yes" && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "When was the last bill received *"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: monthYearOptions,
-    selected: billMonthYear,
-    select: setBillMonthYear
-  })), (lastBillReceived === null || lastBillReceived === void 0 ? void 0 : lastBillReceived.name) === "No" && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Reason *"), /*#__PURE__*/React.createElement(TextInput, {
-    value: reason,
-    onChange: e => setReason(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Access to Meter"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: yesNo,
-    selected: accessToMeter,
-    select: setAccessToMeter
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Sewer Connection *"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: yesNo,
-    selected: sewerConnection,
-    select: setSewerConnection
-  })), (sewerConnection === null || sewerConnection === void 0 ? void 0 : sewerConnection.name) === "No" && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Septic Tank *"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: yesNo,
-    selected: septicTank,
-    select: setSepticTank
-  })), toast && /*#__PURE__*/React.createElement(Toast, {
-    label: toast.message,
+  const Config = MeterDetailsConfig(t, localFormData, handleUpload, meterPhoto, meterPhotoId, setMeterPhoto, setMeterPhotoId);
+  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(FormComposer, {
+    key: isDataLoaded ? "loaded" : "loading",
+    isDisabled: !canSubmit,
+    label: t("ES_COMMON_CONTINUE"),
+    config: Config.map(item => ({
+      ...item,
+      isCollapsible: true,
+      isDefaultOpen: true
+    })),
+    onSubmit: onSubmit,
+    defaultValues: defaultValues,
+    onFormValueChange: onFormValueChange,
+    noCard: false,
+    submitInForm: true
+  }), toast && /*#__PURE__*/React.createElement(Toast, {
     error: toast.type === "error",
+    label: toast.message,
     onClose: () => setToast(null)
-  })));
+  }));
 };
 
 const Home = () => {
@@ -6155,7 +7164,7 @@ const Home = () => {
 const Inbox$1 = ({
   parentRoute
 }) => {
-  var _formState$tableForm3, _formState$tableForm4, _formState$searchForm3, _formState$searchForm4, _dashboardData$dashbo2;
+  var _formState$tableForm3, _formState$tableForm4, _formState$searchForm3, _formState$searchForm4, _dashboardData$dashbo;
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const location = useLocation();
   const formInitValue = {
@@ -6178,10 +7187,19 @@ const Inbox$1 = ({
       search: (formState === null || formState === void 0 ? void 0 : formState.searchForm) || {}
     };
   }, [tenantId, formState === null || formState === void 0 ? void 0 : (_formState$tableForm3 = formState.tableForm) === null || _formState$tableForm3 === void 0 ? void 0 : _formState$tableForm3.offset, formState === null || formState === void 0 ? void 0 : (_formState$tableForm4 = formState.tableForm) === null || _formState$tableForm4 === void 0 ? void 0 : _formState$tableForm4.limit, formState === null || formState === void 0 ? void 0 : formState.searchForm]);
+  const filters = useMemo(() => {
+    const searchForm = (formState === null || formState === void 0 ? void 0 : formState.searchForm) || {};
+    return {
+      ...searchForm,
+      ...(searchForm.kNumber && {
+        kno: searchForm.kNumber
+      })
+    };
+  }, [formState === null || formState === void 0 ? void 0 : formState.searchForm]);
   const {
     isLoading,
     data: dashboardData = {}
-  } = Digit.Hooks.ekyc.useEkycSurveyorDashboard({}, queryParams, {
+  } = Digit.Hooks.ekyc.useEkycApplicationList(filters, queryParams, {
     enabled: !!tenantId,
     keepPreviousData: true
   });
@@ -6204,18 +7222,17 @@ const Inbox$1 = ({
     keepPreviousData: true
   });
   const sourceData = useMemo(() => {
-    var _dashboardData$dashbo;
     if (isSearchActive) {
       if (!searchData) return [];
       return [searchData];
     }
-    return (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo = dashboardData.dashboardInfo) === null || _dashboardData$dashbo === void 0 ? void 0 : _dashboardData$dashbo.consumerList) || [];
+    return (dashboardData === null || dashboardData === void 0 ? void 0 : dashboardData.consumerList) || [];
   }, [isSearchActive, searchData, dashboardData]);
   const filteredData = useMemo(() => {
     return (sourceData || []).map(item => {
       const isSearchItem = !!item.connectionDetails;
       if (isSearchItem) {
-        var _item$propertyInfo, _item$propertyInfo2, _item$connectionDetai, _item$propertyInfo3, _item$connectionDetai2, _item$connectionDetai3;
+        var _item$propertyInfo, _item$propertyInfo2, _item$connectionDetai, _item$propertyInfo3, _item$connectionDetai2, _item$connectionDetai3, _item$connectionDetai4, _item$connectionDetai5;
         return {
           applicationNo: ((_item$propertyInfo = item.propertyInfo) === null || _item$propertyInfo === void 0 ? void 0 : _item$propertyInfo.kno) || "",
           connectionNo: ((_item$propertyInfo2 = item.propertyInfo) === null || _item$propertyInfo2 === void 0 ? void 0 : _item$propertyInfo2.kno) || "",
@@ -6223,6 +7240,7 @@ const Inbox$1 = ({
           applicationNumber: ((_item$propertyInfo3 = item.propertyInfo) === null || _item$propertyInfo3 === void 0 ? void 0 : _item$propertyInfo3.kno) || "",
           citizenName: ((_item$connectionDetai2 = item.connectionDetails) === null || _item$connectionDetai2 === void 0 ? void 0 : _item$connectionDetai2.consumerName) || "",
           status: ((_item$connectionDetai3 = item.connectionDetails) === null || _item$connectionDetai3 === void 0 ? void 0 : _item$connectionDetai3.statusflag) || "",
+          ekycStatus: ((_item$connectionDetai4 = item.connectionDetails) === null || _item$connectionDetai4 === void 0 ? void 0 : _item$connectionDetai4.ekycStatus) || ((_item$connectionDetai5 = item.connectionDetails) === null || _item$connectionDetai5 === void 0 ? void 0 : _item$connectionDetai5.ekycstatus) || item.ekycStatus || item.ekycstatus || "NA",
           sla: 0
         };
       }
@@ -6234,15 +7252,13 @@ const Inbox$1 = ({
         applicationNumber: item.kno || item.applicationNumber || "",
         citizenName: item.consumerName || item.citizenName || "",
         status: item.status || "",
+        ekycStatus: item.ekycStatus || item.ekycstatus || "NA",
         sla: item.sla ?? 0
       };
     });
   }, [sourceData]);
-  const totalRecords = (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo2 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo2 === void 0 ? void 0 : _dashboardData$dashbo2.totalRecords) || (dashboardData === null || dashboardData === void 0 ? void 0 : dashboardData.totalCount) || 0;
+  const totalRecords = (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo = dashboardData.dashboardInfo) === null || _dashboardData$dashbo === void 0 ? void 0 : _dashboardData$dashbo.totalRecords) || (dashboardData === null || dashboardData === void 0 ? void 0 : dashboardData.totalCount) || 0;
   const checkPathName = location.pathname.includes("ekyc/inbox");
-  const PropsForInboxLinks = {
-    headerText: checkPathName ? "MODULE_WATER" : "MODULE_SW"
-  };
   const SearchFormFields = useCallback(({
     registerRef,
     searchFormState,
@@ -6276,12 +7292,12 @@ const Inbox$1 = ({
     });
   };
   const searchFormDefaultValues = {
-    mobileNumber: "",
+    kNumber: "",
     applicationNumber: "",
     consumerNo: ""
   };
   const onSearchFormReset = setSearchFormValue => {
-    setSearchFormValue("mobileNumber", null);
+    setSearchFormValue("kNumber", null);
     setSearchFormValue("applicationNumber", null);
     setSearchFormValue("consumerNo", null);
     dispatch({
@@ -6303,13 +7319,6 @@ const Inbox$1 = ({
     setFilterFormValue,
     getFilterFormValue
   }) => /*#__PURE__*/React.createElement(React.Fragment, null), []);
-  const propsForFilterForm = {
-    FilterFormFields,
-    onFilterFormSubmit: () => {},
-    filterFormDefaultValues: "",
-    resetFilterFormDefaultValues: "",
-    onFilterFormReset: () => {}
-  };
   function formReducer(state, payload) {
     const storageKey = payload.checkPathName ? "EKYC.INBOX" : "EKYC.SW.INBOX";
     switch (payload.action) {
@@ -6401,220 +7410,14 @@ const Inbox$1 = ({
   return /*#__PURE__*/React.createElement("div", {
     className: "app-container"
   }, /*#__PURE__*/React.createElement(InboxComposer, _extends({
-    isInboxLoading,
-    PropsForInboxLinks
-  }, propsForSearchForm, propsForFilterForm, {
+    isInboxLoading
+  }, propsForSearchForm, {
     propsForInboxTable,
     formState
   })));
 };
 
-const AddressDetails = ({
-  config,
-  onSelect
-}) => {
-  var _mdmsData$MdmsRes, _mdmsData$MdmsRes$ego, _mdmsData$MdmsRes$ego2, _mdmsData$MdmsRes$ego3, _mdmsData$MdmsRes$ego4;
-  const {
-    t
-  } = useTranslation();
-  const tenantId = Digit.ULBService.getCurrentTenantId();
-  const [houseNo, setHouseNo] = useState("");
-  const [street, setStreet] = useState("");
-  const [locality, setLocality] = useState("");
-  const [landmark, setLandmark] = useState("");
-  const [subLocality, setSubLocality] = useState(null);
-  const [pinCode, setPinCode] = useState("");
-  const [assembly, setAssembly] = useState(null);
-  const [ward, setWard] = useState(null);
-  const [zone, setZone] = useState(null);
-  const [latitude, setLatitude] = useState("");
-  const [longitude, setLongitude] = useState("");
-  const [addressType, setAddressType] = useState(null);
-  const [doorPhoto, setDoorPhoto] = useState(null);
-  const [doorPhotoFileStoreId, setDoorPhotoFileStoreId] = useState(null);
-  const [toast, setToast] = useState(null);
-  const {
-    data: mdmsData,
-    isLoading
-  } = Digit.Hooks.useCommonMDMS(tenantId, "egov-location", ["TenantBoundary"]);
-  const assemblies = (mdmsData === null || mdmsData === void 0 ? void 0 : (_mdmsData$MdmsRes = mdmsData.MdmsRes) === null || _mdmsData$MdmsRes === void 0 ? void 0 : (_mdmsData$MdmsRes$ego = _mdmsData$MdmsRes["egov-location"]) === null || _mdmsData$MdmsRes$ego === void 0 ? void 0 : (_mdmsData$MdmsRes$ego2 = _mdmsData$MdmsRes$ego.TenantBoundary) === null || _mdmsData$MdmsRes$ego2 === void 0 ? void 0 : (_mdmsData$MdmsRes$ego3 = _mdmsData$MdmsRes$ego2[0]) === null || _mdmsData$MdmsRes$ego3 === void 0 ? void 0 : (_mdmsData$MdmsRes$ego4 = _mdmsData$MdmsRes$ego3.boundary) === null || _mdmsData$MdmsRes$ego4 === void 0 ? void 0 : _mdmsData$MdmsRes$ego4.children) || [];
-  useEffect(() => {
-    let isMounted = true;
-    if (navigator.geolocation) {
-      navigator.geolocation.getCurrentPosition(pos => {
-        if (!isMounted) return;
-        setLatitude(pos.coords.latitude);
-        setLongitude(pos.coords.longitude);
-      }, () => {
-        if (!isMounted) return;
-        setToast({
-          type: "error",
-          message: "GPS access denied"
-        });
-      });
-    }
-    return () => {
-      isMounted = false;
-    };
-  }, []);
-  const handlePincodeChange = e => {
-    const value = e.target.value;
-    if (/^\d{0,6}$/.test(value)) {
-      setPinCode(value);
-      if (value.length === 6) {
-        fetchLocationByPincode(value);
-      }
-    }
-  };
-  const fetchLocationByPincode = pin => {
-    console.log("Fetching location for PIN:", pin);
-  };
-  const selectphoto = async e => {
-    let isMounted = true;
-    const file = e.target.files[0];
-    if (!file) return;
-    if (file.size >= 2000000) {
-      setToast({
-        type: "error",
-        message: "Max size 2MB exceeded"
-      });
-      return;
-    }
-    try {
-      var _res$data, _res$data$files, _res$data$files$;
-      const res = await Digit.UploadServices.Filestorage("EKYC", file, tenantId);
-      if (!isMounted) return;
-      const fileStoreId = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$files = _res$data.files) === null || _res$data$files === void 0 ? void 0 : (_res$data$files$ = _res$data$files[0]) === null || _res$data$files$ === void 0 ? void 0 : _res$data$files$.fileStoreId;
-      if (fileStoreId) {
-        setDoorPhotoFileStoreId(fileStoreId);
-        const reader = new FileReader();
-        reader.onloadend = () => {
-          if (!isMounted) return;
-          setDoorPhoto(reader.result);
-        };
-        reader.readAsDataURL(file);
-        setToast({
-          type: "success",
-          message: "Upload successful"
-        });
-      }
-    } catch {
-      if (!isMounted) return;
-      setToast({
-        type: "error",
-        message: "Upload failed"
-      });
-    }
-    return () => {
-      isMounted = false;
-    };
-  };
-  const removePhoto = () => {
-    setDoorPhoto(null);
-    setDoorPhotoFileStoreId(null);
-  };
-  const isValid = () => {
-    return houseNo && street && pinCode.length === 6 && assembly && ward && zone && latitude && longitude && doorPhotoFileStoreId;
-  };
-  const onStepSelect = () => {
-    if (!isValid()) {
-      setToast({
-        type: "error",
-        message: "Please fill all mandatory fields"
-      });
-      return;
-    }
-    const data = {
-      houseNo,
-      street,
-      locality,
-      landmark,
-      subLocality,
-      pinCode,
-      assembly: assembly === null || assembly === void 0 ? void 0 : assembly.name,
-      ward: ward === null || ward === void 0 ? void 0 : ward.name,
-      zone: zone === null || zone === void 0 ? void 0 : zone.name,
-      latitude,
-      longitude,
-      addressType: addressType === null || addressType === void 0 ? void 0 : addressType.name,
-      doorPhotoFilestoreId: doorPhotoFileStoreId
-    };
-    onSelect(config.key, data);
-  };
-  if (isLoading) return /*#__PURE__*/React.createElement(Loader, null);
-  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(FormStep, {
-    t: t,
-    onSelect: onStepSelect,
-    config: config,
-    label: t("ES_COMMON_CONTINUE")
-  }, /*#__PURE__*/React.createElement(CardLabel, null, "House No / Flat No *"), /*#__PURE__*/React.createElement(TextInput, {
-    value: houseNo,
-    onChange: e => setHouseNo(e.target.value)
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Street / Address Line *"), /*#__PURE__*/React.createElement(TextInput, {
-    value: street,
-    onChange: e => setStreet(e.target.value)
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Locality"), /*#__PURE__*/React.createElement(TextInput, {
-    value: locality,
-    onChange: e => setLocality(e.target.value)
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Landmark"), /*#__PURE__*/React.createElement(TextInput, {
-    value: landmark,
-    onChange: e => setLandmark(e.target.value)
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Sub Locality"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: [],
-    selected: subLocality,
-    select: setSubLocality
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "PIN Code *"), /*#__PURE__*/React.createElement(TextInput, {
-    value: pinCode,
-    onChange: handlePincodeChange,
-    maxLength: 6
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Assembly *"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: assemblies,
-    selected: assembly,
-    select: setAssembly
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Ward *"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: (assembly === null || assembly === void 0 ? void 0 : assembly.children) || [],
-    selected: ward,
-    select: setWard
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Zone *"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: (ward === null || ward === void 0 ? void 0 : ward.children) || [],
-    selected: zone,
-    select: setZone
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Latitude"), /*#__PURE__*/React.createElement(TextInput, {
-    value: latitude,
-    disabled: true
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Longitude"), /*#__PURE__*/React.createElement(TextInput, {
-    value: longitude,
-    disabled: true
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Address Type"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: [{
-      name: "Permanent"
-    }, {
-      name: "Correspondence"
-    }, {
-      name: "Other"
-    }],
-    selected: addressType,
-    select: setAddressType
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Door Image *"), /*#__PURE__*/React.createElement(UploadFile, {
-    onUpload: selectphoto,
-    onDelete: removePhoto,
-    message: doorPhotoFileStoreId ? "Uploaded" : "No file selected"
-  }), doorPhoto && /*#__PURE__*/React.createElement("img", {
-    src: doorPhoto,
-    alt: "preview",
-    style: {
-      width: "100%",
-      marginTop: "10px"
-    }
-  }), toast && /*#__PURE__*/React.createElement(Toast, {
-    label: toast.message,
-    error: toast.type === "error",
-    onClose: () => setToast(null)
-  })));
-};
-
 const CitizenApp = () => {
-  var _Digit$SessionStorage, _Digit$SessionStorage2;
   const {
     t
   } = useTranslation();
@@ -6623,24 +7426,74 @@ const CitizenApp = () => {
     path
   } = useRouteMatch();
   sessionStorage.removeItem("revalidateddone");
-  const getBreadcrumbLabel = () => {
+  const getDynamicBreadcrumbs = () => {
     const pathname = location.pathname;
-    if (pathname.includes("/create-kyc")) return "EKYC_CREATE_KYC";
-    if (pathname.includes("/aadhaar-verification")) return "EKYC_AADHAAR_VERIFICATION";
-    if (pathname.includes("/address-details")) return "EKYC_ADDRESS_DETAILS";
-    if (pathname.includes("/property-info")) return "EKYC_PROPERTY_INFO";
-    if (pathname.includes("/meter-details")) return "EKYC_METER_DETAILS";
-    if (pathname.includes("/review")) return "EKYC_REVIEW";
-    return "EKYC_HOME";
+    const crumbs = [{
+      icon: HomeIcon,
+      path: "/digit-ui/citizen"
+    }, {
+      label: t("EKYC_MODULE_NAME"),
+      path: `/digit-ui/citizen/ekyc`
+    }];
+    if (pathname.includes("/create-kyc")) {
+      crumbs.push({
+        label: t("EKYC_CREATE_KYC")
+      });
+    } else if (pathname.includes("/aadhaar-verification")) {
+      crumbs.push({
+        label: t("EKYC_AADHAAR_VERIFICATION")
+      });
+    } else if (pathname.includes("/address-details")) {
+      crumbs.push({
+        label: t("EKYC_ADDRESS_DETAILS")
+      });
+    } else if (pathname.includes("/property-info")) {
+      crumbs.push({
+        label: t("EKYC_PROPERTY_INFO")
+      });
+    } else if (pathname.includes("/meter-details")) {
+      crumbs.push({
+        label: t("EKYC_METER_DETAILS")
+      });
+    } else if (pathname.includes("/review")) {
+      crumbs.push({
+        label: t("EKYC_INBOX"),
+        path: `/digit-ui/citizen/ekyc/inbox`
+      });
+      crumbs.push({
+        label: t("EKYC_REVIEW")
+      });
+    } else if (pathname.includes("/assign/surveyor-details")) {
+      crumbs.push({
+        label: t("EKYC_ASSIGN"),
+        path: `/digit-ui/citizen/ekyc/assign`
+      });
+      crumbs.push({
+        label: t("EKYC_SURVEYOR_DETAILS")
+      });
+    } else if (pathname.includes("/assign")) {
+      crumbs.push({
+        label: t("EKYC_ASSIGN")
+      });
+    } else if (pathname.includes("/surveyor-dashboard")) {
+      crumbs.push({
+        label: t("EKYC_SURVEYOR_DASHBOARD")
+      });
+    } else if (pathname.includes("/dashboard")) {
+      crumbs.push({
+        label: t("EKYC_DASHBOARD")
+      });
+    } else if (pathname.includes("/inbox")) {
+      crumbs.push({
+        label: t("EKYC_INBOX")
+      });
+    } else if (pathname.includes("/status/")) {
+      crumbs.push({
+        label: t("EKYC_STATUS")
+      });
+    }
+    return crumbs;
   };
-  const breadcrumbs = [{
-    icon: HomeIcon,
-    path: "/digit-ui/citizen"
-  }, {
-    label: t(getBreadcrumbLabel())
-  }];
-  const roles = (_Digit$SessionStorage = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage === void 0 ? void 0 : (_Digit$SessionStorage2 = _Digit$SessionStorage.info) === null || _Digit$SessionStorage2 === void 0 ? void 0 : _Digit$SessionStorage2.roles.map(ele => ele.code);
-  const isEkyAction = !(roles !== null && roles !== void 0 && roles.includes("EKYC_SURVEYOR")) || (roles === null || roles === void 0 ? void 0 : roles.includes("EMPLOYEE"));
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "ground-container form-container"
   }, /*#__PURE__*/React.createElement(ModuleHeader, {
@@ -6648,7 +7501,7 @@ const CitizenApp = () => {
       className: "icon"
     }), t("CS_COMMON_BACK")),
     onLeftClick: () => window.history.back(),
-    breadcrumbs: breadcrumbs
+    breadcrumbs: getDynamicBreadcrumbs()
   }), /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(PrivateRoute, {
     exact: true,
     path: `${path}`,
@@ -6670,11 +7523,6 @@ const CitizenApp = () => {
     component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
       layoutClass: "normal"
     }, /*#__PURE__*/React.createElement(AadhaarVerification, null))
-  }), /*#__PURE__*/React.createElement(PrivateRoute, {
-    path: `${path}/address-details`,
-    component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
-      layoutClass: "normal"
-    }, /*#__PURE__*/React.createElement(AddressDetails, null))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/property-info`,
     component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
@@ -6789,7 +7637,6 @@ const componentsToRegister = {
   EKYC_INBOX_FILTER: props => /*#__PURE__*/React.createElement(Filter, props),
   EkycLinks,
   AadhaarVerification,
-  AddressDetails,
   PropertyInfo,
   MeterDetails
 };