npm - @djb25/digit-ui-module-wt - Versions diffs - 1.0.50 → 1.0.52 - Mend

@djb25/digit-ui-module-wt 1.0.50 → 1.0.52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.modern.js CHANGED Viewed

@@ -342,6 +342,7 @@ const WTCreate = () => {
         }
       });
     }
+    if (data !== null && data !== void 0 && data.silent) return;
     goNext(skipStep, index, isAddMultiple, key);
   }
   const onSuccess = () => {
@@ -506,8 +507,8 @@ const waterTankerPayload = data => {
       address: {
         addressType: data === null || data === void 0 ? void 0 : (_data$address2 = data.address) === null || _data$address2 === void 0 ? void 0 : (_data$address2$addres = _data$address2.addressType) === null || _data$address2$addres === void 0 ? void 0 : _data$address2$addres.code,
         pincode: data === null || data === void 0 ? void 0 : (_data$address3 = data.address) === null || _data$address3 === void 0 ? void 0 : _data$address3.pincode,
-        city: data === null || data === void 0 ? void 0 : (_data$address4 = data.address) === null || _data$address4 === void 0 ? void 0 : (_data$address4$city = _data$address4.city) === null || _data$address4$city === void 0 ? void 0 : (_data$address4$city$c = _data$address4$city.city) === null || _data$address4$city$c === void 0 ? void 0 : _data$address4$city$c.name,
-        cityCode: data === null || data === void 0 ? void 0 : (_data$address5 = data.address) === null || _data$address5 === void 0 ? void 0 : (_data$address5$city = _data$address5.city) === null || _data$address5$city === void 0 ? void 0 : (_data$address5$city$c = _data$address5$city.city) === null || _data$address5$city$c === void 0 ? void 0 : _data$address5$city$c.code,
+        city: (data === null || data === void 0 ? void 0 : (_data$address4 = data.address) === null || _data$address4 === void 0 ? void 0 : (_data$address4$city = _data$address4.city) === null || _data$address4$city === void 0 ? void 0 : (_data$address4$city$c = _data$address4$city.city) === null || _data$address4$city$c === void 0 ? void 0 : _data$address4$city$c.name) || "DJB",
+        cityCode: (data === null || data === void 0 ? void 0 : (_data$address5 = data.address) === null || _data$address5 === void 0 ? void 0 : (_data$address5$city = _data$address5.city) === null || _data$address5$city === void 0 ? void 0 : (_data$address5$city$c = _data$address5$city.city) === null || _data$address5$city$c === void 0 ? void 0 : _data$address5$city$c.code) || "DJB",
         addressLine1: data === null || data === void 0 ? void 0 : (_data$address6 = data.address) === null || _data$address6 === void 0 ? void 0 : _data$address6.addressLine1,
         addressLine2: data === null || data === void 0 ? void 0 : (_data$address7 = data.address) === null || _data$address7 === void 0 ? void 0 : _data$address7.addressLine2,
         locality: data === null || data === void 0 ? void 0 : (_data$address8 = data.address) === null || _data$address8 === void 0 ? void 0 : (_data$address8$locali = _data$address8.locality) === null || _data$address8$locali === void 0 ? void 0 : _data$address8$locali.i18nKey,
@@ -551,8 +552,8 @@ const mobileToiletPayload = data => {
       address: {
         addressType: data === null || data === void 0 ? void 0 : (_data$address14 = data.address) === null || _data$address14 === void 0 ? void 0 : (_data$address14$addre = _data$address14.addressType) === null || _data$address14$addre === void 0 ? void 0 : _data$address14$addre.code,
         pincode: data === null || data === void 0 ? void 0 : (_data$address15 = data.address) === null || _data$address15 === void 0 ? void 0 : _data$address15.pincode,
-        city: data === null || data === void 0 ? void 0 : (_data$address16 = data.address) === null || _data$address16 === void 0 ? void 0 : (_data$address16$city = _data$address16.city) === null || _data$address16$city === void 0 ? void 0 : (_data$address16$city$ = _data$address16$city.city) === null || _data$address16$city$ === void 0 ? void 0 : _data$address16$city$.name,
-        cityCode: data === null || data === void 0 ? void 0 : (_data$address17 = data.address) === null || _data$address17 === void 0 ? void 0 : (_data$address17$city = _data$address17.city) === null || _data$address17$city === void 0 ? void 0 : (_data$address17$city$ = _data$address17$city.city) === null || _data$address17$city$ === void 0 ? void 0 : _data$address17$city$.code,
+        city: (data === null || data === void 0 ? void 0 : (_data$address16 = data.address) === null || _data$address16 === void 0 ? void 0 : (_data$address16$city = _data$address16.city) === null || _data$address16$city === void 0 ? void 0 : (_data$address16$city$ = _data$address16$city.city) === null || _data$address16$city$ === void 0 ? void 0 : _data$address16$city$.name) || "DJB",
+        cityCode: (data === null || data === void 0 ? void 0 : (_data$address17 = data.address) === null || _data$address17 === void 0 ? void 0 : (_data$address17$city = _data$address17.city) === null || _data$address17$city === void 0 ? void 0 : (_data$address17$city$ = _data$address17$city.city) === null || _data$address17$city$ === void 0 ? void 0 : _data$address17$city$.code) || "DJB",
         addressLine1: data === null || data === void 0 ? void 0 : (_data$address18 = data.address) === null || _data$address18 === void 0 ? void 0 : _data$address18.addressLine1,
         addressLine2: data === null || data === void 0 ? void 0 : (_data$address19 = data.address) === null || _data$address19 === void 0 ? void 0 : _data$address19.addressLine2,
         locality: data === null || data === void 0 ? void 0 : (_data$address20 = data.address) === null || _data$address20 === void 0 ? void 0 : (_data$address20$local = _data$address20.locality) === null || _data$address20$local === void 0 ? void 0 : _data$address20$local.i18nKey,
@@ -593,8 +594,8 @@ const treePruningPayload = data => {
       address: {
         addressType: data === null || data === void 0 ? void 0 : (_data$address25 = data.address) === null || _data$address25 === void 0 ? void 0 : (_data$address25$addre = _data$address25.addressType) === null || _data$address25$addre === void 0 ? void 0 : _data$address25$addre.code,
         pincode: data === null || data === void 0 ? void 0 : (_data$address26 = data.address) === null || _data$address26 === void 0 ? void 0 : _data$address26.pincode,
-        city: data === null || data === void 0 ? void 0 : (_data$address27 = data.address) === null || _data$address27 === void 0 ? void 0 : (_data$address27$city = _data$address27.city) === null || _data$address27$city === void 0 ? void 0 : (_data$address27$city$ = _data$address27$city.city) === null || _data$address27$city$ === void 0 ? void 0 : _data$address27$city$.name,
-        cityCode: data === null || data === void 0 ? void 0 : (_data$address28 = data.address) === null || _data$address28 === void 0 ? void 0 : (_data$address28$city = _data$address28.city) === null || _data$address28$city === void 0 ? void 0 : (_data$address28$city$ = _data$address28$city.city) === null || _data$address28$city$ === void 0 ? void 0 : _data$address28$city$.code,
+        city: (data === null || data === void 0 ? void 0 : (_data$address27 = data.address) === null || _data$address27 === void 0 ? void 0 : (_data$address27$city = _data$address27.city) === null || _data$address27$city === void 0 ? void 0 : (_data$address27$city$ = _data$address27$city.city) === null || _data$address27$city$ === void 0 ? void 0 : _data$address27$city$.name) || "DJB",
+        cityCode: (data === null || data === void 0 ? void 0 : (_data$address28 = data.address) === null || _data$address28 === void 0 ? void 0 : (_data$address28$city = _data$address28.city) === null || _data$address28$city === void 0 ? void 0 : (_data$address28$city$ = _data$address28$city.city) === null || _data$address28$city$ === void 0 ? void 0 : _data$address28$city$.code) || "DJB",
         addressLine1: data === null || data === void 0 ? void 0 : (_data$address29 = data.address) === null || _data$address29 === void 0 ? void 0 : _data$address29.addressLine1,
         addressLine2: data === null || data === void 0 ? void 0 : (_data$address30 = data.address) === null || _data$address30 === void 0 ? void 0 : _data$address30.addressLine2,
         locality: data === null || data === void 0 ? void 0 : (_data$address31 = data.address) === null || _data$address31 === void 0 ? void 0 : (_data$address31$local = _data$address31.locality) === null || _data$address31$local === void 0 ? void 0 : _data$address31$local.i18nKey,
@@ -643,7 +644,7 @@ const fillingPointPayload = data => {
         addressLine1: data === null || data === void 0 ? void 0 : (_data$address38 = data.address) === null || _data$address38 === void 0 ? void 0 : _data$address38.addressLine1,
         addressLine2: data === null || data === void 0 ? void 0 : (_data$address39 = data.address) === null || _data$address39 === void 0 ? void 0 : _data$address39.addressLine2,
         landmark: data === null || data === void 0 ? void 0 : (_data$address40 = data.address) === null || _data$address40 === void 0 ? void 0 : _data$address40.landmark,
-        city: (data === null || data === void 0 ? void 0 : (_data$address41 = data.address) === null || _data$address41 === void 0 ? void 0 : (_data$address41$city = _data$address41.city) === null || _data$address41$city === void 0 ? void 0 : _data$address41$city.name) || (data === null || data === void 0 ? void 0 : (_data$address42 = data.address) === null || _data$address42 === void 0 ? void 0 : _data$address42.city) || "",
+        city: (data === null || data === void 0 ? void 0 : (_data$address41 = data.address) === null || _data$address41 === void 0 ? void 0 : (_data$address41$city = _data$address41.city) === null || _data$address41$city === void 0 ? void 0 : _data$address41$city.name) || (data === null || data === void 0 ? void 0 : (_data$address42 = data.address) === null || _data$address42 === void 0 ? void 0 : _data$address42.city) || "DJB",
         cityCode: (data === null || data === void 0 ? void 0 : (_data$address43 = data.address) === null || _data$address43 === void 0 ? void 0 : _data$address43.cityCode) || (data === null || data === void 0 ? void 0 : (_data$address44 = data.address) === null || _data$address44 === void 0 ? void 0 : (_data$address44$city = _data$address44.city) === null || _data$address44$city === void 0 ? void 0 : _data$address44$city.code) || "DJB",
         locality: (data === null || data === void 0 ? void 0 : (_data$address45 = data.address) === null || _data$address45 === void 0 ? void 0 : (_data$address45$local = _data$address45.locality) === null || _data$address45$local === void 0 ? void 0 : _data$address45$local.label) || (data === null || data === void 0 ? void 0 : (_data$address46 = data.address) === null || _data$address46 === void 0 ? void 0 : (_data$address46$local = _data$address46.locality) === null || _data$address46$local === void 0 ? void 0 : _data$address46$local.name) || (data === null || data === void 0 ? void 0 : (_data$address47 = data.address) === null || _data$address47 === void 0 ? void 0 : _data$address47.locality) || "",
         localityCode: (data === null || data === void 0 ? void 0 : (_data$address48 = data.address) === null || _data$address48 === void 0 ? void 0 : (_data$address48$local = _data$address48.locality) === null || _data$address48$local === void 0 ? void 0 : _data$address48$local.code) || (data === null || data === void 0 ? void 0 : (_data$address49 = data.address) === null || _data$address49 === void 0 ? void 0 : _data$address49.localityCode) || "",
@@ -683,7 +684,7 @@ const fixedPointPayload = data => {
         addressLine1: (data === null || data === void 0 ? void 0 : (_data$address62 = data.address) === null || _data$address62 === void 0 ? void 0 : _data$address62.addressLine1) || "",
         addressLine2: (data === null || data === void 0 ? void 0 : (_data$address63 = data.address) === null || _data$address63 === void 0 ? void 0 : _data$address63.addressLine2) || "",
         landmark: (data === null || data === void 0 ? void 0 : (_data$address64 = data.address) === null || _data$address64 === void 0 ? void 0 : _data$address64.landmark) || "",
-        city: (data === null || data === void 0 ? void 0 : (_data$address65 = data.address) === null || _data$address65 === void 0 ? void 0 : (_data$address65$city = _data$address65.city) === null || _data$address65$city === void 0 ? void 0 : _data$address65$city.name) || (data === null || data === void 0 ? void 0 : (_data$address66 = data.address) === null || _data$address66 === void 0 ? void 0 : _data$address66.city) || "",
+        city: (data === null || data === void 0 ? void 0 : (_data$address65 = data.address) === null || _data$address65 === void 0 ? void 0 : (_data$address65$city = _data$address65.city) === null || _data$address65$city === void 0 ? void 0 : _data$address65$city.name) || (data === null || data === void 0 ? void 0 : (_data$address66 = data.address) === null || _data$address66 === void 0 ? void 0 : _data$address66.city) || "DJB",
         cityCode: (data === null || data === void 0 ? void 0 : (_data$address67 = data.address) === null || _data$address67 === void 0 ? void 0 : _data$address67.cityCode) || (data === null || data === void 0 ? void 0 : (_data$address68 = data.address) === null || _data$address68 === void 0 ? void 0 : (_data$address68$city = _data$address68.city) === null || _data$address68$city === void 0 ? void 0 : _data$address68$city.code) || "DJB",
         locality: (data === null || data === void 0 ? void 0 : (_data$address69 = data.address) === null || _data$address69 === void 0 ? void 0 : (_data$address69$local = _data$address69.locality) === null || _data$address69$local === void 0 ? void 0 : _data$address69$local.label) || (data === null || data === void 0 ? void 0 : (_data$address70 = data.address) === null || _data$address70 === void 0 ? void 0 : (_data$address70$local = _data$address70.locality) === null || _data$address70$local === void 0 ? void 0 : _data$address70$local.name) || (data === null || data === void 0 ? void 0 : (_data$address71 = data.address) === null || _data$address71 === void 0 ? void 0 : _data$address71.locality) || "",
         localityCode: (data === null || data === void 0 ? void 0 : (_data$address72 = data.address) === null || _data$address72 === void 0 ? void 0 : (_data$address72$local = _data$address72.locality) === null || _data$address72$local === void 0 ? void 0 : _data$address72$local.code) || (data === null || data === void 0 ? void 0 : (_data$address73 = data.address) === null || _data$address73 === void 0 ? void 0 : _data$address73.localityCode) || "",
@@ -741,7 +742,7 @@ const emergencyWaterTankerPayload = data => {
         addressType: (data === null || data === void 0 ? void 0 : (_data$address84 = data.address) === null || _data$address84 === void 0 ? void 0 : (_data$address84$addre = _data$address84.addressType) === null || _data$address84$addre === void 0 ? void 0 : _data$address84$addre.code) || (data === null || data === void 0 ? void 0 : (_data$address85 = data.address) === null || _data$address85 === void 0 ? void 0 : _data$address85.addressType) || "CORRESPONDENCE",
         pincode: (data === null || data === void 0 ? void 0 : (_data$address86 = data.address) === null || _data$address86 === void 0 ? void 0 : _data$address86.pincode) || (addressFromFP === null || addressFromFP === void 0 ? void 0 : addressFromFP.pincode) || "",
         city: (data === null || data === void 0 ? void 0 : (_data$address87 = data.address) === null || _data$address87 === void 0 ? void 0 : (_data$address87$city = _data$address87.city) === null || _data$address87$city === void 0 ? void 0 : (_data$address87$city$ = _data$address87$city.city) === null || _data$address87$city$ === void 0 ? void 0 : _data$address87$city$.name) || (data === null || data === void 0 ? void 0 : (_data$address88 = data.address) === null || _data$address88 === void 0 ? void 0 : (_data$address88$city = _data$address88.city) === null || _data$address88$city === void 0 ? void 0 : _data$address88$city.name) || (data === null || data === void 0 ? void 0 : (_data$address89 = data.address) === null || _data$address89 === void 0 ? void 0 : _data$address89.city) || (addressFromFP === null || addressFromFP === void 0 ? void 0 : addressFromFP.city) || "",
-        cityCode: (data === null || data === void 0 ? void 0 : (_data$address90 = data.address) === null || _data$address90 === void 0 ? void 0 : (_data$address90$city = _data$address90.city) === null || _data$address90$city === void 0 ? void 0 : (_data$address90$city$ = _data$address90$city.city) === null || _data$address90$city$ === void 0 ? void 0 : _data$address90$city$.code) || (data === null || data === void 0 ? void 0 : (_data$address91 = data.address) === null || _data$address91 === void 0 ? void 0 : _data$address91.cityCode) || (addressFromFP === null || addressFromFP === void 0 ? void 0 : addressFromFP.cityCode) || "DL",
+        cityCode: (data === null || data === void 0 ? void 0 : (_data$address90 = data.address) === null || _data$address90 === void 0 ? void 0 : (_data$address90$city = _data$address90.city) === null || _data$address90$city === void 0 ? void 0 : (_data$address90$city$ = _data$address90$city.city) === null || _data$address90$city$ === void 0 ? void 0 : _data$address90$city$.code) || (data === null || data === void 0 ? void 0 : (_data$address91 = data.address) === null || _data$address91 === void 0 ? void 0 : _data$address91.cityCode) || (addressFromFP === null || addressFromFP === void 0 ? void 0 : addressFromFP.cityCode) || "DJB",
         addressLine1: (data === null || data === void 0 ? void 0 : (_data$address92 = data.address) === null || _data$address92 === void 0 ? void 0 : _data$address92.addressLine1) || (addressFromFP === null || addressFromFP === void 0 ? void 0 : addressFromFP.addressLine1) || "",
         addressLine2: (data === null || data === void 0 ? void 0 : (_data$address93 = data.address) === null || _data$address93 === void 0 ? void 0 : _data$address93.addressLine2) || (addressFromFP === null || addressFromFP === void 0 ? void 0 : addressFromFP.addressLine2) || "",
         locality: (data === null || data === void 0 ? void 0 : (_data$address94 = data.address) === null || _data$address94 === void 0 ? void 0 : (_data$address94$local = _data$address94.locality) === null || _data$address94$local === void 0 ? void 0 : _data$address94$local.i18nKey) || (data === null || data === void 0 ? void 0 : (_data$address95 = data.address) === null || _data$address95 === void 0 ? void 0 : (_data$address95$local = _data$address95.locality) === null || _data$address95$local === void 0 ? void 0 : _data$address95$local.name) || (data === null || data === void 0 ? void 0 : (_data$address96 = data.address) === null || _data$address96 === void 0 ? void 0 : _data$address96.locality) || (addressFromFP === null || addressFromFP === void 0 ? void 0 : addressFromFP.locality) || "",
@@ -3805,7 +3806,7 @@ const AddTripModal = ({
   });
   const fillingPointOptions = fillingPoints.map(fp => ({
     displayLabel: (fp === null || fp === void 0 ? void 0 : fp.fillingPointName) || "NA",
-    value: fp === null || fp === void 0 ? void 0 : fp.id,
+    value: (fp === null || fp === void 0 ? void 0 : fp.fillingPointId) || (fp === null || fp === void 0 ? void 0 : fp.id),
     eeName: (fp === null || fp === void 0 ? void 0 : fp.eeName) || "NA",
     aeName: (fp === null || fp === void 0 ? void 0 : fp.aeName) || "NA"
   }));
@@ -3847,7 +3848,7 @@ const AddTripModal = ({
     className: "custom-modal-overlay",
     style: {
       position: "fixed",
-      top: 0,
+      top: 30,
       left: 0,
       width: "100%",
       height: "100%",
@@ -4238,6 +4239,29 @@ const AddTripModal = ({
   }, initialValues ? t("WT_UPDATE") : t("CS_COMMON_SAVE")))));
 };
+const convertTo12Hour = time24 => {
+  if (!time24) return time24;
+  if (time24.includes("AM") || time24.includes("PM")) return time24;
+  const parts = time24.split(":");
+  if (parts.length < 2) return time24;
+  let h = parseInt(parts[0], 10);
+  const m = parts[1];
+  const ampm = h >= 12 ? "PM" : "AM";
+  h = h % 12 || 12;
+  const strHours = h < 10 ? `0${h}` : h;
+  return `${strHours}:${m} ${ampm}`;
+};
+const convertTo24Hour = time12 => {
+  if (!time12) return time12;
+  const match = time12.match(/^(\d{2}):(\d{2})\s?(AM|PM)$/i);
+  if (!match) return time12;
+  let [_, hours, minutes, ampm] = match;
+  hours = parseInt(hours, 10);
+  if (ampm.toUpperCase() === "PM" && hours < 12) hours += 12;
+  if (ampm.toUpperCase() === "AM" && hours === 12) hours = 0;
+  const strHours = hours < 10 ? `0${hours}` : hours;
+  return `${strHours}:${minutes}`;
+};
 const FixedPointScheduleManagement = ({
   ...props
 }) => {
@@ -4360,19 +4384,54 @@ const FixedPointScheduleManagement = ({
     volume: item.volumeWaterTobeDelivery,
     vehicle: item.vehicleId,
     active: item.isEnable ? "Y" : "N",
-    totalCount: item.totalCount
+    totalCount: item.totalCount,
+    fillingPointId: item.fillingPointId
   })), []);
+  const dayOrder = React.useMemo(() => ({
+    MONDAY: 1,
+    TUESDAY: 2,
+    WEDNESDAY: 3,
+    THURSDAY: 4,
+    FRIDAY: 5,
+    SATURDAY: 6,
+    SUNDAY: 7
+  }), []);
   const data = React.useMemo(() => {
-    return mapScheduleRows((scheduleData === null || scheduleData === void 0 ? void 0 : scheduleData.fixedPointTimeTableDetails) || []);
-  }, [scheduleData, mapScheduleRows]);
+    const rows = mapScheduleRows((scheduleData === null || scheduleData === void 0 ? void 0 : scheduleData.fixedPointTimeTableDetails) || []);
+    return rows.sort((a, b) => {
+      var _a$day, _b$day;
+      const fixedPointCompare = (a.fixedPoint || "").localeCompare(b.fixedPoint || "");
+      if (fixedPointCompare !== 0) return fixedPointCompare;
+      const dayA = dayOrder[(_a$day = a.day) === null || _a$day === void 0 ? void 0 : _a$day.toUpperCase()] || 8;
+      const dayB = dayOrder[(_b$day = b.day) === null || _b$day === void 0 ? void 0 : _b$day.toUpperCase()] || 8;
+      return dayA - dayB;
+    });
+  }, [scheduleData, mapScheduleRows, dayOrder]);
   const fetchNextPage = () => {
-    setPageOffset(prevState => prevState + pageSize);
+    const newOffset = pageOffset + pageSize;
+    setPageOffset(newOffset);
+    setFilters(prev => ({
+      ...prev,
+      offset: newOffset
+    }));
   };
   const fetchPrevPage = () => {
-    setPageOffset(prevState => prevState - pageSize);
+    const newOffset = Math.max(0, pageOffset - pageSize);
+    setPageOffset(newOffset);
+    setFilters(prev => ({
+      ...prev,
+      offset: newOffset
+    }));
   };
   const handlePageSizeChange = e => {
-    setPageSize(Number(e.target.value));
+    const newPageSize = Number(e.target.value);
+    setPageSize(newPageSize);
+    setPageOffset(0);
+    setFilters(prev => ({
+      ...prev,
+      limit: newPageSize,
+      offset: 0
+    }));
   };
   const handleSearch = (customFilters = null, offset = null) => {
     var _day$value;
@@ -4383,17 +4442,12 @@ const FixedPointScheduleManagement = ({
     };
     const newOffset = offset !== null ? offset : 0;
     if (offset === null) setPageOffset(0);
-    setFilters({
+    setFilters(prev => ({
       ...searchFilters,
-      limit: pageSize,
+      limit: prev.limit,
       offset: newOffset
-    });
+    }));
   };
-  React.useEffect(() => {
-    if (pageOffset !== 0) {
-      handleSearch(null, pageOffset);
-    }
-  }, [pageOffset, pageSize]);
   const columns = React.useMemo(() => [{
     Header: t("WT_FIXED_POINT_CODE"),
     accessor: "fixedPoint"
@@ -4732,7 +4786,7 @@ const FixedPointScheduleManagement = ({
     onPrevPage: fetchPrevPage,
     pageSizeLimit: pageSize,
     onSort: props.onSort,
-    disableSort: props.disableSort,
+    disableSort: true,
     sortParams: props.sortParams,
     totalRecords: (scheduleData === null || scheduleData === void 0 ? void 0 : scheduleData.count) || (scheduleData === null || scheduleData === void 0 ? void 0 : scheduleData.totalCount) || (data === null || data === void 0 ? void 0 : (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : _data$.totalCount),
     showCSVExport: true,
@@ -4749,16 +4803,17 @@ const FixedPointScheduleManagement = ({
       scheduleId: data[editingRowIndex].scheduleId,
       fixedPointCode: data[editingRowIndex].fixedPoint,
       fixedPointId: data[editingRowIndex].fixedPointId,
+      fillingPointCode: data[editingRowIndex].fillingPointId,
       day: [{
         label: t(data[editingRowIndex].day),
         value: data[editingRowIndex].day
       }],
       frequencyNo: data[editingRowIndex].freq,
-      arrivalTimeFpl: data[editingRowIndex].arrToFpl,
-      departureTimeFpl: data[editingRowIndex].depFromFpl,
-      arrivalFixedPoint: data[editingRowIndex].arrAtFixedPoint,
-      departureFixedPoint: data[editingRowIndex].depAtFixedPoint,
-      returnFpl: data[editingRowIndex].returnToFpl,
+      arrivalTimeFpl: convertTo24Hour(data[editingRowIndex].arrToFpl),
+      departureTimeFpl: convertTo24Hour(data[editingRowIndex].depFromFpl),
+      arrivalFixedPoint: convertTo24Hour(data[editingRowIndex].arrAtFixedPoint),
+      departureFixedPoint: convertTo24Hour(data[editingRowIndex].depAtFixedPoint),
+      returnFpl: convertTo24Hour(data[editingRowIndex].returnToFpl),
       volume: data[editingRowIndex].volume,
       vehicleId: data[editingRowIndex].vehicle,
       active: {
@@ -4784,14 +4839,14 @@ const FixedPointScheduleManagement = ({
       const fixedPointDetails = {
         system_assigned_schedule_id: formData.scheduleId || existingData.scheduleId || null,
         fixed_point_code: formData.fixedPointId || formData.fixedPointCode || "",
-        fillingPointId: formData.fillingPointCode || null,
+        fillingPointId: formData.fillingPointCode || formData.fillingPointId || null,
         day: daysArr.map(d => d.toUpperCase()),
         trip_no: Number(formData.frequencyNo) || 1,
-        arrival_time_to_fpl: formData.arrivalTimeFpl,
-        departure_time_from_fpl: formData.departureTimeFpl,
-        arrival_time_delivery_point: formData.arrivalFixedPoint,
-        departure_time_delivery_point: formData.departureFixedPoint,
-        time_of_arriving_back_fpl_after_delivery: formData.returnFpl,
+        arrival_time_to_fpl: convertTo12Hour(formData.arrivalTimeFpl),
+        departure_time_from_fpl: convertTo12Hour(formData.departureTimeFpl),
+        arrival_time_delivery_point: convertTo12Hour(formData.arrivalFixedPoint),
+        departure_time_delivery_point: convertTo12Hour(formData.departureFixedPoint),
+        time_of_arriving_back_fpl_after_delivery: convertTo12Hour(formData.returnFpl),
         volume_water_tobe_delivery: formData.volume,
         active: finalActiveStatus,
         is_enable: finalActiveStatus,
@@ -4809,20 +4864,32 @@ const FixedPointScheduleManagement = ({
       };
       const mutationOptions = {
         onError: error => {
-          var _error$response, _error$response$data, _error$response$data$, _error$response$data$2;
+          var _error$response, _error$response$data, _error$response$data$, _error$response2, _error$response2$data, _error$response2$data2, _error$response2$data3;
+          const errMsg = (error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : (_error$response$data$ = _error$response$data.error) === null || _error$response$data$ === void 0 ? void 0 : _error$response$data$.message) || (error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : (_error$response2$data2 = _error$response2$data.Errors) === null || _error$response2$data2 === void 0 ? void 0 : (_error$response2$data3 = _error$response2$data2[0]) === null || _error$response2$data3 === void 0 ? void 0 : _error$response2$data3.message) || (error === null || error === void 0 ? void 0 : error.message) || "Operation Failed";
           setToast({
             key: "error",
-            label: (error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : (_error$response$data$ = _error$response$data.Errors) === null || _error$response$data$ === void 0 ? void 0 : (_error$response$data$2 = _error$response$data$[0]) === null || _error$response$data$2 === void 0 ? void 0 : _error$response$data$2.message) || "Operation Failed"
+            label: errMsg
           });
           setTimeout(closeToast, 5000);
         },
-        onSuccess: () => {
-          setToast({
-            label: editingRowIndex !== null ? t("WT_SCHEDULE_UPDATE_SUCCESS") : t("WT_SCHEDULE_CREATE_SUCCESS")
-          });
-          setShowModal(false);
-          setEditingRowIndex(null);
-          queryClient.invalidateQueries(["FIXED_POINT_SCHEDULE_SEARCH", tenantId]);
+        onSuccess: response => {
+          var _response$data;
+          if (response !== null && response !== void 0 && response.error || response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && _response$data.error) {
+            var _response$error, _response$data2, _response$data2$error;
+            const errMsg = (response === null || response === void 0 ? void 0 : (_response$error = response.error) === null || _response$error === void 0 ? void 0 : _response$error.message) || (response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$error = _response$data2.error) === null || _response$data2$error === void 0 ? void 0 : _response$data2$error.message) || "Operation Failed";
+            setToast({
+              key: "error",
+              label: errMsg
+            });
+            setTimeout(closeToast, 5000);
+          } else {
+            setToast({
+              label: editingRowIndex !== null ? t("WT_SCHEDULE_UPDATE_SUCCESS") : t("WT_SCHEDULE_CREATE_SUCCESS")
+            });
+            setShowModal(false);
+            setEditingRowIndex(null);
+            queryClient.invalidateQueries(["FIXED_POINT_SCHEDULE_SEARCH", tenantId]);
+          }
         }
       };
       if (editingRowIndex !== null) {
@@ -4831,11 +4898,16 @@ const FixedPointScheduleManagement = ({
         createSchedule(payload, mutationOptions);
       }
     }
-  }), toast && /*#__PURE__*/React.createElement(Toast, {
+  }), toast && /*#__PURE__*/React.createElement("div", {
+    style: {
+      position: "fixed",
+      zIndex: 300000
+    }
+  }, /*#__PURE__*/React.createElement(Toast, {
     error: toast.key === "error",
     label: toast.label,
     onClose: closeToast
-  }));
+  })));
 };
 const locationCache = new Map();
@@ -4914,13 +4986,46 @@ L.Icon.Default.mergeOptions({
   iconUrl: "https://unpkg.com/leaflet@1.9.4/dist/images/marker-icon.png",
   shadowUrl: "https://unpkg.com/leaflet@1.9.4/dist/images/marker-shadow.png"
 });
-const onlineIcon = new L.Icon({
-  iconUrl: "https://raw.githubusercontent.com/pointhi/leaflet-color-markers/master/img/marker-icon-2x-green.png",
-  shadowUrl: "https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/images/marker-shadow.png",
-  iconSize: [25, 41],
-  iconAnchor: [12, 41],
-  popupAnchor: [1, -34],
-  shadowSize: [41, 41]
+const onlineIcon = L.divIcon({
+  className: "blinking-green-dot",
+  html: `
+    <div style="position: relative;">
+      <div style="
+        width: 14px;
+        height: 14px;
+        background: #4caf50;
+        border: 2px solid white;
+        border-radius: 50%;
+        box-shadow: 0 0 10px rgba(76, 175, 80, 0.8);
+        z-index: 2;
+        position: relative;
+        animation: blink 1s infinite ease-in-out;
+      "></div>
+      <div style="
+        position: absolute;
+        top: -6px;
+        left: -6px;
+        width: 26px;
+        height: 26px;
+        background: rgba(76, 175, 80, 0.3);
+        border-radius: 50%;
+        animation: pulse 2s infinite;
+        z-index: 1;
+      "></div>
+      <style>
+        @keyframes blink {
+          0%, 100% { opacity: 1; }
+          50% { opacity: 0.6; }
+        }
+        @keyframes pulse {
+          0% { transform: scale(0.6); opacity: 1; }
+          100% { transform: scale(2); opacity: 0; }
+        }
+      </style>
+    </div>
+  `,
+  iconSize: [14, 14],
+  iconAnchor: [7, 7]
 });
 const offlineIcon = new L.Icon({
   iconUrl: "https://raw.githubusercontent.com/pointhi/leaflet-color-markers/master/img/marker-icon-2x-red.png",
@@ -5073,68 +5178,13 @@ const RouteLayer = ({
     }, t("ERROR_LOADING_ROUTE"), error);
   }
   if (!routeData) return null;
-  const renderRouteSegments = () => {
-    if (!routeData.legs) return null;
-    const segments = [];
-    routeData.legs.forEach((leg, legIndex) => {
-      leg.steps.forEach((step, stepIndex) => {
-        const stepCoordinates = step.geometry.coordinates.map(coord => [coord[1], coord[0]]);
-        let segmentColor = _color;
-        if (step.maneuver.type === "turn") {
-          segmentColor = "#ff9800";
-        } else if (step.maneuver.type === "straight") {
-          segmentColor = "#4caf50";
-        } else if (step.maneuver.type === "arrive") {
-          segmentColor = "#f44336";
-        }
-        segments.push(/*#__PURE__*/React.createElement(React.Fragment, {
-          key: `${legIndex}-${stepIndex}`
-        }, /*#__PURE__*/React.createElement(Polyline, {
-          positions: stepCoordinates,
-          color: segmentColor,
-          weight: _weight + 2,
-          opacity: 0.3,
-          lineCap: "round"
-        }), /*#__PURE__*/React.createElement(Polyline, {
-          positions: stepCoordinates,
-          color: segmentColor,
-          weight: _weight,
-          opacity: 0.9,
-          lineCap: "round",
-          eventHandlers: {
-            mouseover: () => setSelectedStep(step),
-            mouseout: () => setSelectedStep(null),
-            click: () => setShowSteps(!showSteps)
-          }
-        }), stepCoordinates.map((coord, idx) => {
-          if (idx % 5 === 0 && idx < stepCoordinates.length - 1) {
-            const nextCoord = stepCoordinates[idx + 1];
-            const angle = Math.atan2(nextCoord[0] - coord[0], nextCoord[1] - coord[1]) * 180 / Math.PI;
-            return /*#__PURE__*/React.createElement(Marker, {
-              key: `dot-${legIndex}-${stepIndex}-${idx}`,
-              position: coord,
-              icon: L.divIcon({
-                className: "direction-dot",
-                html: `<div style="
-                        width: 6px;
-                        height: 6px;
-                        background: white;
-                        border: 2px solid ${segmentColor};
-                        border-radius: 50%;
-                        transform: rotate(${angle}deg);
-                      "></div>`,
-                iconSize: [10, 10],
-                iconAnchor: [5, 5]
-              })
-            });
-          }
-          return null;
-        })));
-      });
-    });
-    return segments;
-  };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, renderRouteSegments(), (selectedStep || showSteps) && /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Polyline, {
+    positions: routeData.coordinates,
+    color: "#1F5FA8",
+    weight: 5,
+    opacity: 0.8,
+    lineJoin: "round"
+  }), (selectedStep || showSteps) && /*#__PURE__*/React.createElement("div", {
     style: {
       position: "absolute",
       bottom: "80px",
@@ -5231,43 +5281,7 @@ const RouteLayer = ({
     style: {
       color: "#666"
     }
-  }, (step.distance / 1000).toFixed(2), " km \xB7 ", Math.round(step.duration / 60), " min"))))))), routeData.distance > 1000 && routeData.coordinates && /*#__PURE__*/React.createElement(RouteMarkers, {
-    coordinates: routeData.coordinates,
-    totalDistance: routeData.distance
-  }));
-};
-const RouteMarkers = ({
-  coordinates,
-  totalDistance
-}) => {
-  const markers = [];
-  const interval = 1000;
-  for (let i = interval; i < totalDistance; i += interval) {
-    const fraction = i / totalDistance;
-    const index = Math.floor(coordinates.length * fraction);
-    if (index < coordinates.length) {
-      markers.push(/*#__PURE__*/React.createElement(Marker, {
-        key: `dist-${i}`,
-        position: coordinates[index],
-        icon: L.divIcon({
-          className: "distance-marker",
-          html: `<div style="
-              background: white;
-              border: 2px solid #1F5FA8;
-              border-radius: 12px;
-              padding: 2px 6px;
-              font-size: 10px;
-              font-weight: bold;
-              color: #1F5FA8;
-              white-space: nowrap;
-            ">${(i / 1000).toFixed(0)} km</div>`,
-          iconSize: [40, 20],
-          iconAnchor: [20, 10]
-        })
-      }));
-    }
-  }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, markers);
+  }, (step.distance / 1000).toFixed(2), " km \xB7 ", Math.round(step.duration / 60), " min"))))))));
 };
 const StatusBadge = ({
   isOnline
@@ -5370,8 +5384,8 @@ const DriverCard = ({
   return /*#__PURE__*/React.createElement("div", {
     onClick: onClick,
     style: {
-      padding: "16px",
-      borderRadius: "12px",
+      padding: "10px",
+      borderRadius: "8px",
       background: isSelected ? "#f0f4ff" : "white",
       border: `2px solid ${isSelected ? "#1F5FA8" : "#f0f0f0"}`,
       cursor: "pointer",
@@ -5382,7 +5396,7 @@ const DriverCard = ({
     style: {
       display: "flex",
       gap: "12px",
-      marginBottom: "12px"
+      marginBottom: "8px"
     }
   }, /*#__PURE__*/React.createElement("div", {
     style: {
@@ -5429,7 +5443,7 @@ const DriverCard = ({
     style: {
       display: "grid",
       gridTemplateColumns: "1fr 1fr",
-      gap: "12px"
+      gap: "8px"
     }
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     style: {
@@ -5657,9 +5671,9 @@ function LiveTrackingSystem() {
       display: "flex",
       justifyContent: "space-between",
       alignItems: "center",
-      marginBottom: "16px",
+      marginBottom: "12px",
       background: "white",
-      padding: "16px 24px",
+      padding: "12px 24px",
       borderRadius: "12px",
       boxShadow: "0 2px 8px rgba(0,0,0,0.05)",
       border: "2px solid #1F5FA844"
@@ -5689,7 +5703,6 @@ function LiveTrackingSystem() {
       gap: "6px",
       background: "#e8f5e9",
       color: "#2e7d32",
-      padding: "4px 12px",
       borderRadius: "20px",
       fontSize: "12px",
       fontWeight: "700",
@@ -5797,7 +5810,7 @@ function LiveTrackingSystem() {
     }
   }, showSidebar && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     style: {
-      padding: "20px",
+      padding: "12px",
       background: "white",
       borderRadius: "12px",
       display: "flex",
@@ -5811,7 +5824,7 @@ function LiveTrackingSystem() {
       display: "flex",
       justifyContent: "space-between",
       alignItems: "center",
-      marginBottom: "16px"
+      marginBottom: "8px"
     }
   }, /*#__PURE__*/React.createElement("h3", {
     style: {
@@ -5840,8 +5853,8 @@ function LiveTrackingSystem() {
     style: {
       display: "flex",
       flexDirection: "column",
-      gap: "16px",
-      marginBottom: "20px"
+      gap: "8px",
+      marginBottom: "12px"
     }
   }, /*#__PURE__*/React.createElement("div", {
     style: {
@@ -5933,7 +5946,7 @@ function LiveTrackingSystem() {
       display: "flex",
       justifyContent: "space-between",
       alignItems: "center",
-      marginBottom: "12px"
+      marginBottom: "8px"
     }
   }, /*#__PURE__*/React.createElement("div", {
     style: {
@@ -6021,7 +6034,7 @@ function LiveTrackingSystem() {
     },
     zoomControl: false
   }, /*#__PURE__*/React.createElement(TileLayer, {
-    url: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    url: "https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png",
     attribution: "\xA9 <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a>"
   }), /*#__PURE__*/React.createElement(MapController, {
     selectedDriver: selectedDriver,
@@ -6391,7 +6404,7 @@ const AddFixFillAddress = ({
   isEdit,
   userDetails
 }) => {
-  var _location$state, _formData$address, _formData$address2, _formData$address3, _formData$address4, _formData$address5, _formData$address6, _formData$address7, _formData$address8, _formData$address9, _formData$address0, _formData$address1, _formData$address10, _formData$address11, _formData$address12, _userDetails$addresse;
+  var _location$state, _formData$address, _formData$address2, _formData$address3, _formData$address4, _formData$address5, _formData$address6, _formData$address7, _formData$address8, _formData$address9, _formData$address0, _formData$address1, _formData$address10, _formData$address11, _formData$address12;
   const {
     data: allCities
   } = Digit.Hooks.useTenants();
@@ -6640,32 +6653,7 @@ const AddFixFillAddress = ({
     defaultOpen: true
   }, /*#__PURE__*/React.createElement("div", {
     className: "formcomposer-section-grid"
-  }, (userDetails === null || userDetails === void 0 ? void 0 : (_userDetails$addresse = userDetails.addresses) === null || _userDetails$addresse === void 0 ? void 0 : _userDetails$addresse.length) > 0 && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("COMMON_ADDRESS_TYPE")), /*#__PURE__*/React.createElement(Dropdown, {
-    selected: selectedAddress,
-    select: setSelectedAddress,
-    option: userDetails.addresses || [],
-    optionKey: "address",
-    t: t,
-    style: {
-      width: "100%"
-    }
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("COMMON_ADDRESS_TYPE")), /*#__PURE__*/React.createElement(Dropdown, {
-    selected: addressType,
-    select: setAddressType,
-    option: availableAddressTypeOptions || [],
-    optionKey: "i18nKey",
-    t: t,
-    style: {
-      width: "100%"
-    }
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("CITY")), /*#__PURE__*/React.createElement(Dropdown, {
-    selected: city,
-    select: setCity,
-    option: allCities || [],
-    optionKey: "i18nKey",
-    t: t,
-    disable: true
-  })), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
     style: {
       position: "relative"
     }
@@ -7421,11 +7409,13 @@ const PointAddressMap = ({
   t
 }) => {
   var _selectedFillingPoint;
+  const history = useHistory();
   const [selectedFillingPoint, setSelectedFillingPoint] = useState(null);
   const [selectedFixedPoint, setSelectedFixedPoint] = useState(null);
   const [hoveredFixedPointId, setHoveredFixedPointId] = useState(null);
   const [mapCenter, setMapCenter] = useState(null);
   const [mapZoom, setMapZoom] = useState(11);
+  const markerRefs = useRef({});
   const defaultCenter = [28.6139, 77.209];
   const getFpId = fp => {
     var _fp$fillingpointmetad;
@@ -7460,17 +7450,21 @@ const PointAddressMap = ({
     })) || [];
   }, [_fillingPoints, selectedFillingPoint]);
   const displayFixedPoints = useMemo(() => {
-    if (selectedFixedPoint) {
-      return [selectedFixedPoint].filter(fx => {
-        var _fx$address, _fx$address2;
-        return ((_fx$address = fx.address) === null || _fx$address === void 0 ? void 0 : _fx$address.latitude) && ((_fx$address2 = fx.address) === null || _fx$address2 === void 0 ? void 0 : _fx$address2.longitude);
-      });
-    }
     return relatedFixedPoints.filter(fx => {
-      var _fx$address3, _fx$address4;
-      return ((_fx$address3 = fx.address) === null || _fx$address3 === void 0 ? void 0 : _fx$address3.latitude) && ((_fx$address4 = fx.address) === null || _fx$address4 === void 0 ? void 0 : _fx$address4.longitude);
+      var _fx$address, _fx$address2;
+      return ((_fx$address = fx.address) === null || _fx$address === void 0 ? void 0 : _fx$address.latitude) && ((_fx$address2 = fx.address) === null || _fx$address2 === void 0 ? void 0 : _fx$address2.longitude);
     });
-  }, [relatedFixedPoints, selectedFixedPoint]);
+  }, [relatedFixedPoints]);
+  useEffect(() => {
+    if (selectedFixedPoint) {
+      var _selectedFixedPoint$a;
+      const fxId = selectedFixedPoint.id || ((_selectedFixedPoint$a = selectedFixedPoint.applicantDetail) === null || _selectedFixedPoint$a === void 0 ? void 0 : _selectedFixedPoint$a.applicantId);
+      const marker = markerRefs.current[fxId];
+      if (marker) {
+        marker.openPopup();
+      }
+    }
+  }, [selectedFixedPoint]);
   const bounds = useMemo(() => {
     const allPoints = [...displayFillingPoints.map(p => [parseFloat(p.address.latitude), parseFloat(p.address.longitude)]), ...displayFixedPoints.map(p => [parseFloat(p.address.latitude), parseFloat(p.address.longitude)])];
     if (allPoints.length === 0) return null;
@@ -7482,11 +7476,24 @@ const PointAddressMap = ({
     setMapCenter(null);
   };
   const handleFixedPointSelect = val => {
-    var _val$address, _val$address2;
-    setSelectedFixedPoint(val);
-    if (val !== null && val !== void 0 && (_val$address = val.address) !== null && _val$address !== void 0 && _val$address.latitude && val !== null && val !== void 0 && (_val$address2 = val.address) !== null && _val$address2 !== void 0 && _val$address2.longitude) {
-      setMapCenter([parseFloat(val.address.latitude), parseFloat(val.address.longitude)]);
-      setMapZoom(16);
+    var _selectedFixedPoint$a2, _selectedFixedPoint$a3, _val$applicantDetail, _val$applicantDetail2;
+    const currentId = (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : (_selectedFixedPoint$a2 = selectedFixedPoint.applicantDetail) === null || _selectedFixedPoint$a2 === void 0 ? void 0 : _selectedFixedPoint$a2.fixedPointId) || (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : selectedFixedPoint.id) || (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : (_selectedFixedPoint$a3 = selectedFixedPoint.applicantDetail) === null || _selectedFixedPoint$a3 === void 0 ? void 0 : _selectedFixedPoint$a3.applicantId);
+    const incomingId = (val === null || val === void 0 ? void 0 : (_val$applicantDetail = val.applicantDetail) === null || _val$applicantDetail === void 0 ? void 0 : _val$applicantDetail.fixedPointId) || (val === null || val === void 0 ? void 0 : val.id) || (val === null || val === void 0 ? void 0 : (_val$applicantDetail2 = val.applicantDetail) === null || _val$applicantDetail2 === void 0 ? void 0 : _val$applicantDetail2.applicantId);
+    if (selectedFixedPoint && currentId === incomingId) {
+      var _val$applicantDetail3;
+      setSelectedFixedPoint(null);
+      const markerId = val.id || ((_val$applicantDetail3 = val.applicantDetail) === null || _val$applicantDetail3 === void 0 ? void 0 : _val$applicantDetail3.applicantId);
+      const marker = markerRefs.current[markerId];
+      if (marker) {
+        marker.closePopup();
+      }
+    } else {
+      var _val$address, _val$address2;
+      setSelectedFixedPoint(val);
+      if (val !== null && val !== void 0 && (_val$address = val.address) !== null && _val$address !== void 0 && _val$address.latitude && val !== null && val !== void 0 && (_val$address2 = val.address) !== null && _val$address2 !== void 0 && _val$address2.longitude) {
+        setMapCenter([parseFloat(val.address.latitude), parseFloat(val.address.longitude)]);
+        setMapZoom(16);
+      }
     }
   };
   const fixedPointOptions = useMemo(() => {
@@ -7527,7 +7534,8 @@ const PointAddressMap = ({
       flexDirection: "column",
       gap: "20px",
       background: "#f9f9f9",
-      zIndex: 10
+      zIndex: 10,
+      overflowY: "auto"
     }
   }, /*#__PURE__*/React.createElement("h3", {
     style: {
@@ -7578,15 +7586,18 @@ const PointAddressMap = ({
       gap: "8px"
     }
   }, relatedFixedPoints.length > 0 ? relatedFixedPoints.map((fx, idx) => {
-    var _fx$applicantDetail2, _selectedFixedPoint$a, _fx$applicantDetail3, _fx$applicantDetail5, _fx$applicantDetail6, _fx$applicantDetail7, _fx$applicantDetail8;
-    const isSelected = (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : selectedFixedPoint.id) === fx.id || ((_fx$applicantDetail2 = fx.applicantDetail) === null || _fx$applicantDetail2 === void 0 ? void 0 : _fx$applicantDetail2.applicantId) && (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : (_selectedFixedPoint$a = selectedFixedPoint.applicantDetail) === null || _selectedFixedPoint$a === void 0 ? void 0 : _selectedFixedPoint$a.applicantId) === ((_fx$applicantDetail3 = fx.applicantDetail) === null || _fx$applicantDetail3 === void 0 ? void 0 : _fx$applicantDetail3.applicantId);
+    var _fx$applicantDetail2, _fx$applicantDetail3, _selectedFixedPoint$a4, _selectedFixedPoint$a5, _fx$applicantDetail4, _fx$applicantDetail5, _fx$applicantDetail6, _fx$applicantDetail7, _fx$address5, _fx$applicantDetail8, _fx$applicantDetail9, _fx$address6, _fx$address7, _fx$address8, _fx$address9;
+    const currentFxId = (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail2 = fx.applicantDetail) === null || _fx$applicantDetail2 === void 0 ? void 0 : _fx$applicantDetail2.fixedPointId) || (fx === null || fx === void 0 ? void 0 : fx.id) || (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail3 = fx.applicantDetail) === null || _fx$applicantDetail3 === void 0 ? void 0 : _fx$applicantDetail3.applicantId) || idx;
+    const selectedFxId = (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : (_selectedFixedPoint$a4 = selectedFixedPoint.applicantDetail) === null || _selectedFixedPoint$a4 === void 0 ? void 0 : _selectedFixedPoint$a4.fixedPointId) || (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : selectedFixedPoint.id) || (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : (_selectedFixedPoint$a5 = selectedFixedPoint.applicantDetail) === null || _selectedFixedPoint$a5 === void 0 ? void 0 : _selectedFixedPoint$a5.applicantId);
+    const isSelected = selectedFixedPoint && currentFxId === selectedFxId;
+    const hoverOrMarkerId = fx.id || ((_fx$applicantDetail4 = fx.applicantDetail) === null || _fx$applicantDetail4 === void 0 ? void 0 : _fx$applicantDetail4.applicantId) || idx;
     return /*#__PURE__*/React.createElement("div", {
       key: idx,
       onClick: () => handleFixedPointSelect(fx),
       onMouseEnter: () => {
-        var _fx$applicantDetail4, _fx$address5, _fx$address6;
-        setHoveredFixedPointId(fx.id || ((_fx$applicantDetail4 = fx.applicantDetail) === null || _fx$applicantDetail4 === void 0 ? void 0 : _fx$applicantDetail4.applicantId) || idx);
-        if (fx !== null && fx !== void 0 && (_fx$address5 = fx.address) !== null && _fx$address5 !== void 0 && _fx$address5.latitude && fx !== null && fx !== void 0 && (_fx$address6 = fx.address) !== null && _fx$address6 !== void 0 && _fx$address6.longitude) {
+        var _fx$address3, _fx$address4;
+        setHoveredFixedPointId(hoverOrMarkerId);
+        if (fx !== null && fx !== void 0 && (_fx$address3 = fx.address) !== null && _fx$address3 !== void 0 && _fx$address3.latitude && fx !== null && fx !== void 0 && (_fx$address4 = fx.address) !== null && _fx$address4 !== void 0 && _fx$address4.longitude) {
           setMapCenter([parseFloat(fx.address.latitude), parseFloat(fx.address.longitude)]);
           setMapZoom(16);
         }
@@ -7603,10 +7614,10 @@ const PointAddressMap = ({
         color: isSelected ? "#1D4E7F" : "#333",
         fontWeight: isSelected ? "600" : "400",
         display: "flex",
-        alignItems: "center",
+        alignItems: "flex-start",
         gap: "10px",
-        boxShadow: isSelected ? "0 2px 8px rgba(29, 78, 127, 0.15)" : hoveredFixedPointId === (fx.id || ((_fx$applicantDetail5 = fx.applicantDetail) === null || _fx$applicantDetail5 === void 0 ? void 0 : _fx$applicantDetail5.applicantId) || idx) ? "0 4px 12px rgba(0,0,0,0.1)" : "none",
-        transform: hoveredFixedPointId === (fx.id || ((_fx$applicantDetail6 = fx.applicantDetail) === null || _fx$applicantDetail6 === void 0 ? void 0 : _fx$applicantDetail6.applicantId) || idx) ? "translateX(4px)" : "none"
+        boxShadow: isSelected ? "0 2px 8px rgba(29, 78, 127, 0.15)" : hoveredFixedPointId === hoverOrMarkerId ? "0 4px 12px rgba(0,0,0,0.1)" : "none",
+        transform: hoveredFixedPointId === hoverOrMarkerId ? "translateX(4px)" : "none"
       }
     }, /*#__PURE__*/React.createElement("div", {
       style: {
@@ -7614,20 +7625,77 @@ const PointAddressMap = ({
         height: "10px",
         borderRadius: "50%",
         background: "#417505",
-        boxShadow: "0 0 4px rgba(65, 117, 5, 0.4)"
+        boxShadow: "0 0 4px rgba(65, 117, 5, 0.4)",
+        marginTop: "5px",
+        flexShrink: 0
       }
     }), /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: "flex",
+        flexDirection: "column",
+        flex: 1
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: "flex",
+        justifyContent: "space-between",
+        alignItems: "flex-start"
+      }
+    }, /*#__PURE__*/React.createElement("div", {
       style: {
         display: "flex",
         flexDirection: "column"
       }
-    }, /*#__PURE__*/React.createElement("span", null, (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail7 = fx.applicantDetail) === null || _fx$applicantDetail7 === void 0 ? void 0 : _fx$applicantDetail7.name) || (fx === null || fx === void 0 ? void 0 : fx.name) || "NA"), /*#__PURE__*/React.createElement("span", {
+    }, /*#__PURE__*/React.createElement("span", {
+      style: {
+        fontWeight: "700"
+      }
+    }, (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail5 = fx.applicantDetail) === null || _fx$applicantDetail5 === void 0 ? void 0 : _fx$applicantDetail5.fixedPointId) || "NA"), /*#__PURE__*/React.createElement("span", {
       style: {
         fontSize: "11px",
         color: "#888",
         fontWeight: "400"
       }
-    }, fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail8 = fx.applicantDetail) === null || _fx$applicantDetail8 === void 0 ? void 0 : _fx$applicantDetail8.fixedPointId)));
+    }, (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail6 = fx.applicantDetail) === null || _fx$applicantDetail6 === void 0 ? void 0 : _fx$applicantDetail6.name) || (fx === null || fx === void 0 ? void 0 : fx.name) || "NA")), /*#__PURE__*/React.createElement("div", {
+      style: {
+        color: "#1D4E7F",
+        fontSize: "10px",
+        paddingTop: "4px"
+      }
+    }, isSelected ? "▲" : "▼")), isSelected && /*#__PURE__*/React.createElement("div", {
+      style: {
+        marginTop: "8px",
+        paddingTop: "8px",
+        borderTop: "1px solid #eee",
+        fontSize: "12px",
+        color: "#555",
+        display: "flex",
+        flexDirection: "column",
+        gap: "4px"
+      }
+    }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("strong", null, t("WT_MOBILE_NUMBER"), ":"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail7 = fx.applicantDetail) === null || _fx$applicantDetail7 === void 0 ? void 0 : _fx$applicantDetail7.mobileNumber) || "NA"), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("strong", null, t("WT_LOCALITY"), ":"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$address5 = fx.address) === null || _fx$address5 === void 0 ? void 0 : _fx$address5.locality) || "NA"), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("strong", null, "Email:"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail8 = fx.applicantDetail) === null || _fx$applicantDetail8 === void 0 ? void 0 : _fx$applicantDetail8.emailId) || "NA"), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("strong", null, "Alt Mobile:"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail9 = fx.applicantDetail) === null || _fx$applicantDetail9 === void 0 ? void 0 : _fx$applicantDetail9.alternateNumber) || "NA"), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("strong", null, "Address:"), " ", [fx === null || fx === void 0 ? void 0 : (_fx$address6 = fx.address) === null || _fx$address6 === void 0 ? void 0 : _fx$address6.houseNo, fx === null || fx === void 0 ? void 0 : (_fx$address7 = fx.address) === null || _fx$address7 === void 0 ? void 0 : _fx$address7.streetName, fx === null || fx === void 0 ? void 0 : (_fx$address8 = fx.address) === null || _fx$address8 === void 0 ? void 0 : _fx$address8.city, fx === null || fx === void 0 ? void 0 : (_fx$address9 = fx.address) === null || _fx$address9 === void 0 ? void 0 : _fx$address9.pincode].filter(Boolean).join(", ") || "NA"), /*#__PURE__*/React.createElement("button", {
+      onClick: e => {
+        var _fx$applicantDetail0;
+        e.stopPropagation();
+        const idToEdit = (fx === null || fx === void 0 ? void 0 : fx.id) || (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail0 = fx.applicantDetail) === null || _fx$applicantDetail0 === void 0 ? void 0 : _fx$applicantDetail0.applicantId);
+        history.push(`/digit-ui/employee/wt/add-fix-point-address?id=${idToEdit}`);
+      },
+      style: {
+        marginTop: "8px",
+        padding: "6px 12px",
+        background: "#F47738",
+        color: "#fff",
+        border: "none",
+        borderRadius: "4px",
+        cursor: "pointer",
+        fontSize: "12px",
+        fontWeight: "bold",
+        alignSelf: "flex-start",
+        transition: "background 0.2s"
+      },
+      onMouseEnter: e => e.target.style.background = "#D6662E",
+      onMouseLeave: e => e.target.style.background = "#F47738"
+    }, "Edit Fixed Point"))));
   }) : /*#__PURE__*/React.createElement("div", {
     style: {
       textAlign: "center",
@@ -7728,7 +7796,7 @@ const PointAddressMap = ({
     center: mapCenter,
     zoom: mapZoom
   }), displayFillingPoints.map((fp, index) => {
-    var _fp$address5;
+    var _fp$address5, _fp$address6, _fp$address7;
     return /*#__PURE__*/React.createElement(React.Fragment, {
       key: `fp-group-${fp.id || index}`
     }, /*#__PURE__*/React.createElement(Circle, {
@@ -7775,6 +7843,31 @@ const PointAddressMap = ({
         fontSize: "12px"
       }
     }, /*#__PURE__*/React.createElement("strong", null, t("WT_LOCALITY"), ":"), " ", ((_fp$address5 = fp.address) === null || _fp$address5 === void 0 ? void 0 : _fp$address5.locality) || "NA"), /*#__PURE__*/React.createElement("p", {
+      style: {
+        margin: 0,
+        fontSize: "12px"
+      }
+    }, /*#__PURE__*/React.createElement("strong", null, t("WT_AE_NAME"), ":"), " ", (fp === null || fp === void 0 ? void 0 : fp.aeName) || "NA", " (", (fp === null || fp === void 0 ? void 0 : fp.aeMobile) || "NA", ")"), /*#__PURE__*/React.createElement("p", {
+      style: {
+        margin: 0,
+        fontSize: "12px"
+      }
+    }, /*#__PURE__*/React.createElement("strong", null, t("WT_JE_NAME"), ":"), " ", (fp === null || fp === void 0 ? void 0 : fp.jeName) || "NA", " (", (fp === null || fp === void 0 ? void 0 : fp.jeMobile) || "NA", ")"), /*#__PURE__*/React.createElement("p", {
+      style: {
+        margin: 0,
+        fontSize: "12px"
+      }
+    }, /*#__PURE__*/React.createElement("strong", null, t("WT_EE_NAME"), ":"), " ", (fp === null || fp === void 0 ? void 0 : fp.eeName) || "NA", " (", (fp === null || fp === void 0 ? void 0 : fp.eeMobile) || "NA", ")"), /*#__PURE__*/React.createElement("p", {
+      style: {
+        margin: 0,
+        fontSize: "12px"
+      }
+    }, /*#__PURE__*/React.createElement("strong", null, "Latitude:"), " ", ((_fp$address6 = fp.address) === null || _fp$address6 === void 0 ? void 0 : _fp$address6.latitude) || "NA"), /*#__PURE__*/React.createElement("p", {
+      style: {
+        margin: 0,
+        fontSize: "12px"
+      }
+    }, /*#__PURE__*/React.createElement("strong", null, "Longitude:"), " ", ((_fp$address7 = fp.address) === null || _fp$address7 === void 0 ? void 0 : _fp$address7.longitude) || "NA"), /*#__PURE__*/React.createElement("p", {
       style: {
         margin: 0,
         fontSize: "12px",
@@ -7782,14 +7875,18 @@ const PointAddressMap = ({
       }
     }, /*#__PURE__*/React.createElement("strong", null, "Coverage:"), " 5 KM Radius"))))));
   }), displayFixedPoints.map((fx, index) => {
-    var _fx$applicantDetail9, _fx$applicantDetail0, _fx$applicantDetail1, _fx$applicantDetail10, _fx$address7;
-    const fxId = fx.id || ((_fx$applicantDetail9 = fx.applicantDetail) === null || _fx$applicantDetail9 === void 0 ? void 0 : _fx$applicantDetail9.applicantId) || index;
+    var _fx$applicantDetail1, _fx$applicantDetail10, _fx$applicantDetail11, _selectedFixedPoint$a6, _selectedFixedPoint$a7, _fx$applicantDetail12, _fx$applicantDetail13, _fx$applicantDetail14, _fx$address0, _fx$applicantDetail15, _fx$applicantDetail16, _fx$address1, _fx$address10, _fx$address11, _fx$address12, _fx$address13, _fx$address14;
+    const fxId = fx.id || ((_fx$applicantDetail1 = fx.applicantDetail) === null || _fx$applicantDetail1 === void 0 ? void 0 : _fx$applicantDetail1.applicantId) || index;
     const isHovered = hoveredFixedPointId === fxId;
+    const currentFxId = (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail10 = fx.applicantDetail) === null || _fx$applicantDetail10 === void 0 ? void 0 : _fx$applicantDetail10.fixedPointId) || (fx === null || fx === void 0 ? void 0 : fx.id) || (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail11 = fx.applicantDetail) === null || _fx$applicantDetail11 === void 0 ? void 0 : _fx$applicantDetail11.applicantId) || index;
+    const selectedFxId = (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : (_selectedFixedPoint$a6 = selectedFixedPoint.applicantDetail) === null || _selectedFixedPoint$a6 === void 0 ? void 0 : _selectedFixedPoint$a6.fixedPointId) || (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : selectedFixedPoint.id) || (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : (_selectedFixedPoint$a7 = selectedFixedPoint.applicantDetail) === null || _selectedFixedPoint$a7 === void 0 ? void 0 : _selectedFixedPoint$a7.applicantId);
+    const isSelected = selectedFixedPoint && currentFxId === selectedFxId;
     return /*#__PURE__*/React.createElement(Marker, {
       key: `fx-${fxId}`,
       position: [parseFloat(fx.address.latitude), parseFloat(fx.address.longitude)],
-      icon: isHovered ? enlargedFixedPointIcon : fixedPointIcon,
-      zIndexOffset: isHovered ? 1000 : 0
+      icon: isHovered || isSelected ? enlargedFixedPointIcon : fixedPointIcon,
+      zIndexOffset: isHovered || isSelected ? 1000 : 0,
+      ref: r => markerRefs.current[fxId] = r
     }, /*#__PURE__*/React.createElement(Popup, null, /*#__PURE__*/React.createElement("div", {
       style: {
         padding: "8px",
@@ -7803,7 +7900,7 @@ const PointAddressMap = ({
         borderBottom: "1px solid #eee",
         paddingBottom: "4px"
       }
-    }, (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail0 = fx.applicantDetail) === null || _fx$applicantDetail0 === void 0 ? void 0 : _fx$applicantDetail0.name) || (fx === null || fx === void 0 ? void 0 : fx.name) || "NA", " (Fixed Point)"), /*#__PURE__*/React.createElement("div", {
+    }, (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail12 = fx.applicantDetail) === null || _fx$applicantDetail12 === void 0 ? void 0 : _fx$applicantDetail12.name) || (fx === null || fx === void 0 ? void 0 : fx.name) || "NA", " (Fixed Point)"), /*#__PURE__*/React.createElement("div", {
       style: {
         display: "flex",
         flexDirection: "column",
@@ -7814,17 +7911,42 @@ const PointAddressMap = ({
         margin: 0,
         fontSize: "12px"
       }
-    }, /*#__PURE__*/React.createElement("strong", null, t("WT_FIXED_POINT_CODE"), ":"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail1 = fx.applicantDetail) === null || _fx$applicantDetail1 === void 0 ? void 0 : _fx$applicantDetail1.fixedPointId) || "NA"), /*#__PURE__*/React.createElement("p", {
+    }, /*#__PURE__*/React.createElement("strong", null, t("WT_FIXED_POINT_CODE"), ":"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail13 = fx.applicantDetail) === null || _fx$applicantDetail13 === void 0 ? void 0 : _fx$applicantDetail13.fixedPointId) || "NA"), /*#__PURE__*/React.createElement("p", {
+      style: {
+        margin: 0,
+        fontSize: "12px"
+      }
+    }, /*#__PURE__*/React.createElement("strong", null, t("WT_MOBILE_NUMBER"), ":"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail14 = fx.applicantDetail) === null || _fx$applicantDetail14 === void 0 ? void 0 : _fx$applicantDetail14.mobileNumber) || "NA"), /*#__PURE__*/React.createElement("p", {
+      style: {
+        margin: 0,
+        fontSize: "12px"
+      }
+    }, /*#__PURE__*/React.createElement("strong", null, t("WT_LOCALITY"), ":"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$address0 = fx.address) === null || _fx$address0 === void 0 ? void 0 : _fx$address0.locality) || "NA"), /*#__PURE__*/React.createElement("p", {
+      style: {
+        margin: 0,
+        fontSize: "12px"
+      }
+    }, /*#__PURE__*/React.createElement("strong", null, "Email:"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail15 = fx.applicantDetail) === null || _fx$applicantDetail15 === void 0 ? void 0 : _fx$applicantDetail15.emailId) || "NA"), /*#__PURE__*/React.createElement("p", {
+      style: {
+        margin: 0,
+        fontSize: "12px"
+      }
+    }, /*#__PURE__*/React.createElement("strong", null, "Alt Mobile:"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail16 = fx.applicantDetail) === null || _fx$applicantDetail16 === void 0 ? void 0 : _fx$applicantDetail16.alternateNumber) || "NA"), /*#__PURE__*/React.createElement("p", {
+      style: {
+        margin: 0,
+        fontSize: "12px"
+      }
+    }, /*#__PURE__*/React.createElement("strong", null, "Address:"), " ", [fx === null || fx === void 0 ? void 0 : (_fx$address1 = fx.address) === null || _fx$address1 === void 0 ? void 0 : _fx$address1.houseNo, fx === null || fx === void 0 ? void 0 : (_fx$address10 = fx.address) === null || _fx$address10 === void 0 ? void 0 : _fx$address10.streetName, fx === null || fx === void 0 ? void 0 : (_fx$address11 = fx.address) === null || _fx$address11 === void 0 ? void 0 : _fx$address11.city, fx === null || fx === void 0 ? void 0 : (_fx$address12 = fx.address) === null || _fx$address12 === void 0 ? void 0 : _fx$address12.pincode].filter(Boolean).join(", ") || "NA"), /*#__PURE__*/React.createElement("p", {
       style: {
         margin: 0,
         fontSize: "12px"
       }
-    }, /*#__PURE__*/React.createElement("strong", null, t("WT_MOBILE_NUMBER"), ":"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail10 = fx.applicantDetail) === null || _fx$applicantDetail10 === void 0 ? void 0 : _fx$applicantDetail10.mobileNumber) || "NA"), /*#__PURE__*/React.createElement("p", {
+    }, /*#__PURE__*/React.createElement("strong", null, "Latitude:"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$address13 = fx.address) === null || _fx$address13 === void 0 ? void 0 : _fx$address13.latitude) || "NA"), /*#__PURE__*/React.createElement("p", {
       style: {
         margin: 0,
         fontSize: "12px"
       }
-    }, /*#__PURE__*/React.createElement("strong", null, t("WT_LOCALITY"), ":"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$address7 = fx.address) === null || _fx$address7 === void 0 ? void 0 : _fx$address7.locality) || "NA")))));
+    }, /*#__PURE__*/React.createElement("strong", null, "Longitude:"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$address14 = fx.address) === null || _fx$address14 === void 0 ? void 0 : _fx$address14.longitude) || "NA")))));
   }))));
 };
@@ -28102,6 +28224,7 @@ const WTEmergencyFixedPointCreate = () => {
         }
       });
     }
+    if (data !== null && data !== void 0 && data.silent) return;
     goNext(skipStep, index, isAddMultiple, key);
   }
   const onSuccess = () => {