@djb25/digit-ui-module-wt 1.0.43 → 1.0.45

package/dist/index.modern.js

@@ -1,4 +1,4 @@
-import { TickMark, ArrowDown, ViewsIcon, MobileNumber, CardLabelError, TextInput, Dropdown, DatePicker, SubmitBar, Card, Table, Loader, Modal, Toast, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, CitizenHomeCard, CHBIcon, PropertyHouse, HomeIcon, KeyNote, CardHeader, FormStep, CardLabel, RadioButtons, UploadFile, TextArea, CheckBox, CardSubHeader, StatusTable, Row, GenericFileIcon, LinkButton, EditIcon, Banner, EmployeeModuleCard, CloseSvg, Label, LinkLabel, ActionBar, DetailsCard, SearchAction, FilterAction, PopUp, ShippingTruck, CustomNameDropdown, MultiSelectDropdown, CollapsibleCardPage as CollapsibleCardPage$1, LabelFieldPair, AddIcon, Menu, CheckSvg, LayoutWrapper, Header, TelePhone, DisplayPhotos, CardSectionHeader, CheckPoint, ConnectingCheckPoints, MultiLink, Localities, RemoveableTag, FormComposer, PDFSvg, MultiUploadWrapper, Close as Close$h, BreakLine, InfoBannerIcon, ButtonSelector, LocationIcon, PTIcon, ApplicantDetails, AddressDetails } from '@djb25/digit-ui-react-components';
+import { TickMark, ArrowDown, ViewsIcon, TextInput, MobileNumber, CardLabelError, Dropdown, DatePicker, SubmitBar, Card, Table, Loader, Modal, Toast, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, CitizenHomeCard, CHBIcon, PropertyHouse, HomeIcon, KeyNote, CardHeader, FormStep, CardLabel, RadioButtons, UploadFile, TextArea, CheckBox, CardSubHeader, StatusTable, Row, GenericFileIcon, LinkButton, EditIcon, Banner, EmployeeModuleCard, CloseSvg, Label, LinkLabel, ActionBar, DetailsCard, SearchAction, FilterAction, PopUp, ShippingTruck, CustomNameDropdown, MultiSelectDropdown, CollapsibleCardPage as CollapsibleCardPage$1, LabelFieldPair, AddIcon, Menu, CheckSvg, LayoutWrapper, Header, TelePhone, DisplayPhotos, CardSectionHeader, CheckPoint, ConnectingCheckPoints, MultiLink, Localities, RemoveableTag, FormComposer, PDFSvg, MultiUploadWrapper, Close as Close$h, BreakLine, InfoBannerIcon, ButtonSelector, LocationIcon, PTIcon, ApplicantDetails, AddressDetails } from '@djb25/digit-ui-react-components';
 import React, { useRef, useEffect, useState, useCallback, useMemo, Fragment, useReducer } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useLocation, useRouteMatch, useHistory, Switch, Route, Redirect, Link, useParams } from 'react-router-dom';
@@ -484,18 +484,18 @@ const formatDate = dateString => {
 };
 const APPLICATION_PATH = "/digit-ui";
 const waterTankerPayload = data => {
-  var _data$requestDetails, _data$requestDetails$, _data$requestDetails2, _data$requestDetails3, _data$requestDetails4, _data$requestDetails5, _data$requestDetails6, _data$requestDetails7, _data$requestDetails8, _data$requestDetails9, _data$requestDetails0, _data$requestDetails1, _data$address, _data$owner, _data$owner2, _data$owner3, _data$owner4, _data$address2, _data$address2$addres, _data$address3, _data$address4, _data$address4$city, _data$address4$city$c, _data$address5, _data$address5$city, _data$address5$city$c, _data$address6, _data$address7, _data$address8, _data$address8$locali, _data$address9, _data$address9$locali, _data$address0, _data$address1, _data$address10, _data$address11, _data$address12, _data$requestDetails10;
+  var _ref, _data$requestDetails, _data$requestDetails$, _data$requestDetails2, _data$requestDetails3, _data$requestDetails4, _data$requestDetails5, _data$requestDetails6, _data$requestDetails7, _data$requestDetails8, _data$requestDetails9, _data$requestDetails0, _data$requestDetails1, _data$requestDetails10, _data$address, _data$owner, _data$owner2, _data$owner3, _data$owner4, _data$address2, _data$address2$addres, _data$address3, _data$address4, _data$address4$city, _data$address4$city$c, _data$address5, _data$address5$city, _data$address5$city$c, _data$address6, _data$address7, _data$address8, _data$address8$locali, _data$address9, _data$address9$locali, _data$address0, _data$address1, _data$address10, _data$address11, _data$address12, _data$requestDetails11;
   const formdata = {
     waterTankerBookingDetail: {
       tenantId: data === null || data === void 0 ? void 0 : data.tenantId,
-      tankerType: data === null || data === void 0 ? void 0 : (_data$requestDetails = data.requestDetails) === null || _data$requestDetails === void 0 ? void 0 : (_data$requestDetails$ = _data$requestDetails.tankerType) === null || _data$requestDetails$ === void 0 ? void 0 : _data$requestDetails$.code,
-      waterType: data === null || data === void 0 ? void 0 : (_data$requestDetails2 = data.requestDetails) === null || _data$requestDetails2 === void 0 ? void 0 : (_data$requestDetails3 = _data$requestDetails2.waterType) === null || _data$requestDetails3 === void 0 ? void 0 : _data$requestDetails3.code,
-      tankerQuantity: data === null || data === void 0 ? void 0 : (_data$requestDetails4 = data.requestDetails) === null || _data$requestDetails4 === void 0 ? void 0 : (_data$requestDetails5 = _data$requestDetails4.tankerQuantity) === null || _data$requestDetails5 === void 0 ? void 0 : _data$requestDetails5.code,
-      waterQuantity: data === null || data === void 0 ? void 0 : (_data$requestDetails6 = data.requestDetails) === null || _data$requestDetails6 === void 0 ? void 0 : (_data$requestDetails7 = _data$requestDetails6.waterQuantity) === null || _data$requestDetails7 === void 0 ? void 0 : _data$requestDetails7.code,
-      description: data === null || data === void 0 ? void 0 : (_data$requestDetails8 = data.requestDetails) === null || _data$requestDetails8 === void 0 ? void 0 : _data$requestDetails8.description,
-      deliveryDate: data === null || data === void 0 ? void 0 : (_data$requestDetails9 = data.requestDetails) === null || _data$requestDetails9 === void 0 ? void 0 : _data$requestDetails9.deliveryDate,
-      deliveryTime: data === null || data === void 0 ? void 0 : (_data$requestDetails0 = data.requestDetails) === null || _data$requestDetails0 === void 0 ? void 0 : _data$requestDetails0.deliveryTime,
-      extraCharge: data !== null && data !== void 0 && (_data$requestDetails1 = data.requestDetails) !== null && _data$requestDetails1 !== void 0 && _data$requestDetails1.extraCharge ? "Y" : "N",
+      tankerType: (_ref = (data === null || data === void 0 ? void 0 : (_data$requestDetails = data.requestDetails) === null || _data$requestDetails === void 0 ? void 0 : (_data$requestDetails$ = _data$requestDetails.tankerType) === null || _data$requestDetails$ === void 0 ? void 0 : _data$requestDetails$.code) || (data === null || data === void 0 ? void 0 : (_data$requestDetails2 = data.requestDetails) === null || _data$requestDetails2 === void 0 ? void 0 : _data$requestDetails2.tankerType) || "") === null || _ref === void 0 ? void 0 : _ref.toUpperCase(),
+      waterType: data === null || data === void 0 ? void 0 : (_data$requestDetails3 = data.requestDetails) === null || _data$requestDetails3 === void 0 ? void 0 : (_data$requestDetails4 = _data$requestDetails3.waterType) === null || _data$requestDetails4 === void 0 ? void 0 : _data$requestDetails4.code,
+      tankerQuantity: data === null || data === void 0 ? void 0 : (_data$requestDetails5 = data.requestDetails) === null || _data$requestDetails5 === void 0 ? void 0 : (_data$requestDetails6 = _data$requestDetails5.tankerQuantity) === null || _data$requestDetails6 === void 0 ? void 0 : _data$requestDetails6.code,
+      waterQuantity: data === null || data === void 0 ? void 0 : (_data$requestDetails7 = data.requestDetails) === null || _data$requestDetails7 === void 0 ? void 0 : (_data$requestDetails8 = _data$requestDetails7.waterQuantity) === null || _data$requestDetails8 === void 0 ? void 0 : _data$requestDetails8.code,
+      description: data === null || data === void 0 ? void 0 : (_data$requestDetails9 = data.requestDetails) === null || _data$requestDetails9 === void 0 ? void 0 : _data$requestDetails9.description,
+      deliveryDate: data === null || data === void 0 ? void 0 : (_data$requestDetails0 = data.requestDetails) === null || _data$requestDetails0 === void 0 ? void 0 : _data$requestDetails0.deliveryDate,
+      deliveryTime: data === null || data === void 0 ? void 0 : (_data$requestDetails1 = data.requestDetails) === null || _data$requestDetails1 === void 0 ? void 0 : _data$requestDetails1.deliveryTime,
+      extraCharge: data !== null && data !== void 0 && (_data$requestDetails10 = data.requestDetails) !== null && _data$requestDetails10 !== void 0 && _data$requestDetails10.extraCharge ? "Y" : "N",
       addressDetailId: (data === null || data === void 0 ? void 0 : (_data$address = data.address) === null || _data$address === void 0 ? void 0 : _data$address.addressDetailId) || "",
       applicantDetail: {
         name: data === null || data === void 0 ? void 0 : (_data$owner = data.owner) === null || _data$owner === void 0 ? void 0 : _data$owner.applicantName,
@@ -518,7 +518,7 @@ const waterTankerPayload = data => {
         latitude: data === null || data === void 0 ? void 0 : (_data$address11 = data.address) === null || _data$address11 === void 0 ? void 0 : _data$address11.latitude,
         longitude: data === null || data === void 0 ? void 0 : (_data$address12 = data.address) === null || _data$address12 === void 0 ? void 0 : _data$address12.longitude
       },
-      WTfileStoreId: data === null || data === void 0 ? void 0 : (_data$requestDetails10 = data.requestDetails) === null || _data$requestDetails10 === void 0 ? void 0 : _data$requestDetails10.fileStoreId,
+      WTfileStoreId: data === null || data === void 0 ? void 0 : (_data$requestDetails11 = data.requestDetails) === null || _data$requestDetails11 === void 0 ? void 0 : _data$requestDetails11.fileStoreId,
       bookingStatus: "BOOKING_CREATED",
       workflow: {
         action: "APPLY",
@@ -699,7 +699,7 @@ const fixedPointPayload = data => {
   };
 };
 const emergencyWaterTankerPayload = data => {
-  var _data$owner29, _data$owner30, _data$requestDetails11, _data$requestDetails12, _data$requestDetails13, _data$requestDetails14, _data$requestDetails15, _data$requestDetails16, _data$requestDetails17, _data$requestDetails18, _data$requestDetails19, _data$requestDetails20, _data$requestDetails21, _data$requestDetails22, _data$requestDetails23, _data$requestDetails24, _data$requestDetails25, _data$requestDetails26, _data$requestDetails27, _data$requestDetails28, _data$address82, _data$dispatchDetails, _data$dispatchDetails2, _data$owner31, _data$owner31$vendor, _data$dispatchDetails3, _data$dispatchDetails4, _data$owner32, _data$owner32$vehicle, _data$dispatchDetails5, _data$dispatchDetails6, _data$owner33, _data$owner33$driver, _data$dispatchDetails7, _data$dispatchDetails8, _data$owner34, _data$owner34$filling, _data$dispatchDetails9, _data$dispatchDetails0, _data$owner35, _data$owner35$vehicle, _data$dispatchDetails1, _data$dispatchDetails10, _data$owner36, _data$owner36$vehicle, _data$owner37, _data$owner38, _data$owner39, _data$owner40, _data$owner41, _data$owner42, _data$address83, _data$address84, _data$address84$addre, _data$address85, _data$address86, _data$address87, _data$address87$city, _data$address87$city$, _data$address88, _data$address88$city, _data$address89, _data$address90, _data$address90$city, _data$address90$city$, _data$address91, _data$address92, _data$address93, _data$address94, _data$address94$local, _data$address95, _data$address95$local, _data$address96, _data$address97, _data$address97$local, _data$address98, _data$address99, _data$address100, _data$address101, _data$address102, _data$address103, _data$address104, _data$address105, _data$address106, _data$address107, _data$address108, _data$requestDetails29;
+  var _data$owner29, _data$owner30, _ref2, _data$requestDetails12, _data$requestDetails13, _data$requestDetails14, _data$requestDetails15, _data$requestDetails16, _data$requestDetails17, _data$requestDetails18, _data$requestDetails19, _data$requestDetails20, _data$requestDetails21, _data$requestDetails22, _data$requestDetails23, _data$requestDetails24, _data$requestDetails25, _data$requestDetails26, _data$requestDetails27, _data$requestDetails28, _data$requestDetails29, _data$address82, _data$dispatchDetails, _data$dispatchDetails2, _data$owner31, _data$owner31$vendor, _data$dispatchDetails3, _data$dispatchDetails4, _data$owner32, _data$owner32$vehicle, _data$dispatchDetails5, _data$dispatchDetails6, _data$owner33, _data$owner33$driver, _data$dispatchDetails7, _data$dispatchDetails8, _data$owner34, _data$owner34$filling, _data$dispatchDetails9, _data$dispatchDetails0, _data$owner35, _data$owner35$vehicle, _data$dispatchDetails1, _data$dispatchDetails10, _data$owner36, _data$owner36$vehicle, _data$owner37, _data$owner38, _data$owner39, _data$owner40, _data$owner41, _data$owner42, _data$address83, _data$address84, _data$address84$addre, _data$address85, _data$address86, _data$address87, _data$address87$city, _data$address87$city$, _data$address88, _data$address88$city, _data$address89, _data$address90, _data$address90$city, _data$address90$city$, _data$address91, _data$address92, _data$address93, _data$address94, _data$address94$local, _data$address95, _data$address95$local, _data$address96, _data$address97, _data$address97$local, _data$address98, _data$address99, _data$address100, _data$address101, _data$address102, _data$address103, _data$address104, _data$address105, _data$address106, _data$address107, _data$address108, _data$requestDetails30;
   const fixedPoint = data === null || data === void 0 ? void 0 : (_data$owner29 = data.owner) === null || _data$owner29 === void 0 ? void 0 : _data$owner29.fixedPoint;
   const applicantDetailFromFP = (fixedPoint === null || fixedPoint === void 0 ? void 0 : fixedPoint.applicantDetail) || {};
   const addressFromFP = (fixedPoint === null || fixedPoint === void 0 ? void 0 : fixedPoint.address) || {};
@@ -707,18 +707,18 @@ const emergencyWaterTankerPayload = data => {
     waterTankerBookingDetail: {
       applicantId: (applicantDetailFromFP === null || applicantDetailFromFP === void 0 ? void 0 : applicantDetailFromFP.applicantId) || (data === null || data === void 0 ? void 0 : (_data$owner30 = data.owner) === null || _data$owner30 === void 0 ? void 0 : _data$owner30.applicantId) || "",
       tenantId: data === null || data === void 0 ? void 0 : data.tenantId,
-      tankerType: (data === null || data === void 0 ? void 0 : (_data$requestDetails11 = data.requestDetails) === null || _data$requestDetails11 === void 0 ? void 0 : (_data$requestDetails12 = _data$requestDetails11.tankerType) === null || _data$requestDetails12 === void 0 ? void 0 : _data$requestDetails12.code) || (data === null || data === void 0 ? void 0 : (_data$requestDetails13 = data.requestDetails) === null || _data$requestDetails13 === void 0 ? void 0 : _data$requestDetails13.tankerType),
-      waterType: (data === null || data === void 0 ? void 0 : (_data$requestDetails14 = data.requestDetails) === null || _data$requestDetails14 === void 0 ? void 0 : (_data$requestDetails15 = _data$requestDetails14.waterType) === null || _data$requestDetails15 === void 0 ? void 0 : _data$requestDetails15.code) || (data === null || data === void 0 ? void 0 : (_data$requestDetails16 = data.requestDetails) === null || _data$requestDetails16 === void 0 ? void 0 : _data$requestDetails16.waterType),
-      tankerQuantity: (data === null || data === void 0 ? void 0 : (_data$requestDetails17 = data.requestDetails) === null || _data$requestDetails17 === void 0 ? void 0 : (_data$requestDetails18 = _data$requestDetails17.tankerQuantity) === null || _data$requestDetails18 === void 0 ? void 0 : _data$requestDetails18.code) || (data === null || data === void 0 ? void 0 : (_data$requestDetails19 = data.requestDetails) === null || _data$requestDetails19 === void 0 ? void 0 : _data$requestDetails19.tankerQuantity),
-      waterQuantity: (data === null || data === void 0 ? void 0 : (_data$requestDetails20 = data.requestDetails) === null || _data$requestDetails20 === void 0 ? void 0 : (_data$requestDetails21 = _data$requestDetails20.waterQuantity) === null || _data$requestDetails21 === void 0 ? void 0 : _data$requestDetails21.code) || (data === null || data === void 0 ? void 0 : (_data$requestDetails22 = data.requestDetails) === null || _data$requestDetails22 === void 0 ? void 0 : (_data$requestDetails23 = _data$requestDetails22.waterQuantity) === null || _data$requestDetails23 === void 0 ? void 0 : _data$requestDetails23.value) || (data === null || data === void 0 ? void 0 : (_data$requestDetails24 = data.requestDetails) === null || _data$requestDetails24 === void 0 ? void 0 : _data$requestDetails24.waterQuantity),
-      description: data === null || data === void 0 ? void 0 : (_data$requestDetails25 = data.requestDetails) === null || _data$requestDetails25 === void 0 ? void 0 : _data$requestDetails25.description,
-      deliveryDate: data === null || data === void 0 ? void 0 : (_data$requestDetails26 = data.requestDetails) === null || _data$requestDetails26 === void 0 ? void 0 : _data$requestDetails26.deliveryDate,
-      deliveryTime: data === null || data === void 0 ? void 0 : (_data$requestDetails27 = data.requestDetails) === null || _data$requestDetails27 === void 0 ? void 0 : _data$requestDetails27.deliveryTime,
-      extraCharge: data !== null && data !== void 0 && (_data$requestDetails28 = data.requestDetails) !== null && _data$requestDetails28 !== void 0 && _data$requestDetails28.extraCharge ? "Y" : "N",
+      tankerType: (_ref2 = (data === null || data === void 0 ? void 0 : (_data$requestDetails12 = data.requestDetails) === null || _data$requestDetails12 === void 0 ? void 0 : (_data$requestDetails13 = _data$requestDetails12.tankerType) === null || _data$requestDetails13 === void 0 ? void 0 : _data$requestDetails13.code) || (data === null || data === void 0 ? void 0 : (_data$requestDetails14 = data.requestDetails) === null || _data$requestDetails14 === void 0 ? void 0 : _data$requestDetails14.tankerType) || "") === null || _ref2 === void 0 ? void 0 : _ref2.toUpperCase(),
+      waterType: (data === null || data === void 0 ? void 0 : (_data$requestDetails15 = data.requestDetails) === null || _data$requestDetails15 === void 0 ? void 0 : (_data$requestDetails16 = _data$requestDetails15.waterType) === null || _data$requestDetails16 === void 0 ? void 0 : _data$requestDetails16.code) || (data === null || data === void 0 ? void 0 : (_data$requestDetails17 = data.requestDetails) === null || _data$requestDetails17 === void 0 ? void 0 : _data$requestDetails17.waterType),
+      tankerQuantity: (data === null || data === void 0 ? void 0 : (_data$requestDetails18 = data.requestDetails) === null || _data$requestDetails18 === void 0 ? void 0 : (_data$requestDetails19 = _data$requestDetails18.tankerQuantity) === null || _data$requestDetails19 === void 0 ? void 0 : _data$requestDetails19.code) || (data === null || data === void 0 ? void 0 : (_data$requestDetails20 = data.requestDetails) === null || _data$requestDetails20 === void 0 ? void 0 : _data$requestDetails20.tankerQuantity),
+      waterQuantity: (data === null || data === void 0 ? void 0 : (_data$requestDetails21 = data.requestDetails) === null || _data$requestDetails21 === void 0 ? void 0 : (_data$requestDetails22 = _data$requestDetails21.waterQuantity) === null || _data$requestDetails22 === void 0 ? void 0 : _data$requestDetails22.code) || (data === null || data === void 0 ? void 0 : (_data$requestDetails23 = data.requestDetails) === null || _data$requestDetails23 === void 0 ? void 0 : (_data$requestDetails24 = _data$requestDetails23.waterQuantity) === null || _data$requestDetails24 === void 0 ? void 0 : _data$requestDetails24.value) || (data === null || data === void 0 ? void 0 : (_data$requestDetails25 = data.requestDetails) === null || _data$requestDetails25 === void 0 ? void 0 : _data$requestDetails25.waterQuantity),
+      description: data === null || data === void 0 ? void 0 : (_data$requestDetails26 = data.requestDetails) === null || _data$requestDetails26 === void 0 ? void 0 : _data$requestDetails26.description,
+      deliveryDate: data === null || data === void 0 ? void 0 : (_data$requestDetails27 = data.requestDetails) === null || _data$requestDetails27 === void 0 ? void 0 : _data$requestDetails27.deliveryDate,
+      deliveryTime: data === null || data === void 0 ? void 0 : (_data$requestDetails28 = data.requestDetails) === null || _data$requestDetails28 === void 0 ? void 0 : _data$requestDetails28.deliveryTime,
+      extraCharge: data !== null && data !== void 0 && (_data$requestDetails29 = data.requestDetails) !== null && _data$requestDetails29 !== void 0 && _data$requestDetails29.extraCharge ? "Y" : "N",
       addressDetailId: (addressFromFP === null || addressFromFP === void 0 ? void 0 : addressFromFP.addressId) || (data === null || data === void 0 ? void 0 : (_data$address82 = data.address) === null || _data$address82 === void 0 ? void 0 : _data$address82.addressDetailId) || "",
       vendorId: (data === null || data === void 0 ? void 0 : (_data$dispatchDetails = data.dispatchDetails) === null || _data$dispatchDetails === void 0 ? void 0 : (_data$dispatchDetails2 = _data$dispatchDetails.vendor) === null || _data$dispatchDetails2 === void 0 ? void 0 : _data$dispatchDetails2.id) || (data === null || data === void 0 ? void 0 : (_data$owner31 = data.owner) === null || _data$owner31 === void 0 ? void 0 : (_data$owner31$vendor = _data$owner31.vendor) === null || _data$owner31$vendor === void 0 ? void 0 : _data$owner31$vendor.id) || "",
       vehicleId: (data === null || data === void 0 ? void 0 : (_data$dispatchDetails3 = data.dispatchDetails) === null || _data$dispatchDetails3 === void 0 ? void 0 : (_data$dispatchDetails4 = _data$dispatchDetails3.vehicle) === null || _data$dispatchDetails4 === void 0 ? void 0 : _data$dispatchDetails4.id) || (data === null || data === void 0 ? void 0 : (_data$owner32 = data.owner) === null || _data$owner32 === void 0 ? void 0 : (_data$owner32$vehicle = _data$owner32.vehicle) === null || _data$owner32$vehicle === void 0 ? void 0 : _data$owner32$vehicle.id) || "",
-      driverId: (data === null || data === void 0 ? void 0 : (_data$dispatchDetails5 = data.dispatchDetails) === null || _data$dispatchDetails5 === void 0 ? void 0 : (_data$dispatchDetails6 = _data$dispatchDetails5.driver) === null || _data$dispatchDetails6 === void 0 ? void 0 : _data$dispatchDetails6.id) || (data === null || data === void 0 ? void 0 : (_data$owner33 = data.owner) === null || _data$owner33 === void 0 ? void 0 : (_data$owner33$driver = _data$owner33.driver) === null || _data$owner33$driver === void 0 ? void 0 : _data$owner33$driver.id) || "",
+      driverId: (data === null || data === void 0 ? void 0 : (_data$dispatchDetails5 = data.dispatchDetails) === null || _data$dispatchDetails5 === void 0 ? void 0 : (_data$dispatchDetails6 = _data$dispatchDetails5.driver) === null || _data$dispatchDetails6 === void 0 ? void 0 : _data$dispatchDetails6.ownerId) || (data === null || data === void 0 ? void 0 : (_data$owner33 = data.owner) === null || _data$owner33 === void 0 ? void 0 : (_data$owner33$driver = _data$owner33.driver) === null || _data$owner33$driver === void 0 ? void 0 : _data$owner33$driver.ownerId) || "",
       fillingPointId: (data === null || data === void 0 ? void 0 : (_data$dispatchDetails7 = data.dispatchDetails) === null || _data$dispatchDetails7 === void 0 ? void 0 : (_data$dispatchDetails8 = _data$dispatchDetails7.fillingPoint) === null || _data$dispatchDetails8 === void 0 ? void 0 : _data$dispatchDetails8.id) || (data === null || data === void 0 ? void 0 : (_data$owner34 = data.owner) === null || _data$owner34 === void 0 ? void 0 : (_data$owner34$filling = _data$owner34.fillingPoint) === null || _data$owner34$filling === void 0 ? void 0 : _data$owner34$filling.id) || "",
       vehicleType: (data === null || data === void 0 ? void 0 : (_data$dispatchDetails9 = data.dispatchDetails) === null || _data$dispatchDetails9 === void 0 ? void 0 : (_data$dispatchDetails0 = _data$dispatchDetails9.vehicle) === null || _data$dispatchDetails0 === void 0 ? void 0 : _data$dispatchDetails0.vehicleType) || (data === null || data === void 0 ? void 0 : (_data$owner35 = data.owner) === null || _data$owner35 === void 0 ? void 0 : (_data$owner35$vehicle = _data$owner35.vehicle) === null || _data$owner35$vehicle === void 0 ? void 0 : _data$owner35$vehicle.vehicleType) || "",
       vehicleCapacity: (data === null || data === void 0 ? void 0 : (_data$dispatchDetails1 = data.dispatchDetails) === null || _data$dispatchDetails1 === void 0 ? void 0 : (_data$dispatchDetails10 = _data$dispatchDetails1.vehicle) === null || _data$dispatchDetails10 === void 0 ? void 0 : _data$dispatchDetails10.capacity) || (data === null || data === void 0 ? void 0 : (_data$owner36 = data.owner) === null || _data$owner36 === void 0 ? void 0 : (_data$owner36$vehicle = _data$owner36.vehicle) === null || _data$owner36$vehicle === void 0 ? void 0 : _data$owner36$vehicle.capacity) || "",
@@ -753,7 +753,7 @@ const emergencyWaterTankerPayload = data => {
         zone: (data === null || data === void 0 ? void 0 : (_data$address106 = data.address) === null || _data$address106 === void 0 ? void 0 : _data$address106.zone) || (addressFromFP === null || addressFromFP === void 0 ? void 0 : addressFromFP.zone) || "",
         constituency: (data === null || data === void 0 ? void 0 : (_data$address107 = data.address) === null || _data$address107 === void 0 ? void 0 : _data$address107.assembly) || (data === null || data === void 0 ? void 0 : (_data$address108 = data.address) === null || _data$address108 === void 0 ? void 0 : _data$address108.constituency) || (addressFromFP === null || addressFromFP === void 0 ? void 0 : addressFromFP.constituency) || ""
       },
-      WTfileStoreId: data === null || data === void 0 ? void 0 : (_data$requestDetails29 = data.requestDetails) === null || _data$requestDetails29 === void 0 ? void 0 : _data$requestDetails29.fileStoreId,
+      WTfileStoreId: data === null || data === void 0 ? void 0 : (_data$requestDetails30 = data.requestDetails) === null || _data$requestDetails30 === void 0 ? void 0 : _data$requestDetails30.fileStoreId,
       bookingStatus: "BOOKING_CREATED",
       workflow: {
         action: "CREATE",
@@ -816,77 +816,33 @@ const WTSearchApplication = ({
   moduleCode,
   isFixedPoint
 }) => {
-  var _tripReportsData$driv;
   const isMobile = window.Digit.Utils.browser.isMobile();
   const user = Digit.UserService.getUser().info;
-  const [showWorkOrderModal, setShowWorkOrderModal] = useState(false);
-  const [selectedVendorForWorkOrder, setSelectedVendorForWorkOrder] = useState(null);
+  const [showImageModal, setShowImageModal] = useState(false);
+  const [selectedImage, setSelectedImage] = useState(null);
+  const [isImageLoading, setIsImageLoading] = useState(false);
   const handleViewDocument = useCallback(async fileStoreId => {
     if (!fileStoreId) return;
+    setIsImageLoading(true);
+    setShowImageModal(true);
     try {
       const response = await Digit.UploadServices.FileFetchbyid(fileStoreId, tenantId);
-      if (response && response.data) {
+      if ((response === null || response === void 0 ? void 0 : response.status) === 200 && response !== null && response !== void 0 && response.data) {
+        var _response$headers;
         const file = new Blob([response.data], {
-          type: response.headers["content-type"]
+          type: ((_response$headers = response.headers) === null || _response$headers === void 0 ? void 0 : _response$headers["content-type"]) || "image/jpeg"
         });
         const fileUrl = URL.createObjectURL(file);
-        window.open(fileUrl, "_blank");
+        setSelectedImage(fileUrl);
+      } else {
+        throw new Error("Failed to fetch image");
       }
     } catch (e) {
       console.error(e);
+    } finally {
+      setIsImageLoading(false);
     }
-  }, []);
-  const DriverReportColumns = useMemo(() => [{
-    Header: t("S.No"),
-    accessor: (row, index) => index + 1
-  }, {
-    Header: t("WT_BOOKING_NO"),
-    accessor: "bookingNo"
-  }, {
-    Header: t("WT_VEHICLE_NO"),
-    accessor: "vehicleRegistrationNo"
-  }, {
-    Header: t("WT_DRIVER_NAME"),
-    accessor: "driverName"
-  }, {
-    Header: t("WT_TANK_CAPACITY"),
-    accessor: "tankCapicity"
-  }, {
-    Header: t("WT_STATUS"),
-    accessor: "currentStatus"
-  }, {
-    Header: t("WT_START_PHOTO"),
-    Cell: ({
-      row
-    }) => row.original.startFileStoreId ? /*#__PURE__*/React.createElement("div", {
-      style: {
-        color: "#f47738",
-        cursor: "pointer",
-        display: "inline-block"
-      },
-      onClick: () => handleViewDocument(row.original.startFileStoreId)
-    }, /*#__PURE__*/React.createElement(ViewsIcon, null)) : t("CS_NA")
-  }, {
-    Header: t("WT_END_PHOTO"),
-    Cell: ({
-      row
-    }) => row.original.endFileStoreId ? /*#__PURE__*/React.createElement("div", {
-      style: {
-        color: "#f47738",
-        cursor: "pointer",
-        display: "inline-block"
-      },
-      onClick: () => handleViewDocument(row.original.endFileStoreId)
-    }, /*#__PURE__*/React.createElement(ViewsIcon, null)) : t("CS_NA")
-  }], [t, handleViewDocument]);
-  const openWorkOrderModal = vendorDetails => {
-    setSelectedVendorForWorkOrder(vendorDetails);
-    setShowWorkOrderModal(true);
-  };
-  const closeWorkOrderModal = () => {
-    setSelectedVendorForWorkOrder(null);
-    setShowWorkOrderModal(false);
-  };
+  }, [tenantId]);
   const defaultValues = {
     offset: 0,
     limit: 10,
@@ -924,20 +880,34 @@ const WTSearchApplication = ({
   });
   const fillingPoints = (fillingPointsData === null || fillingPointsData === void 0 ? void 0 : fillingPointsData.fillingPoints) || [];
   const {
-    data: tripReportsData,
-    isLoading: isTripReportsLoading
+    data: allReportsData,
+    isLoading: isAllReportsLoading
   } = Digit.Hooks.wt.useDriverTripReportSearch({
     tenantId,
     filters: {
-      bookingNo: selectedVendorForWorkOrder === null || selectedVendorForWorkOrder === void 0 ? void 0 : selectedVendorForWorkOrder.bookingNo
+      bookingNo: Array.isArray(data) ? data.map(d => d.bookingNo).join(",") : null
     }
   }, {
-    enabled: !!(selectedVendorForWorkOrder !== null && selectedVendorForWorkOrder !== void 0 && selectedVendorForWorkOrder.bookingNo)
+    enabled: !!data && Array.isArray(data) && data.length > 0 && moduleCode === "WT"
   });
+  const mergedData = useMemo(() => {
+    if (!data || !Array.isArray(data)) return data;
+    if (moduleCode !== "WT" || !(allReportsData !== null && allReportsData !== void 0 && allReportsData.driverTripReports)) return data;
+    return data.map(booking => {
+      const report = allReportsData.driverTripReports.find(r => r.bookingNo === booking.bookingNo);
+      return {
+        ...booking,
+        ...report
+      };
+    });
+  }, [data, allReportsData, moduleCode]);
   const GetCell = value => /*#__PURE__*/React.createElement("span", {
     className: "cell-text"
   }, value);
   const columns = useMemo(() => [{
+    Header: t("S.No"),
+    accessor: (row, index) => index + 1
+  }, {
     Header: t("WT_BOOKING_NO"),
     accessor: "bookingNo",
     disableSortBy: true,
@@ -977,20 +947,41 @@ const WTSearchApplication = ({
       row
     }) => GetCell(t(row.original["bookingStatus"]))
   }, {
-    Header: t("VIEW_REPORTS"),
-    disableSortBy: true,
+    Header: t("WT_VEHICLE_NO"),
+    accessor: "vehicleRegistrationNo"
+  }, {
+    Header: t("WT_DRIVER_NAME"),
+    accessor: "driverName"
+  }, {
+    Header: t("WT_TANK_CAPACITY"),
+    accessor: "tankCapicity"
+  }, {
+    Header: t("WT_STATUS"),
+    accessor: "currentStatus"
+  }, {
+    Header: t("WT_START_PHOTO"),
     Cell: ({
       row
-    }) => {
-      return /*#__PURE__*/React.createElement("button", {
-        className: "submit-bar",
-        style: {
-          backgroundColor: "#417505",
-          color: "white"
-        },
-        onClick: () => openWorkOrderModal(row.original)
-      }, t("VIEW_REPORTS"));
-    }
+    }) => row.original.startFileStoreId ? /*#__PURE__*/React.createElement("div", {
+      style: {
+        color: "#f47738",
+        cursor: "pointer",
+        display: "inline-block"
+      },
+      onClick: () => handleViewDocument(row.original.startFileStoreId)
+    }, /*#__PURE__*/React.createElement(ViewsIcon, null)) : t("CS_NA")
+  }, {
+    Header: t("WT_END_PHOTO"),
+    Cell: ({
+      row
+    }) => row.original.endFileStoreId ? /*#__PURE__*/React.createElement("div", {
+      style: {
+        color: "#f47738",
+        cursor: "pointer",
+        display: "inline-block"
+      },
+      onClick: () => handleViewDocument(row.original.endFileStoreId)
+    }, /*#__PURE__*/React.createElement(ViewsIcon, null)) : t("CS_NA")
   }], [t, user.type]);
   const statusOptions = moduleCode === "TP" ? [{
     i18nKey: "TP_BOOKING_CREATED",
@@ -1075,14 +1066,14 @@ const WTSearchApplication = ({
     return /*#__PURE__*/React.createElement("form", {
       onSubmit: handleSubmit(onSubmit)
     }, activeTab === t("WT_SMART_SEARCH") && /*#__PURE__*/React.createElement("div", {
-      className: "wt-search-grid",
-      style: {
-        display: "grid",
-        gridTemplateColumns: isMobile ? "1fr" : "1fr 1fr",
-        gap: "24px"
-      }
+      className: "formcomposer-section-grid"
     }, /*#__PURE__*/React.createElement("div", {
       className: "search-field-wrapper"
+    }, /*#__PURE__*/React.createElement("label", null, t("WT_BOOKING_NO")), /*#__PURE__*/React.createElement(TextInput, {
+      name: "bookingNo",
+      inputRef: register({})
+    })), /*#__PURE__*/React.createElement("div", {
+      className: "search-field-wrapper"
     }, /*#__PURE__*/React.createElement("label", null, t("WT_MOBILE_NUMBER")), /*#__PURE__*/React.createElement(MobileNumber, {
       name: "mobileNumber",
       inputRef: register({
@@ -1214,7 +1205,7 @@ const WTSearchApplication = ({
     }
   }, text))) : !isLoading && data !== "" ? /*#__PURE__*/React.createElement(Table, {
     t: t,
-    data: data,
+    data: mergedData,
     totalRecords: count,
     columns: columns,
     getCellProps: cellInfo => ({
@@ -1235,16 +1226,16 @@ const WTSearchApplication = ({
       id: getValues("sortBy"),
       desc: getValues("sortOrder") === "DESC"
     }]
-  }) : (data !== "" || isLoading) && /*#__PURE__*/React.createElement(Loader, null)), showWorkOrderModal && /*#__PURE__*/React.createElement(Modal, {
+  }) : (data !== "" || isLoading) && /*#__PURE__*/React.createElement(Loader, null)), showImageModal && /*#__PURE__*/React.createElement(Modal, {
     headerBarMain: /*#__PURE__*/React.createElement("h1", {
-      className: "heading-m",
-      style: {
-        margin: 0
-      }
-    }, t("VIEW_DRIVER_TRIP_REPORTS")),
+      className: "heading-m"
+    }, t("WT_VIEW_PHOTO")),
     headerBarEnd: /*#__PURE__*/React.createElement("div", {
       className: "icon-bg-secondary",
-      onClick: closeWorkOrderModal,
+      onClick: () => {
+        setShowImageModal(false);
+        setSelectedImage(null);
+      },
       style: {
         cursor: "pointer"
       }
@@ -1260,33 +1251,27 @@ const WTSearchApplication = ({
     }), /*#__PURE__*/React.createElement("path", {
       d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
     }))),
-    actionCancelLabel: t("CS_COMMON_CLOSE"),
-    actionCancelOnSubmit: closeWorkOrderModal,
     hideSubmit: true,
-    formId: "modal-action"
+    actionCancelLabel: t("CS_COMMON_CLOSE"),
+    actionCancelOnSubmit: () => {
+      setShowImageModal(false);
+      setSelectedImage(null);
+    }
   }, /*#__PURE__*/React.createElement("div", {
     style: {
-      padding: "16px"
-    }
-  }, isTripReportsLoading ? /*#__PURE__*/React.createElement(Loader, null) : (tripReportsData === null || tripReportsData === void 0 ? void 0 : (_tripReportsData$driv = tripReportsData.driverTripReports) === null || _tripReportsData$driv === void 0 ? void 0 : _tripReportsData$driv.length) > 0 ? /*#__PURE__*/React.createElement(Table, {
-    t: t,
-    data: tripReportsData.driverTripReports,
-    columns: DriverReportColumns,
-    getCellProps: cellInfo => {
-      return {
-        style: {
-          minWidth: "150px",
-          padding: "8px 12px",
-          fontSize: "13.5px"
-        }
-      };
+      display: "flex",
+      justifyContent: "center",
+      alignItems: "center",
+      minHeight: "200px"
     }
-  }) : /*#__PURE__*/React.createElement("p", {
+  }, isImageLoading ? /*#__PURE__*/React.createElement(Loader, null) : selectedImage ? /*#__PURE__*/React.createElement("img", {
+    src: selectedImage,
+    alt: "View",
     style: {
-      textAlign: "center",
-      marginTop: "20px"
+      maxWidth: "100%",
+      maxHeight: "500px"
     }
-  }, t("ES_VENDOR_NO_WORKORDERS")))));
+  }) : /*#__PURE__*/React.createElement("p", null, t("CS_COMMON_NO_DATA")))));
 };
 
 const SearchApp = ({
@@ -16430,150 +16415,283 @@ const WTEditApplicationModal = ({
   applicationData,
   closeModal
 }) => {
-  const [formData, setFormData] = useState({});
+  var _formData$dispatchDet, _formData$dispatchDet2, _formData$dispatchDet3, _formData$dispatchDet4, _fixedPointsData$wate2, _fillingPointsData$fi2, _vendorData$vendor, _formData$dispatchDet5, _formData$dispatchDet6;
+  const tenantId = Digit.ULBService.getCurrentTenantId();
+  const stateId = Digit.ULBService.getStateId();
+  const [formData, setFormData] = useState({
+    owner: {},
+    address: {},
+    requestDetails: {},
+    dispatchDetails: {}
+  });
+  const {
+    data: VehicleType
+  } = Digit.Hooks.useCustomMDMS(stateId, "request-service", [{
+    name: "VehicleType"
+  }], {
+    select: data => {
+      var _data$requestService;
+      return (data === null || data === void 0 ? void 0 : (_data$requestService = data["request-service"]) === null || _data$requestService === void 0 ? void 0 : _data$requestService["VehicleType"]) || [];
+    }
+  });
+  const {
+    data: TankerType
+  } = Digit.Hooks.useCustomMDMS(stateId, "request-service", [{
+    name: "TankerType"
+  }], {
+    select: data => {
+      var _data$requestService2;
+      return (data === null || data === void 0 ? void 0 : (_data$requestService2 = data["request-service"]) === null || _data$requestService2 === void 0 ? void 0 : _data$requestService2["TankerType"]) || [];
+    }
+  });
+  const {
+    data: TankerDetails
+  } = Digit.Hooks.useCustomMDMS(stateId, "request-service", [{
+    name: "TankerQuantity"
+  }], {
+    select: data => {
+      var _data$requestService3;
+      return (data === null || data === void 0 ? void 0 : (_data$requestService3 = data["request-service"]) === null || _data$requestService3 === void 0 ? void 0 : _data$requestService3["TankerQuantity"]) || [];
+    }
+  });
+  const {
+    data: WaterTypeData
+  } = Digit.Hooks.useCustomMDMS(stateId, "Request-service", [{
+    name: "WaterType"
+  }], {
+    select: data => {
+      var _data$RequestService;
+      return (data === null || data === void 0 ? void 0 : (_data$RequestService = data["Request-service"]) === null || _data$RequestService === void 0 ? void 0 : _data$RequestService["WaterType"]) || [];
+    }
+  });
+  const {
+    data: fixedPointsData
+  } = Digit.Hooks.wt.useFixedPointSearchAPI({
+    tenantId,
+    filters: {
+      limit: 1000
+    }
+  }, {
+    enabled: true
+  });
+  const {
+    data: fillingPointsData
+  } = Digit.Hooks.wt.useFillPointSearch({
+    tenantId,
+    filters: {
+      limit: 1000
+    }
+  }, {
+    enabled: true
+  });
+  const mutation = Digit.Hooks.wt.useTankerCreateAPI(tenantId);
   useEffect(() => {
     if (applicationData) {
-      var _applicationData$appl, _applicationData$appl2, _applicationData$appl3, _applicationData$appl4, _applicationData$addr, _applicationData$addr2, _applicationData$addr3, _applicationData$addr4, _applicationData$addr5, _applicationData$addr6, _applicationData$vend, _applicationData$vend2, _applicationData$vend3, _applicationData$vend4, _applicationData$driv, _applicationData$driv2, _applicationData$driv3, _applicationData$driv4, _applicationData$vehi;
+      var _fillingPointsData$fi, _applicationData$appl, _applicationData$appl2, _applicationData$appl3, _applicationData$appl4, _fixedPointsData$wate, _applicationData$appl6, _applicationData$appl7, _applicationData$addr, _applicationData$addr2, _applicationData$addr3, _applicationData$addr4, _applicationData$addr5, _applicationData$addr6, _applicationData$addr7, _applicationData$addr8, _applicationData$addr9, _applicationData$addr0, _applicationData$addr1, _applicationData$addr10, _applicationData$addr11, _applicationData$addr12;
+      const tankerTypeObj = (TankerType === null || TankerType === void 0 ? void 0 : TankerType.find(tt => tt.code === applicationData.tankerType)) || {
+        code: applicationData.tankerType,
+        i18nKey: applicationData.tankerType
+      };
+      const tankerQtyObj = (TankerDetails === null || TankerDetails === void 0 ? void 0 : TankerDetails.find(tq => tq.code === applicationData.tankerQuantity)) || {
+        code: applicationData.tankerQuantity,
+        i18nKey: applicationData.tankerQuantity
+      };
+      const waterTypeObj = (WaterTypeData === null || WaterTypeData === void 0 ? void 0 : WaterTypeData.find(wt => wt.code === applicationData.waterType)) || {
+        code: applicationData.waterType,
+        i18nKey: applicationData.waterType
+      };
+      const fillingPointObj = (fillingPointsData === null || fillingPointsData === void 0 ? void 0 : (_fillingPointsData$fi = fillingPointsData.fillingPoints) === null || _fillingPointsData$fi === void 0 ? void 0 : _fillingPointsData$fi.find(fp => fp.id === applicationData.fillingPointId || fp.fillingPointId === applicationData.fillingPointId)) || {};
+      setFormData({
+        owner: {
+          applicantName: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$appl = applicationData.applicantDetail) === null || _applicationData$appl === void 0 ? void 0 : _applicationData$appl.name) || "",
+          mobileNumber: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$appl2 = applicationData.applicantDetail) === null || _applicationData$appl2 === void 0 ? void 0 : _applicationData$appl2.mobileNumber) || "",
+          alternateNumber: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$appl3 = applicationData.applicantDetail) === null || _applicationData$appl3 === void 0 ? void 0 : _applicationData$appl3.alternateNumber) || "",
+          emailId: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$appl4 = applicationData.applicantDetail) === null || _applicationData$appl4 === void 0 ? void 0 : _applicationData$appl4.emailId) || "",
+          fixedPoint: (fixedPointsData === null || fixedPointsData === void 0 ? void 0 : (_fixedPointsData$wate = fixedPointsData.waterTankerBookingDetail) === null || _fixedPointsData$wate === void 0 ? void 0 : _fixedPointsData$wate.find(fp => {
+            var _fp$applicantDetail, _applicationData$appl5;
+            return ((_fp$applicantDetail = fp.applicantDetail) === null || _fp$applicantDetail === void 0 ? void 0 : _fp$applicantDetail.fixedPointId) === (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$appl5 = applicationData.applicantDetail) === null || _applicationData$appl5 === void 0 ? void 0 : _applicationData$appl5.fixedPointId);
+          })) || "",
+          applicantId: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$appl6 = applicationData.applicantDetail) === null || _applicationData$appl6 === void 0 ? void 0 : _applicationData$appl6.applicantId) || "",
+          gender: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$appl7 = applicationData.applicantDetail) === null || _applicationData$appl7 === void 0 ? void 0 : _applicationData$appl7.gender) || null
+        },
+        address: {
+          houseNo: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr = applicationData.address) === null || _applicationData$addr === void 0 ? void 0 : _applicationData$addr.houseNo) || "",
+          streetName: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr2 = applicationData.address) === null || _applicationData$addr2 === void 0 ? void 0 : _applicationData$addr2.streetName) || "",
+          addressLine1: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr3 = applicationData.address) === null || _applicationData$addr3 === void 0 ? void 0 : _applicationData$addr3.addressLine1) || "",
+          addressLine2: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr4 = applicationData.address) === null || _applicationData$addr4 === void 0 ? void 0 : _applicationData$addr4.addressLine2) || "",
+          landmark: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr5 = applicationData.address) === null || _applicationData$addr5 === void 0 ? void 0 : _applicationData$addr5.landmark) || "",
+          pincode: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr6 = applicationData.address) === null || _applicationData$addr6 === void 0 ? void 0 : _applicationData$addr6.pincode) || "",
+          addressId: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr7 = applicationData.address) === null || _applicationData$addr7 === void 0 ? void 0 : _applicationData$addr7.addressId) || "",
+          city: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr8 = applicationData.address) === null || _applicationData$addr8 === void 0 ? void 0 : _applicationData$addr8.city) || "Delhi",
+          cityCode: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr9 = applicationData.address) === null || _applicationData$addr9 === void 0 ? void 0 : _applicationData$addr9.cityCode) || "DJB",
+          locality: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr0 = applicationData.address) === null || _applicationData$addr0 === void 0 ? void 0 : _applicationData$addr0.locality) || "",
+          localityCode: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr1 = applicationData.address) === null || _applicationData$addr1 === void 0 ? void 0 : _applicationData$addr1.localityCode) || "",
+          ward: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr10 = applicationData.address) === null || _applicationData$addr10 === void 0 ? void 0 : _applicationData$addr10.ward) || "",
+          zone: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr11 = applicationData.address) === null || _applicationData$addr11 === void 0 ? void 0 : _applicationData$addr11.zone) || "",
+          constituency: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr12 = applicationData.address) === null || _applicationData$addr12 === void 0 ? void 0 : _applicationData$addr12.constituency) || ""
+        },
+        requestDetails: {
+          tankerType: tankerTypeObj,
+          waterType: waterTypeObj,
+          tankerQuantity: tankerQtyObj,
+          waterQuantity: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.waterQuantity) || "",
+          description: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.description) || "",
+          deliveryDate: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.deliveryDate) || "",
+          deliveryTime: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.deliveryTime) || "",
+          fileStoreId: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.WTfileStoreId) || null,
+          extraCharge: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.extraCharge) === "Y"
+        },
+        dispatchDetails: {
+          fillingPoint: {
+            ...fillingPointObj,
+            name: (fillingPointObj === null || fillingPointObj === void 0 ? void 0 : fillingPointObj.fillingPointName) || "NA"
+          },
+          vendor: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.vendorDetail) || "",
+          vehicle: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.vehicleDetail) || "",
+          driver: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.driverDetail) || ""
+        }
+      });
+    }
+  }, [applicationData, TankerType, TankerDetails, WaterTypeData, fixedPointsData, fillingPointsData]);
+  const {
+    data: vendorData
+  } = Digit.Hooks.fsm.useVendorSearch({
+    tenantId,
+    filters: {
+      ...(formData !== null && formData !== void 0 && (_formData$dispatchDet = formData.dispatchDetails) !== null && _formData$dispatchDet !== void 0 && (_formData$dispatchDet2 = _formData$dispatchDet.fillingPoint) !== null && _formData$dispatchDet2 !== void 0 && _formData$dispatchDet2.id ? {
+        fillingPointId: formData.dispatchDetails.fillingPoint.id
+      } : {})
+    },
+    config: {
+      enabled: !!(formData !== null && formData !== void 0 && (_formData$dispatchDet3 = formData.dispatchDetails) !== null && _formData$dispatchDet3 !== void 0 && (_formData$dispatchDet4 = _formData$dispatchDet3.fillingPoint) !== null && _formData$dispatchDet4 !== void 0 && _formData$dispatchDet4.id)
+    }
+  });
+  const fixedPointOptions = (fixedPointsData === null || fixedPointsData === void 0 ? void 0 : (_fixedPointsData$wate2 = fixedPointsData.waterTankerBookingDetail) === null || _fixedPointsData$wate2 === void 0 ? void 0 : _fixedPointsData$wate2.map(fp => {
+    var _fp$applicantDetail2, _fp$applicantDetail3;
+    return {
+      ...fp,
+      name: (fp === null || fp === void 0 ? void 0 : (_fp$applicantDetail2 = fp.applicantDetail) === null || _fp$applicantDetail2 === void 0 ? void 0 : _fp$applicantDetail2.name) || (fp === null || fp === void 0 ? void 0 : (_fp$applicantDetail3 = fp.applicantDetail) === null || _fp$applicantDetail3 === void 0 ? void 0 : _fp$applicantDetail3.fixedPointId) || "NA"
+    };
+  })) || [];
+  const fillingPointOptions = (fillingPointsData === null || fillingPointsData === void 0 ? void 0 : (_fillingPointsData$fi2 = fillingPointsData.fillingPoints) === null || _fillingPointsData$fi2 === void 0 ? void 0 : _fillingPointsData$fi2.map(fp => ({
+    ...fp,
+    name: (fp === null || fp === void 0 ? void 0 : fp.fillingPointName) || "NA"
+  }))) || [];
+  const vendorOptions = (vendorData === null || vendorData === void 0 ? void 0 : (_vendorData$vendor = vendorData.vendor) === null || _vendorData$vendor === void 0 ? void 0 : _vendorData$vendor.map(v => ({
+    ...v,
+    name: (v === null || v === void 0 ? void 0 : v.name) || (v === null || v === void 0 ? void 0 : v.vendor_id) || "NA"
+  }))) || [];
+  let vehicleOptions = [];
+  let driverOptions = [];
+  if (formData !== null && formData !== void 0 && (_formData$dispatchDet5 = formData.dispatchDetails) !== null && _formData$dispatchDet5 !== void 0 && _formData$dispatchDet5.vendor && typeof (formData === null || formData === void 0 ? void 0 : (_formData$dispatchDet6 = formData.dispatchDetails) === null || _formData$dispatchDet6 === void 0 ? void 0 : _formData$dispatchDet6.vendor) === "object") {
+    var _formData$dispatchDet7, _formData$dispatchDet8, _formData$dispatchDet9, _formData$dispatchDet0;
+    vehicleOptions = (formData === null || formData === void 0 ? void 0 : (_formData$dispatchDet7 = formData.dispatchDetails) === null || _formData$dispatchDet7 === void 0 ? void 0 : (_formData$dispatchDet8 = _formData$dispatchDet7.vendor.vehicles) === null || _formData$dispatchDet8 === void 0 ? void 0 : _formData$dispatchDet8.map(veh => ({
+      ...veh,
+      name: (veh === null || veh === void 0 ? void 0 : veh.registrationNumber) || (veh === null || veh === void 0 ? void 0 : veh.type) || "NA"
+    }))) || [];
+    driverOptions = (formData === null || formData === void 0 ? void 0 : (_formData$dispatchDet9 = formData.dispatchDetails) === null || _formData$dispatchDet9 === void 0 ? void 0 : (_formData$dispatchDet0 = _formData$dispatchDet9.vendor.drivers) === null || _formData$dispatchDet0 === void 0 ? void 0 : _formData$dispatchDet0.map(drv => ({
+      ...drv,
+      name: (drv === null || drv === void 0 ? void 0 : drv.name) || (drv === null || drv === void 0 ? void 0 : drv.licenseNumber) || "NA"
+    }))) || [];
+  }
+  const waterTypeOptions = (WaterTypeData === null || WaterTypeData === void 0 ? void 0 : WaterTypeData.map(data => ({
+    i18nKey: `${data.code}`,
+    code: `${data.code}`,
+    value: `${data.code}`
+  }))) || [];
+  const tankerTypeOptions = (TankerType === null || TankerType === void 0 ? void 0 : TankerType.map(data => ({
+    i18nKey: `${data.i18nKey}`,
+    code: `${data.code}`,
+    value: `${data.value}`
+  }))) || [];
+  const tankerQtyOptions = (TankerDetails === null || TankerDetails === void 0 ? void 0 : TankerDetails.map(data => ({
+    i18nKey: `${data.code}`,
+    code: `${data.code}`,
+    value: `${data.code}`
+  }))) || [];
+  const vehicleCapacityOptions = (VehicleType === null || VehicleType === void 0 ? void 0 : VehicleType.filter(data => {
+    var _formData$requestDeta, _formData$requestDeta2;
+    const vType = data.vehicleType ? data.vehicleType.toLowerCase() : "";
+    const tType = formData !== null && formData !== void 0 && (_formData$requestDeta = formData.requestDetails) !== null && _formData$requestDeta !== void 0 && (_formData$requestDeta2 = _formData$requestDeta.tankerType) !== null && _formData$requestDeta2 !== void 0 && _formData$requestDeta2.code ? formData.requestDetails.tankerType.code.toLowerCase() : "";
+    return vType === tType || vType.includes("tanker");
+  }).map(data => ({
+    i18nKey: `${data.capacityName}`,
+    code: `${data.capacity}`,
+    value: `${data.capacity}`,
+    capacity: `${data.capacity}`
+  }))) || [];
+  const handleFixedPointSelect = selected => {
+    if (selected && typeof selected === "object") {
+      const applicant = selected.applicantDetail;
+      const addr = selected.address;
       setFormData({
-        name: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$appl = applicationData.applicantDetail) === null || _applicationData$appl === void 0 ? void 0 : _applicationData$appl.name) || "",
-        mobileNumber: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$appl2 = applicationData.applicantDetail) === null || _applicationData$appl2 === void 0 ? void 0 : _applicationData$appl2.mobileNumber) || "",
-        emailId: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$appl3 = applicationData.applicantDetail) === null || _applicationData$appl3 === void 0 ? void 0 : _applicationData$appl3.emailId) || "",
-        alternateNumber: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$appl4 = applicationData.applicantDetail) === null || _applicationData$appl4 === void 0 ? void 0 : _applicationData$appl4.alternateNumber) || "",
-        houseNo: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr = applicationData.address) === null || _applicationData$addr === void 0 ? void 0 : _applicationData$addr.houseNo) || "",
-        streetName: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr2 = applicationData.address) === null || _applicationData$addr2 === void 0 ? void 0 : _applicationData$addr2.streetName) || "",
-        addressLine1: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr3 = applicationData.address) === null || _applicationData$addr3 === void 0 ? void 0 : _applicationData$addr3.addressLine1) || "",
-        addressLine2: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr4 = applicationData.address) === null || _applicationData$addr4 === void 0 ? void 0 : _applicationData$addr4.addressLine2) || "",
-        landmark: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr5 = applicationData.address) === null || _applicationData$addr5 === void 0 ? void 0 : _applicationData$addr5.landmark) || "",
-        pincode: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addr6 = applicationData.address) === null || _applicationData$addr6 === void 0 ? void 0 : _applicationData$addr6.pincode) || "",
-        tankerType: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.tankerType) || "",
-        waterType: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.waterType) || "",
-        tankerQuantity: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.tankerQuantity) || "",
-        waterQuantity: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.waterQuantity) || "",
-        description: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.description) || "",
-        deliveryDate: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.deliveryDate) || "",
-        deliveryTime: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.deliveryTime) || "",
-        vendorName: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$vend = applicationData.vendorDetail) === null || _applicationData$vend === void 0 ? void 0 : _applicationData$vend.name) || "",
-        vendorMobileNumber: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$vend2 = applicationData.vendorDetail) === null || _applicationData$vend2 === void 0 ? void 0 : _applicationData$vend2.mobileNumber) || "",
-        vendorAlternateNumber: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$vend3 = applicationData.vendorDetail) === null || _applicationData$vend3 === void 0 ? void 0 : _applicationData$vend3.alternateNumber) || "",
-        vendorEmailId: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$vend4 = applicationData.vendorDetail) === null || _applicationData$vend4 === void 0 ? void 0 : _applicationData$vend4.emailId) || "",
-        driverName: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$driv = applicationData.driverDetail) === null || _applicationData$driv === void 0 ? void 0 : _applicationData$driv.name) || "",
-        driverMobileNumber: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$driv2 = applicationData.driverDetail) === null || _applicationData$driv2 === void 0 ? void 0 : _applicationData$driv2.mobileNumber) || "",
-        driverAlternateNumber: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$driv3 = applicationData.driverDetail) === null || _applicationData$driv3 === void 0 ? void 0 : _applicationData$driv3.alternateNumber) || "",
-        driverEmailId: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$driv4 = applicationData.driverDetail) === null || _applicationData$driv4 === void 0 ? void 0 : _applicationData$driv4.emailId) || "",
-        fillingPoints: (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$vehi = applicationData.vehicleDetail) === null || _applicationData$vehi === void 0 ? void 0 : _applicationData$vehi.fillingPoints) || ""
+        ...formData,
+        owner: {
+          ...formData.owner,
+          fixedPoint: selected,
+          applicantName: (applicant === null || applicant === void 0 ? void 0 : applicant.name) || formData.owner.applicantName,
+          mobileNumber: (applicant === null || applicant === void 0 ? void 0 : applicant.mobileNumber) || formData.owner.mobileNumber,
+          alternateNumber: (applicant === null || applicant === void 0 ? void 0 : applicant.alternateNumber) || formData.owner.alternateNumber,
+          emailId: (applicant === null || applicant === void 0 ? void 0 : applicant.emailId) || formData.owner.emailId
+        },
+        address: {
+          ...formData.address,
+          houseNo: (addr === null || addr === void 0 ? void 0 : addr.houseNo) || "",
+          streetName: (addr === null || addr === void 0 ? void 0 : addr.streetName) || "",
+          addressLine1: (addr === null || addr === void 0 ? void 0 : addr.addressLine1) || "",
+          addressLine2: (addr === null || addr === void 0 ? void 0 : addr.addressLine2) || "",
+          landmark: (addr === null || addr === void 0 ? void 0 : addr.landmark) || "",
+          pincode: addr !== null && addr !== void 0 && addr.pincode ? addr.pincode.toString().split(".")[0] : "",
+          city: (addr === null || addr === void 0 ? void 0 : addr.city) || "Delhi",
+          cityCode: (addr === null || addr === void 0 ? void 0 : addr.cityCode) || "DJB",
+          locality: (addr === null || addr === void 0 ? void 0 : addr.locality) || "",
+          localityCode: (addr === null || addr === void 0 ? void 0 : addr.localityCode) || "",
+          ward: (addr === null || addr === void 0 ? void 0 : addr.ward) || "",
+          zone: (addr === null || addr === void 0 ? void 0 : addr.zone) || "",
+          constituency: (addr === null || addr === void 0 ? void 0 : addr.constituency) || ""
+        }
       });
     }
-  }, [applicationData]);
-  const handleChange = (e, key) => {
+  };
+  const handleFillingPointSelect = selected => {
+    setFormData({
+      ...formData,
+      dispatchDetails: {
+        ...formData.dispatchDetails,
+        fillingPoint: selected,
+        vendor: "",
+        vehicle: "",
+        driver: ""
+      }
+    });
+  };
+  const handleVendorSelect = selected => {
     setFormData({
       ...formData,
-      [key]: e.target.value
+      dispatchDetails: {
+        ...formData.dispatchDetails,
+        vendor: selected,
+        vehicle: "",
+        driver: ""
+      }
     });
   };
   const handleUpdate = () => {
-    console.log("Updated Data:", formData);
-    closeModal();
+    const payload = emergencyWaterTankerPayload({
+      ...formData,
+      tenantId
+    });
+    mutation.mutate(payload, {
+      onSuccess: () => {
+        closeModal();
+        window.location.reload();
+      },
+      onError: error => {
+        console.error("Update Error:", error);
+      }
+    });
   };
-  const fieldGroups = [{
-    title: "WT_APPLICANT_DETAILS",
-    fields: [{
-      label: "WT_APPLICANT_NAME",
-      key: "name"
-    }, {
-      label: "WT_MOBILE_NUMBER",
-      key: "mobileNumber"
-    }, {
-      label: "WT_ALT_MOBILE_NUMBER",
-      key: "alternateNumber"
-    }, {
-      label: "WT_EMAIL_ID",
-      key: "emailId"
-    }]
-  }, {
-    title: "WT_ADDRESS_DETAILS",
-    fields: [{
-      label: "WT_HOUSE_NO",
-      key: "houseNo"
-    }, {
-      label: "WT_STREET_NAME",
-      key: "streetName"
-    }, {
-      label: "WT_ADDRESS_LINE1",
-      key: "addressLine1"
-    }, {
-      label: "WT_ADDRESS_LINE2",
-      key: "addressLine2"
-    }, {
-      label: "WT_LANDMARK",
-      key: "landmark"
-    }, {
-      label: "WT_PINCODE",
-      key: "pincode"
-    }]
-  }, {
-    title: "WT_REQUEST_DETAILS",
-    fields: [{
-      label: "WT_TANKER_TYPE",
-      key: "tankerType"
-    }, {
-      label: "WT_WATER_TYPE",
-      key: "waterType"
-    }, {
-      label: "WT_TANKER_QUANTITY",
-      key: "tankerQuantity"
-    }, {
-      label: "WT_WATER_QUANTITY",
-      key: "waterQuantity"
-    }, {
-      label: "WT_DELIVERY_DATE",
-      key: "deliveryDate",
-      type: "date"
-    }, {
-      label: "WT_DELIVERY_TIME",
-      key: "deliveryTime",
-      type: "time"
-    }, {
-      label: "WT_DESCRIPTION",
-      key: "description",
-      fullWidth: true
-    }]
-  }, {
-    title: "WT_VENDOR_DETAILS",
-    fields: [{
-      label: "WT_VENDOR_NAME",
-      key: "vendorName"
-    }, {
-      label: "WT_MOBILE_NUMBER",
-      key: "vendorMobileNumber"
-    }, {
-      label: "WT_ALT_MOBILE_NUMBER",
-      key: "vendorAlternateNumber"
-    }, {
-      label: "WT_EMAIL_ID",
-      key: "vendorEmailId"
-    }]
-  }, {
-    title: "WT_DRIVER_DETAILS",
-    fields: [{
-      label: "WT_DRIVER_NAME",
-      key: "driverName"
-    }, {
-      label: "WT_MOBILE_NUMBER",
-      key: "driverMobileNumber"
-    }, {
-      label: "WT_ALT_MOBILE_NUMBER",
-      key: "driverAlternateNumber"
-    }, {
-      label: "WT_EMAIL_ID",
-      key: "driverEmailId"
-    }]
-  }, {
-    title: "WT_VEHICLE_DETAILS",
-    fields: [{
-      label: "WT_FILLING_POINTS",
-      key: "fillingPoints"
-    }]
-  }];
+  if (mutation.isLoading) return /*#__PURE__*/React.createElement(Loader, null);
   return /*#__PURE__*/React.createElement(Modal, {
     headerBarMain: /*#__PURE__*/React.createElement("h1", {
       className: "heading-m"
@@ -16591,8 +16709,7 @@ const WTEditApplicationModal = ({
       overflowY: "auto",
       padding: "20px"
     }
-  }, fieldGroups.map((group, index) => /*#__PURE__*/React.createElement("div", {
-    key: index,
+  }, /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: "24px"
     }
@@ -16605,17 +16722,15 @@ const WTEditApplicationModal = ({
       borderBottom: "1px solid #e0e0e0",
       paddingBottom: "8px"
     }
-  }, t(group.title)), /*#__PURE__*/React.createElement("div", {
+  }, t("WT_APPLICANT_DETAILS")), /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
       flexWrap: "wrap",
       gap: "16px"
     }
-  }, group.fields.map(field => /*#__PURE__*/React.createElement("div", {
-    key: field.key,
+  }, /*#__PURE__*/React.createElement("div", {
     style: {
-      flex: field.fullWidth ? "1 1 100%" : "1 1 200px",
-      maxWidth: "100%"
+      flex: "1 1 100%"
     }
   }, /*#__PURE__*/React.createElement(CardLabel, {
     style: {
@@ -16623,15 +16738,390 @@ const WTEditApplicationModal = ({
       marginBottom: "4px",
       fontSize: "14px"
     }
-  }, t(field.label)), /*#__PURE__*/React.createElement(TextInput, {
-    type: field.type || "text",
-    value: formData[field.key],
-    onChange: e => handleChange(e, field.key),
+  }, t("WT_FIXED_POINT")), /*#__PURE__*/React.createElement(Dropdown, {
+    selected: formData.owner.fixedPoint,
+    option: fixedPointOptions,
+    select: handleFixedPointSelect,
+    optionKey: "name",
+    t: t,
+    placeholder: t("WT_SELECT_FIXED_POINT")
+  })), /*#__PURE__*/React.createElement("div", {
     style: {
-      width: "100%",
-      maxWidth: "100%"
+      flex: "1 1 200px"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    style: {
+      fontWeight: "600",
+      marginBottom: "4px",
+      fontSize: "14px"
+    }
+  }, t("WT_APPLICANT_NAME")), /*#__PURE__*/React.createElement(TextInput, {
+    value: formData.owner.applicantName,
+    onChange: e => setFormData({
+      ...formData,
+      owner: {
+        ...formData.owner,
+        applicantName: e.target.value
+      }
+    })
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: "1 1 200px"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    style: {
+      fontWeight: "600",
+      marginBottom: "4px",
+      fontSize: "14px"
+    }
+  }, t("WT_MOBILE_NUMBER")), /*#__PURE__*/React.createElement(MobileNumber, {
+    value: formData.owner.mobileNumber,
+    onChange: val => setFormData({
+      ...formData,
+      owner: {
+        ...formData.owner,
+        mobileNumber: val
+      }
+    })
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: "1 1 200px"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    style: {
+      fontWeight: "600",
+      marginBottom: "4px",
+      fontSize: "14px"
+    }
+  }, t("WT_ALT_MOBILE_NUMBER")), /*#__PURE__*/React.createElement(MobileNumber, {
+    value: formData.owner.alternateNumber,
+    onChange: val => setFormData({
+      ...formData,
+      owner: {
+        ...formData.owner,
+        alternateNumber: val
+      }
+    })
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: "1 1 200px"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    style: {
+      fontWeight: "600",
+      marginBottom: "4px",
+      fontSize: "14px"
+    }
+  }, t("WT_EMAIL_ID")), /*#__PURE__*/React.createElement(TextInput, {
+    value: formData.owner.emailId,
+    onChange: e => setFormData({
+      ...formData,
+      owner: {
+        ...formData.owner,
+        emailId: e.target.value
+      }
+    })
+  })))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginBottom: "24px"
+    }
+  }, /*#__PURE__*/React.createElement("h2", {
+    style: {
+      fontSize: "18px",
+      fontWeight: "bold",
+      marginBottom: "16px",
+      color: "#0B0C10",
+      borderBottom: "1px solid #e0e0e0",
+      paddingBottom: "8px"
+    }
+  }, t("WT_ADDRESS_DETAILS")), /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      flexWrap: "wrap",
+      gap: "16px"
+    }
+  }, ["houseNo", "streetName", "addressLine1", "addressLine2", "landmark", "pincode"].map(key => /*#__PURE__*/React.createElement("div", {
+    key: key,
+    style: {
+      flex: "1 1 200px"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    style: {
+      fontWeight: "600",
+      marginBottom: "4px",
+      fontSize: "14px"
+    }
+  }, t(`WT_${key.toUpperCase()}`)), /*#__PURE__*/React.createElement(TextInput, {
+    value: formData.address[key],
+    onChange: e => setFormData({
+      ...formData,
+      address: {
+        ...formData.address,
+        [key]: e.target.value
+      }
+    })
+  }))))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginBottom: "24px"
+    }
+  }, /*#__PURE__*/React.createElement("h2", {
+    style: {
+      fontSize: "18px",
+      fontWeight: "bold",
+      marginBottom: "16px",
+      color: "#0B0C10",
+      borderBottom: "1px solid #e0e0e0",
+      paddingBottom: "8px"
+    }
+  }, t("WT_REQUEST_DETAILS")), /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      flexWrap: "wrap",
+      gap: "16px"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: "1 1 200px"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    style: {
+      fontWeight: "600",
+      marginBottom: "4px",
+      fontSize: "14px"
+    }
+  }, t("WT_TANKER_TYPE")), /*#__PURE__*/React.createElement(Dropdown, {
+    selected: formData.requestDetails.tankerType,
+    option: tankerTypeOptions,
+    select: val => setFormData({
+      ...formData,
+      requestDetails: {
+        ...formData.requestDetails,
+        tankerType: val
+      }
+    }),
+    optionKey: "i18nKey",
+    t: t
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: "1 1 200px"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    style: {
+      fontWeight: "600",
+      marginBottom: "4px",
+      fontSize: "14px"
+    }
+  }, t("WT_WATER_TYPE")), /*#__PURE__*/React.createElement(Dropdown, {
+    selected: formData.requestDetails.waterType,
+    option: waterTypeOptions,
+    select: val => setFormData({
+      ...formData,
+      requestDetails: {
+        ...formData.requestDetails,
+        waterType: val
+      }
+    }),
+    optionKey: "i18nKey",
+    t: t
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: "1 1 200px"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    style: {
+      fontWeight: "600",
+      marginBottom: "4px",
+      fontSize: "14px"
+    }
+  }, t("WT_TANKER_QUANTITY")), /*#__PURE__*/React.createElement(Dropdown, {
+    selected: formData.requestDetails.tankerQuantity,
+    option: tankerQtyOptions,
+    select: val => setFormData({
+      ...formData,
+      requestDetails: {
+        ...formData.requestDetails,
+        tankerQuantity: val
+      }
+    }),
+    optionKey: "i18nKey",
+    t: t
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: "1 1 200px"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    style: {
+      fontWeight: "600",
+      marginBottom: "4px",
+      fontSize: "14px"
+    }
+  }, t("WT_WATER_QUANTITY")), /*#__PURE__*/React.createElement(Dropdown, {
+    selected: formData.requestDetails.waterQuantity,
+    option: vehicleCapacityOptions,
+    select: val => setFormData({
+      ...formData,
+      requestDetails: {
+        ...formData.requestDetails,
+        waterQuantity: val
+      }
+    }),
+    optionKey: "i18nKey",
+    t: t
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: "1 1 200px"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    style: {
+      fontWeight: "600",
+      marginBottom: "4px",
+      fontSize: "14px"
+    }
+  }, t("WT_DELIVERY_DATE")), /*#__PURE__*/React.createElement(TextInput, {
+    type: "date",
+    value: formData.requestDetails.deliveryDate,
+    onChange: e => setFormData({
+      ...formData,
+      requestDetails: {
+        ...formData.requestDetails,
+        deliveryDate: e.target.value
+      }
+    })
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: "1 1 200px"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    style: {
+      fontWeight: "600",
+      marginBottom: "4px",
+      fontSize: "14px"
+    }
+  }, t("WT_DELIVERY_TIME")), /*#__PURE__*/React.createElement(TextInput, {
+    type: "time",
+    value: formData.requestDetails.deliveryTime,
+    onChange: e => setFormData({
+      ...formData,
+      requestDetails: {
+        ...formData.requestDetails,
+        deliveryTime: e.target.value
+      }
+    })
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: "1 1 100%"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    style: {
+      fontWeight: "600",
+      marginBottom: "4px",
+      fontSize: "14px"
+    }
+  }, t("WT_DESCRIPTION")), /*#__PURE__*/React.createElement(TextArea, {
+    value: formData.requestDetails.description,
+    onChange: e => setFormData({
+      ...formData,
+      requestDetails: {
+        ...formData.requestDetails,
+        description: e.target.value
+      }
+    })
+  })))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginBottom: "24px"
+    }
+  }, /*#__PURE__*/React.createElement("h2", {
+    style: {
+      fontSize: "18px",
+      fontWeight: "bold",
+      marginBottom: "16px",
+      color: "#0B0C10",
+      borderBottom: "1px solid #e0e0e0",
+      paddingBottom: "8px"
+    }
+  }, t("WT_DISPATCH_DETAILS")), /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      flexWrap: "wrap",
+      gap: "16px"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: "1 1 200px"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    style: {
+      fontWeight: "600",
+      marginBottom: "4px",
+      fontSize: "14px"
+    }
+  }, t("WT_FILLING_POINT")), /*#__PURE__*/React.createElement(Dropdown, {
+    selected: formData.dispatchDetails.fillingPoint,
+    option: fillingPointOptions,
+    select: handleFillingPointSelect,
+    optionKey: "name",
+    t: t
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: "1 1 200px"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    style: {
+      fontWeight: "600",
+      marginBottom: "4px",
+      fontSize: "14px"
     }
-  }))))))));
+  }, t("WT_VENDOR")), /*#__PURE__*/React.createElement(Dropdown, {
+    selected: formData.dispatchDetails.vendor,
+    option: vendorOptions,
+    select: handleVendorSelect,
+    optionKey: "name",
+    t: t
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: "1 1 200px"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    style: {
+      fontWeight: "600",
+      marginBottom: "4px",
+      fontSize: "14px"
+    }
+  }, t("WT_VEHICLE")), /*#__PURE__*/React.createElement(Dropdown, {
+    selected: formData.dispatchDetails.vehicle,
+    option: vehicleOptions,
+    select: val => setFormData({
+      ...formData,
+      dispatchDetails: {
+        ...formData.dispatchDetails,
+        vehicle: val
+      }
+    }),
+    optionKey: "name",
+    t: t
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: "1 1 200px"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    style: {
+      fontWeight: "600",
+      marginBottom: "4px",
+      fontSize: "14px"
+    }
+  }, t("WT_DRIVER")), /*#__PURE__*/React.createElement(Dropdown, {
+    selected: formData.dispatchDetails.driver,
+    option: driverOptions,
+    select: val => setFormData({
+      ...formData,
+      dispatchDetails: {
+        ...formData.dispatchDetails,
+        driver: val
+      }
+    }),
+    optionKey: "name",
+    t: t
+  }))))));
 };
 
 const configPTApproverApplication = ({
@@ -26037,7 +26527,11 @@ const EmergencyFixedPointRequestDetails = ({
   var _formData$requestDeta, _formData$requestDeta2, _formData$requestDeta3, _formData$requestDeta4, _formData$requestDeta5, _formData$requestDeta6, _formData$requestDeta7, _formData$requestDeta8, _formData$requestDeta9;
   const user = Digit.UserService.getUser().info;
   let validation = {};
-  const [tankerType, settankerType] = useState((formData === null || formData === void 0 ? void 0 : (_formData$requestDeta = formData.requestDetails) === null || _formData$requestDeta === void 0 ? void 0 : _formData$requestDeta.tankerType) || "");
+  const [tankerType, settankerType] = useState((formData === null || formData === void 0 ? void 0 : (_formData$requestDeta = formData.requestDetails) === null || _formData$requestDeta === void 0 ? void 0 : _formData$requestDeta.tankerType) || {
+    code: "TANKER",
+    i18nKey: "TANKER",
+    value: "TANKER"
+  });
   const [tankerQuantity, settankerQuantity] = useState((formData === null || formData === void 0 ? void 0 : (_formData$requestDeta2 = formData.requestDetails) === null || _formData$requestDeta2 === void 0 ? void 0 : _formData$requestDeta2.tankerQuantity) || {
     i18nKey: "1",
     code: "1",
@@ -26105,7 +26599,6 @@ const EmergencyFixedPointRequestDetails = ({
   });
   let Vehicle = [];
   let tankerDetails = [];
-  let tankerTypeDetails = [];
   let WaterType = [];
   WaterTypeData && WaterTypeData.map(data => {
     WaterType.push({
@@ -26131,18 +26624,25 @@ const EmergencyFixedPointRequestDetails = ({
     });
   });
   TankerType && TankerType.map(data => {
-    tankerTypeDetails.push({
-      i18nKey: `${data.i18nKey}`,
-      code: `${data.code}`,
-      value: `${data.value}`
-    });
   });
-  const VehicleDetails = Vehicle.filter(data => (tankerType === null || tankerType === void 0 ? void 0 : tankerType.code) === data.vehicleType).map(data => ({
+  let VehicleDetails = Vehicle.filter(data => {
+    const vType = data.vehicleType ? data.vehicleType.toLowerCase() : "";
+    const tType = tankerType !== null && tankerType !== void 0 && tankerType.code ? tankerType.code.toLowerCase() : "";
+    return vType === tType || vType.includes("tanker");
+  }).map(data => ({
     i18nKey: `${data.capacityName}`,
     code: `${data.code}`,
     value: `${data.value}`,
     capacity: `${data.capacity}`
   }));
+  if (VehicleDetails.length === 0 && Vehicle.length > 0) {
+    VehicleDetails = Vehicle.map(data => ({
+      i18nKey: `${data.capacityName}`,
+      code: `${data.code}`,
+      value: `${data.value}`,
+      capacity: `${data.capacity}`
+    }));
+  }
   const TimeInput = () => {
     return /*#__PURE__*/React.createElement("div", {
       className: "flex items-center"
@@ -26207,38 +26707,13 @@ const EmergencyFixedPointRequestDetails = ({
     };
     onSelect(config.key, request, false);
   };
-  useEffect(() => {
-    if (!tankerType && tankerTypeDetails !== null && tankerTypeDetails !== void 0 && tankerTypeDetails.length) {
-      settankerType(tankerTypeDetails[0]);
-    }
-  }, [tankerTypeDetails]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormStep, {
     config: config,
     onSelect: goNext,
     t: t,
-    isDisabled: !tankerType || !deliveryDate || !tankerQuantity || !waterQuantity || !deliveryTime || !description || !waterType,
+    isDisabled: !tankerType || !deliveryDate || !tankerQuantity || !waterQuantity || !deliveryTime || !waterType,
     className: "card-form-container"
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WT_TANKER_TYPE")}`, " ", /*#__PURE__*/React.createElement("span", {
-    className: "astericColor"
-  }, "*")), /*#__PURE__*/React.createElement(RadioButtons, {
-    t: t,
-    options: tankerTypeDetails,
-    style: {
-      display: "flex",
-      flexWrap: "wrap",
-      maxHeight: "30px"
-    },
-    innerStyles: {
-      minWidth: "24%"
-    },
-    optionsKey: "i18nKey",
-    name: `tankerType`,
-    value: tankerType,
-    selectedOption: tankerType,
-    onSelect: settankerType,
-    labelKey: "i18nKey",
-    isPTFlow: true
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WT_WATER_TYPE")}`, " ", /*#__PURE__*/React.createElement("span", {
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WT_WATER_TYPE")}`, " ", /*#__PURE__*/React.createElement("span", {
     className: "astericColor"
   }, "*")), /*#__PURE__*/React.createElement(Dropdown, {
     className: "form-field",
@@ -26300,9 +26775,7 @@ const EmergencyFixedPointRequestDetails = ({
     },
     message: uploadedFile ? `1 ${t(`WT_ACTION_FILEUPLOADED`)}` : t(`WT_ACTION_NO_FILEUPLOADED`),
     error: error
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WT_DESCRIPTION")}`, " ", /*#__PURE__*/React.createElement("span", {
-    className: "astericColor"
-  }, "*")), /*#__PURE__*/React.createElement(TextArea, Object.assign({
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WT_DESCRIPTION")}`), /*#__PURE__*/React.createElement(TextArea, Object.assign({
     t: t,
     type: "text",
     isMandatory: false,
@@ -26311,9 +26784,9 @@ const EmergencyFixedPointRequestDetails = ({
     value: description,
     onChange: setDescription,
     style: inputStyles,
-    ValidationRequired: true
+    ValidationRequired: false
   }, validation = {
-    isRequired: true,
+    isRequired: false,
     pattern: "^[a-zA-Z ]+$",
     type: "tel",
     title: t("PT_NAME_ERROR_MESSAGE")
@@ -27180,6 +27653,17 @@ const EmergencyFixedPointApplicantDetails = ({
   const [relationShipType, setRelationShipType] = useState((formData === null || formData === void 0 ? void 0 : (_formData$owner9 = formData.owner) === null || _formData$owner9 === void 0 ? void 0 : _formData$owner9.relationShipType) || "");
   const [fixedPoint, setFixedPoint] = useState((formData === null || formData === void 0 ? void 0 : (_formData$owner0 = formData.owner) === null || _formData$owner0 === void 0 ? void 0 : _formData$owner0.fixedPoint) || "");
   const [autoPopulatedAddress, setAutoPopulatedAddress] = useState(null);
+  const [searchQuery, setSearchQuery] = useState("");
+  const [debouncedSearchQuery, setDebouncedSearchQuery] = useState("");
+  React.useEffect(() => {
+    const handler = setTimeout(() => {
+      setDebouncedSearchQuery(searchQuery);
+    }, 500);
+    return () => clearTimeout(handler);
+  }, [searchQuery]);
+  const handleSearch = React.useCallback(val => {
+    setSearchQuery(val);
+  }, []);
   const handleFixedPointSelect = selected => {
     setFixedPoint(selected);
     if (selected && typeof selected === "object") {
@@ -27253,10 +27737,13 @@ const EmergencyFixedPointApplicantDetails = ({
   } = Digit.Hooks.wt.useFixedPointSearchAPI({
     tenantId,
     filters: {
-      limit: 1000
+      limit: 1000,
+      ...(debouncedSearchQuery ? {
+        name: debouncedSearchQuery
+      } : {})
     }
   }, {
-    enabled: true
+    enabled: (isExistingFixedPoint === null || isExistingFixedPoint === void 0 ? void 0 : isExistingFixedPoint.code) === "YES"
   });
   const fixedPointOptions = (fixedPointsData === null || fixedPointsData === void 0 ? void 0 : (_fixedPointsData$wate = fixedPointsData.waterTankerBookingDetail) === null || _fixedPointsData$wate === void 0 ? void 0 : _fixedPointsData$wate.map(fp => {
     var _fp$applicantDetail, _fp$applicantDetail2;
@@ -27362,7 +27849,8 @@ const EmergencyFixedPointApplicantDetails = ({
     optionKey: "name",
     t: t,
     name: "fixedPoint",
-    placeholder: t("WT_SELECT_FIXED_POINT", "Select Fixed Point")
+    placeholder: t("WT_SELECT_FIXED_POINT", "Select Fixed Point"),
+    onSearch: handleSearch
   }) : /*#__PURE__*/React.createElement(TextInput, {
     t: t,
     type: "text",