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

package/dist/index.modern.js

@@ -1,7 +1,7 @@
 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';
@@ -319,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}`));
@@ -331,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: {
@@ -1845,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}`));
@@ -1857,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: {
@@ -2281,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) || "",
@@ -2289,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
         };
       }
@@ -2301,6 +2302,7 @@ 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
       };
     });
@@ -3216,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) || {};
@@ -3365,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 = {}
@@ -3643,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,
@@ -3670,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,
@@ -3681,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 => {
@@ -3696,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, {
@@ -3706,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
     }
@@ -3718,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
     }
@@ -3730,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
     }
@@ -3742,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
     }
@@ -3822,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",
@@ -3893,7 +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)
+  }));
+};
+
+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"
+      }
+    });
+  }
+  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"
+      }
+    });
+  }
+  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 = ({
@@ -3901,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,
@@ -3919,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 (updatedDefaults.documentProof) {
+        setDocumentProof(updatedDefaults.documentProof);
       }
-      if (details.informantName) setInformantName(details.informantName);
-      if (details.informantRelation) setInformantRelation(details.informantRelation);
+      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, /*#__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)
@@ -4234,6 +4604,7 @@ const ekycConfig = [{
     component: "AddressDetails",
     key: "addressDetails",
     doorImage: true,
+    showMapActualLocation: false,
     texts: {
       header: "EKYC_ADDRESS_DETAILS",
       submitBarLabel: "COMMON_SAVE_NEXT"
@@ -5769,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,
@@ -5780,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,
@@ -5795,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
-        });
+        };
+      }
+      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);
       }
-      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));
+      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;
     }
@@ -5866,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 = ({
@@ -5999,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,
@@ -6017,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("-", "/");
@@ -6131,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"
-        });
+        };
       }
-      if (apiMeter.meterPhotoFileStoreId) setMeterPhotoId(apiMeter.meterPhotoFileStoreId);
+      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);
+      }
+      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 = () => {
@@ -6374,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 = {
@@ -6397,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
   });
@@ -6423,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) || "",
@@ -6442,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
         };
       }
@@ -6453,11 +7252,12 @@ 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 SearchFormFields = useCallback(({
     registerRef,
@@ -6492,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({