@djb25/digit-ui-module-wt 1.0.79 → 1.0.81

package/dist/index.js

@@ -3543,7 +3543,125 @@ const WTDesktopInbox = _ref => {
   const _useState4 = React.useState(false),
     isSidebarCollapsed = _useState4[0],
     setIsSidebarCollapsed = _useState4[1];
-  const columns = React__default.useMemo(() => props.isSearch ? tableConfig.searchColumns(props) : tableConfig.inboxColumns(props) || [], []);
+  const _useState5 = React.useState(false),
+    showImageModal = _useState5[0],
+    setShowImageModal = _useState5[1];
+  const _useState6 = React.useState({
+      startUrl: null,
+      endUrl: null,
+      bookingNo: "",
+      isLoading: false
+    }),
+    imageModalData = _useState6[0],
+    setImageModalData = _useState6[1];
+  const tenantId = Digit.ULBService.getCurrentTenantId();
+  const fetchImageUrl = React.useCallback(function (fileStoreId) {
+    try {
+      let _exit = false;
+      if (!fileStoreId) return Promise.resolve(null);
+      const _temp = _catch(function () {
+        return Promise.resolve(Digit.UploadServices.Filefetch([fileStoreId], tenantId)).then(function (res) {
+          var _res$data, _res$data2, _res$data2$fileStoreI, _res$data2$fileStoreI2;
+          if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data[fileStoreId]) {
+            const _res$data$fileStoreId = res.data[fileStoreId].split(",")[0];
+            _exit = true;
+            return _res$data$fileStoreId;
+          }
+          if (res !== null && res !== void 0 && (_res$data2 = res.data) !== null && _res$data2 !== void 0 && (_res$data2$fileStoreI = _res$data2.fileStoreIds) !== null && _res$data2$fileStoreI !== void 0 && (_res$data2$fileStoreI2 = _res$data2$fileStoreI[0]) !== null && _res$data2$fileStoreI2 !== void 0 && _res$data2$fileStoreI2.url) {
+            const _res$data$fileStoreId2 = res.data.fileStoreIds[0].url.split(",")[0];
+            _exit = true;
+            return _res$data$fileStoreId2;
+          }
+        });
+      }, function (err) {
+        console.error("Error fetching image URL:", err);
+      });
+      return Promise.resolve(_temp && _temp.then ? _temp.then(function (_result) {
+        return _exit ? _result : null;
+      }) : _exit ? _temp : null);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, [tenantId]);
+  const handleViewImage = React.useCallback(function (_ref2) {
+    let startFileStoreId = _ref2.startFileStoreId,
+      endFileStoreId = _ref2.endFileStoreId,
+      bookingNo = _ref2.bookingNo;
+    try {
+      setShowImageModal(true);
+      setImageModalData({
+        startUrl: null,
+        endUrl: null,
+        bookingNo: bookingNo || "",
+        isLoading: true
+      });
+      const _temp2 = _catch(function () {
+        return Promise.resolve(Promise.all([fetchImageUrl(startFileStoreId), fetchImageUrl(endFileStoreId)])).then(function (_ref3) {
+          let startUrl = _ref3[0],
+            endUrl = _ref3[1];
+          setImageModalData({
+            startUrl,
+            endUrl,
+            bookingNo: bookingNo || "",
+            isLoading: false
+          });
+        });
+      }, function (err) {
+        console.error("Error loading images:", err);
+        setImageModalData(prev => _extends({}, prev, {
+          isLoading: false
+        }));
+      });
+      return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, [fetchImageUrl]);
+  const downloadImage = React.useCallback(function (url, filename) {
+    try {
+      if (!url) return Promise.resolve();
+      const _temp3 = _catch(function () {
+        return Promise.resolve(fetch(url)).then(function (response) {
+          return Promise.resolve(response.blob()).then(function (blob) {
+            const blobUrl = URL.createObjectURL(blob);
+            const link = document.createElement("a");
+            link.href = blobUrl;
+            link.download = filename;
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+            URL.revokeObjectURL(blobUrl);
+          });
+        });
+      }, function (err) {
+        console.error("Error downloading image:", err);
+        window.open(url, "_blank");
+      });
+      return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, []);
+  const handleDownloadImage = React.useCallback(function (_ref4) {
+    let startFileStoreId = _ref4.startFileStoreId,
+      endFileStoreId = _ref4.endFileStoreId,
+      bookingNo = _ref4.bookingNo;
+    try {
+      return Promise.resolve(Promise.all([fetchImageUrl(startFileStoreId), fetchImageUrl(endFileStoreId)])).then(function (_ref5) {
+        let startUrl = _ref5[0],
+          endUrl = _ref5[1];
+        const prefix = bookingNo || "trip";
+        if (startUrl) downloadImage(startUrl, prefix + "_start_trip.jpg");
+        if (endUrl) downloadImage(endUrl, prefix + "_end_trip.jpg");
+      });
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, [fetchImageUrl, downloadImage]);
+  const columns = React__default.useMemo(() => props.isSearch ? tableConfig.searchColumns(props) : tableConfig.inboxColumns(_extends({}, props, {
+    onViewImage: handleViewImage,
+    onDownloadImage: handleDownloadImage
+  })) || [], [handleViewImage, handleDownloadImage]);
   const inboxCsvColumns = React__default.useMemo(() => {
     var _columns$, _columns$2, _columns$3, _columns$4, _columns$find3;
     const csvColumns = [{
@@ -3913,7 +4031,223 @@ const WTDesktopInbox = _ref => {
       minWidth: 0,
       overflowX: "auto"
     }
-  }, result)));
+  }, result)), showImageModal && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
+    headerBarMain: /*#__PURE__*/React__default.createElement("h1", {
+      className: "heading-m",
+      style: {
+        margin: 0,
+        color: "#0B2559"
+      }
+    }, t("WT_DELIVERY_IMAGES"), " ", imageModalData.bookingNo ? "\u2014 " + imageModalData.bookingNo : ""),
+    headerBarEnd: /*#__PURE__*/React__default.createElement("div", {
+      onClick: () => {
+        setShowImageModal(false);
+        setImageModalData({
+          startUrl: null,
+          endUrl: null,
+          bookingNo: "",
+          isLoading: false
+        });
+      },
+      style: {
+        cursor: "pointer",
+        width: "32px",
+        height: "32px",
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center",
+        borderRadius: "50%",
+        background: "rgba(0,0,0,0.08)",
+        transition: "background 0.2s ease"
+      },
+      onMouseEnter: e => e.currentTarget.style.background = "rgba(0,0,0,0.15)",
+      onMouseLeave: e => e.currentTarget.style.background = "rgba(0,0,0,0.08)"
+    }, /*#__PURE__*/React__default.createElement("svg", {
+      width: "18",
+      height: "18",
+      viewBox: "0 0 24 24",
+      fill: "none",
+      xmlns: "http://www.w3.org/2000/svg"
+    }, /*#__PURE__*/React__default.createElement("path", {
+      d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z",
+      fill: "#333"
+    }))),
+    hideSubmit: true,
+    actionCancelLabel: t("CS_COMMON_CLOSE"),
+    actionCancelOnSubmit: () => {
+      setShowImageModal(false);
+      setImageModalData({
+        startUrl: null,
+        endUrl: null,
+        bookingNo: "",
+        isLoading: false
+      });
+    },
+    popmoduleClassName: "wt-delivery-image-modal"
+  }, /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      minHeight: "200px",
+      padding: "16px"
+    }
+  }, imageModalData.isLoading ? /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      display: "flex",
+      justifyContent: "center",
+      alignItems: "center",
+      minHeight: "200px"
+    }
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null)) : /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      display: "flex",
+      gap: "32px",
+      justifyContent: "center",
+      flexWrap: "wrap"
+    }
+  }, /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      display: "flex",
+      flexDirection: "column",
+      alignItems: "center",
+      gap: "12px"
+    }
+  }, /*#__PURE__*/React__default.createElement("h3", {
+    style: {
+      margin: 0,
+      fontSize: "15px",
+      fontWeight: "700",
+      color: "#0B2559",
+      letterSpacing: "0.3px"
+    }
+  }, t("WT_START_TRIP_IMAGE")), imageModalData.startUrl ? /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      position: "relative",
+      borderRadius: "10px",
+      overflow: "hidden",
+      boxShadow: "0 4px 16px rgba(0,0,0,0.12)"
+    }
+  }, /*#__PURE__*/React__default.createElement("img", {
+    src: imageModalData.startUrl,
+    alt: "Start Trip",
+    style: {
+      maxWidth: "360px",
+      maxHeight: "400px",
+      objectFit: "contain",
+      display: "block"
+    }
+  }), /*#__PURE__*/React__default.createElement("button", {
+    type: "button",
+    onClick: () => downloadImage(imageModalData.startUrl, (imageModalData.bookingNo || "trip") + "_start.jpg"),
+    style: {
+      position: "absolute",
+      bottom: "10px",
+      right: "10px",
+      display: "inline-flex",
+      alignItems: "center",
+      gap: "4px",
+      padding: "6px 12px",
+      fontSize: "12px",
+      fontWeight: "600",
+      color: "#fff",
+      background: "rgba(0,0,0,0.6)",
+      border: "none",
+      borderRadius: "6px",
+      cursor: "pointer",
+      backdropFilter: "blur(4px)"
+    }
+  }, /*#__PURE__*/React__default.createElement("svg", {
+    width: "14",
+    height: "14",
+    viewBox: "0 0 24 24",
+    fill: "none"
+  }, /*#__PURE__*/React__default.createElement("path", {
+    d: "M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z",
+    fill: "#fff"
+  })), t("CS_COMMON_DOWNLOAD"))) : /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      width: "200px",
+      height: "200px",
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "center",
+      background: "#f8fafc",
+      borderRadius: "10px",
+      border: "2px dashed #e2e8f0",
+      color: "#94a3b8",
+      fontSize: "13px"
+    }
+  }, t("CS_NO_IMAGE_AVAILABLE"))), /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      display: "flex",
+      flexDirection: "column",
+      alignItems: "center",
+      gap: "12px"
+    }
+  }, /*#__PURE__*/React__default.createElement("h3", {
+    style: {
+      margin: 0,
+      fontSize: "15px",
+      fontWeight: "700",
+      color: "#0B2559",
+      letterSpacing: "0.3px"
+    }
+  }, t("WT_END_TRIP_IMAGE")), imageModalData.endUrl ? /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      position: "relative",
+      borderRadius: "10px",
+      overflow: "hidden",
+      boxShadow: "0 4px 16px rgba(0,0,0,0.12)"
+    }
+  }, /*#__PURE__*/React__default.createElement("img", {
+    src: imageModalData.endUrl,
+    alt: "End Trip",
+    style: {
+      maxWidth: "360px",
+      maxHeight: "400px",
+      objectFit: "contain",
+      display: "block"
+    }
+  }), /*#__PURE__*/React__default.createElement("button", {
+    type: "button",
+    onClick: () => downloadImage(imageModalData.endUrl, (imageModalData.bookingNo || "trip") + "_end.jpg"),
+    style: {
+      position: "absolute",
+      bottom: "10px",
+      right: "10px",
+      display: "inline-flex",
+      alignItems: "center",
+      gap: "4px",
+      padding: "6px 12px",
+      fontSize: "12px",
+      fontWeight: "600",
+      color: "#fff",
+      background: "rgba(0,0,0,0.6)",
+      border: "none",
+      borderRadius: "6px",
+      cursor: "pointer",
+      backdropFilter: "blur(4px)"
+    }
+  }, /*#__PURE__*/React__default.createElement("svg", {
+    width: "14",
+    height: "14",
+    viewBox: "0 0 24 24",
+    fill: "none"
+  }, /*#__PURE__*/React__default.createElement("path", {
+    d: "M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z",
+    fill: "#fff"
+  })), t("CS_COMMON_DOWNLOAD"))) : /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      width: "200px",
+      height: "200px",
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "center",
+      background: "#f8fafc",
+      borderRadius: "10px",
+      border: "2px dashed #e2e8f0",
+      color: "#94a3b8",
+      fontSize: "13px"
+    }
+  }, t("CS_NO_IMAGE_AVAILABLE")))))));
 };
 
 const SortBy = props => {
@@ -7158,7 +7492,13 @@ const AddFillingPointMetaData = _ref => {
       key: input.name
     }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.LabelFieldPair, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, {
       className: "card-label-smaller"
-    }, t(input.label), input.isMandatory ? " *" : ""), /*#__PURE__*/React__default.createElement("div", {
+    }, t(input.label), input.isMandatory ? /*#__PURE__*/React__default.createElement("span", {
+      className: "check-page-link-button",
+      style: {
+        color: "red",
+        fontWeight: "bold"
+      }
+    }, " * ") : ""), /*#__PURE__*/React__default.createElement("div", {
       style: {
         display: "flex"
       }
@@ -17732,12 +18072,26 @@ const WTApplicationDetails = () => {
   }))));
 };
 
+const isDeliveredStatus = row => {
+  var _row$searchData, _row$workflowData, _row$workflowData$sta;
+  const bookingStatus = (row === null || row === void 0 ? void 0 : (_row$searchData = row.searchData) === null || _row$searchData === void 0 ? void 0 : _row$searchData.bookingStatus) || (row === null || row === void 0 ? void 0 : (_row$workflowData = row.workflowData) === null || _row$workflowData === void 0 ? void 0 : (_row$workflowData$sta = _row$workflowData.state) === null || _row$workflowData$sta === void 0 ? void 0 : _row$workflowData$sta.applicationStatus) || "";
+  return ["TANKER_DELIVERED", "DELIVERED"].includes(bookingStatus.toUpperCase());
+};
+const getTripReportFileIds = row => {
+  var _row$searchData2, _row$searchData2$driv;
+  const tripReport = row === null || row === void 0 ? void 0 : (_row$searchData2 = row.searchData) === null || _row$searchData2 === void 0 ? void 0 : (_row$searchData2$driv = _row$searchData2.driverTripReport) === null || _row$searchData2$driv === void 0 ? void 0 : _row$searchData2$driv[0];
+  return {
+    startFileStoreId: (tripReport === null || tripReport === void 0 ? void 0 : tripReport.startFileStoreId) || null,
+    endFileStoreId: (tripReport === null || tripReport === void 0 ? void 0 : tripReport.endFileStoreId) || null,
+    hasImages: !!(tripReport !== null && tripReport !== void 0 && tripReport.startFileStoreId || tripReport !== null && tripReport !== void 0 && tripReport.endFileStoreId)
+  };
+};
 const GetCell = value => /*#__PURE__*/React__default.createElement("span", {
   className: "cell-text"
 }, value);
 const getCreatedTime = row => {
-  var _row$searchData, _row$searchData$audit, _row$workflowData, _row$workflowData$aud;
-  return (row === null || row === void 0 ? void 0 : (_row$searchData = row.searchData) === null || _row$searchData === void 0 ? void 0 : (_row$searchData$audit = _row$searchData.auditDetails) === null || _row$searchData$audit === void 0 ? void 0 : _row$searchData$audit.createdTime) || (row === null || row === void 0 ? void 0 : (_row$workflowData = row.workflowData) === null || _row$workflowData === void 0 ? void 0 : (_row$workflowData$aud = _row$workflowData.auditDetails) === null || _row$workflowData$aud === void 0 ? void 0 : _row$workflowData$aud.createdTime);
+  var _row$searchData3, _row$searchData3$audi, _row$workflowData2, _row$workflowData2$au;
+  return (row === null || row === void 0 ? void 0 : (_row$searchData3 = row.searchData) === null || _row$searchData3 === void 0 ? void 0 : (_row$searchData3$audi = _row$searchData3.auditDetails) === null || _row$searchData3$audi === void 0 ? void 0 : _row$searchData3$audi.createdTime) || (row === null || row === void 0 ? void 0 : (_row$workflowData2 = row.workflowData) === null || _row$workflowData2 === void 0 ? void 0 : (_row$workflowData2$au = _row$workflowData2.auditDetails) === null || _row$workflowData2$au === void 0 ? void 0 : _row$workflowData2$au.createdTime);
 };
 const getFormattedCreatedAt = row => {
   const createdTime = getCreatedTime(row);
@@ -17745,8 +18099,8 @@ const getFormattedCreatedAt = row => {
   return Digit.DateUtils.ConvertEpochToDate(createdTime) + " " + Digit.DateUtils.ConvertEpochToTimeInHours(createdTime);
 };
 const getDeliveryDateTime = row => {
-  var _row$searchData2;
-  const driverTripReport = row === null || row === void 0 ? void 0 : (_row$searchData2 = row.searchData) === null || _row$searchData2 === void 0 ? void 0 : _row$searchData2.driverTripReport;
+  var _row$searchData4;
+  const driverTripReport = row === null || row === void 0 ? void 0 : (_row$searchData4 = row.searchData) === null || _row$searchData4 === void 0 ? void 0 : _row$searchData4.driverTripReport;
   if (Array.isArray(driverTripReport) && driverTripReport.length > 0) {
     var _driverTripReport$, _driverTripReport$$au;
     const lastModifiedTime = (_driverTripReport$ = driverTripReport[0]) === null || _driverTripReport$ === void 0 ? void 0 : (_driverTripReport$$au = _driverTripReport$.auditDetails) === null || _driverTripReport$$au === void 0 ? void 0 : _driverTripReport$$au.lastModifiedTime;
@@ -17788,8 +18142,8 @@ const TableConfig = t => ({
       Header: t("WT_BOOKING_NO"),
       id: "bookingNo",
       accessor: row => {
-        var _row$searchData3;
-        return (row === null || row === void 0 ? void 0 : (_row$searchData3 = row.searchData) === null || _row$searchData3 === void 0 ? void 0 : _row$searchData3["bookingNo"]) || "";
+        var _row$searchData5;
+        return (row === null || row === void 0 ? void 0 : (_row$searchData5 = row.searchData) === null || _row$searchData5 === void 0 ? void 0 : _row$searchData5["bookingNo"]) || "";
       },
       Cell: _ref => {
         var _row$original, _row$original$searchD, _row$original2, _row$original2$search;
@@ -17808,8 +18162,8 @@ const TableConfig = t => ({
       Header: window.location.href.includes("fixed-point") ? t("WT_FIXED_POINT_NAME") : t("WT_APPLICANT_NAME"),
       id: "applicantName",
       accessor: row => {
-        var _row$searchData4, _row$searchData4$appl;
-        return (row === null || row === void 0 ? void 0 : (_row$searchData4 = row.searchData) === null || _row$searchData4 === void 0 ? void 0 : (_row$searchData4$appl = _row$searchData4.applicantDetail) === null || _row$searchData4$appl === void 0 ? void 0 : _row$searchData4$appl["name"]) || "";
+        var _row$searchData6, _row$searchData6$appl;
+        return (row === null || row === void 0 ? void 0 : (_row$searchData6 = row.searchData) === null || _row$searchData6 === void 0 ? void 0 : (_row$searchData6$appl = _row$searchData6.applicantDetail) === null || _row$searchData6$appl === void 0 ? void 0 : _row$searchData6$appl["name"]) || "";
       },
       Cell: row => {
         var _row$cell, _row$cell$row, _row$cell$row$origina, _row$cell$row$origina2, _row$cell$row$origina3;
@@ -17823,8 +18177,8 @@ const TableConfig = t => ({
       Header: t("WT_MOBILE_NUMBER"),
       id: "mobileNumber",
       accessor: row => {
-        var _row$searchData5, _row$searchData5$appl;
-        return (row === null || row === void 0 ? void 0 : (_row$searchData5 = row.searchData) === null || _row$searchData5 === void 0 ? void 0 : (_row$searchData5$appl = _row$searchData5.applicantDetail) === null || _row$searchData5$appl === void 0 ? void 0 : _row$searchData5$appl["mobileNumber"]) || "";
+        var _row$searchData7, _row$searchData7$appl;
+        return (row === null || row === void 0 ? void 0 : (_row$searchData7 = row.searchData) === null || _row$searchData7 === void 0 ? void 0 : (_row$searchData7$appl = _row$searchData7.applicantDetail) === null || _row$searchData7$appl === void 0 ? void 0 : _row$searchData7$appl["mobileNumber"]) || "";
       },
       Cell: row => {
         var _row$cell2, _row$cell2$row, _row$cell2$row$origin, _row$cell2$row$origin2, _row$cell2$row$origin3;
@@ -17838,8 +18192,8 @@ const TableConfig = t => ({
       Header: t("LOCALITY"),
       id: "localityCode",
       accessor: row => {
-        var _row$searchData6;
-        return (row === null || row === void 0 ? void 0 : (_row$searchData6 = row.searchData) === null || _row$searchData6 === void 0 ? void 0 : _row$searchData6["localityCode"]) || "";
+        var _row$searchData8;
+        return (row === null || row === void 0 ? void 0 : (_row$searchData8 = row.searchData) === null || _row$searchData8 === void 0 ? void 0 : _row$searchData8["localityCode"]) || "";
       },
       Cell: _ref2 => {
         var _row$original3, _row$original3$search, _row$original4, _row$original4$search;
@@ -17854,8 +18208,8 @@ const TableConfig = t => ({
       Header: t("Filling Point"),
       id: "fillingPoint",
       accessor: row => {
-        var _row$searchData7, _row$searchData7$fill, _row$searchData8;
-        return (row === null || row === void 0 ? void 0 : (_row$searchData7 = row.searchData) === null || _row$searchData7 === void 0 ? void 0 : (_row$searchData7$fill = _row$searchData7.fillingPointMetadata) === null || _row$searchData7$fill === void 0 ? void 0 : _row$searchData7$fill.name) || (row === null || row === void 0 ? void 0 : (_row$searchData8 = row.searchData) === null || _row$searchData8 === void 0 ? void 0 : _row$searchData8.fillingPointName) || "-";
+        var _row$searchData9, _row$searchData9$fill, _row$searchData0;
+        return (row === null || row === void 0 ? void 0 : (_row$searchData9 = row.searchData) === null || _row$searchData9 === void 0 ? void 0 : (_row$searchData9$fill = _row$searchData9.fillingPointMetadata) === null || _row$searchData9$fill === void 0 ? void 0 : _row$searchData9$fill.name) || (row === null || row === void 0 ? void 0 : (_row$searchData0 = row.searchData) === null || _row$searchData0 === void 0 ? void 0 : _row$searchData0.fillingPointName) || "-";
       },
       Cell: _ref3 => {
         var _row$original5, _row$original5$search, _row$original5$search2, _row$original6, _row$original6$search;
@@ -17880,8 +18234,8 @@ const TableConfig = t => ({
       Header: t("WT_STATUS"),
       id: "applicationStatus",
       accessor: row => {
-        var _row$workflowData2, _row$workflowData2$st;
-        return (row === null || row === void 0 ? void 0 : (_row$workflowData2 = row.workflowData) === null || _row$workflowData2 === void 0 ? void 0 : (_row$workflowData2$st = _row$workflowData2.state) === null || _row$workflowData2$st === void 0 ? void 0 : _row$workflowData2$st["applicationStatus"]) || "";
+        var _row$workflowData3, _row$workflowData3$st;
+        return (row === null || row === void 0 ? void 0 : (_row$workflowData3 = row.workflowData) === null || _row$workflowData3 === void 0 ? void 0 : (_row$workflowData3$st = _row$workflowData3.state) === null || _row$workflowData3$st === void 0 ? void 0 : _row$workflowData3$st["applicationStatus"]) || "";
       },
       Cell: _ref5 => {
         var _row$original8, _row$original8$workfl, _row$original8$workfl2;
@@ -17931,6 +18285,128 @@ const TableConfig = t => ({
         return GetCell(getDriverNameFromSearchData(row === null || row === void 0 ? void 0 : (_row$original1 = row.original) === null || _row$original1 === void 0 ? void 0 : _row$original1.searchData));
       },
       mobileCell: original => GetMobCell(getDriverNameFromSearchData(original === null || original === void 0 ? void 0 : original.searchData))
+    }, {
+      Header: t("WT_DELIVERY_IMAGES"),
+      id: "deliveryImages",
+      disableSortBy: true,
+      accessor: () => "",
+      Cell: _ref0 => {
+        let row = _ref0.row;
+        const original = row === null || row === void 0 ? void 0 : row.original;
+        const delivered = isDeliveredStatus(original);
+        const _getTripReportFileIds = getTripReportFileIds(original),
+          startFileStoreId = _getTripReportFileIds.startFileStoreId,
+          endFileStoreId = _getTripReportFileIds.endFileStoreId,
+          hasImages = _getTripReportFileIds.hasImages;
+        if (!delivered || !hasImages) {
+          return /*#__PURE__*/React__default.createElement("span", {
+            className: "cell-text",
+            style: {
+              color: "#94a3b8"
+            }
+          }, t("CS_NA"));
+        }
+        return /*#__PURE__*/React__default.createElement("div", {
+          style: {
+            display: "flex",
+            gap: "8px",
+            alignItems: "center",
+            flexWrap: "wrap"
+          }
+        }, /*#__PURE__*/React__default.createElement("button", {
+          type: "button",
+          title: t("WT_VIEW_IMAGES"),
+          onClick: () => {
+            var _props$onViewImage, _original$searchData1;
+            return (_props$onViewImage = props.onViewImage) === null || _props$onViewImage === void 0 ? void 0 : _props$onViewImage.call(props, {
+              startFileStoreId,
+              endFileStoreId,
+              bookingNo: original === null || original === void 0 ? void 0 : (_original$searchData1 = original.searchData) === null || _original$searchData1 === void 0 ? void 0 : _original$searchData1.bookingNo
+            });
+          },
+          style: {
+            display: "inline-flex",
+            alignItems: "center",
+            gap: "4px",
+            padding: "4px 10px",
+            fontSize: "12px",
+            fontWeight: "600",
+            color: "#0B2559",
+            background: "#EFF6FF",
+            border: "1px solid #BFDBFE",
+            borderRadius: "6px",
+            cursor: "pointer",
+            transition: "all 0.15s ease",
+            whiteSpace: "nowrap"
+          },
+          onMouseEnter: e => {
+            e.currentTarget.style.background = "#DBEAFE";
+            e.currentTarget.style.borderColor = "#93C5FD";
+          },
+          onMouseLeave: e => {
+            e.currentTarget.style.background = "#EFF6FF";
+            e.currentTarget.style.borderColor = "#BFDBFE";
+          }
+        }, /*#__PURE__*/React__default.createElement("svg", {
+          width: "14",
+          height: "14",
+          viewBox: "0 0 24 24",
+          fill: "none",
+          xmlns: "http://www.w3.org/2000/svg"
+        }, /*#__PURE__*/React__default.createElement("path", {
+          d: "M12 4.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5zM12 17c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5zm0-8c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z",
+          fill: "currentColor"
+        })), t("ES_COMMON_VIEW")), /*#__PURE__*/React__default.createElement("button", {
+          type: "button",
+          title: t("WT_DOWNLOAD_IMAGES"),
+          onClick: () => {
+            var _props$onDownloadImag, _original$searchData10;
+            return (_props$onDownloadImag = props.onDownloadImage) === null || _props$onDownloadImag === void 0 ? void 0 : _props$onDownloadImag.call(props, {
+              startFileStoreId,
+              endFileStoreId,
+              bookingNo: original === null || original === void 0 ? void 0 : (_original$searchData10 = original.searchData) === null || _original$searchData10 === void 0 ? void 0 : _original$searchData10.bookingNo
+            });
+          },
+          style: {
+            display: "inline-flex",
+            alignItems: "center",
+            gap: "4px",
+            padding: "4px 10px",
+            fontSize: "12px",
+            fontWeight: "600",
+            color: "#065F46",
+            background: "#ECFDF5",
+            border: "1px solid #A7F3D0",
+            borderRadius: "6px",
+            cursor: "pointer",
+            transition: "all 0.15s ease",
+            whiteSpace: "nowrap"
+          },
+          onMouseEnter: e => {
+            e.currentTarget.style.background = "#D1FAE5";
+            e.currentTarget.style.borderColor = "#6EE7B7";
+          },
+          onMouseLeave: e => {
+            e.currentTarget.style.background = "#ECFDF5";
+            e.currentTarget.style.borderColor = "#A7F3D0";
+          }
+        }, /*#__PURE__*/React__default.createElement("svg", {
+          width: "14",
+          height: "14",
+          viewBox: "0 0 24 24",
+          fill: "none",
+          xmlns: "http://www.w3.org/2000/svg"
+        }, /*#__PURE__*/React__default.createElement("path", {
+          d: "M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z",
+          fill: "currentColor"
+        })), t("CS_COMMON_DOWNLOAD")));
+      },
+      mobileCell: original => {
+        const delivered = isDeliveredStatus(original);
+        const _getTripReportFileIds2 = getTripReportFileIds(original),
+          hasImages = _getTripReportFileIds2.hasImages;
+        return GetMobCell(delivered && hasImages ? "📷" : "-");
+      }
     }] : [])],
     serviceRequestIdKey: original => {
       var _original$t, _original$t$props;
@@ -17942,12 +18418,12 @@ const TableConfig = t => ({
       Header: t("MT_BOOKING_NO"),
       id: "bookingNo",
       accessor: row => {
-        var _row$searchData9;
-        return (row === null || row === void 0 ? void 0 : (_row$searchData9 = row.searchData) === null || _row$searchData9 === void 0 ? void 0 : _row$searchData9["bookingNo"]) || "";
+        var _row$searchData1;
+        return (row === null || row === void 0 ? void 0 : (_row$searchData1 = row.searchData) === null || _row$searchData1 === void 0 ? void 0 : _row$searchData1["bookingNo"]) || "";
       },
-      Cell: _ref0 => {
+      Cell: _ref1 => {
         var _row$original10, _row$original10$searc, _row$original11, _row$original11$searc;
-        let row = _ref0.row;
+        let row = _ref1.row;
         return /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("span", {
           className: "link"
         }, /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
@@ -17955,65 +18431,65 @@ const TableConfig = t => ({
         }, (_row$original11 = row.original) === null || _row$original11 === void 0 ? void 0 : (_row$original11$searc = _row$original11.searchData) === null || _row$original11$searc === void 0 ? void 0 : _row$original11$searc["bookingNo"])));
       },
       mobileCell: original => {
-        var _original$searchData1;
-        return GetMobCell(original === null || original === void 0 ? void 0 : (_original$searchData1 = original.searchData) === null || _original$searchData1 === void 0 ? void 0 : _original$searchData1["bookingNo"]);
+        var _original$searchData11;
+        return GetMobCell(original === null || original === void 0 ? void 0 : (_original$searchData11 = original.searchData) === null || _original$searchData11 === void 0 ? void 0 : _original$searchData11["bookingNo"]);
       }
     }, {
       Header: t("MT_APPLICANT_NAME"),
       id: "applicantName",
       accessor: row => {
-        var _row$searchData0, _row$searchData0$appl;
-        return (row === null || row === void 0 ? void 0 : (_row$searchData0 = row.searchData) === null || _row$searchData0 === void 0 ? void 0 : (_row$searchData0$appl = _row$searchData0.applicantDetail) === null || _row$searchData0$appl === void 0 ? void 0 : _row$searchData0$appl["name"]) || "";
+        var _row$searchData10, _row$searchData10$app;
+        return (row === null || row === void 0 ? void 0 : (_row$searchData10 = row.searchData) === null || _row$searchData10 === void 0 ? void 0 : (_row$searchData10$app = _row$searchData10.applicantDetail) === null || _row$searchData10$app === void 0 ? void 0 : _row$searchData10$app["name"]) || "";
       },
       Cell: row => {
         var _row$cell3, _row$cell3$row, _row$cell3$row$origin, _row$cell3$row$origin2, _row$cell3$row$origin3;
         return GetCell("" + (row === null || row === void 0 ? void 0 : (_row$cell3 = row.cell) === null || _row$cell3 === void 0 ? void 0 : (_row$cell3$row = _row$cell3.row) === null || _row$cell3$row === void 0 ? void 0 : (_row$cell3$row$origin = _row$cell3$row.original) === null || _row$cell3$row$origin === void 0 ? void 0 : (_row$cell3$row$origin2 = _row$cell3$row$origin.searchData) === null || _row$cell3$row$origin2 === void 0 ? void 0 : (_row$cell3$row$origin3 = _row$cell3$row$origin2.applicantDetail) === null || _row$cell3$row$origin3 === void 0 ? void 0 : _row$cell3$row$origin3["name"]));
       },
       mobileCell: original => {
-        var _original$searchData10, _original$searchData11;
-        return GetMobCell(original === null || original === void 0 ? void 0 : (_original$searchData10 = original.searchData) === null || _original$searchData10 === void 0 ? void 0 : (_original$searchData11 = _original$searchData10.applicantDetail) === null || _original$searchData11 === void 0 ? void 0 : _original$searchData11["name"]);
+        var _original$searchData12, _original$searchData13;
+        return GetMobCell(original === null || original === void 0 ? void 0 : (_original$searchData12 = original.searchData) === null || _original$searchData12 === void 0 ? void 0 : (_original$searchData13 = _original$searchData12.applicantDetail) === null || _original$searchData13 === void 0 ? void 0 : _original$searchData13["name"]);
       }
     }, {
       Header: t("MT_MOBILE_NUMBER"),
       id: "mobileNumber",
       accessor: row => {
-        var _row$searchData1, _row$searchData1$appl;
-        return (row === null || row === void 0 ? void 0 : (_row$searchData1 = row.searchData) === null || _row$searchData1 === void 0 ? void 0 : (_row$searchData1$appl = _row$searchData1.applicantDetail) === null || _row$searchData1$appl === void 0 ? void 0 : _row$searchData1$appl["mobileNumber"]) || "";
+        var _row$searchData11, _row$searchData11$app;
+        return (row === null || row === void 0 ? void 0 : (_row$searchData11 = row.searchData) === null || _row$searchData11 === void 0 ? void 0 : (_row$searchData11$app = _row$searchData11.applicantDetail) === null || _row$searchData11$app === void 0 ? void 0 : _row$searchData11$app["mobileNumber"]) || "";
       },
       Cell: row => {
         var _row$cell4, _row$cell4$row, _row$cell4$row$origin, _row$cell4$row$origin2, _row$cell4$row$origin3;
         return GetCell("" + (row === null || row === void 0 ? void 0 : (_row$cell4 = row.cell) === null || _row$cell4 === void 0 ? void 0 : (_row$cell4$row = _row$cell4.row) === null || _row$cell4$row === void 0 ? void 0 : (_row$cell4$row$origin = _row$cell4$row.original) === null || _row$cell4$row$origin === void 0 ? void 0 : (_row$cell4$row$origin2 = _row$cell4$row$origin.searchData) === null || _row$cell4$row$origin2 === void 0 ? void 0 : (_row$cell4$row$origin3 = _row$cell4$row$origin2.applicantDetail) === null || _row$cell4$row$origin3 === void 0 ? void 0 : _row$cell4$row$origin3["mobileNumber"]));
       },
       mobileCell: original => {
-        var _original$searchData12, _original$searchData13;
-        return GetMobCell(original === null || original === void 0 ? void 0 : (_original$searchData12 = original.searchData) === null || _original$searchData12 === void 0 ? void 0 : (_original$searchData13 = _original$searchData12.applicantDetail) === null || _original$searchData13 === void 0 ? void 0 : _original$searchData13["mobileNumber"]);
+        var _original$searchData14, _original$searchData15;
+        return GetMobCell(original === null || original === void 0 ? void 0 : (_original$searchData14 = original.searchData) === null || _original$searchData14 === void 0 ? void 0 : (_original$searchData15 = _original$searchData14.applicantDetail) === null || _original$searchData15 === void 0 ? void 0 : _original$searchData15["mobileNumber"]);
       }
     }, {
       Header: t("LOCALITY"),
       id: "localityCode",
       accessor: row => {
-        var _row$searchData10;
-        return (row === null || row === void 0 ? void 0 : (_row$searchData10 = row.searchData) === null || _row$searchData10 === void 0 ? void 0 : _row$searchData10["localityCode"]) || "";
+        var _row$searchData12;
+        return (row === null || row === void 0 ? void 0 : (_row$searchData12 = row.searchData) === null || _row$searchData12 === void 0 ? void 0 : _row$searchData12["localityCode"]) || "";
       },
-      Cell: _ref1 => {
+      Cell: _ref10 => {
         var _row$original12, _row$original12$searc, _row$original13, _row$original13$searc;
-        let row = _ref1.row;
+        let row = _ref10.row;
         return GetCell(getLocalityTranslation((_row$original12 = row.original) === null || _row$original12 === void 0 ? void 0 : (_row$original12$searc = _row$original12.searchData) === null || _row$original12$searc === void 0 ? void 0 : _row$original12$searc["localityCode"], (_row$original13 = row.original) === null || _row$original13 === void 0 ? void 0 : (_row$original13$searc = _row$original13.searchData) === null || _row$original13$searc === void 0 ? void 0 : _row$original13$searc.tenantId, t));
       },
       mobileCell: original => {
-        var _original$searchData14, _original$searchData15;
-        return GetMobCell(getLocalityTranslation(original === null || original === void 0 ? void 0 : (_original$searchData14 = original.searchData) === null || _original$searchData14 === void 0 ? void 0 : _original$searchData14["localityCode"], original === null || original === void 0 ? void 0 : (_original$searchData15 = original.searchData) === null || _original$searchData15 === void 0 ? void 0 : _original$searchData15.tenantId, t));
+        var _original$searchData16, _original$searchData17;
+        return GetMobCell(getLocalityTranslation(original === null || original === void 0 ? void 0 : (_original$searchData16 = original.searchData) === null || _original$searchData16 === void 0 ? void 0 : _original$searchData16["localityCode"], original === null || original === void 0 ? void 0 : (_original$searchData17 = original.searchData) === null || _original$searchData17 === void 0 ? void 0 : _original$searchData17.tenantId, t));
       }
     }, {
       Header: t("MT_STATUS"),
       id: "applicationStatus",
       accessor: row => {
-        var _row$workflowData3, _row$workflowData3$st;
-        return (row === null || row === void 0 ? void 0 : (_row$workflowData3 = row.workflowData) === null || _row$workflowData3 === void 0 ? void 0 : (_row$workflowData3$st = _row$workflowData3.state) === null || _row$workflowData3$st === void 0 ? void 0 : _row$workflowData3$st["applicationStatus"]) || "";
+        var _row$workflowData4, _row$workflowData4$st;
+        return (row === null || row === void 0 ? void 0 : (_row$workflowData4 = row.workflowData) === null || _row$workflowData4 === void 0 ? void 0 : (_row$workflowData4$st = _row$workflowData4.state) === null || _row$workflowData4$st === void 0 ? void 0 : _row$workflowData4$st["applicationStatus"]) || "";
       },
-      Cell: _ref10 => {
+      Cell: _ref11 => {
         var _row$original15, _row$original15$workf, _row$original15$workf2;
-        let row = _ref10.row;
+        let row = _ref11.row;
         return GetCell(t("" + (row === null || row === void 0 ? void 0 : (_row$original15 = row.original) === null || _row$original15 === void 0 ? void 0 : (_row$original15$workf = _row$original15.workflowData) === null || _row$original15$workf === void 0 ? void 0 : (_row$original15$workf2 = _row$original15$workf.state) === null || _row$original15$workf2 === void 0 ? void 0 : _row$original15$workf2["applicationStatus"])));
       },
       mobileCell: original => {
@@ -18031,12 +18507,12 @@ const TableConfig = t => ({
       Header: t("MT_BOOKING_NO"),
       id: "bookingNo",
       accessor: row => {
-        var _row$searchData11;
-        return (row === null || row === void 0 ? void 0 : (_row$searchData11 = row.searchData) === null || _row$searchData11 === void 0 ? void 0 : _row$searchData11["bookingNo"]) || "";
+        var _row$searchData13;
+        return (row === null || row === void 0 ? void 0 : (_row$searchData13 = row.searchData) === null || _row$searchData13 === void 0 ? void 0 : _row$searchData13["bookingNo"]) || "";
       },
-      Cell: _ref11 => {
+      Cell: _ref12 => {
         var _row$original16, _row$original16$searc, _row$original17, _row$original17$searc;
-        let row = _ref11.row;
+        let row = _ref12.row;
         return /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("span", {
           className: "link"
         }, /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
@@ -18044,65 +18520,65 @@ const TableConfig = t => ({
         }, (_row$original17 = row.original) === null || _row$original17 === void 0 ? void 0 : (_row$original17$searc = _row$original17.searchData) === null || _row$original17$searc === void 0 ? void 0 : _row$original17$searc["bookingNo"])));
       },
       mobileCell: original => {
-        var _original$searchData16;
-        return GetMobCell(original === null || original === void 0 ? void 0 : (_original$searchData16 = original.searchData) === null || _original$searchData16 === void 0 ? void 0 : _original$searchData16["bookingNo"]);
+        var _original$searchData18;
+        return GetMobCell(original === null || original === void 0 ? void 0 : (_original$searchData18 = original.searchData) === null || _original$searchData18 === void 0 ? void 0 : _original$searchData18["bookingNo"]);
       }
     }, {
       Header: t("MT_APPLICANT_NAME"),
       id: "applicantName",
       accessor: row => {
-        var _row$searchData12, _row$searchData12$app;
-        return (row === null || row === void 0 ? void 0 : (_row$searchData12 = row.searchData) === null || _row$searchData12 === void 0 ? void 0 : (_row$searchData12$app = _row$searchData12.applicantDetail) === null || _row$searchData12$app === void 0 ? void 0 : _row$searchData12$app["name"]) || "";
+        var _row$searchData14, _row$searchData14$app;
+        return (row === null || row === void 0 ? void 0 : (_row$searchData14 = row.searchData) === null || _row$searchData14 === void 0 ? void 0 : (_row$searchData14$app = _row$searchData14.applicantDetail) === null || _row$searchData14$app === void 0 ? void 0 : _row$searchData14$app["name"]) || "";
       },
       Cell: row => {
         var _row$cell5, _row$cell5$row, _row$cell5$row$origin, _row$cell5$row$origin2, _row$cell5$row$origin3;
         return GetCell("" + (row === null || row === void 0 ? void 0 : (_row$cell5 = row.cell) === null || _row$cell5 === void 0 ? void 0 : (_row$cell5$row = _row$cell5.row) === null || _row$cell5$row === void 0 ? void 0 : (_row$cell5$row$origin = _row$cell5$row.original) === null || _row$cell5$row$origin === void 0 ? void 0 : (_row$cell5$row$origin2 = _row$cell5$row$origin.searchData) === null || _row$cell5$row$origin2 === void 0 ? void 0 : (_row$cell5$row$origin3 = _row$cell5$row$origin2.applicantDetail) === null || _row$cell5$row$origin3 === void 0 ? void 0 : _row$cell5$row$origin3["name"]));
       },
       mobileCell: original => {
-        var _original$searchData17, _original$searchData18;
-        return GetMobCell(original === null || original === void 0 ? void 0 : (_original$searchData17 = original.searchData) === null || _original$searchData17 === void 0 ? void 0 : (_original$searchData18 = _original$searchData17.applicantDetail) === null || _original$searchData18 === void 0 ? void 0 : _original$searchData18["name"]);
+        var _original$searchData19, _original$searchData20;
+        return GetMobCell(original === null || original === void 0 ? void 0 : (_original$searchData19 = original.searchData) === null || _original$searchData19 === void 0 ? void 0 : (_original$searchData20 = _original$searchData19.applicantDetail) === null || _original$searchData20 === void 0 ? void 0 : _original$searchData20["name"]);
       }
     }, {
       Header: t("MT_MOBILE_NUMBER"),
       id: "mobileNumber",
       accessor: row => {
-        var _row$searchData13, _row$searchData13$app;
-        return (row === null || row === void 0 ? void 0 : (_row$searchData13 = row.searchData) === null || _row$searchData13 === void 0 ? void 0 : (_row$searchData13$app = _row$searchData13.applicantDetail) === null || _row$searchData13$app === void 0 ? void 0 : _row$searchData13$app["mobileNumber"]) || "";
+        var _row$searchData15, _row$searchData15$app;
+        return (row === null || row === void 0 ? void 0 : (_row$searchData15 = row.searchData) === null || _row$searchData15 === void 0 ? void 0 : (_row$searchData15$app = _row$searchData15.applicantDetail) === null || _row$searchData15$app === void 0 ? void 0 : _row$searchData15$app["mobileNumber"]) || "";
       },
       Cell: row => {
         var _row$cell6, _row$cell6$row, _row$cell6$row$origin, _row$cell6$row$origin2, _row$cell6$row$origin3;
         return GetCell("" + (row === null || row === void 0 ? void 0 : (_row$cell6 = row.cell) === null || _row$cell6 === void 0 ? void 0 : (_row$cell6$row = _row$cell6.row) === null || _row$cell6$row === void 0 ? void 0 : (_row$cell6$row$origin = _row$cell6$row.original) === null || _row$cell6$row$origin === void 0 ? void 0 : (_row$cell6$row$origin2 = _row$cell6$row$origin.searchData) === null || _row$cell6$row$origin2 === void 0 ? void 0 : (_row$cell6$row$origin3 = _row$cell6$row$origin2.applicantDetail) === null || _row$cell6$row$origin3 === void 0 ? void 0 : _row$cell6$row$origin3["mobileNumber"]));
       },
       mobileCell: original => {
-        var _original$searchData19, _original$searchData20;
-        return GetMobCell(original === null || original === void 0 ? void 0 : (_original$searchData19 = original.searchData) === null || _original$searchData19 === void 0 ? void 0 : (_original$searchData20 = _original$searchData19.applicantDetail) === null || _original$searchData20 === void 0 ? void 0 : _original$searchData20["mobileNumber"]);
+        var _original$searchData21, _original$searchData22;
+        return GetMobCell(original === null || original === void 0 ? void 0 : (_original$searchData21 = original.searchData) === null || _original$searchData21 === void 0 ? void 0 : (_original$searchData22 = _original$searchData21.applicantDetail) === null || _original$searchData22 === void 0 ? void 0 : _original$searchData22["mobileNumber"]);
       }
     }, {
       Header: t("LOCALITY"),
       id: "localityCode",
       accessor: row => {
-        var _row$searchData14;
-        return (row === null || row === void 0 ? void 0 : (_row$searchData14 = row.searchData) === null || _row$searchData14 === void 0 ? void 0 : _row$searchData14["localityCode"]) || "";
+        var _row$searchData16;
+        return (row === null || row === void 0 ? void 0 : (_row$searchData16 = row.searchData) === null || _row$searchData16 === void 0 ? void 0 : _row$searchData16["localityCode"]) || "";
       },
-      Cell: _ref12 => {
+      Cell: _ref13 => {
         var _row$original18, _row$original18$searc, _row$original19, _row$original19$searc;
-        let row = _ref12.row;
+        let row = _ref13.row;
         return GetCell(getLocalityTranslation((_row$original18 = row.original) === null || _row$original18 === void 0 ? void 0 : (_row$original18$searc = _row$original18.searchData) === null || _row$original18$searc === void 0 ? void 0 : _row$original18$searc["localityCode"], (_row$original19 = row.original) === null || _row$original19 === void 0 ? void 0 : (_row$original19$searc = _row$original19.searchData) === null || _row$original19$searc === void 0 ? void 0 : _row$original19$searc.tenantId, t));
       },
       mobileCell: original => {
-        var _original$searchData21, _original$searchData22;
-        return GetMobCell(getLocalityTranslation(original === null || original === void 0 ? void 0 : (_original$searchData21 = original.searchData) === null || _original$searchData21 === void 0 ? void 0 : _original$searchData21["localityCode"], original === null || original === void 0 ? void 0 : (_original$searchData22 = original.searchData) === null || _original$searchData22 === void 0 ? void 0 : _original$searchData22.tenantId, t));
+        var _original$searchData23, _original$searchData24;
+        return GetMobCell(getLocalityTranslation(original === null || original === void 0 ? void 0 : (_original$searchData23 = original.searchData) === null || _original$searchData23 === void 0 ? void 0 : _original$searchData23["localityCode"], original === null || original === void 0 ? void 0 : (_original$searchData24 = original.searchData) === null || _original$searchData24 === void 0 ? void 0 : _original$searchData24.tenantId, t));
       }
     }, {
       Header: t("MT_STATUS"),
       id: "applicationStatus",
       accessor: row => {
-        var _row$workflowData4, _row$workflowData4$st;
-        return (row === null || row === void 0 ? void 0 : (_row$workflowData4 = row.workflowData) === null || _row$workflowData4 === void 0 ? void 0 : (_row$workflowData4$st = _row$workflowData4.state) === null || _row$workflowData4$st === void 0 ? void 0 : _row$workflowData4$st["applicationStatus"]) || "";
+        var _row$workflowData5, _row$workflowData5$st;
+        return (row === null || row === void 0 ? void 0 : (_row$workflowData5 = row.workflowData) === null || _row$workflowData5 === void 0 ? void 0 : (_row$workflowData5$st = _row$workflowData5.state) === null || _row$workflowData5$st === void 0 ? void 0 : _row$workflowData5$st["applicationStatus"]) || "";
       },
-      Cell: _ref13 => {
+      Cell: _ref14 => {
         var _row$original21, _row$original21$workf, _row$original21$workf2;
-        let row = _ref13.row;
+        let row = _ref14.row;
         return GetCell(t("" + (row === null || row === void 0 ? void 0 : (_row$original21 = row.original) === null || _row$original21 === void 0 ? void 0 : (_row$original21$workf = _row$original21.workflowData) === null || _row$original21$workf === void 0 ? void 0 : (_row$original21$workf2 = _row$original21$workf.state) === null || _row$original21$workf2 === void 0 ? void 0 : _row$original21$workf2["applicationStatus"])));
       },
       mobileCell: original => {
@@ -19654,8 +20130,70 @@ const configWSApproverApplication = _ref => {
     uploadedFile = _ref.uploadedFile,
     setUploadedFile = _ref.setUploadedFile,
     businessService = _ref.businessService,
-    error = _ref.error;
+    error = _ref.error,
+    isReasonRequiredAction = _ref.isReasonRequiredAction,
+    selectedReason = _ref.selectedReason,
+    setSelectedReason = _ref.setSelectedReason,
+    otherReasonText = _ref.otherReasonText,
+    setOtherReasonText = _ref.setOtherReasonText;
   if (action !== null && action !== void 0 && (_action$action = action.action) !== null && _action$action !== void 0 && _action$action.includes("SEND_BACK") || (action === null || action === void 0 ? void 0 : action.action) == "APPROVE_FOR_CONNECTION") ;
+  const reasonOptions = [{
+    code: "INCOMPLETE_DOCUMENTS",
+    name: "Incomplete / Incorrect Documents",
+    i18nKey: "WS_MUTATION_REASON_INCOMPLETE_DOCUMENTS"
+  }, {
+    code: "MISMATCH_DETAILS",
+    name: "Mismatch in Owner / Consumer Details",
+    i18nKey: "WS_MUTATION_REASON_MISMATCH_DETAILS"
+  }, {
+    code: "INVALID_PROOF",
+    name: "Invalid / Unverified Proof Provided",
+    i18nKey: "WS_MUTATION_REASON_INVALID_PROOF"
+  }, {
+    code: "OTHER",
+    name: "Other",
+    i18nKey: "WS_MUTATION_REASON_OTHER"
+  }];
+  const commentsField = isReasonRequiredAction ? [{
+    label: t("WF_REASON_LABEL") || t("Reason"),
+    isMandatory: true,
+    populators: /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
+      option: reasonOptions,
+      autoComplete: "off",
+      optionKey: "name",
+      id: "mutationActionReason",
+      select: val => {
+        setSelectedReason(val);
+        if ((val === null || val === void 0 ? void 0 : val.code) !== "OTHER") {
+          setOtherReasonText("");
+        }
+      },
+      selected: selectedReason,
+      t: t,
+      placeholder: t("WF_SELECT_REASON_PLACEHOLDER") || "Select Reason"
+    })
+  }, ...((selectedReason === null || selectedReason === void 0 ? void 0 : selectedReason.code) === "OTHER" ? [{
+    label: t("WF_OTHER_REASON_LABEL") || t("Please specify reason"),
+    isMandatory: true,
+    populators: /*#__PURE__*/React__default.createElement("textarea", {
+      className: "employee-card-input",
+      style: {
+        width: "100%",
+        height: "80px",
+        resize: "vertical",
+        marginTop: "4px"
+      },
+      value: otherReasonText,
+      onChange: e => setOtherReasonText(e.target.value),
+      placeholder: t("WF_ENTER_OTHER_REASON_PLACEHOLDER") || "Enter reason details..."
+    })
+  }] : [])] : [{
+    label: t("WF_COMMON_COMMENTS"),
+    type: "textarea",
+    populators: {
+      name: "comments"
+    }
+  }];
   return {
     label: {
       heading: "WF_" + (action === null || action === void 0 ? void 0 : action.action) + "_APPLICATION",
@@ -19663,13 +20201,7 @@ const configWSApproverApplication = _ref => {
       cancel: "CS_COMMON_CANCEL"
     },
     form: [{
-      body: [{
-        label: t("WF_COMMON_COMMENTS"),
-        type: "textarea",
-        populators: {
-          name: "comments"
-        }
-      }, {
+      body: [...commentsField, {
         label: t("WS_APPROVAL_CHECKLIST_BUTTON_UP_FILE"),
         populators: /*#__PURE__*/React__default.createElement(digitUiReactComponents.UploadFile, {
           id: "workflow-doc",
@@ -21929,7 +22461,7 @@ const convertDateToEpochNew = function (dateString, dayStartOrEnd) {
   }
 };
 const ActionModal$5 = _ref => {
-  var _action$assigneeRoles, _action$assigneeRoles2;
+  var _action$assigneeRoles, _action$assigneeRoles2, _applicationData, _applicationData$appl, _applicationData2, _applicationData2$bus, _applicationData3, _applicationData3$app, _action$action, _action$action2;
   let t = _ref.t,
     action = _ref.action,
     tenantId = _ref.tenantId,
@@ -21971,6 +22503,14 @@ const ActionModal$5 = _ref => {
   const _useState7 = React.useState(null),
     error = _useState7[0],
     setError = _useState7[1];
+  const _useState8 = React.useState(null),
+    selectedReason = _useState8[0],
+    setSelectedReason = _useState8[1];
+  const _useState9 = React.useState(""),
+    otherReasonText = _useState9[0],
+    setOtherReasonText = _useState9[1];
+  const isMutationApp = ((_applicationData = applicationData) === null || _applicationData === void 0 ? void 0 : (_applicationData$appl = _applicationData.applicationType) === null || _applicationData$appl === void 0 ? void 0 : _applicationData$appl.includes("MUTATION")) || ((_applicationData2 = applicationData) === null || _applicationData2 === void 0 ? void 0 : (_applicationData2$bus = _applicationData2.businessService) === null || _applicationData2$bus === void 0 ? void 0 : _applicationData2$bus.includes("MUTATION")) || (businessService === null || businessService === void 0 ? void 0 : businessService.includes("MUTATION")) || ((_applicationData3 = applicationData) === null || _applicationData3 === void 0 ? void 0 : (_applicationData3$app = _applicationData3.applicationNo) === null || _applicationData3$app === void 0 ? void 0 : _applicationData3$app.includes("MUT"));
+  const isReasonRequiredAction = isMutationApp && ((action === null || action === void 0 ? void 0 : (_action$action = action.action) === null || _action$action === void 0 ? void 0 : _action$action.includes("SEND_BACK")) || (action === null || action === void 0 ? void 0 : (_action$action2 = action.action) === null || _action$action2 === void 0 ? void 0 : _action$action2.includes("REJECT")));
   const isMobile = window.Digit.Utils.browser.isMobile();
   const isEmployee = window.location.href.includes("/employee");
   React.useEffect(() => {
@@ -22031,24 +22571,40 @@ const ActionModal$5 = _ref => {
     })();
   }, [file]);
   function submit(data) {
-    var _applicationData, _applicationData7, _applicationData8, _applicationData8$app, _applicationData9, _applicationData9$pro, _applicationData0, _applicationData0$pro, _applicationData10, _applicationData11;
-    if ((_applicationData = applicationData) !== null && _applicationData !== void 0 && _applicationData.isBillAmend) {
-      var _applicationData2, _applicationData2$bil, _applicationData3, _applicationData4, _applicationData4$bil, _applicationData5, _applicationData5$app, _applicationData6, _applicationData6$app;
-      const comments = data !== null && data !== void 0 && data.comments ? data.comments : null;
-      const additionalDetails = _extends({}, (_applicationData2 = applicationData) === null || _applicationData2 === void 0 ? void 0 : (_applicationData2$bil = _applicationData2.billAmendmentDetails) === null || _applicationData2$bil === void 0 ? void 0 : _applicationData2$bil.additionalDetails, {
+    var _applicationData4, _applicationData0, _applicationData1, _applicationData1$app, _applicationData10, _applicationData10$pr, _applicationData11, _applicationData11$pr, _applicationData13, _applicationData14;
+    let commentValue = (data === null || data === void 0 ? void 0 : data.comments) || "";
+    if (isReasonRequiredAction) {
+      if (!selectedReason) {
+        setError(t("PLEASE_SELECT_REASON") || "Please select a reason");
+        return;
+      }
+      if ((selectedReason === null || selectedReason === void 0 ? void 0 : selectedReason.code) === "OTHER") {
+        if (!otherReasonText || otherReasonText.trim() === "") {
+          setError(t("PLEASE_ENTER_REASON") || "Please enter the reason");
+          return;
+        }
+        commentValue = otherReasonText.trim();
+      } else {
+        commentValue = (selectedReason === null || selectedReason === void 0 ? void 0 : selectedReason.name) || (selectedReason !== null && selectedReason !== void 0 && selectedReason.i18nKey ? t(selectedReason === null || selectedReason === void 0 ? void 0 : selectedReason.i18nKey) : selectedReason === null || selectedReason === void 0 ? void 0 : selectedReason.code);
+      }
+    }
+    if ((_applicationData4 = applicationData) !== null && _applicationData4 !== void 0 && _applicationData4.isBillAmend) {
+      var _applicationData5, _applicationData5$bil, _applicationData6, _applicationData7, _applicationData7$bil, _applicationData8, _applicationData8$app, _applicationData9, _applicationData9$app;
+      const comments = commentValue || (data !== null && data !== void 0 && data.comments ? data.comments : null);
+      const additionalDetails = _extends({}, (_applicationData5 = applicationData) === null || _applicationData5 === void 0 ? void 0 : (_applicationData5$bil = _applicationData5.billAmendmentDetails) === null || _applicationData5$bil === void 0 ? void 0 : _applicationData5$bil.additionalDetails, {
         comments
       });
-      const amendment = _extends({}, (_applicationData3 = applicationData) === null || _applicationData3 === void 0 ? void 0 : _applicationData3.billAmendmentDetails, {
+      const amendment = _extends({}, (_applicationData6 = applicationData) === null || _applicationData6 === void 0 ? void 0 : _applicationData6.billAmendmentDetails, {
         workflow: {
-          businessId: (_applicationData4 = applicationData) === null || _applicationData4 === void 0 ? void 0 : (_applicationData4$bil = _applicationData4.billAmendmentDetails) === null || _applicationData4$bil === void 0 ? void 0 : _applicationData4$bil.amendmentId,
+          businessId: (_applicationData7 = applicationData) === null || _applicationData7 === void 0 ? void 0 : (_applicationData7$bil = _applicationData7.billAmendmentDetails) === null || _applicationData7$bil === void 0 ? void 0 : _applicationData7$bil.amendmentId,
           action: action === null || action === void 0 ? void 0 : action.action,
           tenantId: tenantId,
-          businessService: (_applicationData5 = applicationData) !== null && _applicationData5 !== void 0 && (_applicationData5$app = _applicationData5.applicationType) !== null && _applicationData5$app !== void 0 && _applicationData5$app.includes("WATER") ? "WS.AMENDMENT" : "SW.AMENDMENT",
-          moduleName: (_applicationData6 = applicationData) !== null && _applicationData6 !== void 0 && (_applicationData6$app = _applicationData6.applicationType) !== null && _applicationData6$app !== void 0 && _applicationData6$app.includes("WATER") ? "WS" : "SW",
+          businessService: (_applicationData8 = applicationData) !== null && _applicationData8 !== void 0 && (_applicationData8$app = _applicationData8.applicationType) !== null && _applicationData8$app !== void 0 && _applicationData8$app.includes("WATER") ? "WS.AMENDMENT" : "SW.AMENDMENT",
+          moduleName: (_applicationData9 = applicationData) !== null && _applicationData9 !== void 0 && (_applicationData9$app = _applicationData9.applicationType) !== null && _applicationData9$app !== void 0 && _applicationData9$app.includes("WATER") ? "WS" : "SW",
           assignes: !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? [] : [{
             uuid: selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid
           }],
-          comment: (data === null || data === void 0 ? void 0 : data.comments) || "",
+          comment: commentValue || (data === null || data === void 0 ? void 0 : data.comments) || "",
           documents: uploadedFile ? [{
             documentType: (action === null || action === void 0 ? void 0 : action.action) + " DOC",
             fileName: file === null || file === void 0 ? void 0 : file.name,
@@ -22056,7 +22612,7 @@ const ActionModal$5 = _ref => {
           }] : []
         },
         additionalDetails,
-        comment: (data === null || data === void 0 ? void 0 : data.comments) || "",
+        comment: commentValue || (data === null || data === void 0 ? void 0 : data.comments) || "",
         wfDocuments: uploadedFile ? [{
           documentType: (action === null || action === void 0 ? void 0 : action.action) + " DOC",
           fileName: file === null || file === void 0 ? void 0 : file.name,
@@ -22067,7 +22623,7 @@ const ActionModal$5 = _ref => {
           assignes: !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? [] : [{
             uuid: selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid
           }],
-          comment: (data === null || data === void 0 ? void 0 : data.comments) || "",
+          comment: commentValue || (data === null || data === void 0 ? void 0 : data.comments) || "",
           documents: uploadedFile ? [{
             documentType: (action === null || action === void 0 ? void 0 : action.action) + " DOC",
             fileName: file === null || file === void 0 ? void 0 : file.name,
@@ -22082,7 +22638,7 @@ const ActionModal$5 = _ref => {
     }
     applicationData = _extends({}, applicationData, {
       action: action === null || action === void 0 ? void 0 : action.action,
-      comment: (data === null || data === void 0 ? void 0 : data.comments) || "",
+      comment: commentValue,
       assignee: !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? [] : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
       assignes: !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? [] : [{
         uuid: selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid
@@ -22092,12 +22648,12 @@ const ActionModal$5 = _ref => {
         fileName: file === null || file === void 0 ? void 0 : file.name,
         fileStoreId: uploadedFile
       }] : null,
-      processInstance: _extends({}, (_applicationData7 = applicationData) === null || _applicationData7 === void 0 ? void 0 : _applicationData7.processInstance, {
+      processInstance: _extends({}, (_applicationData0 = applicationData) === null || _applicationData0 === void 0 ? void 0 : _applicationData0.processInstance, {
         action: action === null || action === void 0 ? void 0 : action.action,
         assignes: !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? [] : [{
           uuid: selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid
         }],
-        comment: (data === null || data === void 0 ? void 0 : data.comments) || "",
+        comment: commentValue,
         documents: uploadedFile ? [{
           documentType: (action === null || action === void 0 ? void 0 : action.action) + " DOC",
           fileName: file === null || file === void 0 ? void 0 : file.name,
@@ -22105,36 +22661,36 @@ const ActionModal$5 = _ref => {
         }] : []
       })
     });
-    if (data !== null && data !== void 0 && data.date && (_applicationData8 = applicationData) !== null && _applicationData8 !== void 0 && (_applicationData8$app = _applicationData8.applicationType) !== null && _applicationData8$app !== void 0 && _applicationData8$app.includes("DISCONNECT")) {
+    if (data !== null && data !== void 0 && data.date && (_applicationData1 = applicationData) !== null && _applicationData1 !== void 0 && (_applicationData1$app = _applicationData1.applicationType) !== null && _applicationData1$app !== void 0 && _applicationData1$app.includes("DISCONNECT")) {
       const disconnectionExecutionDate = cloneDeep_1(data === null || data === void 0 ? void 0 : data.date);
       applicationData.disconnectionExecutionDate = convertDateToEpochNew(disconnectionExecutionDate);
     } else if (data !== null && data !== void 0 && data.date) {
       const connectionExecutionDate = cloneDeep_1(data === null || data === void 0 ? void 0 : data.date);
       applicationData.connectionExecutionDate = convertDateToEpochNew(connectionExecutionDate);
     }
-    if (((_applicationData9 = applicationData) === null || _applicationData9 === void 0 ? void 0 : (_applicationData9$pro = _applicationData9.processInstance) === null || _applicationData9$pro === void 0 ? void 0 : _applicationData9$pro.businessService) == "DisconnectWSConnection" || ((_applicationData0 = applicationData) === null || _applicationData0 === void 0 ? void 0 : (_applicationData0$pro = _applicationData0.processInstance) === null || _applicationData0$pro === void 0 ? void 0 : _applicationData0$pro.businessService) == "DisconnectSWConnection" || window.location.href.includes("disconnection")) {
-      var _applicationData1;
-      ((_applicationData1 = applicationData) === null || _applicationData1 === void 0 ? void 0 : _applicationData1.serviceType) == "WATER" ? submitAction({
+    if (((_applicationData10 = applicationData) === null || _applicationData10 === void 0 ? void 0 : (_applicationData10$pr = _applicationData10.processInstance) === null || _applicationData10$pr === void 0 ? void 0 : _applicationData10$pr.businessService) == "DisconnectWSConnection" || ((_applicationData11 = applicationData) === null || _applicationData11 === void 0 ? void 0 : (_applicationData11$pr = _applicationData11.processInstance) === null || _applicationData11$pr === void 0 ? void 0 : _applicationData11$pr.businessService) == "DisconnectSWConnection" || window.location.href.includes("disconnection")) {
+      var _applicationData12;
+      ((_applicationData12 = applicationData) === null || _applicationData12 === void 0 ? void 0 : _applicationData12.serviceType) == "WATER" ? submitAction({
         WaterConnection: applicationData,
         disconnectRequest: true
       }) : submitAction({
         SewerageConnection: applicationData,
         disconnectRequest: true
       });
-    } else if (((_applicationData10 = applicationData) === null || _applicationData10 === void 0 ? void 0 : _applicationData10.applicationType) == "SEWERAGE_RECONNECTION") {
+    } else if (((_applicationData13 = applicationData) === null || _applicationData13 === void 0 ? void 0 : _applicationData13.applicationType) == "SEWERAGE_RECONNECTION") {
       submitAction({
         SewerageConnection: applicationData,
         disconnectRequest: false,
         reconnectRequest: true
       });
-    } else if (((_applicationData11 = applicationData) === null || _applicationData11 === void 0 ? void 0 : _applicationData11.applicationType) == "WATER_RECONNECTION") {
+    } else if (((_applicationData14 = applicationData) === null || _applicationData14 === void 0 ? void 0 : _applicationData14.applicationType) == "WATER_RECONNECTION") {
       submitAction({
         WaterConnection: applicationData,
         disconnectRequest: false,
         reconnectRequest: true
       });
     } else {
-      var _parsedAdhocRebateDat, _parsedAdhocRebateDat2, _parsedAdhocRebateDat3, _parsedAdhocRebateDat4, _parsedAdhocRebateDat5, _parsedAdhocRebateDat6, _parsedAdhocRebateDat7, _parsedAdhocRebateDat8, _parsedAdhocRebateDat9, _parsedAdhocRebateDat0, _parsedAdhocRebateDat1, _parsedAdhocRebateDat10, _applicationData12;
+      var _parsedAdhocRebateDat, _parsedAdhocRebateDat2, _parsedAdhocRebateDat3, _parsedAdhocRebateDat4, _parsedAdhocRebateDat5, _parsedAdhocRebateDat6, _parsedAdhocRebateDat7, _parsedAdhocRebateDat8, _parsedAdhocRebateDat9, _parsedAdhocRebateDat0, _parsedAdhocRebateDat1, _parsedAdhocRebateDat10, _applicationData15;
       const adhocRebateData = sessionStorage.getItem("Digit.ADHOC_ADD_REBATE_DATA");
       const parsedAdhocRebateData = adhocRebateData ? JSON.parse(adhocRebateData) : "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat !== void 0 && _parsedAdhocRebateDat.adhocPenalty) applicationData.additionalDetails.adhocPenalty = parseInt(parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat2 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat2 === void 0 ? void 0 : _parsedAdhocRebateDat2.adhocPenalty) || "";
@@ -22143,7 +22699,7 @@ const ActionModal$5 = _ref => {
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat7 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat7 !== void 0 && _parsedAdhocRebateDat7.adhocRebate) applicationData.additionalDetails.adhocRebate = parseInt(parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat8 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat8 === void 0 ? void 0 : _parsedAdhocRebateDat8.adhocRebate) || "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat9 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat9 !== void 0 && _parsedAdhocRebateDat9.adhocRebateComment) applicationData.additionalDetails.adhocRebateComment = (parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat0 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat0 === void 0 ? void 0 : _parsedAdhocRebateDat0.adhocRebateComment) || "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat1 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat1 !== void 0 && _parsedAdhocRebateDat1.adhocRebateReason) applicationData.additionalDetails.adhocRebateReason = (parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat10 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat10 === void 0 ? void 0 : _parsedAdhocRebateDat10.adhocRebateReason) || "";
-      ((_applicationData12 = applicationData) === null || _applicationData12 === void 0 ? void 0 : _applicationData12.serviceType) == "WATER" ? submitAction({
+      ((_applicationData15 = applicationData) === null || _applicationData15 === void 0 ? void 0 : _applicationData15.serviceType) == "WATER" ? submitAction({
         WaterConnection: applicationData,
         disconnectRequest: false,
         reconnectRequest: false
@@ -22155,8 +22711,8 @@ const ActionModal$5 = _ref => {
     }
   }
   React.useEffect(() => {
-    var _applicationData13, _applicationData13$pr, _applicationData14, _applicationData14$pr;
-    if (((_applicationData13 = applicationData) === null || _applicationData13 === void 0 ? void 0 : (_applicationData13$pr = _applicationData13.processInstance) === null || _applicationData13$pr === void 0 ? void 0 : _applicationData13$pr.businessService) == "DisconnectWSConnection" || ((_applicationData14 = applicationData) === null || _applicationData14 === void 0 ? void 0 : (_applicationData14$pr = _applicationData14.processInstance) === null || _applicationData14$pr === void 0 ? void 0 : _applicationData14$pr.businessService) == "DisconnectSWConnection") {
+    var _applicationData16, _applicationData16$pr, _applicationData17, _applicationData17$pr;
+    if (((_applicationData16 = applicationData) === null || _applicationData16 === void 0 ? void 0 : (_applicationData16$pr = _applicationData16.processInstance) === null || _applicationData16$pr === void 0 ? void 0 : _applicationData16$pr.businessService) == "DisconnectWSConnection" || ((_applicationData17 = applicationData) === null || _applicationData17 === void 0 ? void 0 : (_applicationData17$pr = _applicationData17.processInstance) === null || _applicationData17$pr === void 0 ? void 0 : _applicationData17$pr.businessService) == "DisconnectSWConnection") {
       if (action) {
         setConfig(configWSDisConnectApplication({
           t,
@@ -22183,11 +22739,16 @@ const ActionModal$5 = _ref => {
           uploadedFile,
           setUploadedFile,
           businessService,
-          error
+          error,
+          isReasonRequiredAction,
+          selectedReason,
+          setSelectedReason,
+          otherReasonText,
+          setOtherReasonText
         }));
       }
     }
-  }, [action, approvers, uploadedFile, error]);
+  }, [action, approvers, uploadedFile, error, isReasonRequiredAction, selectedReason, otherReasonText]);
   return action && config.form ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
     headerBarMain: /*#__PURE__*/React__default.createElement(Heading$6, {
       label: t(config.label.heading)
@@ -22204,7 +22765,13 @@ const ActionModal$5 = _ref => {
       width: "100%",
       height: "auto"
     } : {}
-  }, PTALoading ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.FormComposer, {
+  }, PTALoading ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null) : /*#__PURE__*/React__default.createElement(React__default.Fragment, null, error && /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabelError, {
+    style: {
+      marginBottom: "12px",
+      marginLeft: "12px",
+      marginRight: "12px"
+    }
+  }, error), /*#__PURE__*/React__default.createElement(digitUiReactComponents.FormComposer, {
     config: config.form,
     noBoxShadow: true,
     inline: true,
@@ -22216,7 +22783,7 @@ const ActionModal$5 = _ref => {
     cardFormWrapperClassName: cardFormWrapperClassName,
     cardClassName: cardClassName,
     formClassName: formClassName
-  })) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
+  }))) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
 };
 
 const Heading$7 = props => {
@@ -24248,9 +24815,9 @@ function PropertyDocuments(_ref) {
       var _document$values;
       document === null || document === void 0 ? void 0 : (_document$values = document.values) === null || _document$values === void 0 ? void 0 : _document$values.forEach(value => {
         if (!value.isPhoto) {
-          var _ref2, _checkedMap$value$ori, _value$originalDoc, _value$originalDoc2;
+          var _ref2, _checkedMap$value$fil, _value$originalDoc;
           requiredDocsCount++;
-          const isChecked = (_ref2 = (_checkedMap$value$ori = checkedMap[value === null || value === void 0 ? void 0 : (_value$originalDoc = value.originalDoc) === null || _value$originalDoc === void 0 ? void 0 : _value$originalDoc.id]) != null ? _checkedMap$value$ori : value === null || value === void 0 ? void 0 : (_value$originalDoc2 = value.originalDoc) === null || _value$originalDoc2 === void 0 ? void 0 : _value$originalDoc2.isVerified) != null ? _ref2 : false;
+          const isChecked = (_ref2 = (_checkedMap$value$fil = checkedMap[value === null || value === void 0 ? void 0 : value.fileStoreId]) != null ? _checkedMap$value$fil : value === null || value === void 0 ? void 0 : (_value$originalDoc = value.originalDoc) === null || _value$originalDoc === void 0 ? void 0 : _value$originalDoc.isVerified) != null ? _ref2 : false;
           if (isChecked) {
             checkedCount++;
           }
@@ -24258,7 +24825,7 @@ function PropertyDocuments(_ref) {
       });
     });
     const allChecked = requiredDocsCount === 0 || checkedCount === requiredDocsCount;
-    const isDocVerifState = !applicationStatus || applicationStatus === "PENDING_FOR_DOCUMENT_VERIFICATION";
+    const isDocVerifState = !applicationStatus || applicationStatus === "PENDING_FOR_DOCUMENT_VERIFICATION" || applicationStatus === "PENDING_APPROVAL_FOR_MUTATION";
     const finalVerified = isDocVerifState ? allChecked : true;
     window.isDocumentsVerified = finalVerified;
     window.dispatchEvent(new CustomEvent("DOCUMENTS_VERIFIED", {
@@ -24494,7 +25061,7 @@ function PropertyDocuments(_ref) {
         style: {
           cursor: "pointer"
         }
-      }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.ViewsIcon, null)), !isPhoto && ((_ref3, _checkedMap$value$ori2, _value$originalDoc3, _value$originalDoc4, _value$originalDoc5, _value$originalDoc6, _value$originalDoc7) => {
+      }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.ViewsIcon, null)), !isPhoto && ((_ref3, _checkedMap$value$fil2, _value$originalDoc2, _value$originalDoc3, _ref4, _checkedMap$value$fil3, _value$originalDoc4) => {
         return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
           onClick: () => {
             if (fileUrl) {
@@ -24536,26 +25103,25 @@ function PropertyDocuments(_ref) {
             margin: 0
           }
         }, /*#__PURE__*/React__default.createElement("input", {
-          key: "chk-" + (value === null || value === void 0 ? void 0 : (_value$originalDoc5 = value.originalDoc) === null || _value$originalDoc5 === void 0 ? void 0 : _value$originalDoc5.id) + "-" + (value === null || value === void 0 ? void 0 : (_value$originalDoc6 = value.originalDoc) === null || _value$originalDoc6 === void 0 ? void 0 : _value$originalDoc6.isVerified),
+          key: "chk-" + (value === null || value === void 0 ? void 0 : value.fileStoreId) + "-" + (value === null || value === void 0 ? void 0 : (_value$originalDoc3 = value.originalDoc) === null || _value$originalDoc3 === void 0 ? void 0 : _value$originalDoc3.isVerified),
           type: "checkbox",
           className: "verify-doc-checkbox",
           style: {
             width: "18px",
             height: "18px",
             accentColor: "#F47738",
-            cursor: applicationStatus && applicationStatus !== "PENDING_FOR_DOCUMENT_VERIFICATION" ? "not-allowed" : "pointer"
+            cursor: applicationStatus && applicationStatus !== "PENDING_FOR_DOCUMENT_VERIFICATION" && applicationStatus !== "PENDING_APPROVAL_FOR_MUTATION" ? "not-allowed" : "pointer"
           },
-          disabled: applicationStatus && applicationStatus !== "PENDING_FOR_DOCUMENT_VERIFICATION",
-          defaultChecked: value === null || value === void 0 ? void 0 : (_value$originalDoc7 = value.originalDoc) === null || _value$originalDoc7 === void 0 ? void 0 : _value$originalDoc7.isVerified,
+          disabled: applicationStatus && applicationStatus !== "PENDING_FOR_DOCUMENT_VERIFICATION" && applicationStatus !== "PENDING_APPROVAL_FOR_MUTATION" && applicationStatus !== "ACTIVATE_MUTATION",
+          checked: applicationStatus === "PENDING_FOR_MUTATION_ACTIVATION" || ((_ref4 = (_checkedMap$value$fil3 = checkedMap[value === null || value === void 0 ? void 0 : value.fileStoreId]) != null ? _checkedMap$value$fil3 : value === null || value === void 0 ? void 0 : (_value$originalDoc4 = value.originalDoc) === null || _value$originalDoc4 === void 0 ? void 0 : _value$originalDoc4.isVerified) != null ? _ref4 : false),
           onChange: e => {
-            var _value$originalDoc8;
             const checked = e.target.checked;
             if (value !== null && value !== void 0 && value.originalDoc) {
               value.originalDoc.isVerified = checked;
             }
-            if (value !== null && value !== void 0 && (_value$originalDoc8 = value.originalDoc) !== null && _value$originalDoc8 !== void 0 && _value$originalDoc8.id) {
+            if (value !== null && value !== void 0 && value.fileStoreId) {
               setCheckedMap(prev => _extends({}, prev, {
-                [value.originalDoc.id]: checked
+                [value.fileStoreId]: checked
               }));
             }
           }
@@ -25338,7 +25904,7 @@ const Rebate_menu = [{
   value: "Others"
 }];
 const WSFeeEstimation = _ref => {
-  var _wsAdditionalDetails$, _wsAdditionalDetails$18, _fields$adhocPenaltyR, _fields$adhocRebateRe;
+  var _wsAdditionalDetails$, _fields$adhocPenaltyR, _fields$adhocRebateRe;
   let wsAdditionalDetails = _ref.wsAdditionalDetails;
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
@@ -25369,23 +25935,23 @@ const WSFeeEstimation = _ref => {
     var _wsAdditionalDetails$2, _wsAdditionalDetails$3, _sessionFormData$bill;
     const data = _extends({}, wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$2 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$2 === void 0 ? void 0 : (_wsAdditionalDetails$3 = _wsAdditionalDetails$2.appDetails) === null || _wsAdditionalDetails$3 === void 0 ? void 0 : _wsAdditionalDetails$3.additionalDetails);
     if ((sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill = sessionFormData.billDetails) === null || _sessionFormData$bill === void 0 ? void 0 : _sessionFormData$bill.length) > 0) {
-      var _sessionFormData$bill2, _sessionFormData$bill3, _sessionFormData$bill4, _sessionFormData$bill5, _sessionFormData$bill6, _sessionFormData$bill7, _sessionFormData$bill8, _sessionFormData$bill9, _sessionFormData$bill0;
-      const billAccountDetails = (sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill2 = sessionFormData.billDetails) === null || _sessionFormData$bill2 === void 0 ? void 0 : (_sessionFormData$bill3 = _sessionFormData$bill2[0]) === null || _sessionFormData$bill3 === void 0 ? void 0 : _sessionFormData$bill3.billAccountDetails) || [];
+      var _sessionFormData$bill2, _sessionFormData$bill3, _sessionFormData$bill4, _sessionFormData$bill5, _sessionFormData$bill6, _sessionFormData$bill7, _sessionFormData$bill8, _sessionFormData$bill9, _sessionFormData$bill0, _sessionFormData$bill1, _sessionFormData$bill10;
+      const billAccountDetails = (sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill2 = sessionFormData.billDetails) === null || _sessionFormData$bill2 === void 0 ? void 0 : (_sessionFormData$bill3 = _sessionFormData$bill2[0]) === null || _sessionFormData$bill3 === void 0 ? void 0 : _sessionFormData$bill3.billAccountDetails) || (sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill4 = sessionFormData.billDetails) === null || _sessionFormData$bill4 === void 0 ? void 0 : (_sessionFormData$bill5 = _sessionFormData$bill4[0]) === null || _sessionFormData$bill5 === void 0 ? void 0 : _sessionFormData$bill5.taxHeadEstimates) || [];
       const values = billAccountDetails.length > 0 ? billAccountDetails.map(bill => ({
         title: bill === null || bill === void 0 ? void 0 : bill.taxHeadCode,
         value: /*#__PURE__*/React__default.createElement("span", null, "\u20B9", Number(bill === null || bill === void 0 ? void 0 : bill.amount).toFixed(2))
       })) : [{
         title: "WS_APPLICATION_FEE_HEADER",
-        value: /*#__PURE__*/React__default.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill4 = sessionFormData.billDetails) === null || _sessionFormData$bill4 === void 0 ? void 0 : (_sessionFormData$bill5 = _sessionFormData$bill4[0]) === null || _sessionFormData$bill5 === void 0 ? void 0 : _sessionFormData$bill5.fee)
+        value: /*#__PURE__*/React__default.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill6 = sessionFormData.billDetails) === null || _sessionFormData$bill6 === void 0 ? void 0 : (_sessionFormData$bill7 = _sessionFormData$bill6[0]) === null || _sessionFormData$bill7 === void 0 ? void 0 : _sessionFormData$bill7.fee)
       }, {
         title: "WS_SERVICE_FEE_HEADER",
-        value: /*#__PURE__*/React__default.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill6 = sessionFormData.billDetails) === null || _sessionFormData$bill6 === void 0 ? void 0 : (_sessionFormData$bill7 = _sessionFormData$bill6[0]) === null || _sessionFormData$bill7 === void 0 ? void 0 : _sessionFormData$bill7.charge)
+        value: /*#__PURE__*/React__default.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill8 = sessionFormData.billDetails) === null || _sessionFormData$bill8 === void 0 ? void 0 : (_sessionFormData$bill9 = _sessionFormData$bill8[0]) === null || _sessionFormData$bill9 === void 0 ? void 0 : _sessionFormData$bill9.charge)
       }, {
         title: "WS_TAX_HEADER",
-        value: /*#__PURE__*/React__default.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill8 = sessionFormData.billDetails) === null || _sessionFormData$bill8 === void 0 ? void 0 : (_sessionFormData$bill9 = _sessionFormData$bill8[0]) === null || _sessionFormData$bill9 === void 0 ? void 0 : _sessionFormData$bill9.taxAmount)
+        value: /*#__PURE__*/React__default.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill0 = sessionFormData.billDetails) === null || _sessionFormData$bill0 === void 0 ? void 0 : (_sessionFormData$bill1 = _sessionFormData$bill0[0]) === null || _sessionFormData$bill1 === void 0 ? void 0 : _sessionFormData$bill1.taxAmount)
       }];
       setValues(values);
-      setBillDetails(sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill0 = sessionFormData.billDetails) === null || _sessionFormData$bill0 === void 0 ? void 0 : _sessionFormData$bill0[0]);
+      setBillDetails(sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill10 = sessionFormData.billDetails) === null || _sessionFormData$bill10 === void 0 ? void 0 : _sessionFormData$bill10[0]);
     } else {
       setSessionFormData(data);
       setFields(data);
@@ -25555,17 +26121,7 @@ const WSFeeEstimation = _ref => {
     } : {
       color: "#2E9E8F"
     }
-  }))), wsAdditionalDetails !== null && wsAdditionalDetails !== void 0 && (_wsAdditionalDetails$18 = wsAdditionalDetails.additionalDetails) !== null && _wsAdditionalDetails$18 !== void 0 && _wsAdditionalDetails$18.isAdhocRebate ? /*#__PURE__*/React__default.createElement("div", {
-    onClick: e => {
-      showPopUp(true);
-    }
-  }, /*#__PURE__*/React__default.createElement("span", {
-    className: "add-details-link hover-button",
-    style: {
-      cursor: "pointer",
-      color: "#a82227"
-    }
-  }, t("WS_PAYMENT_ADD_REBATE_PENALTY"))) : null, popup && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
+  }))), popup && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
     headerBarMain: /*#__PURE__*/React__default.createElement(Heading, {
       label: t("PT_ADD_REBATE_PENALITY")
     }),
@@ -25847,7 +26403,7 @@ const ViewBreakup = _ref => {
       }
       return rows.map(row => ({
         title: t(row === null || row === void 0 ? void 0 : row.taxHeadCode),
-        value: "\u20B9" + formatNumber(row === null || row === void 0 ? void 0 : row.amount)
+        value: /*#__PURE__*/React__default.createElement("span", null, "\u20B9" + formatNumber(row === null || row === void 0 ? void 0 : row.amount))
       }));
     };
     const connectionHolder = wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$2 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$2 === void 0 ? void 0 : (_wsAdditionalDetails$3 = _wsAdditionalDetails$2.appDetails) === null || _wsAdditionalDetails$3 === void 0 ? void 0 : (_wsAdditionalDetails$4 = _wsAdditionalDetails$3.connectionHolders) === null || _wsAdditionalDetails$4 === void 0 ? void 0 : _wsAdditionalDetails$4[0];
@@ -26049,7 +26605,7 @@ const ViewBreakup = _ref => {
     label: "Sewer Infra Charges",
     value: infrastructureChargeDetail.sewerComponentIFC,
     currency: true
-  }, {
+  }, ...(infrastructureChargeDetail.rebateAmount > 0 ? [{
     label: "Rebate",
     value: infrastructureChargeDetail.rebatePercentage,
     unit: "%"
@@ -26057,7 +26613,31 @@ const ViewBreakup = _ref => {
     label: "Rebate amount",
     value: infrastructureChargeDetail.rebateAmount,
     currency: true
+  }] : []), ...(infrastructureChargeDetail.institutionalRebateApplied ? [{
+    label: "Institutional rebate",
+    value: infrastructureChargeDetail.institutionalRebatePercentage,
+    unit: "%"
+  }, {
+    label: "Institutional rebate amount",
+    value: infrastructureChargeDetail.institutionalRebateAmount,
+    currency: true
+  }, {
+    label: "Institutional rebate reason",
+    value: t(infrastructureChargeDetail.institutionalRebateReason),
+    isText: true
+  }] : []), ...(infrastructureChargeDetail.dwellingRebateApplied ? [{
+    label: "Dwelling rebate",
+    value: infrastructureChargeDetail.dwellingRebatePercentage,
+    unit: "%"
   }, {
+    label: "Dwelling rebate amount",
+    value: infrastructureChargeDetail.dwellingRebateAmount,
+    currency: true
+  }, {
+    label: "Dwelling rebate reason",
+    value: t(infrastructureChargeDetail.dwellingRebateReason),
+    isText: true
+  }] : []), {
     label: "Net IFC",
     value: infrastructureChargeDetail.netIFC,
     currency: true
@@ -26481,8 +27061,8 @@ const DueVerification = _ref => {
       return newData;
     });
   }, [applicationData]);
-  const isPendingApproval = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_APPROVAL_FOR_CONNECTION" || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_CONNECTION_ACTIVATION";
-  const isActivation = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_CONNECTION_ACTIVATION";
+  const isPendingApproval = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_FIELD_INSPECTION";
+  const isActivation = ["PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT", "PENDING_FOR_CONNECTION_ACTIVATION", "CONNECTION_ACTIVATED"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus);
   const columns = React.useMemo(() => {
     const baseColumns = [{
       Header: t("K No."),
@@ -26500,7 +27080,7 @@ const DueVerification = _ref => {
       Header: t("Total Amount"),
       accessor: "totalAmount"
     }];
-    if (isPendingApproval) {
+    if (isPendingApproval || isActivation) {
       baseColumns.push({
         Header: t("Remarks"),
         accessor: "remarks",
@@ -26519,7 +27099,7 @@ const DueVerification = _ref => {
       });
     }
     return baseColumns;
-  }, [t, handleRemarkChange, isPendingApproval]);
+  }, [t, handleRemarkChange, isPendingApproval, isActivation]);
   React.useEffect(() => {
     if (applicationData !== null && applicationData !== void 0 && applicationData.dueVerification && Array.isArray(applicationData.dueVerification)) {
       setTableData(applicationData.dueVerification);
@@ -26621,7 +27201,11 @@ const InspectionInformation = _ref => {
   let applicationData = _ref.applicationData;
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
-  const _useState = React.useState(null),
+  const defaultInspectionType = {
+    i18nKey: "New Connection Visit",
+    code: "new_connection_visit"
+  };
+  const _useState = React.useState(defaultInspectionType),
     inspectionType = _useState[0],
     setInspectionType = _useState[1];
   const _useState2 = React.useState(""),
@@ -26631,20 +27215,23 @@ const InspectionInformation = _ref => {
     inspectorName = _useState3[0],
     setInspectorName = _useState3[1];
   React.useEffect(() => {
-    if (applicationData !== null && applicationData !== void 0 && applicationData.inspectionInformation) {
+    if (applicationData) {
+      if (!applicationData.inspectionInformation) {
+        applicationData.inspectionInformation = {};
+      }
+      if (!applicationData.inspectionInformation.inspectionType) {
+        applicationData.inspectionInformation.inspectionType = defaultInspectionType;
+      }
       const apiInspectionType = applicationData.inspectionInformation.inspectionType;
       let matchedType = null;
       const inspectionCode = typeof apiInspectionType === "object" && apiInspectionType !== null ? apiInspectionType.code : apiInspectionType;
       if (inspectionCode) {
         matchedType = [{
-          i18nKey: "ES_COMMON_SELECT",
-          code: ""
-        }, {
           i18nKey: "New Connection Visit",
           code: "new_connection_visit"
         }].find(opt => opt.code === inspectionCode || opt.i18nKey === inspectionCode);
       }
-      setInspectionType(matchedType || null);
+      setInspectionType(matchedType || defaultInspectionType);
       let dateValue = applicationData.inspectionInformation.inspectionDate || "";
       if (dateValue && typeof dateValue === 'number') {
         const d = new Date(dateValue);
@@ -26661,9 +27248,6 @@ const InspectionInformation = _ref => {
     }
   }, [applicationData]);
   const inspectionTypeOptions = [{
-    i18nKey: "ES_COMMON_SELECT",
-    code: ""
-  }, {
     i18nKey: "New Connection Visit",
     code: "new_connection_visit"
   }];
@@ -26683,7 +27267,7 @@ const InspectionInformation = _ref => {
     if (!applicationData.inspectionInformation) applicationData.inspectionInformation = {};
     applicationData.inspectionInformation.inspectorName = val;
   };
-  const readOnly = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_CONNECTION_ACTIVATION";
+  const readOnly = ["PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT", "PENDING_FOR_CONNECTION_ACTIVATION", "CONNECTION_ACTIVATED"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus);
   return /*#__PURE__*/React__default.createElement("div", {
     style: {
       marginBottom: "20px"
@@ -26759,6 +27343,7 @@ function ApplicationDetailsContent(_ref) {
     workflowDetails = _ref.workflowDetails,
     isDataLoading = _ref.isDataLoading,
     applicationData = _ref.applicationData,
+    businessService = _ref.businessService,
     timelineStatusPrefix = _ref.timelineStatusPrefix,
     _ref$showTimeLine = _ref.showTimeLine,
     showTimeLine = _ref$showTimeLine === void 0 ? true : _ref$showTimeLine,
@@ -27034,7 +27619,7 @@ function ApplicationDetailsContent(_ref) {
     infoClickInfoLabel: getClickInfoDetails(),
     infoClickInfoLabel1: getClickInfoDetails1()
   }) : null, applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a = applicationDetails.applicationDetails) === null || _applicationDetails$a === void 0 ? void 0 : _applicationDetails$a.map((detail, index) => {
-    var _detail$title, _detail$values, _detail$additionalDet, _applicationDetails$a2, _applicationDetails$a3, _applicationDetails$a4, _detail$additionalDet2, _applicationDetails$a5, _applicationDetails$a6, _detail$additionalDet3, _detail$additionalDet4, _detail$additionalDet5, _detail$additionalDet6, _detail$additionalDet7, _detail$additionalDet8, _detail$additionalDet9, _workflowDetails$data, _workflowDetails$data2, _detail$additionalDet0, _detail$additionalDet1, _detail$additionalDet10, _detail$additionalDet11, _detail$additionalDet12, _detail$additionalDet13, _detail$additionalDet14, _detail$additionalDet15, _detail$additionalDet16, _detail$additionalDet17, _detail$additionalDet18, _detail$additionalDet19, _detail$additionalDet20, _detail$additionalDet21, _detail$additionalDet22, _detail$additionalDet23, _detail$additionalDet24, _detail$additionalDet25, _detail$additionalDet26, _detail$additionalDet27, _detail$additionalDet28, _detail$additionalDet29;
+    var _detail$title, _detail$values, _detail$additionalDet, _applicationDetails$a2, _applicationDetails$a3, _applicationDetails$a4, _detail$additionalDet2, _applicationDetails$a5, _applicationDetails$a6, _detail$additionalDet3, _detail$additionalDet4, _detail$additionalDet5, _detail$additionalDet6, _detail$additionalDet7, _detail$additionalDet8, _detail$additionalDet9, _workflowDetails$data, _workflowDetails$data2, _detail$additionalDet0, _detail$additionalDet1, _detail$additionalDet10, _detail$additionalDet11, _detail$additionalDet12, _detail$additionalDet13, _detail$additionalDet14, _detail$additionalDet15, _detail$additionalDet16, _detail$additionalDet17, _detail$additionalDet18, _detail$additionalDet19, _applicationData$appl, _detail$additionalDet20, _applicationData$appl2, _detail$additionalDet21, _detail$additionalDet22, _detail$additionalDet23, _detail$additionalDet24, _detail$additionalDet25, _detail$additionalDet26, _detail$additionalDet27, _detail$additionalDet28, _detail$additionalDet29;
     return /*#__PURE__*/React__default.createElement(React__default.Fragment, {
       key: index
     }, /*#__PURE__*/React__default.createElement("div", {
@@ -27265,9 +27850,9 @@ function ApplicationDetailsContent(_ref) {
     }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet17 = detail.additionalDetails) === null || _detail$additionalDet17 === void 0 ? void 0 : _detail$additionalDet17.documents) && /*#__PURE__*/React__default.createElement(PropertyDocuments, {
       documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet18 = detail.additionalDetails) === null || _detail$additionalDet18 === void 0 ? void 0 : _detail$additionalDet18.documents,
       applicationStatus: applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet19 = detail.additionalDetails) === null || _detail$additionalDet19 === void 0 ? void 0 : _detail$additionalDet19.documents) && ((applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_FIELD_INSPECTION" || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_APPROVAL_FOR_CONNECTION" || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_CONNECTION_ACTIVATION" || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_RECONNECTION") && /*#__PURE__*/React__default.createElement(DueVerification, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet19 = detail.additionalDetails) === null || _detail$additionalDet19 === void 0 ? void 0 : _detail$additionalDet19.documents) && !(applicationData !== null && applicationData !== void 0 && (_applicationData$appl = applicationData.applicationType) !== null && _applicationData$appl !== void 0 && _applicationData$appl.includes("MUTATION")) && !(businessService !== null && businessService !== void 0 && businessService.includes("MUTATION")) && ["PENDING_FOR_FIELD_INSPECTION", "PENDING_APPROVAL_FOR_CONNECTION", "PENDING_FOR_CONNECTION_ACTIVATION", "PENDING_FOR_RECONNECTION", "PENDING_FOR_DUE_VERIFICATION", "PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT", "CONNECTION_ACTIVATED", "PENDING_FOR_CONNECTION_ACTIVATION"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) && /*#__PURE__*/React__default.createElement(DueVerification, {
       applicationData: applicationData
-    }), " ", (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet20 = detail.additionalDetails) === null || _detail$additionalDet20 === void 0 ? void 0 : _detail$additionalDet20.documents) && ((applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_APPROVAL_FOR_CONNECTION" || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_CONNECTION_ACTIVATION") && /*#__PURE__*/React__default.createElement(InspectionInformation, {
+    }), " ", (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet20 = detail.additionalDetails) === null || _detail$additionalDet20 === void 0 ? void 0 : _detail$additionalDet20.documents) && !(applicationData !== null && applicationData !== void 0 && (_applicationData$appl2 = applicationData.applicationType) !== null && _applicationData$appl2 !== void 0 && _applicationData$appl2.includes("MUTATION")) && !(businessService !== null && businessService !== void 0 && businessService.includes("MUTATION")) && ["PENDING_FOR_FIELD_INSPECTION", "PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT", "CONNECTION_ACTIVATED", "PENDING_FOR_CONNECTION_ACTIVATION"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) && /*#__PURE__*/React__default.createElement(InspectionInformation, {
       applicationData: applicationData
     }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet21 = detail.additionalDetails) === null || _detail$additionalDet21 === void 0 ? void 0 : _detail$additionalDet21.taxHeadEstimatesCalculation) && /*#__PURE__*/React__default.createElement(PropertyEstimates, {
       taxHeadEstimatesCalculation: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet22 = detail.additionalDetails) === null || _detail$additionalDet22 === void 0 ? void 0 : _detail$additionalDet22.taxHeadEstimatesCalculation
@@ -27438,7 +28023,7 @@ function ApplicationDetailsActionBar(_ref) {
       if (typeof window !== "undefined" && typeof window.isDocumentsVerified !== "undefined") {
         return !window.isDocumentsVerified;
       }
-      return false;
+      return true;
     }),
     isSubmitDisabled = _React$useState[0],
     setIsSubmitDisabled = _React$useState[1];
@@ -27451,7 +28036,10 @@ function ApplicationDetailsActionBar(_ref) {
     };
     if (typeof window !== "undefined") {
       window.addEventListener("DOCUMENTS_VERIFIED", handleDocVerification);
-      return () => window.removeEventListener("DOCUMENTS_VERIFIED", handleDocVerification);
+      return () => {
+        window.removeEventListener("DOCUMENTS_VERIFIED", handleDocVerification);
+        delete window.isDocumentsVerified;
+      };
     }
   }, []);
   if (window.location.href.includes("/obps") || window.location.href.includes("/noc")) {