@djb25/digit-ui-module-wt 1.0.38 → 1.0.39

package/dist/index.modern.js

@@ -2592,19 +2592,6 @@ const InboxLinks = ({
   const {
     t
   } = useTranslation();
-  const allLinks = [];
-  const [links, setLinks] = useState([]);
-  const {
-    roles: userRoles
-  } = Digit.UserService.getUser().info;
-  useEffect(() => {
-    let linksToShow = allLinks.filter(e => e.businessService === businessService).filter(({
-      roles
-    }) => roles.some(e => userRoles.map(({
-      code
-    }) => code).includes(e)) || !(roles !== null && roles !== void 0 && roles.length));
-    setLinks(linksToShow);
-  }, []);
   const GetLogo = () => /*#__PURE__*/React.createElement("div", {
     className: "header"
   }, /*#__PURE__*/React.createElement("span", {
@@ -2618,23 +2605,7 @@ const InboxLinks = ({
       className: "filter inboxLinks"
     }, /*#__PURE__*/React.createElement("div", {
       className: "complaint-links-container"
-    }, Digit.UserService.getUser().info.type !== "CITIZEN" && GetLogo(), /*#__PURE__*/React.createElement("div", {
-      className: "body"
-    }, links.map(({
-      link,
-      text,
-      hyperlink: _hyperlink = false,
-      roles: _roles = []
-    }, index) => {
-      return /*#__PURE__*/React.createElement("span", {
-        className: "link",
-        key: index
-      }, _hyperlink ? /*#__PURE__*/React.createElement("a", {
-        href: link
-      }, text) : /*#__PURE__*/React.createElement(Link, {
-        to: link
-      }, t(text)));
-    }))))
+    }, Digit.UserService.getUser().info.type !== "CITIZEN" && GetLogo()))
   );
 };
 
@@ -4641,6 +4612,25 @@ const calculateDistance = (lat1, lon1, lat2, lon2) => {
 function deg2rad(deg) {
   return deg * (Math.PI / 180);
 }
+const geocodeAddress = async address => {
+  if (!address || !address.trim()) return null;
+  try {
+    const response = await fetch(`https://nominatim.openstreetmap.org/search?format=json&q=${encodeURIComponent(address)}`, {
+      headers: {
+        "Accept-Language": "en",
+        "User-Agent": "Digit-UI-WT-Module"
+      }
+    });
+    if (!response.ok) {
+      throw new Error(`Geocoding failed: ${response.statusText}`);
+    }
+    const data = await response.json();
+    return data;
+  } catch (error) {
+    console.error("Error in geocodeAddress:", error);
+    return null;
+  }
+};
 
 delete L.Icon.Default.prototype._getIconUrl;
 L.Icon.Default.mergeOptions({
@@ -5232,20 +5222,18 @@ function LiveTrackingSystem() {
   } = Digit.Hooks.fsm.useVendorSearch({
     tenantId,
     filters: {
-      status: "ACTIVE"
+      status: "ACTIVE",
+      ...(selectedFillingPoint !== null && selectedFillingPoint !== void 0 && selectedFillingPoint.id ? {
+        fillingPointId: selectedFillingPoint === null || selectedFillingPoint === void 0 ? void 0 : selectedFillingPoint.id
+      } : {})
     },
     config: {
       select: data => (data === null || data === void 0 ? void 0 : data.vendor) || []
     }
   });
   const filteredVendorOptions = useMemo(() => {
-    if (!vendorOptions || !vendorOptions.length) return [];
-    if (!selectedFillingPoint) return vendorOptions;
-    return vendorOptions.filter(vendor => {
-      var _vendor$fillingPoint;
-      return (vendor === null || vendor === void 0 ? void 0 : (_vendor$fillingPoint = vendor.fillingPoint) === null || _vendor$fillingPoint === void 0 ? void 0 : _vendor$fillingPoint.id) === (selectedFillingPoint === null || selectedFillingPoint === void 0 ? void 0 : selectedFillingPoint.id);
-    });
-  }, [vendorOptions, selectedFillingPoint]);
+    return vendorOptions || [];
+  }, [vendorOptions]);
   useEffect(() => {
     if (vendorOptions !== null && vendorOptions !== void 0 && vendorOptions.length && Object.keys(drivers).length) {
       var _vendorOptions$, _vendorOptions$2, _vendorOptions$2$driv;
@@ -5354,8 +5342,7 @@ function LiveTrackingSystem() {
     const matchesFillingPoint = !selectedFillingPoint || (() => {
       if (!vendorOptions || !vendorOptions.length) return false;
       return vendorOptions.some(vendor => {
-        var _vendor$fillingPoint2, _vendor$drivers2;
-        if ((vendor === null || vendor === void 0 ? void 0 : (_vendor$fillingPoint2 = vendor.fillingPoint) === null || _vendor$fillingPoint2 === void 0 ? void 0 : _vendor$fillingPoint2.id) !== (selectedFillingPoint === null || selectedFillingPoint === void 0 ? void 0 : selectedFillingPoint.id)) return false;
+        var _vendor$drivers2;
         return (_vendor$drivers2 = vendor.drivers) === null || _vendor$drivers2 === void 0 ? void 0 : _vendor$drivers2.some(d => {
           var _d$owner5, _d$owner6, _d$owner7, _d$owner8;
           return ((_d$owner5 = d.owner) === null || _d$owner5 === void 0 ? void 0 : _d$owner5.mobileNumber) === driver.driverId || ((_d$owner6 = d.owner) === null || _d$owner6 === void 0 ? void 0 : _d$owner6.uuid) === driver.driverId || d.id === driver.driverId || String((_d$owner7 = d.owner) === null || _d$owner7 === void 0 ? void 0 : _d$owner7.mobileNumber) === String(driver.driverId) || String((_d$owner8 = d.owner) === null || _d$owner8 === void 0 ? void 0 : _d$owner8.uuid) === String(driver.driverId);
@@ -6154,6 +6141,9 @@ const AddFixFillAddress = ({
   const [longitude, setLongitude] = useState((formData === null || formData === void 0 ? void 0 : (_formData$address12 = formData.address) === null || _formData$address12 === void 0 ? void 0 : _formData$address12.longitude) || "");
   const [selectedAddress, setSelectedAddress] = useState("");
   const [showPincodeSuggestions, setShowPincodeSuggestions] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(null);
+  const [geocodedAddress, setGeocodedAddress] = useState(null);
   const isInitialized = useRef(!isEdit);
   const lastSyncedAddress = useRef(null);
   const lastBookingId = useRef(null);
@@ -6276,8 +6266,8 @@ const AddFixFillAddress = ({
       setAddressLine2(addressData.addressLine2 || "");
       setAddressType(allOptions.find(a => a.code === addressData.addressType) || addressData.addressType || allOptions.find(a => a.code === "PERMANENT"));
       setZone(addressData.zone || "");
-      setBlock(addressData.block || "");
-      setAssembly(addressData.assembly || "");
+      setBlock(addressData.block || addressData.ward || "");
+      setAssembly(addressData.assembly || addressData.constituency || "");
       setLatitude(addressData.latitude || "");
       setLongitude(addressData.longitude || "");
       if ((structuredLocality === null || structuredLocality === void 0 ? void 0 : structuredLocality.length) > 0 || !addressData.cityCode) {
@@ -6318,6 +6308,38 @@ const AddFixFillAddress = ({
       setAddressType(allOptions.find(a => a.code === selectedAddress.addressType));
     }
   }, [selectedAddress, structuredLocality]);
+  const getLatLng = async () => {
+    try {
+      setLoading(true);
+      setError(null);
+      const parts = [houseNo, streetName, addressLine1, addressLine2, (locality === null || locality === void 0 ? void 0 : locality.name) || (typeof locality === "string" ? locality : ""), (city === null || city === void 0 ? void 0 : city.name) || (typeof city === "string" ? city : ""), pincode].filter(Boolean);
+      const fullAddress = parts.join(", ");
+      if (!fullAddress.trim()) {
+        setError(t("WT_ENTER_ADDRESS_DETAILS_FIRST"));
+        setLoading(false);
+        return;
+      }
+      const data = await geocodeAddress(fullAddress);
+      if (data && data.length > 0) {
+        setLatitude(data[0].lat);
+        setLongitude(data[0].lon);
+        setGeocodedAddress(data[0].display_name);
+      } else {
+        setError(t("WT_LOCATION_NOT_FOUND"));
+      }
+    } catch (err) {
+      setError(t("WT_GEOCODING_ERROR"));
+    } finally {
+      setLoading(false);
+    }
+  };
+  useEffect(() => {
+    if (!addressLine1 || addressLine1.trim().length < 5) return;
+    const timer = setTimeout(() => {
+      getLatLng();
+    }, 1000);
+    return () => clearTimeout(timer);
+  }, [addressLine1]);
   useEffect(() => {
     if (!onSelect || !isInitialized.current) return;
     const currentAddress = {
@@ -6365,9 +6387,7 @@ const AddFixFillAddress = ({
     style: {
       width: "100%"
     }
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("CITY"), " ", /*#__PURE__*/React.createElement("span", {
-    className: "astericColor"
-  }, "*")), /*#__PURE__*/React.createElement(Dropdown, {
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("CITY")), /*#__PURE__*/React.createElement(Dropdown, {
     selected: city,
     select: setCity,
     option: allCities || [],
@@ -6378,9 +6398,7 @@ const AddFixFillAddress = ({
     style: {
       position: "relative"
     }
-  }, /*#__PURE__*/React.createElement(CardLabel, null, t("PINCODE"), " ", /*#__PURE__*/React.createElement("span", {
-    className: "astericColor"
-  }, "*")), /*#__PURE__*/React.createElement(TextInput, {
+  }, /*#__PURE__*/React.createElement(CardLabel, null, t("PINCODE")), /*#__PURE__*/React.createElement(TextInput, {
     value: pincode,
     onChange: e => {
       const newPin = e.target.value.replace(/\D/g, "").slice(0, 6);
@@ -6427,9 +6445,7 @@ const AddFixFillAddress = ({
       setPincode(p.code);
       setShowPincodeSuggestions(false);
     }
-  }, p.code)))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("LOCALITY"), " ", /*#__PURE__*/React.createElement("span", {
-    className: "astericColor"
-  }, "*")), /*#__PURE__*/React.createElement(Dropdown, {
+  }, p.code)))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("LOCALITY")), /*#__PURE__*/React.createElement(Dropdown, {
     selected: locality,
     select: val => {
       setLocality(val);
@@ -6446,84 +6462,63 @@ const AddFixFillAddress = ({
     t: t,
     style: {
       width: "100%"
-    }
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("HOUSE_NO"), /*#__PURE__*/React.createElement("span", {
-    className: "astericColor"
-  }, "*")), /*#__PURE__*/React.createElement(TextInput, {
+    },
+    isSearchable: true
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("HOUSE_NO")), /*#__PURE__*/React.createElement(TextInput, {
     value: houseNo,
     onChange: e => setHouseNo(e.target.value),
     style: {
       width: "100%"
     }
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("STREET_NAME"), " ", /*#__PURE__*/React.createElement("span", {
-    className: "astericColor"
-  }, "*")), /*#__PURE__*/React.createElement(TextInput, {
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("STREET_NAME")), /*#__PURE__*/React.createElement(TextInput, {
     value: streetName,
     onChange: e => setStreetName(e.target.value),
     style: {
       width: "100%"
     }
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("ADDRESS_LINE1"), " ", /*#__PURE__*/React.createElement("span", {
-    className: "astericColor"
-  }, "*")), /*#__PURE__*/React.createElement(TextInput, {
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("ADDRESS_LINE1")), /*#__PURE__*/React.createElement(TextInput, {
     value: addressLine1,
     onChange: e => setAddressLine1(e.target.value),
     style: {
       width: "100%"
     }
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("ADDRESS_LINE2"), " ", /*#__PURE__*/React.createElement("span", {
-    className: "astericColor"
-  }, "*")), /*#__PURE__*/React.createElement(TextInput, {
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("ADDRESS_LINE2")), /*#__PURE__*/React.createElement(TextInput, {
     value: addressLine2,
     onChange: e => setAddressLine2(e.target.value),
     style: {
       width: "100%"
     }
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("BLOCK"), " ", /*#__PURE__*/React.createElement("span", {
-    className: "astericColor"
-  }, "*")), /*#__PURE__*/React.createElement(TextInput, {
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("BLOCK")), /*#__PURE__*/React.createElement(TextInput, {
     value: block,
     onChange: e => setBlock(e.target.value),
     style: {
       width: "100%"
     }
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("ZONE"), " ", /*#__PURE__*/React.createElement("span", {
-    className: "astericColor"
-  }, "*")), /*#__PURE__*/React.createElement(TextInput, {
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("ZONE")), /*#__PURE__*/React.createElement(TextInput, {
     value: zone,
     onChange: e => setZone(e.target.value),
     style: {
       width: "100%"
     }
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("ASSEMBLY_CONSTITUENCY"), " ", /*#__PURE__*/React.createElement("span", {
-    className: "astericColor"
-  }, "*")), /*#__PURE__*/React.createElement(TextInput, {
-    value: assembly,
-    onChange: e => setAssembly(e.target.value),
-    style: {
-      width: "100%"
-    }
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("LATITUDE"), " ", /*#__PURE__*/React.createElement("span", {
-    className: "astericColor"
-  }, "*")), /*#__PURE__*/React.createElement(TextInput, {
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("LATITUDE")), /*#__PURE__*/React.createElement(TextInput, {
     value: latitude,
     onChange: e => setLatitude(e.target.value),
     style: {
       width: "100%"
     }
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("LONGITUDE"), " ", /*#__PURE__*/React.createElement("span", {
-    className: "astericColor"
-  }, "*")), /*#__PURE__*/React.createElement(TextInput, {
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("LONGITUDE")), /*#__PURE__*/React.createElement(TextInput, {
     value: longitude,
     onChange: e => setLongitude(e.target.value),
     style: {
       width: "100%"
     }
-  })), /*#__PURE__*/React.createElement("div", {
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("ASSEMBLY_CONSTITUENCY")), /*#__PURE__*/React.createElement(TextInput, {
+    value: assembly,
+    onChange: e => setAssembly(e.target.value),
     style: {
-      gridColumn: "span 2"
+      width: "100%"
     }
-  }, /*#__PURE__*/React.createElement(CardLabel, null, t("LANDMARK")), /*#__PURE__*/React.createElement(TextInput, {
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("LANDMARK")), /*#__PURE__*/React.createElement(TextInput, {
     value: landmark,
     onChange: e => setLandmark(e.target.value),
     style: {
@@ -6533,7 +6528,7 @@ const AddFixFillAddress = ({
 };
 
 const AddFillingPointAddress = () => {
-  var _formData$owner, _formData$owner2, _formData$owner3, _formData$owner4, _formData$owner5, _formData$owner6, _formData$owner7, _formData$owner8, _formData$owner9, _formData$address, _formData$address2, _formData$address3, _formData$address4, _formData$address5, _formData$address6, _formData$address7, _formData$address8, _formData$address9;
+  var _formData$owner, _formData$owner2, _formData$owner3, _formData$owner4, _formData$owner5, _formData$owner6, _formData$owner7, _formData$owner8, _formData$owner9, _formData$address, _formData$address2, _formData$address3, _formData$address4, _formData$address5, _formData$address6, _formData$address7;
   const {
     t
   } = useTranslation();
@@ -6636,14 +6631,14 @@ const AddFillingPointAddress = () => {
     });
   };
   const isMobile = window.Digit.Utils.browser.isMobile();
-  const isFormDisabled = !(formData !== null && formData !== void 0 && (_formData$owner = formData.owner) !== null && _formData$owner !== void 0 && _formData$owner.aeName) || !(formData !== null && formData !== void 0 && (_formData$owner2 = formData.owner) !== null && _formData$owner2 !== void 0 && _formData$owner2.aeMobile) || !(formData !== null && formData !== void 0 && (_formData$owner3 = formData.owner) !== null && _formData$owner3 !== void 0 && _formData$owner3.aeEmail) || !(formData !== null && formData !== void 0 && (_formData$owner4 = formData.owner) !== null && _formData$owner4 !== void 0 && _formData$owner4.jeName) || !(formData !== null && formData !== void 0 && (_formData$owner5 = formData.owner) !== null && _formData$owner5 !== void 0 && _formData$owner5.jeMobile) || !(formData !== null && formData !== void 0 && (_formData$owner6 = formData.owner) !== null && _formData$owner6 !== void 0 && _formData$owner6.jeEmail) || !(formData !== null && formData !== void 0 && (_formData$owner7 = formData.owner) !== null && _formData$owner7 !== void 0 && _formData$owner7.eeName) || !(formData !== null && formData !== void 0 && (_formData$owner8 = formData.owner) !== null && _formData$owner8 !== void 0 && _formData$owner8.eeMobile) || !(formData !== null && formData !== void 0 && (_formData$owner9 = formData.owner) !== null && _formData$owner9 !== void 0 && _formData$owner9.eeEmail) || !(formData !== null && formData !== void 0 && (_formData$address = formData.address) !== null && _formData$address !== void 0 && _formData$address.houseNo) || !(formData !== null && formData !== void 0 && (_formData$address2 = formData.address) !== null && _formData$address2 !== void 0 && _formData$address2.streetName) || !(formData !== null && formData !== void 0 && (_formData$address3 = formData.address) !== null && _formData$address3 !== void 0 && _formData$address3.addressLine1) || !(formData !== null && formData !== void 0 && (_formData$address4 = formData.address) !== null && _formData$address4 !== void 0 && _formData$address4.addressLine2) || !(formData !== null && formData !== void 0 && (_formData$address5 = formData.address) !== null && _formData$address5 !== void 0 && _formData$address5.city) || !(formData !== null && formData !== void 0 && (_formData$address6 = formData.address) !== null && _formData$address6 !== void 0 && _formData$address6.locality) || !(formData !== null && formData !== void 0 && (_formData$address7 = formData.address) !== null && _formData$address7 !== void 0 && _formData$address7.latitude) || !(formData !== null && formData !== void 0 && (_formData$address8 = formData.address) !== null && _formData$address8 !== void 0 && _formData$address8.longitude) || !(formData !== null && formData !== void 0 && (_formData$address9 = formData.address) !== null && _formData$address9 !== void 0 && _formData$address9.pincode);
+  const isFormDisabled = !(formData !== null && formData !== void 0 && (_formData$owner = formData.owner) !== null && _formData$owner !== void 0 && _formData$owner.aeName) || !(formData !== null && formData !== void 0 && (_formData$owner2 = formData.owner) !== null && _formData$owner2 !== void 0 && _formData$owner2.aeMobile) || !(formData !== null && formData !== void 0 && (_formData$owner3 = formData.owner) !== null && _formData$owner3 !== void 0 && _formData$owner3.aeEmail) || !(formData !== null && formData !== void 0 && (_formData$owner4 = formData.owner) !== null && _formData$owner4 !== void 0 && _formData$owner4.jeName) || !(formData !== null && formData !== void 0 && (_formData$owner5 = formData.owner) !== null && _formData$owner5 !== void 0 && _formData$owner5.jeMobile) || !(formData !== null && formData !== void 0 && (_formData$owner6 = formData.owner) !== null && _formData$owner6 !== void 0 && _formData$owner6.jeEmail) || !(formData !== null && formData !== void 0 && (_formData$owner7 = formData.owner) !== null && _formData$owner7 !== void 0 && _formData$owner7.eeName) || !(formData !== null && formData !== void 0 && (_formData$owner8 = formData.owner) !== null && _formData$owner8 !== void 0 && _formData$owner8.eeMobile) || !(formData !== null && formData !== void 0 && (_formData$owner9 = formData.owner) !== null && _formData$owner9 !== void 0 && _formData$owner9.eeEmail) || !(formData !== null && formData !== void 0 && (_formData$address = formData.address) !== null && _formData$address !== void 0 && _formData$address.addressLine1) || !(formData !== null && formData !== void 0 && (_formData$address2 = formData.address) !== null && _formData$address2 !== void 0 && _formData$address2.addressLine2) || !(formData !== null && formData !== void 0 && (_formData$address3 = formData.address) !== null && _formData$address3 !== void 0 && _formData$address3.city) || !(formData !== null && formData !== void 0 && (_formData$address4 = formData.address) !== null && _formData$address4 !== void 0 && _formData$address4.locality) || !(formData !== null && formData !== void 0 && (_formData$address5 = formData.address) !== null && _formData$address5 !== void 0 && _formData$address5.latitude) || !(formData !== null && formData !== void 0 && (_formData$address6 = formData.address) !== null && _formData$address6 !== void 0 && _formData$address6.longitude) || !(formData !== null && formData !== void 0 && (_formData$address7 = formData.address) !== null && _formData$address7 !== void 0 && _formData$address7.pincode);
   if (isEditLoading) return /*#__PURE__*/React.createElement(Loader, null);
   return /*#__PURE__*/React.createElement("div", {
     className: "employee-form-section-wrapper"
   }, /*#__PURE__*/React.createElement(VerticalTimeline, {
     config: [{
       timeLine: [{
-        actions: "Add Filling Point",
+        actions: editId ? "Update Filling Point" : "Add Filling Point",
         currentStep: 1
       }]
     }],
@@ -6720,7 +6715,7 @@ const AddFixPointAddress = () => {
         return ((_item$applicantDetail = item.applicantDetail) === null || _item$applicantDetail === void 0 ? void 0 : _item$applicantDetail.applicantId) === editId;
       });
       if (data) {
-        var _data$applicantDetail, _data$applicantDetail2, _data$applicantDetail3, _data$applicantDetail4, _data$applicantDetail5, _data$address, _data$address2;
+        var _data$applicantDetail, _data$applicantDetail2, _data$applicantDetail3, _data$applicantDetail4, _data$applicantDetail5, _data$address, _data$address2, _data$address3, _data$address4, _data$address5, _data$address6;
         setFormData({
           owner: {
             name: (_data$applicantDetail = data.applicantDetail) === null || _data$applicantDetail === void 0 ? void 0 : _data$applicantDetail.name,
@@ -6732,7 +6727,9 @@ const AddFixPointAddress = () => {
           address: {
             ...data.address,
             addressId: (_data$address = data.address) === null || _data$address === void 0 ? void 0 : _data$address.addressId,
-            applicantId: (_data$address2 = data.address) === null || _data$address2 === void 0 ? void 0 : _data$address2.applicantId
+            applicantId: (_data$address2 = data.address) === null || _data$address2 === void 0 ? void 0 : _data$address2.applicantId,
+            block: ((_data$address3 = data.address) === null || _data$address3 === void 0 ? void 0 : _data$address3.ward) || ((_data$address4 = data.address) === null || _data$address4 === void 0 ? void 0 : _data$address4.block),
+            assembly: ((_data$address5 = data.address) === null || _data$address5 === void 0 ? void 0 : _data$address5.constituency) || ((_data$address6 = data.address) === null || _data$address6 === void 0 ? void 0 : _data$address6.assembly)
           },
           bookingId: data.bookingId,
           bookingNo: data.bookingNo,
@@ -6795,7 +6792,7 @@ const AddFixPointAddress = () => {
   }, /*#__PURE__*/React.createElement(VerticalTimeline, {
     config: [{
       timeLine: [{
-        actions: "Add Fixed Point",
+        actions: editId ? "Update Fixed Point" : "Add Fixed Point",
         currentStep: 1
       }]
     }],
@@ -7104,6 +7101,7 @@ const SearchFillingPointAddress = () => {
   const [fixedPointStatus, setFixedPointStatus] = useState(null);
   const [appliedFixedPointStatus, setAppliedFixedPointStatus] = useState(null);
   const [searchParams, setSearchParams] = useState({});
+  const [selectedFillingPoint, setSelectedFillingPoint] = useState(null);
   const [toast, setToast] = useState(null);
   const [showLocalityModal, setShowLocalityModal] = useState(false);
   const [selectedLocalityRow, setSelectedLocalityRow] = useState(null);
@@ -7208,6 +7206,7 @@ const SearchFillingPointAddress = () => {
     setStatus(null);
     setFixedPointStatus(null);
     setAppliedFixedPointStatus(null);
+    setSelectedFillingPoint(null);
     setSearchParams({});
   };
   const onTabChange = tab => {
@@ -7235,7 +7234,8 @@ const SearchFillingPointAddress = () => {
         name: searchValue
       }),
       mobileNumber: mobileNumber,
-      status: selectedTab === "FILLING_POINT" ? status === null || status === void 0 ? void 0 : status.code : null
+      status: selectedTab === "FILLING_POINT" ? status === null || status === void 0 ? void 0 : status.code : null,
+      fillingPointId: (selectedFillingPoint === null || selectedFillingPoint === void 0 ? void 0 : selectedFillingPoint.id) || (selectedFillingPoint === null || selectedFillingPoint === void 0 ? void 0 : selectedFillingPoint.bookingId) || (selectedFillingPoint === null || selectedFillingPoint === void 0 ? void 0 : selectedFillingPoint.fillingPointId) || (selectedFillingPoint === null || selectedFillingPoint === void 0 ? void 0 : selectedFillingPoint.uuid)
     };
     setAppliedFixedPointStatus(fixedPointStatus);
     setSearchParams(filters);
@@ -7553,8 +7553,15 @@ const SearchFillingPointAddress = () => {
       }, {
         Header: t("WT_FILLING_POINT"),
         exportAccessor: row => {
-          var _row$fillingpointmeta2, _row$fillingPoint, _row$fillingPointDeta, _row$fillingPointDeta2;
-          return (row === null || row === void 0 ? void 0 : row.fillingPointId) || (row === null || row === void 0 ? void 0 : (_row$fillingpointmeta2 = row.fillingpointmetadata) === null || _row$fillingpointmeta2 === void 0 ? void 0 : _row$fillingpointmeta2.fillingPointId) || (row === null || row === void 0 ? void 0 : row.fillingPtName) || (row === null || row === void 0 ? void 0 : row.filling_pt_name) || (row !== null && row !== void 0 && row.fillingPoint && typeof row.fillingPoint === "object" ? (_row$fillingPoint = row.fillingPoint) === null || _row$fillingPoint === void 0 ? void 0 : _row$fillingPoint.id : row === null || row === void 0 ? void 0 : row.fillingPoint) || (row === null || row === void 0 ? void 0 : (_row$fillingPointDeta = row.fillingPointDetail) === null || _row$fillingPointDeta === void 0 ? void 0 : _row$fillingPointDeta.id) || (row === null || row === void 0 ? void 0 : (_row$fillingPointDeta2 = row.fillingPointDetail) === null || _row$fillingPointDeta2 === void 0 ? void 0 : _row$fillingPointDeta2.bookingId) || "NA";
+          var _row$fillingpointmeta2, _row$fillingPoint, _row$fillingPointDeta, _row$fillingPointDeta2, _row$fillingPoint2, _row$fillingpointmeta3;
+          const rowFpId = String((row === null || row === void 0 ? void 0 : row.fillingPointId) || (row === null || row === void 0 ? void 0 : (_row$fillingpointmeta2 = row.fillingpointmetadata) === null || _row$fillingpointmeta2 === void 0 ? void 0 : _row$fillingpointmeta2.fillingPointId) || (row === null || row === void 0 ? void 0 : row.fillingPtName) || (row === null || row === void 0 ? void 0 : row.filling_pt_name) || (row !== null && row !== void 0 && row.fillingPoint && typeof row.fillingPoint === "object" ? (_row$fillingPoint = row.fillingPoint) === null || _row$fillingPoint === void 0 ? void 0 : _row$fillingPoint.id : row === null || row === void 0 ? void 0 : row.fillingPoint) || (row === null || row === void 0 ? void 0 : (_row$fillingPointDeta = row.fillingPointDetail) === null || _row$fillingPointDeta === void 0 ? void 0 : _row$fillingPointDeta.id) || (row === null || row === void 0 ? void 0 : (_row$fillingPointDeta2 = row.fillingPointDetail) === null || _row$fillingPointDeta2 === void 0 ? void 0 : _row$fillingPointDeta2.bookingId) || "");
+          const found = allFillingPoints === null || allFillingPoints === void 0 ? void 0 : allFillingPoints.find(fp => {
+            var _fp$fillingpointmetad2;
+            const fpId = String(fp.id || fp.bookingId || fp.fillingPointId || fp.uuid || ((_fp$fillingpointmetad2 = fp.fillingpointmetadata) === null || _fp$fillingpointmetad2 === void 0 ? void 0 : _fp$fillingpointmetad2.fillingPointId));
+            return fpId === rowFpId && rowFpId !== "undefined" && rowFpId !== "null" && rowFpId !== "";
+          });
+          const name = (found === null || found === void 0 ? void 0 : found.fillingPointName) || (row === null || row === void 0 ? void 0 : row.fillingPointName) || (row === null || row === void 0 ? void 0 : (_row$fillingPoint2 = row.fillingPoint) === null || _row$fillingPoint2 === void 0 ? void 0 : _row$fillingPoint2.fillingPointName) || (row === null || row === void 0 ? void 0 : (_row$fillingpointmeta3 = row.fillingpointmetadata) === null || _row$fillingpointmeta3 === void 0 ? void 0 : _row$fillingpointmeta3.fillingPointName) || (row === null || row === void 0 ? void 0 : row.fillingPtName) || (row === null || row === void 0 ? void 0 : row.filling_pt_name);
+          return name && name !== "undefined" && name !== "null" ? name : rowFpId && rowFpId !== "undefined" && rowFpId !== "null" ? rowFpId : "NA";
         }
       }];
     }
@@ -7636,6 +7643,15 @@ const SearchFillingPointAddress = () => {
     selected: fixedPointStatus,
     select: setFixedPointStatus,
     t: t
+  })), selectedTab === "FIXED_POINT" && /*#__PURE__*/React.createElement("div", {
+    className: "finance-mainlayout-col1"
+  }, /*#__PURE__*/React.createElement(Label, null, t("WT_FILLING_POINT")), /*#__PURE__*/React.createElement(Dropdown, {
+    option: allFillingPoints,
+    optionKey: "fillingPointName",
+    selected: selectedFillingPoint,
+    select: setSelectedFillingPoint,
+    t: t,
+    placeholder: t("ES_COMMON_STATUS")
   })), selectedTab === "FILLING_POINT" && /*#__PURE__*/React.createElement("div", {
     className: "finance-mainlayout-col1"
   }, /*#__PURE__*/React.createElement(Label, null, t("WT_FILLING_POINT_DESIGNATION")), /*#__PURE__*/React.createElement(Dropdown, {
@@ -7643,7 +7659,8 @@ const SearchFillingPointAddress = () => {
     optionKey: "i18nKey",
     selected: status,
     select: setStatus,
-    t: t
+    t: t,
+    placeholder: t("ES_COMMON_STATUS")
   })), /*#__PURE__*/React.createElement("div", {
     className: "finance-mainlayout-col1"
   }, /*#__PURE__*/React.createElement(Label, null, "\xA0"), /*#__PURE__*/React.createElement("span", {