@djb25/digit-ui-module-ekyc 1.0.11 → 1.0.12

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, useRouteMatch, Switch, Route, Redirect } from 'react-router-dom';
-import { PersonIcon, EmployeeModuleCard, Loader, Card, InboxLinks, Table, HomeIcon, TextInput, Header, SubmitBar, DetailsCard, FilterForm, FilterFormField, Dropdown, Label, Tooltip, CardLabelError, InboxComposer, Toast, Modal, RadioButtons, CardHeader, CardSubHeader, StatusTable, Row, GenericFileIcon, CheckBox, ActionBar, LinkButton, EditIcon as EditIcon$1, FormStep, CardLabel, UploadFile, VerticalTimeline, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, 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, Toast, Modal, RadioButtons, CardHeader, CardSubHeader, StatusTable, Row, GenericFileIcon, CheckBox, ActionBar, LinkButton, EditIcon as EditIcon$1, FormStep, CardLabel, UploadFile, VerticalTimeline, 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 'react-dom';
@@ -24,6 +24,9 @@ const EKYCCard = () => {
     }, {
       label: t("EKYC_INBOX"),
       link: `/digit-ui/employee/ekyc/inbox`
+    }, {
+      label: t("CEO_M.F_DOR_FINANCE_VIEW"),
+      link: `/digit-ui/employee/ekyc/ceo-dashboard`
     }, {
       label: t("EKYC_MAPPING"),
       link: `/digit-ui/employee/ekyc/mapping`
@@ -332,7 +335,7 @@ const DesktopInbox = ({
     }
   }], [t, parentRoute]);
   const tableData = useMemo(() => {
-    return (data === null || data === void 0 ? void 0 : data.items) || [];
+    return (data === null || data === void 0 ? void 0 : data.items) || (Array.isArray(data) ? data : []);
   }, [data]);
   return /*#__PURE__*/React.createElement("div", {
     className: "app-container"
@@ -1080,7 +1083,7 @@ const SearchFormFieldsComponents = ({
     className: "mobile-input"
   }, /*#__PURE__*/React.createElement(Label, {
     className: "flex-roww flex-gap-2"
-  }, t("EKYC_K_NUMBER") || "K Number", /*#__PURE__*/React.createElement(Tooltip, {
+  }, t("EKYC_K_NUMBER") || "K Number", /*#__PURE__*/React.createElement(CustomTooltip, {
     message: t("EKYC_K_NUMBER_MESSAGE")
   })), /*#__PURE__*/React.createElement(Controller, {
     name: "kNumber",
@@ -1180,13 +1183,14 @@ const Inbox = ({
           sla: 0
         };
       }
+      const fullName = [item.firstName, item.middleName, item.lastName].filter(Boolean).join(" ");
       return {
         ...item,
         applicationNo: item.kno || item.applicationNumber || "",
-        connectionNo: item.connectionNo || "",
-        owner: item.consumerName || item.citizenName || "",
+        connectionNo: item.kno || "",
+        owner: fullName || item.consumerName || item.citizenName || "",
         applicationNumber: item.kno || item.applicationNumber || "",
-        citizenName: item.consumerName || item.citizenName || "",
+        citizenName: fullName || item.consumerName || item.citizenName || "",
         status: item.status || "",
         sla: item.sla ?? 0
       };
@@ -1195,7 +1199,7 @@ const Inbox = ({
   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 checkPathName = location.pathname.includes("ekyc/inbox");
   const PropsForInboxLinks = {
-    headerText: checkPathName ? "MODULE_WATER" : "MODULE_SW"
+    headerText: checkPathName ? "EKYC_MODULE" : "MODULE_SW"
   };
   const SearchFormFields = useCallback(({
     registerRef,
@@ -1359,7 +1363,8 @@ const Inbox = ({
     PropsForInboxLinks
   }, propsForSearchForm, propsForFilterForm, {
     propsForInboxTable,
-    formState
+    formState,
+    countData: dashboardData === null || dashboardData === void 0 ? void 0 : dashboardData.dashboardInfo
   })));
 };
 
@@ -2720,9 +2725,6 @@ const ActionButton = ({
   jumpTo,
   state
 }) => {
-  const {
-    t
-  } = useTranslation();
   const history = useHistory();
   function routeTo() {
     history.push(jumpTo, {
@@ -2733,13 +2735,15 @@ const ActionButton = ({
   return /*#__PURE__*/React.createElement(LinkButton, {
     label: /*#__PURE__*/React.createElement(EditIcon$1, {
       style: {
-        marginTop: "-30px",
-        float: "right",
-        position: "relative",
-        bottom: "32px"
+        width: "20px",
+        height: "20px",
+        fill: "#F47738"
       }
     }),
-    className: "check-page-link-button",
+    style: {
+      margin: 0,
+      padding: 0
+    },
     onClick: routeTo
   });
 };
@@ -2747,16 +2751,145 @@ const checkForNA = value => value !== null && value !== undefined && value !== "
 const boolToYesNo = (value, t) => {
   if (value === true || value === "true" || String(value).toLowerCase() === "yes") return t("CORE_COMMON_YES");
   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 extractActiveData = (searchData, flowState) => {
+const extractReviewData = (searchData, flowState) => {
   const rawData = searchData && Object.keys(searchData).length > 0 ? searchData : (flowState === null || flowState === void 0 ? void 0 : flowState.reviewData) || {};
-  const reviewWrapper = (rawData === null || rawData === void 0 ? void 0 : rawData.applicationReview) || rawData;
+  const reviewWrapper = (rawData === null || rawData === void 0 ? void 0 : rawData.applicationReviewInfo) || (rawData === null || rawData === void 0 ? void 0 : rawData.applicationReview) || rawData;
   const applicationData = (Array.isArray(reviewWrapper) ? reviewWrapper[0] : reviewWrapper) || {};
-  return (applicationData === null || applicationData === void 0 ? void 0 : applicationData.newData) || applicationData;
+  return {
+    newData: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.newData) || applicationData,
+    oldData: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.oldData) || null
+  };
+};
+const ReviewSection = ({
+  title,
+  fields,
+  newData,
+  oldData,
+  t,
+  jumpTo,
+  state
+}) => {
+  return /*#__PURE__*/React.createElement("div", {
+    className: "review-section-wrapper",
+    style: {
+      marginBottom: "48px",
+      background: "#fff",
+      borderRadius: "12px",
+      border: "1px solid #EAECF0",
+      overflow: "hidden"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      padding: "20px 24px",
+      background: "#F9FAFB",
+      borderBottom: "1px solid #EAECF0",
+      display: "flex",
+      justifyContent: "space-between",
+      alignItems: "center"
+    }
+  }, /*#__PURE__*/React.createElement(CardSubHeader, {
+    style: {
+      margin: 0,
+      fontSize: "18px",
+      color: "#101828",
+      fontWeight: "700"
+    }
+  }, title), jumpTo && /*#__PURE__*/React.createElement(ActionButton, {
+    jumpTo: jumpTo,
+    state: state
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      padding: "0 24px"
+    }
+  }, /*#__PURE__*/React.createElement("table", {
+    style: {
+      width: "100%",
+      borderCollapse: "collapse",
+      tableLayout: "fixed"
+    }
+  }, /*#__PURE__*/React.createElement("thead", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("th", {
+    style: {
+      padding: "16px 0",
+      textAlign: "left",
+      color: "#667085",
+      fontSize: "12px",
+      fontWeight: "600",
+      textTransform: "uppercase",
+      width: "30%"
+    }
+  }, t("EKYC_FIELD_NAME")), /*#__PURE__*/React.createElement("th", {
+    style: {
+      padding: "16px 0",
+      textAlign: "left",
+      color: "#667085",
+      fontSize: "12px",
+      fontWeight: "600",
+      textTransform: "uppercase",
+      width: "35%"
+    }
+  }, t("EKYC_EXISTING_INFORMATION")), /*#__PURE__*/React.createElement("th", {
+    style: {
+      padding: "16px 0",
+      textAlign: "left",
+      color: "#667085",
+      fontSize: "12px",
+      fontWeight: "600",
+      textTransform: "uppercase",
+      width: "35%"
+    }
+  }, t("EKYC_PROPOSED_UPDATES")))), /*#__PURE__*/React.createElement("tbody", null, fields.map((field, idx) => {
+    const valNew = newData === null || newData === void 0 ? void 0 : newData[field.key];
+    const valOld = oldData === null || oldData === void 0 ? void 0 : oldData[field.key];
+    const isChanged = oldData && String(valNew) !== String(valOld) && valOld !== undefined && valOld !== null;
+    return /*#__PURE__*/React.createElement("tr", {
+      key: idx,
+      style: {
+        borderTop: "1px solid #F2F4F7"
+      }
+    }, /*#__PURE__*/React.createElement("td", {
+      style: {
+        padding: "16px 0",
+        fontSize: "14px",
+        color: "#344054",
+        fontWeight: "500"
+      }
+    }, t(field.label)), /*#__PURE__*/React.createElement("td", {
+      style: {
+        padding: "16px 0",
+        fontSize: "14px",
+        color: "#667085"
+      }
+    }, field.isBool ? boolToYesNo(valOld, t) : checkForNA(valOld)), /*#__PURE__*/React.createElement("td", {
+      style: {
+        padding: "16px 0",
+        fontSize: "14px",
+        color: isChanged ? "#1B8B32" : "#101828",
+        fontWeight: isChanged ? "700" : "400"
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: "flex",
+        alignItems: "center",
+        gap: "8px"
+      }
+    }, field.isBool ? boolToYesNo(valNew, t) : checkForNA(valNew), isChanged && /*#__PURE__*/React.createElement("span", {
+      style: {
+        background: "#ECFDF3",
+        color: "#067647",
+        padding: "2px 8px",
+        borderRadius: "12px",
+        fontSize: "10px",
+        fontWeight: "600"
+      }
+    }, t("EKYC_CHANGED")))));
+  })))));
 };
 const Review = () => {
-  var _editedProperty$conne, _editedProperty$conne2, _editedProperty$userT, _editedProperty$noOfF, _editedMeter$meterSta, _editedMeter$workingS, _editedMeter$lastBill;
+  var _newDataRaw$connectio, _newDataRaw$connectio2, _newDataRaw$connectio3, _newDataRaw$address, _newDataRaw$address2, _newDataRaw$address3, _newDataRaw$address4, _newDataRaw$address5, _newDataRaw$address6, _newDataRaw$address7, _newDataRaw$address8, _newDataRaw$address9, _newDataRaw$address0, _newDataRaw$address1, _newDataRaw$address10, _newDataRaw$address11, _newDataRaw$address12, _newDataRaw$address13, _newDataRaw$address14, _newDataRaw$property, _newDataRaw$property2, _editedProperty$conne, _newDataRaw$property3, _editedProperty$conne2, _newDataRaw$property4, _editedProperty$userT, _newDataRaw$property5, _editedProperty$noOfF, _newDataRaw$property6, _newDataRaw$property7, _newDataRaw$meter, _editedMeter$meterSta, _newDataRaw$meter2, _newDataRaw$meter3, _newDataRaw$meter4, _newDataRaw$meter5, _editedMeter$workingS, _newDataRaw$meter6, _editedMeter$lastBill, _newDataRaw$meter7, _newDataRaw$meter8;
   const {
     t
   } = useTranslation();
@@ -2764,6 +2897,8 @@ const Review = () => {
   const location = useLocation();
   const [agree, setAgree] = useState(false);
   const [isSubmitting, setIsSubmitting] = useState(false);
+  const [showPreview, setShowPreview] = useState(false);
+  const [previewUrl, setPreviewUrl] = useState("");
   const flowState = location.state || {};
   const {
     kNumber,
@@ -2778,6 +2913,8 @@ const Review = () => {
     meterDetails: editedMeter = {}
   } = edits;
   const tenantId = Digit.ULBService.getCurrentTenantId();
+  const workflowMutation = Digit.Hooks.ekyc.useEkycWorkflow(tenantId);
+  const updateMutation = Digit.Hooks.ekyc.useEkycUpdate(tenantId);
   const {
     data: searchData,
     isLoading: isSearchLoading
@@ -2787,67 +2924,308 @@ const Review = () => {
   }, tenantId, {
     enabled: !!activeKno
   });
-  const activeData = extractActiveData(searchData, flowState);
-  const apiConn = (activeData === null || activeData === void 0 ? void 0 : activeData.connectionDetails) || activeData || {};
-  const apiAddr = (activeData === null || activeData === void 0 ? void 0 : activeData.addressDetails) || activeData || {};
-  const apiProp = (activeData === null || activeData === void 0 ? void 0 : activeData.propertyInfo) || activeData || {};
-  const apiMeter = (activeData === null || activeData === void 0 ? void 0 : activeData.meterDetails) || activeData || {};
+  const {
+    newData: apiNewData,
+    oldData: apiOldData
+  } = extractReviewData(searchData, flowState);
+  const prepareConsolidatedData = data => {
+    if (!data) return null;
+    const apiConn = (data === null || data === void 0 ? void 0 : data.connectionDetails) || data || {};
+    const apiAddr = (data === null || data === void 0 ? void 0 : data.addressDetails) || data || {};
+    const apiProp = (data === null || data === void 0 ? void 0 : data.propertyInfo) || data || {};
+    const apiMeter = (data === null || data === void 0 ? void 0 : data.meterDetails) || data || {};
+    return {
+      connection: {
+        consumerName: (apiConn === null || apiConn === void 0 ? void 0 : apiConn.consumerName) || (apiConn !== null && apiConn !== void 0 && apiConn.firstName ? [apiConn.firstName, apiConn.middleName, apiConn.lastName].filter(Boolean).join(" ") : null),
+        address: (apiConn === null || apiConn === void 0 ? void 0 : apiConn.address) || (apiConn === null || apiConn === void 0 ? void 0 : apiConn.addressRaw),
+        connectionType: (apiConn === null || apiConn === void 0 ? void 0 : apiConn.connectionType) || (apiConn === null || apiConn === void 0 ? void 0 : apiConn.connectionCategory),
+        meterNumber: (apiConn === null || apiConn === void 0 ? void 0 : apiConn.meterNumber) || (apiConn === null || apiConn === void 0 ? void 0 : apiConn.meterNo),
+        phoneNumber: (apiConn === null || apiConn === void 0 ? void 0 : apiConn.phoneNumber) || (apiConn === null || apiConn === void 0 ? void 0 : apiConn.mobileNo) || (apiConn === null || apiConn === void 0 ? void 0 : apiConn.mobileNumber),
+        email: apiConn === null || apiConn === void 0 ? void 0 : apiConn.email,
+        statusflag: (apiConn === null || apiConn === void 0 ? void 0 : apiConn.statusflag) || (apiConn === null || apiConn === void 0 ? void 0 : apiConn.statusFlag),
+        ekycStatus: apiConn === null || apiConn === void 0 ? void 0 : apiConn.ekycStatus,
+        knumber: (apiConn === null || apiConn === void 0 ? void 0 : apiConn.knumber) || (apiConn === null || apiConn === void 0 ? void 0 : apiConn.kno)
+      },
+      address: {
+        fullAddress: (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.fullAddress) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.addressRaw),
+        flatHouseNumber: (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.flatHouseNumber) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.flatNo),
+        buildingTower: (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.buildingTower) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.building),
+        landmark: apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.landmark,
+        pinCode: (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.pinCode) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.pincode),
+        ward: (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.ward) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.locality),
+        assembly: apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.assembly,
+        gpsValid: apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.gpsValid,
+        latitude: apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.latitude,
+        longitude: apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.longitude,
+        mobileNo: (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.mobileNo) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.mobileNumber),
+        whatsappNo: apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.whatsappNo,
+        email: apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.email,
+        noOfPerson: (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.noOfPerson) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.noOfPersons),
+        knumber: (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.knumber) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.kno),
+        doorPhotoFilestoreId: apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.doorPhotoFilestoreId
+      },
+      property: {
+        kno: apiProp === null || apiProp === void 0 ? void 0 : apiProp.kno,
+        pidNumber: apiProp === null || apiProp === void 0 ? void 0 : apiProp.pidNumber,
+        typeOfConnection: apiProp === null || apiProp === void 0 ? void 0 : apiProp.typeOfConnection,
+        connectionCategory: apiProp === null || apiProp === void 0 ? void 0 : apiProp.connectionCategory,
+        userType: apiProp === null || apiProp === void 0 ? void 0 : apiProp.userType,
+        numberOfFloors: (apiProp === null || apiProp === void 0 ? void 0 : apiProp.numberOfFloors) || (apiProp === null || apiProp === void 0 ? void 0 : apiProp.noOfFloor),
+        tenantName: apiProp === null || apiProp === void 0 ? void 0 : apiProp.tenantName,
+        tenantMobile: apiProp === null || apiProp === void 0 ? void 0 : apiProp.tenantMobile,
+        ekycStatus: apiProp === null || apiProp === void 0 ? void 0 : apiProp.ekycStatus,
+        propertyDocumentFileStoreId: apiProp === null || apiProp === void 0 ? void 0 : apiProp.propertyDocumentFileStoreId,
+        buildingImageFileStoreId: apiProp === null || apiProp === void 0 ? void 0 : apiProp.buildingImageFileStoreId
+      },
+      meter: {
+        kno: apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.kno,
+        metered: (apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.meterStatus) === "METERED" || (apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.metered),
+        meterNumber: (apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.meterNumber) || (apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.meterNo),
+        meterMake: apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.meterMake,
+        meterLocationAddress: apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.meterLocationAddress,
+        meterLatitude: apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.meterLatitude,
+        meterLongitude: apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.meterLongitude,
+        workingStatus: apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.workingStatus,
+        lastBillRaised: apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.lastBillRaised,
+        systemMeterId: apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.systemMeterId,
+        meterPhotoFileStoreId: apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.meterPhotoFileStoreId
+      }
+    };
+  };
+  const newDataRaw = prepareConsolidatedData(apiNewData);
+  const oldDataRaw = prepareConsolidatedData(apiOldData);
   const connectionData = {
-    consumerName: (aadhaarData === null || aadhaarData === void 0 ? void 0 : aadhaarData.name) || (apiConn === null || apiConn === void 0 ? void 0 : apiConn.consumerName),
-    address: (apiConn === null || apiConn === void 0 ? void 0 : apiConn.address) || (apiConn === null || apiConn === void 0 ? void 0 : apiConn.addressRaw),
-    connectionType: (apiConn === null || apiConn === void 0 ? void 0 : apiConn.connectionType) || (apiConn === null || apiConn === void 0 ? void 0 : apiConn.connectionCategory),
-    meterNumber: (apiConn === null || apiConn === void 0 ? void 0 : apiConn.meterNumber) || (apiConn === null || apiConn === void 0 ? void 0 : apiConn.meterNo),
-    phoneNumber: (aadhaarData === null || aadhaarData === void 0 ? void 0 : aadhaarData.mobileNumber) || (apiConn === null || apiConn === void 0 ? void 0 : apiConn.phoneNumber) || (apiConn === null || apiConn === void 0 ? void 0 : apiConn.mobileNo),
-    email: apiConn === null || apiConn === void 0 ? void 0 : apiConn.email,
-    statusflag: (apiConn === null || apiConn === void 0 ? void 0 : apiConn.statusflag) || (apiConn === null || apiConn === void 0 ? void 0 : apiConn.statusFlag),
-    ekycStatus: apiConn === null || apiConn === void 0 ? void 0 : apiConn.ekycStatus,
-    knumber: (apiConn === null || apiConn === void 0 ? void 0 : apiConn.knumber) || (apiConn === null || apiConn === void 0 ? void 0 : apiConn.kno) || activeKno
+    ...(newDataRaw === null || newDataRaw === void 0 ? void 0 : newDataRaw.connection),
+    consumerName: (aadhaarData === null || aadhaarData === void 0 ? void 0 : aadhaarData.name) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$connectio = newDataRaw.connection) === null || _newDataRaw$connectio === void 0 ? void 0 : _newDataRaw$connectio.consumerName),
+    phoneNumber: (aadhaarData === null || aadhaarData === void 0 ? void 0 : aadhaarData.mobileNumber) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$connectio2 = newDataRaw.connection) === null || _newDataRaw$connectio2 === void 0 ? void 0 : _newDataRaw$connectio2.phoneNumber),
+    knumber: (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$connectio3 = newDataRaw.connection) === null || _newDataRaw$connectio3 === void 0 ? void 0 : _newDataRaw$connectio3.knumber) || activeKno
   };
   const addressData = {
-    fullAddress: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.fullAddress) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.fullAddress) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.addressRaw),
-    flatHouseNumber: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.flatHouseNumber) || (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.flatNo) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.flatHouseNumber),
-    buildingTower: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.buildingTower) || (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.building) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.buildingTower),
-    landmark: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.landmark) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.landmark),
-    pinCode: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.pinCode) || (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.pincode) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.pinCode) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.pincode),
-    ward: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.ward) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.ward) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.locality),
-    assembly: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.assembly) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.assembly),
-    gpsValid: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.gpsValid) !== undefined ? editedAddress.gpsValid : apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.gpsValid,
-    latitude: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.latitude) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.latitude),
-    longitude: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.longitude) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.longitude),
-    mobileNo: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.mobileNo) || (aadhaarData === null || aadhaarData === void 0 ? void 0 : aadhaarData.mobileNumber) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.mobileNo),
-    whatsappNo: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.whatsappNo) || (aadhaarData === null || aadhaarData === void 0 ? void 0 : aadhaarData.whatsappNumber) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.whatsappNo),
-    email: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.email) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.email),
-    noOfPerson: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.noOfPerson) || (aadhaarData === null || aadhaarData === void 0 ? void 0 : aadhaarData.noOfPersons) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.noOfPerson),
-    knumber: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.knumber) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.knumber) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.kno) || activeKno,
-    doorPhotoFilestoreId: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.doorPhotoFileStoreId) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.doorPhotoFilestoreId)
+    ...(newDataRaw === null || newDataRaw === void 0 ? void 0 : newDataRaw.address),
+    fullAddress: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.fullAddress) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address = newDataRaw.address) === null || _newDataRaw$address === void 0 ? void 0 : _newDataRaw$address.fullAddress),
+    flatHouseNumber: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.flatHouseNumber) || (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.flatNo) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address2 = newDataRaw.address) === null || _newDataRaw$address2 === void 0 ? void 0 : _newDataRaw$address2.flatHouseNumber),
+    buildingTower: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.buildingTower) || (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.building) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address3 = newDataRaw.address) === null || _newDataRaw$address3 === void 0 ? void 0 : _newDataRaw$address3.buildingTower),
+    landmark: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.landmark) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address4 = newDataRaw.address) === null || _newDataRaw$address4 === void 0 ? void 0 : _newDataRaw$address4.landmark),
+    pinCode: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.pinCode) || (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.pincode) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address5 = newDataRaw.address) === null || _newDataRaw$address5 === void 0 ? void 0 : _newDataRaw$address5.pinCode),
+    ward: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.ward) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address6 = newDataRaw.address) === null || _newDataRaw$address6 === void 0 ? void 0 : _newDataRaw$address6.ward),
+    assembly: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.assembly) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address7 = newDataRaw.address) === null || _newDataRaw$address7 === void 0 ? void 0 : _newDataRaw$address7.assembly),
+    gpsValid: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.gpsValid) !== undefined ? editedAddress.gpsValid : newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address8 = newDataRaw.address) === null || _newDataRaw$address8 === void 0 ? void 0 : _newDataRaw$address8.gpsValid,
+    latitude: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.latitude) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address9 = newDataRaw.address) === null || _newDataRaw$address9 === void 0 ? void 0 : _newDataRaw$address9.latitude),
+    longitude: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.longitude) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address0 = newDataRaw.address) === null || _newDataRaw$address0 === void 0 ? void 0 : _newDataRaw$address0.longitude),
+    mobileNo: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.mobileNo) || (aadhaarData === null || aadhaarData === void 0 ? void 0 : aadhaarData.mobileNumber) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address1 = newDataRaw.address) === null || _newDataRaw$address1 === void 0 ? void 0 : _newDataRaw$address1.mobileNo),
+    whatsappNo: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.whatsappNo) || (aadhaarData === null || aadhaarData === void 0 ? void 0 : aadhaarData.whatsappNumber) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address10 = newDataRaw.address) === null || _newDataRaw$address10 === void 0 ? void 0 : _newDataRaw$address10.whatsappNo),
+    email: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.email) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address11 = newDataRaw.address) === null || _newDataRaw$address11 === void 0 ? void 0 : _newDataRaw$address11.email),
+    noOfPerson: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.noOfPerson) || (aadhaarData === null || aadhaarData === void 0 ? void 0 : aadhaarData.noOfPersons) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address12 = newDataRaw.address) === null || _newDataRaw$address12 === void 0 ? void 0 : _newDataRaw$address12.noOfPerson),
+    knumber: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.knumber) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address13 = newDataRaw.address) === null || _newDataRaw$address13 === void 0 ? void 0 : _newDataRaw$address13.knumber) || activeKno,
+    doorPhotoFilestoreId: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.doorPhotoFileStoreId) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address14 = newDataRaw.address) === null || _newDataRaw$address14 === void 0 ? void 0 : _newDataRaw$address14.doorPhotoFilestoreId)
   };
   const propertyData = {
-    kno: (apiProp === null || apiProp === void 0 ? void 0 : apiProp.kno) || activeKno,
-    pidNumber: (editedProperty === null || editedProperty === void 0 ? void 0 : editedProperty.pidNumber) || (apiProp === null || apiProp === void 0 ? void 0 : apiProp.pidNumber),
-    typeOfConnection: (editedProperty === null || editedProperty === void 0 ? void 0 : (_editedProperty$conne = editedProperty.connectionTypeData) === null || _editedProperty$conne === void 0 ? void 0 : _editedProperty$conne.label) || (apiProp === null || apiProp === void 0 ? void 0 : apiProp.typeOfConnection),
-    connectionCategory: (editedProperty === null || editedProperty === void 0 ? void 0 : (_editedProperty$conne2 = editedProperty.connectionCategoryData) === null || _editedProperty$conne2 === void 0 ? void 0 : _editedProperty$conne2.label) || (apiProp === null || apiProp === void 0 ? void 0 : apiProp.connectionCategory),
-    userType: (editedProperty === null || editedProperty === void 0 ? void 0 : (_editedProperty$userT = editedProperty.userTypeData) === null || _editedProperty$userT === void 0 ? void 0 : _editedProperty$userT.label) || (apiProp === null || apiProp === void 0 ? void 0 : apiProp.userType),
-    numberOfFloors: (editedProperty === null || editedProperty === void 0 ? void 0 : (_editedProperty$noOfF = editedProperty.noOfFloorsData) === null || _editedProperty$noOfF === void 0 ? void 0 : _editedProperty$noOfF.label) || (apiProp === null || apiProp === void 0 ? void 0 : apiProp.numberOfFloors),
-    tenantName: apiProp === null || apiProp === void 0 ? void 0 : apiProp.tenantName,
-    tenantMobile: apiProp === null || apiProp === void 0 ? void 0 : apiProp.tenantMobile,
-    ekycStatus: apiProp === null || apiProp === void 0 ? void 0 : apiProp.ekycStatus,
-    propertyDocumentFileStoreId: (editedProperty === null || editedProperty === void 0 ? void 0 : editedProperty.propertyDocumentFileStoreId) || (apiProp === null || apiProp === void 0 ? void 0 : apiProp.propertyDocumentFileStoreId),
-    buildingImageFileStoreId: apiProp === null || apiProp === void 0 ? void 0 : apiProp.buildingImageFileStoreId
+    ...(newDataRaw === null || newDataRaw === void 0 ? void 0 : newDataRaw.property),
+    kno: (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$property = newDataRaw.property) === null || _newDataRaw$property === void 0 ? void 0 : _newDataRaw$property.kno) || activeKno,
+    pidNumber: (editedProperty === null || editedProperty === void 0 ? void 0 : editedProperty.pidNumber) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$property2 = newDataRaw.property) === null || _newDataRaw$property2 === void 0 ? void 0 : _newDataRaw$property2.pidNumber),
+    typeOfConnection: (editedProperty === null || editedProperty === void 0 ? void 0 : (_editedProperty$conne = editedProperty.connectionTypeData) === null || _editedProperty$conne === void 0 ? void 0 : _editedProperty$conne.label) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$property3 = newDataRaw.property) === null || _newDataRaw$property3 === void 0 ? void 0 : _newDataRaw$property3.typeOfConnection),
+    connectionCategory: (editedProperty === null || editedProperty === void 0 ? void 0 : (_editedProperty$conne2 = editedProperty.connectionCategoryData) === null || _editedProperty$conne2 === void 0 ? void 0 : _editedProperty$conne2.label) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$property4 = newDataRaw.property) === null || _newDataRaw$property4 === void 0 ? void 0 : _newDataRaw$property4.connectionCategory),
+    userType: (editedProperty === null || editedProperty === void 0 ? void 0 : (_editedProperty$userT = editedProperty.userTypeData) === null || _editedProperty$userT === void 0 ? void 0 : _editedProperty$userT.label) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$property5 = newDataRaw.property) === null || _newDataRaw$property5 === void 0 ? void 0 : _newDataRaw$property5.userType),
+    numberOfFloors: (editedProperty === null || editedProperty === void 0 ? void 0 : (_editedProperty$noOfF = editedProperty.noOfFloorsData) === null || _editedProperty$noOfF === void 0 ? void 0 : _editedProperty$noOfF.label) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$property6 = newDataRaw.property) === null || _newDataRaw$property6 === void 0 ? void 0 : _newDataRaw$property6.numberOfFloors),
+    propertyDocumentFileStoreId: (editedProperty === null || editedProperty === void 0 ? void 0 : editedProperty.propertyDocumentFileStoreId) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$property7 = newDataRaw.property) === null || _newDataRaw$property7 === void 0 ? void 0 : _newDataRaw$property7.propertyDocumentFileStoreId)
   };
   const meterData = {
-    kno: (editedMeter === null || editedMeter === void 0 ? void 0 : editedMeter.kno) || (apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.kno) || activeKno,
-    metered: (editedMeter === null || editedMeter === void 0 ? void 0 : (_editedMeter$meterSta = editedMeter.meterStatusData) === null || _editedMeter$meterSta === void 0 ? void 0 : _editedMeter$meterSta.value) === "Metered" || (apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.metered),
-    meterNumber: (apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.meterNumber) || (apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.meterNo),
-    meterMake: (editedMeter === null || editedMeter === void 0 ? void 0 : editedMeter.meterMake) || (apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.meterMake),
-    meterLocationAddress: (editedMeter === null || editedMeter === void 0 ? void 0 : editedMeter.meterLocation) || (apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.meterLocationAddress),
-    meterLatitude: apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.meterLatitude,
-    meterLongitude: apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.meterLongitude,
-    workingStatus: (editedMeter === null || editedMeter === void 0 ? void 0 : (_editedMeter$workingS = editedMeter.workingStatusData) === null || _editedMeter$workingS === void 0 ? void 0 : _editedMeter$workingS.value) === "Working" || (apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.workingStatus),
-    lastBillRaised: (editedMeter === null || editedMeter === void 0 ? void 0 : (_editedMeter$lastBill = editedMeter.lastBillRaisedData) === null || _editedMeter$lastBill === void 0 ? void 0 : _editedMeter$lastBill.value) === "Yes" || (apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.lastBillRaised),
-    systemMeterId: apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.systemMeterId,
-    meterPhotoFileStoreId: (editedMeter === null || editedMeter === void 0 ? void 0 : editedMeter.meterPhotoFileStoreId) || (apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.meterPhotoFileStoreId)
+    ...(newDataRaw === null || newDataRaw === void 0 ? void 0 : newDataRaw.meter),
+    kno: (editedMeter === null || editedMeter === void 0 ? void 0 : editedMeter.kno) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$meter = newDataRaw.meter) === null || _newDataRaw$meter === void 0 ? void 0 : _newDataRaw$meter.kno) || activeKno,
+    metered: (editedMeter === null || editedMeter === void 0 ? void 0 : (_editedMeter$meterSta = editedMeter.meterStatusData) === null || _editedMeter$meterSta === void 0 ? void 0 : _editedMeter$meterSta.value) === "Metered" || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$meter2 = newDataRaw.meter) === null || _newDataRaw$meter2 === void 0 ? void 0 : _newDataRaw$meter2.metered),
+    meterNumber: newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$meter3 = newDataRaw.meter) === null || _newDataRaw$meter3 === void 0 ? void 0 : _newDataRaw$meter3.meterNumber,
+    meterMake: (editedMeter === null || editedMeter === void 0 ? void 0 : editedMeter.meterMake) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$meter4 = newDataRaw.meter) === null || _newDataRaw$meter4 === void 0 ? void 0 : _newDataRaw$meter4.meterMake),
+    meterLocationAddress: (editedMeter === null || editedMeter === void 0 ? void 0 : editedMeter.meterLocation) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$meter5 = newDataRaw.meter) === null || _newDataRaw$meter5 === void 0 ? void 0 : _newDataRaw$meter5.meterLocationAddress),
+    workingStatus: (editedMeter === null || editedMeter === void 0 ? void 0 : (_editedMeter$workingS = editedMeter.workingStatusData) === null || _editedMeter$workingS === void 0 ? void 0 : _editedMeter$workingS.value) === "Working" || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$meter6 = newDataRaw.meter) === null || _newDataRaw$meter6 === void 0 ? void 0 : _newDataRaw$meter6.workingStatus),
+    lastBillRaised: (editedMeter === null || editedMeter === void 0 ? void 0 : (_editedMeter$lastBill = editedMeter.lastBillRaisedData) === null || _editedMeter$lastBill === void 0 ? void 0 : _editedMeter$lastBill.value) === "Yes" || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$meter7 = newDataRaw.meter) === null || _newDataRaw$meter7 === void 0 ? void 0 : _newDataRaw$meter7.lastBillRaised),
+    meterPhotoFileStoreId: (editedMeter === null || editedMeter === void 0 ? void 0 : editedMeter.meterPhotoFileStoreId) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$meter8 = newDataRaw.meter) === null || _newDataRaw$meter8 === void 0 ? void 0 : _newDataRaw$meter8.meterPhotoFileStoreId)
   };
+  const connectionFields = [{
+    label: "EKYC_K_NUMBER",
+    key: "knumber"
+  }, {
+    label: "EKYC_CONSUMER_NAME",
+    key: "consumerName"
+  }, {
+    label: "EKYC_ADDRESS",
+    key: "address"
+  }, {
+    label: "EKYC_CONNECTION_TYPE",
+    key: "connectionType"
+  }, {
+    label: "EKYC_METER_NO",
+    key: "meterNumber"
+  }, {
+    label: "EKYC_MOBILE_NO",
+    key: "phoneNumber"
+  }, {
+    label: "EKYC_EMAIL",
+    key: "email"
+  }, {
+    label: "EKYC_STATUS_FLAG",
+    key: "statusflag"
+  }, {
+    label: "EKYC_STATUS",
+    key: "ekycStatus"
+  }];
+  const addressFields = [{
+    label: "EKYC_FULL_ADDRESS",
+    key: "fullAddress"
+  }, {
+    label: "EKYC_FLAT_HOUSE_NO",
+    key: "flatHouseNumber"
+  }, {
+    label: "EKYC_BUILDING_TOWER",
+    key: "buildingTower"
+  }, {
+    label: "EKYC_LANDMARK",
+    key: "landmark"
+  }, {
+    label: "EKYC_PINCODE",
+    key: "pinCode"
+  }, {
+    label: "EKYC_LOCALITY",
+    key: "ward"
+  }, {
+    label: "EKYC_ASSEMBLY",
+    key: "assembly"
+  }, {
+    label: "EKYC_GPS_VALID",
+    key: "gpsValid",
+    isBool: true
+  }, {
+    label: "EKYC_LATITUDE",
+    key: "latitude"
+  }, {
+    label: "EKYC_LONGITUDE",
+    key: "longitude"
+  }, {
+    label: "EKYC_MOBILE_NO",
+    key: "mobileNo"
+  }, {
+    label: "EKYC_WHATSAPP_NO",
+    key: "whatsappNo"
+  }, {
+    label: "EKYC_EMAIL",
+    key: "email"
+  }, {
+    label: "EKYC_NO_OF_PERSONS",
+    key: "noOfPerson"
+  }, {
+    label: "EKYC_K_NUMBER",
+    key: "knumber"
+  }];
+  const propertyFields = [{
+    label: "EKYC_CONNECTION_CATEGORY",
+    key: "connectionCategory"
+  }, {
+    label: "EKYC_PID_NUMBER",
+    key: "pidNumber"
+  }, {
+    label: "EKYC_TYPE_OF_CONNECTION",
+    key: "typeOfConnection"
+  }, {
+    label: "EKYC_USER_TYPE",
+    key: "userType"
+  }, {
+    label: "EKYC_FLOOR_COUNT",
+    key: "numberOfFloors"
+  }, {
+    label: "EKYC_TENANT_NAME",
+    key: "tenantName"
+  }, {
+    label: "EKYC_TENANT_MOBILE",
+    key: "tenantMobile"
+  }, {
+    label: "EKYC_STATUS",
+    key: "ekycStatus"
+  }];
+  const meterFields = [{
+    label: "EKYC_METERED",
+    key: "metered",
+    isBool: true
+  }, {
+    label: "EKYC_METER_NO",
+    key: "meterNumber"
+  }, {
+    label: "EKYC_METER_MAKE",
+    key: "meterMake"
+  }, {
+    label: "EKYC_METER_LOCATION_ADDRESS",
+    key: "meterLocationAddress"
+  }, {
+    label: "EKYC_METER_LATITUDE",
+    key: "meterLatitude"
+  }, {
+    label: "EKYC_METER_LONGITUDE",
+    key: "meterLongitude"
+  }, {
+    label: "EKYC_WORKING_STATUS",
+    key: "workingStatus",
+    isBool: true
+  }, {
+    label: "EKYC_LAST_BILL_RAISED",
+    key: "lastBillRaised",
+    isBool: true
+  }, {
+    label: "EKYC_SYSTEM_METER_ID",
+    key: "systemMeterId"
+  }];
   const handleDeclaration = () => setAgree(!agree);
+  const handleReject = async () => {
+    var _Digit$UserService$ge, _Digit$UserService$ge2, _Digit$UserService$ge3;
+    const payload = {
+      RequestInfo: {
+        apiId: "Rainmaker",
+        ver: "1.0",
+        msgId: "message-id",
+        authToken: (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.access_token
+      },
+      kno: activeKno,
+      action: "REJECTED",
+      remarks: "Application rejected by reviewer",
+      reviewedBy: (_Digit$UserService$ge2 = Digit.UserService.getUser()) === null || _Digit$UserService$ge2 === void 0 ? void 0 : (_Digit$UserService$ge3 = _Digit$UserService$ge2.info) === null || _Digit$UserService$ge3 === void 0 ? void 0 : _Digit$UserService$ge3.userName,
+      role: "ZRO"
+    };
+    try {
+      const result = await workflowMutation.mutateAsync(payload);
+      if (result) {
+        history.push("/digit-ui/employee/ekyc/response", {
+          success: true,
+          result
+        });
+      }
+    } catch (err) {
+      console.error("Reject Error:", err);
+    }
+  };
+  const handleApprove = async () => {
+    var _Digit$UserService$ge4, _Digit$UserService$ge5, _Digit$UserService$ge6;
+    const payload = {
+      RequestInfo: {
+        apiId: "Rainmaker",
+        ver: "1.0",
+        msgId: "message-id",
+        authToken: (_Digit$UserService$ge4 = Digit.UserService.getUser()) === null || _Digit$UserService$ge4 === void 0 ? void 0 : _Digit$UserService$ge4.access_token
+      },
+      kno: activeKno,
+      action: "APPROVED",
+      remarks: "All documents verified",
+      reviewedBy: (_Digit$UserService$ge5 = Digit.UserService.getUser()) === null || _Digit$UserService$ge5 === void 0 ? void 0 : (_Digit$UserService$ge6 = _Digit$UserService$ge5.info) === null || _Digit$UserService$ge6 === void 0 ? void 0 : _Digit$UserService$ge6.userName,
+      role: "ZRO"
+    };
+    try {
+      const result = await workflowMutation.mutateAsync(payload);
+      if (result) {
+        history.push("/digit-ui/employee/ekyc/response", {
+          success: true,
+          result
+        });
+      }
+    } catch (err) {
+      console.error("Approve Error:", err);
+    }
+  };
   const handleFinalSubmit = async () => {
     setIsSubmitting(true);
     try {
@@ -2861,7 +3239,7 @@ const Review = () => {
           meterDetails: meterData
         }
       };
-      const result = await Digit.EkycService.application_update(payload, tenantId);
+      const result = await updateMutation.mutateAsync(payload);
       if (result) {
         history.push("/digit-ui/employee/ekyc/response", {
           success: true,
@@ -2874,258 +3252,254 @@ const Review = () => {
       setIsSubmitting(false);
     }
   };
+  const handleViewDocument = fileStoreId => {
+    if (!fileStoreId) return;
+    const documentUrl = `https://dev-djb.nitcon.in/filestore/v1/files/id?tenantId=dl.djb&fileStoreId=${fileStoreId}`;
+    setPreviewUrl(documentUrl);
+    setShowPreview(true);
+  };
   if (isSearchLoading || isSubmitting) return /*#__PURE__*/React.createElement(Loader, null);
   const baseUrl = "/digit-ui/employee/ekyc";
   return /*#__PURE__*/React.createElement("div", {
-    className: "review-container"
-  }, /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement("div", {
+    className: "employeeCard overflow-y-scroll"
+  }, /*#__PURE__*/React.createElement(Card, {
+    style: {
+      padding: "32px"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
       justifyContent: "space-between",
       alignItems: "center",
-      marginBottom: "20px"
+      marginBottom: "40px",
+      borderBottom: "1px solid #EAECF0",
+      paddingBottom: "20px"
     }
   }, /*#__PURE__*/React.createElement(CardHeader, {
     style: {
-      margin: 0
+      margin: 0,
+      fontSize: "28px"
     }
   }, t("EKYC_REVIEW_APPLICATION")), /*#__PURE__*/React.createElement("div", {
     style: {
       background: "#F9FAFB",
-      border: "0.5px solid #EAECF0",
-      borderRadius: "20px",
-      padding: "4px 14px",
-      fontSize: "12px",
-      color: "#667085"
+      border: "1px solid #EAECF0",
+      borderRadius: "24px",
+      padding: "8px 20px",
+      fontSize: "14px",
+      color: "#475467",
+      fontWeight: "500"
     }
   }, t("EKYC_K_NUMBER"), ": ", /*#__PURE__*/React.createElement("span", {
     style: {
-      color: "#0B0C0C",
-      fontWeight: "600"
-    }
-  }, activeKno))), /*#__PURE__*/React.createElement(CardSubHeader, null, t("EKYC_CONNECTION_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, {
-    style: {
-      marginTop: "20px",
-      marginBottom: "30px"
-    }
-  }, /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_K_NUMBER"),
-    text: checkForNA(connectionData.knumber)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_CONSUMER_NAME"),
-    text: checkForNA(connectionData.consumerName)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_ADDRESS"),
-    text: checkForNA(connectionData.address)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_CONNECTION_TYPE"),
-    text: checkForNA(connectionData.connectionType)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_METER_NO"),
-    text: checkForNA(connectionData.meterNumber)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_MOBILE_NO"),
-    text: checkForNA(connectionData.phoneNumber)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_EMAIL"),
-    text: checkForNA(connectionData.email)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_STATUS_FLAG"),
-    text: checkForNA(connectionData.statusflag)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_STATUS"),
-    text: checkForNA(connectionData.ekycStatus)
-  })), /*#__PURE__*/React.createElement(CardSubHeader, null, t("EKYC_ADDRESS_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, {
-    style: {
-      marginTop: "20px",
-      marginBottom: "30px"
+      color: "#101828",
+      fontWeight: "700"
+    }
+  }, activeKno))), /*#__PURE__*/React.createElement(ReviewSection, {
+    title: t("EKYC_CONNECTION_DETAILS"),
+    fields: connectionFields,
+    newData: connectionData,
+    oldData: oldDataRaw === null || oldDataRaw === void 0 ? void 0 : oldDataRaw.connection,
+    t: t,
+    jumpTo: `${baseUrl}/consumer-details`,
+    state: {
+      ...flowState,
+      reviewData: searchData,
+      edits
+    }
+  }), /*#__PURE__*/React.createElement(ReviewSection, {
+    title: t("EKYC_ADDRESS_DETAILS"),
+    fields: addressFields,
+    newData: addressData,
+    oldData: oldDataRaw === null || oldDataRaw === void 0 ? void 0 : oldDataRaw.address,
+    t: t,
+    jumpTo: `${baseUrl}/address-details`,
+    state: {
+      ...flowState,
+      reviewData: searchData,
+      edits
+    }
+  }), /*#__PURE__*/React.createElement(ReviewSection, {
+    title: t("EKYC_PROPERTY_INFO"),
+    fields: propertyFields,
+    newData: propertyData,
+    oldData: oldDataRaw === null || oldDataRaw === void 0 ? void 0 : oldDataRaw.property,
+    t: t,
+    jumpTo: `${baseUrl}/property-info`,
+    state: {
+      ...flowState,
+      reviewData: searchData,
+      edits
+    }
+  }), /*#__PURE__*/React.createElement(ReviewSection, {
+    title: t("EKYC_METER_DETAILS"),
+    fields: meterFields,
+    newData: meterData,
+    oldData: oldDataRaw === null || oldDataRaw === void 0 ? void 0 : oldDataRaw.meter,
+    t: t,
+    jumpTo: `${baseUrl}/meter-details`,
+    state: {
+      ...flowState,
+      reviewData: searchData,
+      edits
     }
-  }, /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_FULL_ADDRESS"),
-    text: checkForNA(addressData.fullAddress),
-    actionButton: /*#__PURE__*/React.createElement(ActionButton, {
-      jumpTo: `${baseUrl}/address-details`,
-      state: {
-        ...flowState,
-        reviewData: searchData,
-        edits
-      }
-    })
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_FLAT_HOUSE_NO"),
-    text: checkForNA(addressData.flatHouseNumber)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_BUILDING_TOWER"),
-    text: checkForNA(addressData.buildingTower)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_LANDMARK"),
-    text: checkForNA(addressData.landmark)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_PINCODE"),
-    text: checkForNA(addressData.pinCode)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_LOCALITY"),
-    text: checkForNA(addressData.ward)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_ASSEMBLY"),
-    text: checkForNA(addressData.assembly)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_GPS_VALID"),
-    text: boolToYesNo(addressData.gpsValid, t)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_LATITUDE"),
-    text: checkForNA(addressData.latitude)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_LONGITUDE"),
-    text: checkForNA(addressData.longitude)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_MOBILE_NO"),
-    text: checkForNA(addressData.mobileNo)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_WHATSAPP_NO"),
-    text: checkForNA(addressData.whatsappNo)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_EMAIL"),
-    text: checkForNA(addressData.email)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_NO_OF_PERSONS"),
-    text: checkForNA(addressData.noOfPerson)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_K_NUMBER"),
-    text: checkForNA(addressData.knumber)
-  })), /*#__PURE__*/React.createElement(CardSubHeader, null, t("EKYC_PROPERTY_INFO")), /*#__PURE__*/React.createElement(StatusTable, {
+  }), /*#__PURE__*/React.createElement("div", {
     style: {
-      marginTop: "20px",
-      marginBottom: "30px"
+      marginTop: "40px"
     }
-  }, /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_CONNECTION_CATEGORY"),
-    text: checkForNA(propertyData.connectionCategory),
-    actionButton: /*#__PURE__*/React.createElement(ActionButton, {
-      jumpTo: `${baseUrl}/property-info`,
-      state: {
-        ...flowState,
-        reviewData: searchData,
-        edits
-      }
-    })
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_PID_NUMBER"),
-    text: checkForNA(propertyData.pidNumber)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_TYPE_OF_CONNECTION"),
-    text: checkForNA(propertyData.typeOfConnection)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_USER_TYPE"),
-    text: checkForNA(propertyData.userType)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_FLOOR_COUNT"),
-    text: checkForNA(propertyData.numberOfFloors)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_TENANT_NAME"),
-    text: checkForNA(propertyData.tenantName)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_TENANT_MOBILE"),
-    text: checkForNA(propertyData.tenantMobile)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_STATUS"),
-    text: checkForNA(propertyData.ekycStatus)
-  })), /*#__PURE__*/React.createElement(CardSubHeader, null, t("EKYC_METER_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, {
+  }, /*#__PURE__*/React.createElement(CardSubHeader, {
     style: {
-      marginTop: "20px",
-      marginBottom: "30px"
+      marginBottom: "20px"
     }
-  }, /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_METERED"),
-    text: boolToYesNo(meterData.metered, t),
-    actionButton: /*#__PURE__*/React.createElement(ActionButton, {
-      jumpTo: `${baseUrl}/meter-details`,
-      state: {
-        ...flowState,
-        reviewData: searchData,
-        edits
-      }
-    })
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_METER_NO"),
-    text: checkForNA(meterData.meterNumber)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_METER_MAKE"),
-    text: checkForNA(meterData.meterMake)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_METER_LOCATION_ADDRESS"),
-    text: checkForNA(meterData.meterLocationAddress)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_METER_LATITUDE"),
-    text: checkForNA(meterData.meterLatitude)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_METER_LONGITUDE"),
-    text: checkForNA(meterData.meterLongitude)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_WORKING_STATUS"),
-    text: boolToYesNo(meterData.workingStatus, t)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_LAST_BILL_RAISED"),
-    text: boolToYesNo(meterData.lastBillRaised, t)
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("EKYC_SYSTEM_METER_ID"),
-    text: checkForNA(meterData.systemMeterId)
-  })), /*#__PURE__*/React.createElement(CardSubHeader, null, t("EKYC_DOCUMENTS")), /*#__PURE__*/React.createElement(StatusTable, {
+  }, t("EKYC_DOCUMENTS")), /*#__PURE__*/React.createElement(StatusTable, {
     style: {
-      marginTop: "20px",
-      marginBottom: "30px"
+      maxWidth: "600px"
     }
   }, /*#__PURE__*/React.createElement(Row, {
     label: t("EKYC_DOOR_PHOTO"),
     text: addressData.doorPhotoFilestoreId ? t("EKYC_PHOTO_AVAILABLE") : t("CS_NA"),
-    actionButton: addressData.doorPhotoFilestoreId && /*#__PURE__*/React.createElement(GenericFileIcon, {
+    actionButton: addressData.doorPhotoFilestoreId && /*#__PURE__*/React.createElement("div", {
+      onClick: () => handleViewDocument(addressData.doorPhotoFilestoreId)
+    }, /*#__PURE__*/React.createElement(GenericFileIcon, {
       style: {
-        cursor: "pointer"
+        cursor: "pointer",
+        fill: "#F47738"
       }
-    })
+    }))
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("EKYC_METER_PHOTO"),
     text: meterData.meterPhotoFileStoreId ? t("EKYC_PHOTO_AVAILABLE") : t("CS_NA"),
-    actionButton: meterData.meterPhotoFileStoreId && /*#__PURE__*/React.createElement(GenericFileIcon, {
+    actionButton: meterData.meterPhotoFileStoreId && /*#__PURE__*/React.createElement("div", {
+      onClick: () => handleViewDocument(meterData.meterPhotoFileStoreId)
+    }, /*#__PURE__*/React.createElement(GenericFileIcon, {
       style: {
-        cursor: "pointer"
+        cursor: "pointer",
+        fill: "#F47738"
       }
-    })
+    }))
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("EKYC_BUILDING_IMAGE"),
     text: propertyData.buildingImageFileStoreId ? t("EKYC_PHOTO_AVAILABLE") : t("CS_NA"),
-    actionButton: propertyData.buildingImageFileStoreId && /*#__PURE__*/React.createElement(GenericFileIcon, {
+    actionButton: propertyData.buildingImageFileStoreId && /*#__PURE__*/React.createElement("div", {
+      onClick: () => handleViewDocument(propertyData.buildingImageFileStoreId)
+    }, /*#__PURE__*/React.createElement(GenericFileIcon, {
       style: {
-        cursor: "pointer"
+        cursor: "pointer",
+        fill: "#F47738"
       }
-    })
+    }))
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("EKYC_PROPERTY_DOCUMENTS"),
     text: propertyData.propertyDocumentFileStoreId ? t("EKYC_DOCS_AVAILABLE") : t("CS_NA"),
-    actionButton: propertyData.propertyDocumentFileStoreId && /*#__PURE__*/React.createElement(GenericFileIcon, {
+    actionButton: propertyData.propertyDocumentFileStoreId && /*#__PURE__*/React.createElement("div", {
+      onClick: () => handleViewDocument(propertyData.propertyDocumentFileStoreId)
+    }, /*#__PURE__*/React.createElement(GenericFileIcon, {
       style: {
-        cursor: "pointer"
+        cursor: "pointer",
+        fill: "#F47738"
       }
-    })
-  })), /*#__PURE__*/React.createElement(CheckBox, {
+    }))
+  }))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: "40px",
+      paddingTop: "30px",
+      borderTop: "1px solid #EAECF0"
+    }
+  }, /*#__PURE__*/React.createElement(CheckBox, {
     id: "agreeDeclaration",
     name: "agreeDeclaration",
-    label: t("EKYC_FINAL_DECLARATION"),
+    label: /*#__PURE__*/React.createElement("span", {
+      style: {
+        fontSize: "16px",
+        color: "#344054"
+      }
+    }, t("EKYC_FINAL_DECLARATION")),
     onChange: handleDeclaration,
-    checked: agree,
-    style: {
-      marginTop: "20px"
-    }
-  })), /*#__PURE__*/React.createElement(ActionBar, {
+    checked: agree
+  }))), /*#__PURE__*/React.createElement(ActionBar, {
     style: {
       position: "static",
-      marginTop: "24px"
+      marginTop: "32px",
+      display: "flex",
+      justifyContent: "flex-end"
     }
   }, /*#__PURE__*/React.createElement(SubmitBar, {
+    label: t("EKYC_REJECT"),
+    onSubmit: handleReject,
+    disabled: !agree
+  }), /*#__PURE__*/React.createElement(SubmitBar, {
+    label: t("EKYC_APPROVE"),
+    onSubmit: handleApprove,
+    disabled: !agree
+  }), /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("EKYC_SUBMIT_APPLICATION"),
     onSubmit: handleFinalSubmit,
     disabled: !agree
-  })));
+  })), showPreview && /*#__PURE__*/React.createElement("div", {
+    style: {
+      position: "fixed",
+      top: 0,
+      left: 0,
+      width: "100%",
+      height: "100%",
+      backgroundColor: "rgba(0,0,0,0.7)",
+      display: "flex",
+      justifyContent: "center",
+      alignItems: "center",
+      zIndex: 10000
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      position: "relative",
+      backgroundColor: "#fff",
+      padding: "30px",
+      borderRadius: "12px",
+      maxWidth: "600px",
+      width: "100%",
+      maxHeight: "70vh",
+      overflow: "auto",
+      boxShadow: "0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04)"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    onClick: () => setShowPreview(false),
+    style: {
+      position: "absolute",
+      top: "10px",
+      right: "10px",
+      cursor: "pointer",
+      fontWeight: "bold",
+      fontSize: "20px",
+      color: "#333",
+      background: "#eee",
+      width: "30px",
+      height: "30px",
+      display: "flex",
+      justifyContent: "center",
+      alignItems: "center",
+      borderRadius: "50%"
+    }
+  }, "\xD7"), /*#__PURE__*/React.createElement("img", {
+    src: previewUrl,
+    alt: "Document Preview",
+    style: {
+      maxWidth: "100%",
+      height: "auto",
+      display: "block"
+    },
+    onError: e => {
+      e.target.style.display = "none";
+      e.target.nextSibling.style.display = "block";
+    }
+  }), /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "none",
+      padding: "40px",
+      textAlign: "center"
+    }
+  }, /*#__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")
+  })))));
 };
 
 var QueryClientContext = function () {
@@ -3149,41 +3523,117 @@ var useQueryClient = function useQueryClient() {
 
 const AadhaarVerification = ({
   config,
-  onSelect
+  onSelect,
+  formData
 }) => {
-  const [kno, setKno] = useState("");
-  const [consumerType, setConsumerType] = useState(null);
-  const [occupantType, setOccupantType] = useState(null);
-  const [categoryType, setCategoryType] = useState(null);
-  const [consumerName, setConsumerName] = useState("");
-  const [firstName, setFirstName] = useState("");
-  const [middleName, setMiddleName] = useState("");
-  const [lastName, setLastName] = useState("");
-  const [gender, setGender] = useState(null);
-  const [relation, setRelation] = useState("");
-  const [mobile, setMobile] = useState("");
-  const [whatsapp, setWhatsapp] = useState("");
-  const [email, setEmail] = useState("");
-  const [residents, setResidents] = useState("");
-  const [documentProof, setDocumentProof] = useState(null);
-  const [documentId, setDocumentId] = useState(null);
-  const [ownerMobile, setOwnerMobile] = useState("");
-  const [tenantVerification, setTenantVerification] = useState("");
-  const [designation, setDesignation] = useState("");
-  const [department, setDepartment] = useState("");
-  const [employeeId, setEmployeeId] = useState("");
-  const [landline, setLandline] = useState("");
-  const [entityRelation, setEntityRelation] = useState("");
-  const [contactPerson, setContactPerson] = useState("");
-  const [entityName, setEntityName] = useState("");
-  const [idProof, setIdProof] = useState(null);
-  const [idNumber, setIdNumber] = useState("");
-  const [idFile, setIdFile] = useState(null);
-  const [consent, setConsent] = useState(false);
-  const [informantIsConsumer, setInformantIsConsumer] = useState(true);
-  const [informantName, setInformantName] = useState("");
-  const [informantRelation, setInformantRelation] = useState("");
+  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 {
+    isLoading,
+    data: searchData
+  } = Digit.Hooks.ekyc.useSearchConnection({
+    tenantId,
+    details: {
+      kno: searchKno
+    }
+  }, {
+    enabled: !!searchKno,
+    cacheTime: 0
+  });
+  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 [toast, setToast] = useState(null);
+  useEffect(() => {
+    const rawData = searchData || (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.firstName) {
+        setFirstName(details.firstName);
+        if (details.middleName) setMiddleName(details.middleName);
+        if (details.lastName) setLastName(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]);
+        if (parts.length > 2) {
+          setMiddleName(parts.slice(1, -1).join(" "));
+          setLastName(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);
+      }
+      if (details.informantName) setInformantName(details.informantName);
+      if (details.informantRelation) setInformantRelation(details.informantRelation);
+    }
+  }, [searchData, formData === null || formData === void 0 ? void 0 : formData.connectionDetails, searchKno]);
   const consumerTypeOptions = [{
     name: "Individual"
   }, {
@@ -3205,6 +3655,15 @@ const AadhaarVerification = ({
   }, {
     name: "Not prefer to say"
   }];
+  const identityTypeOptions = [{
+    name: "Aadhaar Card"
+  }, {
+    name: "Driving License"
+  }, {
+    name: "Passport"
+  }, {
+    name: "Voter ID"
+  }];
   const uploadFile = async (e, setter, idSetter) => {
     const file = e.target.files[0];
     if (!file) return;
@@ -3234,14 +3693,7 @@ const AadhaarVerification = ({
     if ((occupantType === null || occupantType === void 0 ? void 0 : occupantType.name) === "Tenanted" && !documentId && !ownerMobile) return false;
     return consent;
   };
-  const onStepSelect = () => {
-    if (!isValid()) {
-      setToast({
-        type: "error",
-        message: "Fill required fields"
-      });
-      return;
-    }
+  const onStepSelect = async () => {
     const data = {
       kno,
       consumerType: consumerType === null || consumerType === void 0 ? void 0 : consumerType.name,
@@ -3252,6 +3704,7 @@ const AadhaarVerification = ({
       middleName,
       lastName,
       gender: gender === null || gender === void 0 ? void 0 : gender.name,
+      parentSpouseName,
       relation,
       mobile,
       whatsapp,
@@ -3274,15 +3727,32 @@ const AadhaarVerification = ({
       informantName,
       informantRelation
     };
-    onSelect(config.key, data);
+    try {
+      await updateMutation.mutateAsync({
+        RequestInfo: {},
+        updateType: "CONSUMER",
+        ...data
+      });
+      setToast({
+        type: "success",
+        message: "Data updated successfully!"
+      });
+      onSelect(config.key, data);
+    } catch (error) {
+      setToast({
+        type: "error",
+        message: "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
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "K Number *"), /*#__PURE__*/React.createElement(TextInput, {
-    value: kno,
-    onChange: e => setKno(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Consumer Type *"), /*#__PURE__*/React.createElement(Dropdown, {
+    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
@@ -3307,6 +3777,9 @@ const AadhaarVerification = ({
     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)
@@ -3319,7 +3792,26 @@ const AadhaarVerification = ({
   })), /*#__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)
-  })), (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, {
+  })), /*#__PURE__*/React.createElement("div", null, console.log("identityType", identityType), /*#__PURE__*/React.createElement(CardLabel, null, "Type of Identity *"), /*#__PURE__*/React.createElement(Dropdown, {
+    option: identityTypeOptions,
+    selected: identityType,
+    select: setIdentityType
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Proof of Identity"), /*#__PURE__*/React.createElement(UploadFile, {
+    onUpload: e => uploadFile(e, setDocumentProof, setDocumentId)
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Document Number"), /*#__PURE__*/React.createElement(TextInput, {
+    value: documentNumber,
+    onChange: e => setDocumentNumber(e.target.value)
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Informant Is Consumer"), /*#__PURE__*/React.createElement(CheckBox, {
+    label: "Yes, the informant is the consumer",
+    checked: informantIsConsumer,
+    onChange: e => setInformantIsConsumer(e.target.checked)
+  })), !informantIsConsumer && /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Informant Name"), /*#__PURE__*/React.createElement(TextInput, {
+    value: informantName,
+    onChange: e => setInformantName(e.target.value)
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Informant Relation"), /*#__PURE__*/React.createElement(TextInput, {
+    value: informantRelation,
+    onChange: e => setInformantRelation(e.target.value)
+  }))), (occupantType === null || occupantType === void 0 ? void 0 : occupantType.name) === "Tenanted" && /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Document Proof"), /*#__PURE__*/React.createElement(UploadFile, {
     onUpload: e => uploadFile(e, setDocumentProof, setDocumentId)
   })), !documentId && /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, "Owner Mobile *"), /*#__PURE__*/React.createElement(TextInput, {
     value: ownerMobile,
@@ -3342,7 +3834,11 @@ const AadhaarVerification = ({
   })), /*#__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, {
+    error: toast.type === "error",
+    label: toast.message,
+    onClose: () => setToast(null)
+  }));
 };
 
 const ekycConfig = [{
@@ -3559,259 +4055,89 @@ const EmployeeApp = ({
     className: "employee-form-content"
   }, /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/dashboard`,
-    component: () => /*#__PURE__*/React.createElement(Dashboard, {
+    component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "normal"
+    }, /*#__PURE__*/React.createElement(Dashboard, {
       parentRoute: path,
       businessService: "EKYC",
       moduleCode: "EKYC",
       isInbox: true
-    })
+    }))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/inbox`,
-    component: () => /*#__PURE__*/React.createElement(Inbox, {
+    component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "normal"
+    }, /*#__PURE__*/React.createElement(Inbox, {
       parentRoute: path,
       businessService: "EKYC",
       moduleCode: "EKYC",
       isInbox: true
-    })
+    }))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/create-kyc`,
-    component: () => /*#__PURE__*/React.createElement(Create, null)
+    component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "normal"
+    }, /*#__PURE__*/React.createElement(Create, null))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/mapping`,
-    component: () => /*#__PURE__*/React.createElement(Mapping, null)
+    component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "normal"
+    }, /*#__PURE__*/React.createElement(Mapping, null))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: formStepRoutes.map(route => `${path}/${route}`),
-    component: props => /*#__PURE__*/React.createElement(EKYCForm, Object.assign({}, props, {
+    component: props => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "normal"
+    }, /*#__PURE__*/React.createElement(EKYCForm, Object.assign({}, props, {
       path: path
-    }))
+    })))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/review`,
-    component: () => /*#__PURE__*/React.createElement(Review, null)
+    component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "normal"
+    }, /*#__PURE__*/React.createElement(Review, null))
   }))))));
 };
 
-const AddressDetails = ({
+const PropertyInfo = ({
   config,
-  onSelect
+  onSelect,
+  formData
 }) => {
-  var _mdmsData$MdmsRes, _mdmsData$MdmsRes$ego, _mdmsData$MdmsRes$ego2, _mdmsData$MdmsRes$ego3, _mdmsData$MdmsRes$ego4;
   const {
     t
   } = useTranslation();
+  const location = useLocation();
+  const flowState = location.state || {};
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const [houseNo, setHouseNo] = useState("");
-  const [street, setStreet] = useState("");
-  const [locality, setLocality] = useState("");
-  const [landmark, setLandmark] = useState("");
-  const [subLocality, setSubLocality] = useState(null);
-  const [pinCode, setPinCode] = useState("");
-  const [assembly, setAssembly] = useState(null);
-  const [ward, setWard] = useState(null);
-  const [zone, setZone] = useState(null);
-  const [latitude, setLatitude] = useState("");
-  const [longitude, setLongitude] = useState("");
-  const [addressType, setAddressType] = useState(null);
-  const [doorPhoto, setDoorPhoto] = useState(null);
-  const [doorPhotoFileStoreId, setDoorPhotoFileStoreId] = useState(null);
-  const [toast, setToast] = useState(null);
+  const 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 {
-    data: mdmsData,
-    isLoading
-  } = Digit.Hooks.useCommonMDMS(tenantId, "egov-location", ["TenantBoundary"]);
-  const assemblies = (mdmsData === null || mdmsData === void 0 ? void 0 : (_mdmsData$MdmsRes = mdmsData.MdmsRes) === null || _mdmsData$MdmsRes === void 0 ? void 0 : (_mdmsData$MdmsRes$ego = _mdmsData$MdmsRes["egov-location"]) === null || _mdmsData$MdmsRes$ego === void 0 ? void 0 : (_mdmsData$MdmsRes$ego2 = _mdmsData$MdmsRes$ego.TenantBoundary) === null || _mdmsData$MdmsRes$ego2 === void 0 ? void 0 : (_mdmsData$MdmsRes$ego3 = _mdmsData$MdmsRes$ego2[0]) === null || _mdmsData$MdmsRes$ego3 === void 0 ? void 0 : (_mdmsData$MdmsRes$ego4 = _mdmsData$MdmsRes$ego3.boundary) === null || _mdmsData$MdmsRes$ego4 === void 0 ? void 0 : _mdmsData$MdmsRes$ego4.children) || [];
-  useEffect(() => {
-    let isMounted = true;
-    if (navigator.geolocation) {
-      navigator.geolocation.getCurrentPosition(pos => {
-        if (!isMounted) return;
-        setLatitude(pos.coords.latitude);
-        setLongitude(pos.coords.longitude);
-      }, () => {
-        if (!isMounted) return;
-        setToast({
-          type: "error",
-          message: "GPS access denied"
-        });
-      });
-    }
-    return () => {
-      isMounted = false;
-    };
-  }, []);
-  const handlePincodeChange = e => {
-    const value = e.target.value;
-    if (/^\d{0,6}$/.test(value)) {
-      setPinCode(value);
-      if (value.length === 6) {
-        fetchLocationByPincode(value);
-      }
-    }
-  };
-  const fetchLocationByPincode = pin => {
-    console.log("Fetching location for PIN:", pin);
-  };
-  const selectphoto = async e => {
-    let isMounted = true;
-    const file = e.target.files[0];
-    if (!file) return;
-    if (file.size >= 2000000) {
-      setToast({
-        type: "error",
-        message: "Max size 2MB exceeded"
-      });
-      return;
-    }
-    try {
-      var _res$data, _res$data$files, _res$data$files$;
-      const res = await Digit.UploadServices.Filestorage("EKYC", file, tenantId);
-      if (!isMounted) return;
-      const fileStoreId = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$files = _res$data.files) === null || _res$data$files === void 0 ? void 0 : (_res$data$files$ = _res$data$files[0]) === null || _res$data$files$ === void 0 ? void 0 : _res$data$files$.fileStoreId;
-      if (fileStoreId) {
-        setDoorPhotoFileStoreId(fileStoreId);
-        const reader = new FileReader();
-        reader.onloadend = () => {
-          if (!isMounted) return;
-          setDoorPhoto(reader.result);
-        };
-        reader.readAsDataURL(file);
-        setToast({
-          type: "success",
-          message: "Upload successful"
-        });
-      }
-    } catch {
-      if (!isMounted) return;
-      setToast({
-        type: "error",
-        message: "Upload failed"
-      });
-    }
-    return () => {
-      isMounted = false;
-    };
-  };
-  const removePhoto = () => {
-    setDoorPhoto(null);
-    setDoorPhotoFileStoreId(null);
-  };
-  const isValid = () => {
-    return houseNo && street && pinCode.length === 6 && assembly && ward && zone && latitude && longitude && doorPhotoFileStoreId;
-  };
-  const onStepSelect = () => {
-    if (!isValid()) {
-      setToast({
-        type: "error",
-        message: "Please fill all mandatory fields"
-      });
-      return;
-    }
-    const data = {
-      houseNo,
-      street,
-      locality,
-      landmark,
-      subLocality,
-      pinCode,
-      assembly: assembly === null || assembly === void 0 ? void 0 : assembly.name,
-      ward: ward === null || ward === void 0 ? void 0 : ward.name,
-      zone: zone === null || zone === void 0 ? void 0 : zone.name,
-      latitude,
-      longitude,
-      addressType: addressType === null || addressType === void 0 ? void 0 : addressType.name,
-      doorPhotoFilestoreId: doorPhotoFileStoreId
-    };
-    onSelect(config.key, data);
-  };
-  if (isLoading) return /*#__PURE__*/React.createElement(Loader, null);
-  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(FormStep, {
-    t: t,
-    onSelect: onStepSelect,
-    config: config,
-    label: t("ES_COMMON_CONTINUE")
-  }, /*#__PURE__*/React.createElement(CardLabel, null, "House No / Flat No *"), /*#__PURE__*/React.createElement(TextInput, {
-    value: houseNo,
-    onChange: e => setHouseNo(e.target.value)
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Street / Address Line *"), /*#__PURE__*/React.createElement(TextInput, {
-    value: street,
-    onChange: e => setStreet(e.target.value)
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Locality"), /*#__PURE__*/React.createElement(TextInput, {
-    value: locality,
-    onChange: e => setLocality(e.target.value)
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Landmark"), /*#__PURE__*/React.createElement(TextInput, {
-    value: landmark,
-    onChange: e => setLandmark(e.target.value)
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Sub Locality"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: [],
-    selected: subLocality,
-    select: setSubLocality
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "PIN Code *"), /*#__PURE__*/React.createElement(TextInput, {
-    value: pinCode,
-    onChange: handlePincodeChange,
-    maxLength: 6
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Assembly *"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: assemblies,
-    selected: assembly,
-    select: setAssembly
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Ward *"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: (assembly === null || assembly === void 0 ? void 0 : assembly.children) || [],
-    selected: ward,
-    select: setWard
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Zone *"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: (ward === null || ward === void 0 ? void 0 : ward.children) || [],
-    selected: zone,
-    select: setZone
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Latitude"), /*#__PURE__*/React.createElement(TextInput, {
-    value: latitude,
-    disabled: true
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Longitude"), /*#__PURE__*/React.createElement(TextInput, {
-    value: longitude,
-    disabled: true
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Address Type"), /*#__PURE__*/React.createElement(Dropdown, {
-    option: [{
-      name: "Permanent"
-    }, {
-      name: "Correspondence"
-    }, {
-      name: "Other"
-    }],
-    selected: addressType,
-    select: setAddressType
-  }), /*#__PURE__*/React.createElement(CardLabel, null, "Door Image *"), /*#__PURE__*/React.createElement(UploadFile, {
-    onUpload: selectphoto,
-    onDelete: removePhoto,
-    message: doorPhotoFileStoreId ? "Uploaded" : "No file selected"
-  }), doorPhoto && /*#__PURE__*/React.createElement("img", {
-    src: doorPhoto,
-    alt: "preview",
-    style: {
-      width: "100%",
-      marginTop: "10px"
+    isLoading,
+    data: searchData
+  } = Digit.Hooks.ekyc.useSearchConnection({
+    tenantId,
+    details: {
+      kno: searchKno
     }
-  }), toast && /*#__PURE__*/React.createElement(Toast, {
-    label: toast.message,
-    error: toast.type === "error",
-    onClose: () => setToast(null)
-  })));
-};
-
-const PropertyInfo = ({
-  config,
-  onSelect
-}) => {
-  const {
-    t
-  } = useTranslation();
-  const tenantId = Digit.ULBService.getCurrentTenantId();
-  const [pidNumber, setPidNumber] = useState("");
-  const [propertyType, setPropertyType] = useState(null);
-  const [subPropertyCategory, setSubPropertyCategory] = useState(null);
-  const [noOfFloors, setNoOfFloors] = useState("");
-  const [floorNo, setFloorNo] = useState("");
-  const [noOfRooms, setNoOfRooms] = useState("");
-  const [noOfBeds, setNoOfBeds] = useState("");
-  const [dwellingUnits, setDwellingUnits] = useState("");
+  }, {
+    enabled: !!searchKno,
+    cacheTime: 0
+  });
+  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(null);
+  const [buildingImageId, setBuildingImageId] = useState(savedData.buildingImageId || null);
   const [toast, setToast] = useState(null);
   const propertyTypeOptions = [{
     name: "Residential"
@@ -3824,6 +4150,36 @@ const PropertyInfo = ({
   }, {
     name: "Nursing Home"
   }];
+  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);
+      if (propertyInfo.subPropertyCategory) {
+        const matchingType = propertyTypeOptions.find(type => type.name.toLowerCase() === propertyInfo.subPropertyCategory.toLowerCase());
+        if (matchingType) setPropertyType(matchingType);else setPropertyType({
+          name: propertyInfo.subPropertyCategory
+        });
+        setSubPropertyCategory({
+          name: propertyInfo.subPropertyCategory
+        });
+      }
+      if (propertyInfo.propertyType) {
+        setSubPropertyCategory({
+          name: propertyInfo.propertyType
+        });
+        if (!propertyInfo.subPropertyCategory) setPropertyType({
+          name: propertyInfo.propertyType
+        });
+      }
+      if (propertyInfo.floorNo) setFloorNo(propertyInfo.floorNo);
+      if (propertyInfo.numberOfRooms !== null && propertyInfo.numberOfRooms !== undefined) setNoOfRooms(String(propertyInfo.numberOfRooms));
+      if (propertyInfo.numberOfBeds !== null && propertyInfo.numberOfBeds !== undefined) setNoOfBeds(String(propertyInfo.numberOfBeds));
+      if (propertyInfo.numberOfDwellingUnits !== null && propertyInfo.numberOfDwellingUnits !== undefined) setDwellingUnits(String(propertyInfo.numberOfDwellingUnits));
+    }
+  }, [searchData, formData === null || formData === void 0 ? void 0 : formData.connectionDetails]);
   const handleUpload = async e => {
     const file = e.target.files[0];
     if (!file) return;
@@ -3856,20 +4212,15 @@ const PropertyInfo = ({
     }
   };
   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 onStepSelect = () => {
-    if (!isValid()) {
-      setToast({
-        type: "error",
-        message: "Fill all required fields"
-      });
-      return;
-    }
+  const onStepSelect = async () => {
     const data = {
       pidNumber,
       propertyType: propertyType === null || propertyType === void 0 ? void 0 : propertyType.name,
@@ -3881,13 +4232,34 @@ const PropertyInfo = ({
       dwellingUnits,
       buildingImageId
     };
-    onSelect(config.key, data);
+    try {
+      await updateMutation.mutateAsync({
+        RequestInfo: {},
+        updateType: "PROPERTY",
+        kno: searchKno,
+        ...data
+      });
+      setToast({
+        type: "success",
+        message: "Property details updated successfully!"
+      });
+      onSelect(config.key, data);
+    } catch (error) {
+      setToast({
+        type: "error",
+        message: "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,
-    label: t("ES_COMMON_CONTINUE")
+    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)
@@ -3953,28 +4325,62 @@ const PropertyInfo = ({
 
 const MeterDetails = ({
   config,
-  onSelect
+  onSelect,
+  formData
 }) => {
+  const location = useLocation();
+  const flowState = location.state || {};
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const [connectionCategory, setConnectionCategory] = useState("");
-  const [saType, setSaType] = useState("");
-  const [status, setStatus] = useState("");
-  const [mrCode, setMrCode] = useState("");
-  const [areaCode, setAreaCode] = useState("");
-  const [mrKey, setMrKey] = useState("");
-  const [meterNumber, setMeterNumber] = useState("");
-  const [meterMaker, setMeterMaker] = useState("");
-  const [meterStatus, setMeterStatus] = useState(null);
-  const [meterCondition, setMeterCondition] = useState(null);
-  const [meterLocation, setMeterLocation] = useState(null);
-  const [lastBillReceived, setLastBillReceived] = useState(null);
-  const [billMonthYear, setBillMonthYear] = useState(null);
-  const [reason, setReason] = useState("");
-  const [accessToMeter, setAccessToMeter] = useState(null);
-  const [sewerConnection, setSewerConnection] = useState(null);
-  const [septicTank, setSepticTank] = useState(null);
+  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 {
+    isLoading,
+    data: searchData
+  } = Digit.Hooks.ekyc.useSearchConnection({
+    tenantId,
+    details: {
+      kno: searchKno
+    }
+  }, {
+    enabled: !!searchKno,
+    cacheTime: 0
+  });
+  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(null);
+  const [meterPhotoId, setMeterPhotoId] = useState(savedData.meterPhotoId || null);
   const [toast, setToast] = useState(null);
   const yesNo = [{
     name: "Yes"
@@ -4006,6 +4412,91 @@ const MeterDetails = ({
       });
     }
   }
+  useEffect(() => {
+    const rawData = searchData || (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.meterStatus) {
+        const matchingStatus = meterStatusOptions.find(o => o.name.toLowerCase() === apiMeter.meterStatus.toLowerCase());
+        if (matchingStatus) setMeterStatus(matchingStatus);else setMeterStatus({
+          name: apiMeter.meterStatus
+        });
+      } else if (apiMeter.metered !== undefined) {
+        setMeterStatus({
+          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({
+          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({
+          name: apiMeter.meterLocation
+        });
+      }
+      if (apiMeter.lastBillRaised !== undefined && apiMeter.lastBillRaised !== null) {
+        const strVal = String(apiMeter.lastBillRaised).toLowerCase();
+        if (strVal === "true" || strVal === "yes") setLastBillReceived({
+          name: "Yes"
+        });else setLastBillReceived({
+          name: "No"
+        });
+      }
+      if (apiMeter.lastBillReceivedDate) {
+        const formatted = apiMeter.lastBillReceivedDate.replace("-", "/");
+        const parsedParts = formatted.split("/");
+        if (parsedParts.length === 2) {
+          const mon = parseInt(parsedParts[0], 10);
+          const yr = parseInt(parsedParts[1], 10);
+          setBillMonthYear({
+            name: `${mon}/${yr}`
+          });
+        } else {
+          setBillMonthYear({
+            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({
+          name: "Yes"
+        });else setAccessToMeter({
+          name: "No"
+        });
+      }
+      if (apiMeter.sewerConnection !== undefined && apiMeter.sewerConnection !== null) {
+        const strVal = String(apiMeter.sewerConnection).toLowerCase();
+        if (strVal === "true" || strVal === "yes") setSewerConnection({
+          name: "Yes"
+        });else setSewerConnection({
+          name: "No"
+        });
+      }
+      if (apiMeter.septicTank !== undefined && apiMeter.septicTank !== null) {
+        const strVal = String(apiMeter.septicTank).toLowerCase();
+        if (strVal === "true" || strVal === "yes") setSepticTank({
+          name: "Yes"
+        });else setSepticTank({
+          name: "No"
+        });
+      }
+      if (apiMeter.meterPhotoFileStoreId) setMeterPhotoId(apiMeter.meterPhotoFileStoreId);
+    }
+  }, [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 => {
     const file = e.target.files[0];
@@ -4035,17 +4526,11 @@ const MeterDetails = ({
     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 onStepSelect = () => {
-    if (!isValid()) {
-      setToast({
-        type: "error",
-        message: "Fill all mandatory fields"
-      });
-      return;
-    }
+  const onStepSelect = async () => {
     const data = {
       connectionCategory,
       saType,
@@ -4066,11 +4551,32 @@ const MeterDetails = ({
       septicTank: septicTank === null || septicTank === void 0 ? void 0 : septicTank.name,
       meterPhotoId
     };
-    onSelect(config.key, data);
+    try {
+      await updateMutation.mutateAsync({
+        RequestInfo: {},
+        updateType: "METER",
+        kno: searchKno,
+        ...data
+      });
+      setToast({
+        type: "success",
+        message: "Meter details updated successfully!"
+      });
+      onSelect(config.key, data);
+    } catch (error) {
+      setToast({
+        type: "error",
+        message: "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
+    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)
@@ -4433,6 +4939,210 @@ const Inbox$1 = ({
   })));
 };
 
+const AddressDetails = ({
+  config,
+  onSelect
+}) => {
+  var _mdmsData$MdmsRes, _mdmsData$MdmsRes$ego, _mdmsData$MdmsRes$ego2, _mdmsData$MdmsRes$ego3, _mdmsData$MdmsRes$ego4;
+  const {
+    t
+  } = useTranslation();
+  const tenantId = Digit.ULBService.getCurrentTenantId();
+  const [houseNo, setHouseNo] = useState("");
+  const [street, setStreet] = useState("");
+  const [locality, setLocality] = useState("");
+  const [landmark, setLandmark] = useState("");
+  const [subLocality, setSubLocality] = useState(null);
+  const [pinCode, setPinCode] = useState("");
+  const [assembly, setAssembly] = useState(null);
+  const [ward, setWard] = useState(null);
+  const [zone, setZone] = useState(null);
+  const [latitude, setLatitude] = useState("");
+  const [longitude, setLongitude] = useState("");
+  const [addressType, setAddressType] = useState(null);
+  const [doorPhoto, setDoorPhoto] = useState(null);
+  const [doorPhotoFileStoreId, setDoorPhotoFileStoreId] = useState(null);
+  const [toast, setToast] = useState(null);
+  const {
+    data: mdmsData,
+    isLoading
+  } = Digit.Hooks.useCommonMDMS(tenantId, "egov-location", ["TenantBoundary"]);
+  const assemblies = (mdmsData === null || mdmsData === void 0 ? void 0 : (_mdmsData$MdmsRes = mdmsData.MdmsRes) === null || _mdmsData$MdmsRes === void 0 ? void 0 : (_mdmsData$MdmsRes$ego = _mdmsData$MdmsRes["egov-location"]) === null || _mdmsData$MdmsRes$ego === void 0 ? void 0 : (_mdmsData$MdmsRes$ego2 = _mdmsData$MdmsRes$ego.TenantBoundary) === null || _mdmsData$MdmsRes$ego2 === void 0 ? void 0 : (_mdmsData$MdmsRes$ego3 = _mdmsData$MdmsRes$ego2[0]) === null || _mdmsData$MdmsRes$ego3 === void 0 ? void 0 : (_mdmsData$MdmsRes$ego4 = _mdmsData$MdmsRes$ego3.boundary) === null || _mdmsData$MdmsRes$ego4 === void 0 ? void 0 : _mdmsData$MdmsRes$ego4.children) || [];
+  useEffect(() => {
+    let isMounted = true;
+    if (navigator.geolocation) {
+      navigator.geolocation.getCurrentPosition(pos => {
+        if (!isMounted) return;
+        setLatitude(pos.coords.latitude);
+        setLongitude(pos.coords.longitude);
+      }, () => {
+        if (!isMounted) return;
+        setToast({
+          type: "error",
+          message: "GPS access denied"
+        });
+      });
+    }
+    return () => {
+      isMounted = false;
+    };
+  }, []);
+  const handlePincodeChange = e => {
+    const value = e.target.value;
+    if (/^\d{0,6}$/.test(value)) {
+      setPinCode(value);
+      if (value.length === 6) {
+        fetchLocationByPincode(value);
+      }
+    }
+  };
+  const fetchLocationByPincode = pin => {
+    console.log("Fetching location for PIN:", pin);
+  };
+  const selectphoto = async e => {
+    let isMounted = true;
+    const file = e.target.files[0];
+    if (!file) return;
+    if (file.size >= 2000000) {
+      setToast({
+        type: "error",
+        message: "Max size 2MB exceeded"
+      });
+      return;
+    }
+    try {
+      var _res$data, _res$data$files, _res$data$files$;
+      const res = await Digit.UploadServices.Filestorage("EKYC", file, tenantId);
+      if (!isMounted) return;
+      const fileStoreId = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$files = _res$data.files) === null || _res$data$files === void 0 ? void 0 : (_res$data$files$ = _res$data$files[0]) === null || _res$data$files$ === void 0 ? void 0 : _res$data$files$.fileStoreId;
+      if (fileStoreId) {
+        setDoorPhotoFileStoreId(fileStoreId);
+        const reader = new FileReader();
+        reader.onloadend = () => {
+          if (!isMounted) return;
+          setDoorPhoto(reader.result);
+        };
+        reader.readAsDataURL(file);
+        setToast({
+          type: "success",
+          message: "Upload successful"
+        });
+      }
+    } catch {
+      if (!isMounted) return;
+      setToast({
+        type: "error",
+        message: "Upload failed"
+      });
+    }
+    return () => {
+      isMounted = false;
+    };
+  };
+  const removePhoto = () => {
+    setDoorPhoto(null);
+    setDoorPhotoFileStoreId(null);
+  };
+  const isValid = () => {
+    return houseNo && street && pinCode.length === 6 && assembly && ward && zone && latitude && longitude && doorPhotoFileStoreId;
+  };
+  const onStepSelect = () => {
+    if (!isValid()) {
+      setToast({
+        type: "error",
+        message: "Please fill all mandatory fields"
+      });
+      return;
+    }
+    const data = {
+      houseNo,
+      street,
+      locality,
+      landmark,
+      subLocality,
+      pinCode,
+      assembly: assembly === null || assembly === void 0 ? void 0 : assembly.name,
+      ward: ward === null || ward === void 0 ? void 0 : ward.name,
+      zone: zone === null || zone === void 0 ? void 0 : zone.name,
+      latitude,
+      longitude,
+      addressType: addressType === null || addressType === void 0 ? void 0 : addressType.name,
+      doorPhotoFilestoreId: doorPhotoFileStoreId
+    };
+    onSelect(config.key, data);
+  };
+  if (isLoading) return /*#__PURE__*/React.createElement(Loader, null);
+  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(FormStep, {
+    t: t,
+    onSelect: onStepSelect,
+    config: config,
+    label: t("ES_COMMON_CONTINUE")
+  }, /*#__PURE__*/React.createElement(CardLabel, null, "House No / Flat No *"), /*#__PURE__*/React.createElement(TextInput, {
+    value: houseNo,
+    onChange: e => setHouseNo(e.target.value)
+  }), /*#__PURE__*/React.createElement(CardLabel, null, "Street / Address Line *"), /*#__PURE__*/React.createElement(TextInput, {
+    value: street,
+    onChange: e => setStreet(e.target.value)
+  }), /*#__PURE__*/React.createElement(CardLabel, null, "Locality"), /*#__PURE__*/React.createElement(TextInput, {
+    value: locality,
+    onChange: e => setLocality(e.target.value)
+  }), /*#__PURE__*/React.createElement(CardLabel, null, "Landmark"), /*#__PURE__*/React.createElement(TextInput, {
+    value: landmark,
+    onChange: e => setLandmark(e.target.value)
+  }), /*#__PURE__*/React.createElement(CardLabel, null, "Sub Locality"), /*#__PURE__*/React.createElement(Dropdown, {
+    option: [],
+    selected: subLocality,
+    select: setSubLocality
+  }), /*#__PURE__*/React.createElement(CardLabel, null, "PIN Code *"), /*#__PURE__*/React.createElement(TextInput, {
+    value: pinCode,
+    onChange: handlePincodeChange,
+    maxLength: 6
+  }), /*#__PURE__*/React.createElement(CardLabel, null, "Assembly *"), /*#__PURE__*/React.createElement(Dropdown, {
+    option: assemblies,
+    selected: assembly,
+    select: setAssembly
+  }), /*#__PURE__*/React.createElement(CardLabel, null, "Ward *"), /*#__PURE__*/React.createElement(Dropdown, {
+    option: (assembly === null || assembly === void 0 ? void 0 : assembly.children) || [],
+    selected: ward,
+    select: setWard
+  }), /*#__PURE__*/React.createElement(CardLabel, null, "Zone *"), /*#__PURE__*/React.createElement(Dropdown, {
+    option: (ward === null || ward === void 0 ? void 0 : ward.children) || [],
+    selected: zone,
+    select: setZone
+  }), /*#__PURE__*/React.createElement(CardLabel, null, "Latitude"), /*#__PURE__*/React.createElement(TextInput, {
+    value: latitude,
+    disabled: true
+  }), /*#__PURE__*/React.createElement(CardLabel, null, "Longitude"), /*#__PURE__*/React.createElement(TextInput, {
+    value: longitude,
+    disabled: true
+  }), /*#__PURE__*/React.createElement(CardLabel, null, "Address Type"), /*#__PURE__*/React.createElement(Dropdown, {
+    option: [{
+      name: "Permanent"
+    }, {
+      name: "Correspondence"
+    }, {
+      name: "Other"
+    }],
+    selected: addressType,
+    select: setAddressType
+  }), /*#__PURE__*/React.createElement(CardLabel, null, "Door Image *"), /*#__PURE__*/React.createElement(UploadFile, {
+    onUpload: selectphoto,
+    onDelete: removePhoto,
+    message: doorPhotoFileStoreId ? "Uploaded" : "No file selected"
+  }), doorPhoto && /*#__PURE__*/React.createElement("img", {
+    src: doorPhoto,
+    alt: "preview",
+    style: {
+      width: "100%",
+      marginTop: "10px"
+    }
+  }), toast && /*#__PURE__*/React.createElement(Toast, {
+    label: toast.message,
+    error: toast.type === "error",
+    onClose: () => setToast(null)
+  })));
+};
+
 const CitizenApp = () => {
   const {
     t
@@ -4458,8 +5168,8 @@ const CitizenApp = () => {
   }, {
     label: t(getBreadcrumbLabel())
   }];
-  return /*#__PURE__*/React.createElement(AppContainer, null, /*#__PURE__*/React.createElement("div", {
-    className: "ground-container employee-app-container form-container"
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "ground-container form-container"
   }, /*#__PURE__*/React.createElement(ModuleHeader, {
     leftContent: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ArrowLeft, {
       className: "icon"
@@ -4469,32 +5179,49 @@ const CitizenApp = () => {
   }), /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(PrivateRoute, {
     exact: true,
     path: `${path}`,
-    component: () => /*#__PURE__*/React.createElement(Home, null)
+    component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "normal"
+    }, /*#__PURE__*/React.createElement(Home, null))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/dashboard`,
-    component: () => /*#__PURE__*/React.createElement(Dashboard, null)
+    component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "normal"
+    }, /*#__PURE__*/React.createElement(Dashboard, null))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/inbox`,
-    component: () => /*#__PURE__*/React.createElement(Inbox$1, null)
+    component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "normal"
+    }, /*#__PURE__*/React.createElement(Inbox$1, null))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/aadhaar-verification`,
-    component: () => /*#__PURE__*/React.createElement(AadhaarVerification, null)
+    component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "normal"
+    }, /*#__PURE__*/React.createElement(AadhaarVerification, null))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/address-details`,
-    component: () => /*#__PURE__*/React.createElement(AddressDetails, null)
+    component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "normal"
+    }, /*#__PURE__*/React.createElement(AddressDetails, null))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/property-info`,
-    component: () => /*#__PURE__*/React.createElement(PropertyInfo, null)
+    component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "normal"
+    }, /*#__PURE__*/React.createElement(PropertyInfo, null))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/meter-details`,
-    component: () => /*#__PURE__*/React.createElement(MeterDetails, null)
+    component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "normal"
+    }, /*#__PURE__*/React.createElement(MeterDetails, null))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/review`,
-    component: () => /*#__PURE__*/React.createElement(Review, null)
+    component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "normal"
+    }, /*#__PURE__*/React.createElement(Review, null))
   }))));
 };
 
 const EkycModule = ({
+  stateCode,
   userType,
   tenants
 }) => {
@@ -4502,7 +5229,27 @@ const EkycModule = ({
     path,
     url
   } = useRouteMatch();
+  const moduleCode = "EKYC";
+  const language = Digit.StoreData.getCurrentLanguage();
+  const {
+    isLoading,
+    data: store
+  } = Digit.Services.useStore({
+    stateCode,
+    moduleCode,
+    language
+  });
   Digit.SessionStorage.set("EKYC_TENANTS", tenants);
+  useEffect(() => Digit.LocalizationService.getLocale({
+    modules: [`rainmaker-ekyc`, `rainmaker-${Digit.ULBService.getCurrentTenantId()}`],
+    locale: Digit.StoreData.getCurrentLanguage(),
+    tenantId: Digit.ULBService.getCurrentTenantId()
+  }), []);
+  if (isLoading) {
+    return /*#__PURE__*/React.createElement(Loader, {
+      page: true
+    });
+  }
   if (userType === "employee") {
     return /*#__PURE__*/React.createElement(EmployeeApp, {
       path: path,