@egovernments/digit-ui-libraries 1.4.0 → 1.5.0-beta.1

package/dist/index.js

@@ -9,9 +9,11 @@ var reactI18next = require('react-i18next');
 var ReactPostprocessor = _interopDefault(require('i18next-react-postprocessor'));
 var dateFns = require('date-fns');
 var html2canvas = _interopDefault(require('html2canvas'));
-var jsPDF = _interopDefault(require('jspdf'));
+require('jspdf');
 var XLSX = _interopDefault(require('xlsx'));
+var domtoimage = _interopDefault(require('dom-to-image'));
 require('date-fns/esm');
+var reactRouterDom = require('react-router-dom');
 
 function _extends() {
   _extends = Object.assign || function (target) {
@@ -220,7 +222,6 @@ var actionHandler = function actionHandler(action, id, fieldList) {
   var index = getIndex(id, fieldList);
 
   if (!action) {
-    console.error("no action found");
     return;
   }
 
@@ -310,6 +311,7 @@ var Urls = {
   Authenticate: "/user/oauth/token",
   RegisterUser: "/user/citizen/_create",
   ChangePassword: "/user/password/nologin/_update",
+  ChangePassword1: "/user/password/_update",
   UserProfileUpdate: "/user/profile/_update",
   EmployeeSearch: "/egov-hrms/employees/_search",
   InboxSearch: "/inbox/v1/_search",
@@ -347,7 +349,9 @@ var Urls = {
     update: "/property-services/property/_update",
     pt_calculation_estimate: "/pt-calculator-v2/propertytax/v2/_estimate",
     assessment_create: "/property-services/assessment/_create",
-    assessment_search: "/property-services/assessment/_search"
+    assessment_search: "/property-services/assessment/_search",
+    payment_search: "/collection-services/payments/PT/_search",
+    pt_calculate_mutation: "/pt-calculator-v2/propertytax/mutation/_calculate"
   },
   dss: {
     dashboardConfig: "/dashboard-analytics/dashboard/getDashboardConfig",
@@ -362,6 +366,7 @@ var Urls = {
     update: "/echallan-services/eChallan/v1/_update",
     download_pdf: "/egov-pdf/download/UC/mcollect-challan",
     receipt_download: "/egov-pdf/download/PAYMENT/consolidatedreceipt",
+    bill_download: "/egov-pdf/download/bills/consolidatedbill",
     count: "/echallan-services/eChallan/v1/_count"
   },
   hrms: {
@@ -405,9 +410,14 @@ var Urls = {
     search: "/egov-user-event/v1/events/_search",
     update: "/egov-user-event/v1/events/lat/_update",
     updateEvent: "/egov-user-event/v1/events/_update",
+    updateEventCDG: "/egov-user-event/v1/events/lat/_update",
     count: "/egov-user-event/v1/events/notifications/_count",
     create: "/egov-user-event/v1/events/_create"
   },
+  ws: {
+    water_search: "/ws-services/wc/_search",
+    sewarage_search: "/sw-services/swc/_search"
+  },
   engagement: {
     document: {
       search: "/egov-document-uploader/egov-du/document/_search",
@@ -524,20 +534,26 @@ Axios.interceptors.response.use(function (res) {
 });
 
 var requestInfo = function requestInfo() {
+  var _Digit$UserService$ge;
+
   return {
-    authToken: Digit.UserService.getUser().access_token
+    authToken: ((_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.access_token) || null
   };
 };
 
 var authHeaders = function authHeaders() {
+  var _Digit$UserService$ge2;
+
   return {
-    "auth-token": Digit.UserService.getUser().access_token
+    "auth-token": ((_Digit$UserService$ge2 = Digit.UserService.getUser()) === null || _Digit$UserService$ge2 === void 0 ? void 0 : _Digit$UserService$ge2.access_token) || null
   };
 };
 
 var userServiceData = function userServiceData() {
+  var _Digit$UserService$ge3;
+
   return {
-    userInfo: Digit.UserService.getUser().info
+    userInfo: (_Digit$UserService$ge3 = Digit.UserService.getUser()) === null || _Digit$UserService$ge3 === void 0 ? void 0 : _Digit$UserService$ge3.info
   };
 };
 
@@ -624,10 +640,6 @@ var Request = function Request(_ref) {
         apiId: "Rainmaker"
       };
 
-      if (noRequestInfo) {
-        delete data.RequestInfo;
-      }
-
       if (auth) {
         data.RequestInfo = _extends({}, data.RequestInfo, requestInfo());
       }
@@ -641,11 +653,15 @@ var Request = function Request(_ref) {
           msgId: ts + "|" + Digit.StoreData.getCurrentLanguage()
         });
       }
+
+      if (noRequestInfo) {
+        delete data.RequestInfo;
+      }
     }
 
     var headers1 = {
       "Content-Type": "application/json",
-      Accept: (_window2 = window) !== null && _window2 !== void 0 && (_window2$globalConfig = _window2.globalConfigs) !== null && _window2$globalConfig !== void 0 && _window2$globalConfig.getConfig("ENABLE_SINGLEINSTANCE") ? "*/*" : "application/pdf"
+      Accept: (_window2 = window) !== null && _window2 !== void 0 && (_window2$globalConfig = _window2.globalConfigs) !== null && _window2$globalConfig !== void 0 && _window2$globalConfig.getConfig("ENABLE_SINGLEINSTANCE") ? "application/pdf,application/json" : "application/pdf"
     };
     if (authHeader) headers = _extends({}, headers, authHeaders());
     if (userDownload) headers = _extends({}, headers, headers1);
@@ -671,6 +687,8 @@ var Request = function Request(_ref) {
 
     var _temp4 = function () {
       if (multipartFormData) {
+        var _Digit$UserService$ge4;
+
         return Promise.resolve(Axios({
           method: method,
           url: _url,
@@ -678,7 +696,7 @@ var Request = function Request(_ref) {
           params: params,
           headers: {
             "Content-Type": "multipart/form-data",
-            "auth-token": Digit.UserService.getUser().access_token
+            "auth-token": ((_Digit$UserService$ge4 = Digit.UserService.getUser()) === null || _Digit$UserService$ge4 === void 0 ? void 0 : _Digit$UserService$ge4.access_token) || null
           }
         })).then(function (multipartFormDataRes) {
           _exit2 = true;
@@ -1566,6 +1584,20 @@ var getRentalDetailsCategoryCriteria = function getRentalDetailsCategoryCriteria
   };
 };
 
+var getChargeSlabsCategoryCriteria = function getChargeSlabsCategoryCriteria(tenantId, moduleCode) {
+  return {
+    details: {
+      tenantId: tenantId,
+      moduleDetails: [{
+        moduleName: moduleCode,
+        masterDetails: [{
+          name: "ChargeSlabs"
+        }]
+      }]
+    }
+  };
+};
+
 var getGenderTypeList = function getGenderTypeList(tenantId, moduleCode, type) {
   return {
     type: type,
@@ -1765,6 +1797,54 @@ var getTradeTypeRoleCriteria = function getTradeTypeRoleCriteria(tenantId, modul
   };
 };
 
+var getFSTPORejectionReasonCriteria = function getFSTPORejectionReasonCriteria(tenantId, moduleCode, type) {
+  return {
+    type: type,
+    details: {
+      tenantId: tenantId,
+      moduleDetails: [{
+        moduleName: moduleCode,
+        masterDetails: [{
+          name: "FSTPORejectionReason",
+          filter: null
+        }]
+      }]
+    }
+  };
+};
+
+var getFSMPaymentTypeCriteria = function getFSMPaymentTypeCriteria(tenantId, moduleCode, type) {
+  return {
+    type: type,
+    details: {
+      tenantId: tenantId,
+      moduleDetails: [{
+        moduleName: moduleCode,
+        masterDetails: [{
+          name: "PaymentType",
+          filter: null
+        }]
+      }]
+    }
+  };
+};
+
+var getFSMTripNumberCriteria = function getFSMTripNumberCriteria(tenantId, moduleCode, type) {
+  return {
+    type: type,
+    details: {
+      tenantId: tenantId,
+      moduleDetails: [{
+        moduleName: moduleCode,
+        masterDetails: [{
+          name: "TripNumber",
+          filter: null
+        }]
+      }]
+    }
+  };
+};
+
 var GetEgovLocations = function GetEgovLocations(MdmsRes) {
   return MdmsRes["egov-location"].TenantBoundary[0].boundary.children.map(function (obj) {
     return {
@@ -2007,6 +2087,14 @@ var getRentalDetailsCategory = function getRentalDetailsCategory(MdmsRes) {
   });
 };
 
+var getChargeSlabsCategory = function getChargeSlabsCategory(MdmsRes) {
+  MdmsRes["PropertyTax"].ChargeSlabs.filter(function (category) {
+    return category.active;
+  }).map(function (ChargeSlabsInfo) {
+    return _extends({}, ChargeSlabsInfo);
+  });
+};
+
 var getGenderType = function getGenderType(MdmsRes) {
   return MdmsRes["common-masters"].GenderType.filter(function (GenderType) {
     return GenderType.active;
@@ -2063,7 +2151,45 @@ var GetMCollectApplicationStatus = function GetMCollectApplicationStatus(MdmsRes
   });
 };
 
-var getDssDashboard = function getDssDashboard() {
+var getFSMGenderType = function getFSMGenderType(MdmsRes) {
+  return MdmsRes["common-masters"].GenderType.map(function (genderDetails) {
+    return _extends({}, genderDetails, {
+      i18nKey: "COMMON_GENDER_" + genderDetails.code
+    });
+  });
+};
+
+var GetFSTPORejectionReason = function GetFSTPORejectionReason(MdmsRes) {
+  return MdmsRes["Vehicle"].FSTPORejectionReason.filter(function (reason) {
+    return reason.active;
+  }).map(function (reasonDetails) {
+    return _extends({}, reasonDetails, {
+      i18nKey: "ES_ACTION_REASON_" + reasonDetails.code
+    });
+  });
+};
+
+var GetPaymentType = function GetPaymentType(MdmsRes) {
+  return MdmsRes["FSM"].PaymentType.filter(function (option) {
+    return option.active;
+  }).map(function (reasonDetails) {
+    return _extends({}, reasonDetails, {
+      i18nKey: "ES_ACTION_" + reasonDetails.code
+    });
+  });
+};
+
+var GetTripNumber = function GetTripNumber(MdmsRes) {
+  return MdmsRes["FSM"].TripNumber.filter(function (option) {
+    return option.active;
+  }).map(function (reasonDetails) {
+    return _extends({}, reasonDetails, {
+      i18nKey: "ES_ACTION_TRIP_" + reasonDetails.code
+    });
+  });
+};
+
+var getDssDashboard = function getDssDashboard(MdmsRes) {
   return MdmsRes["dss-dashboard"]["dashboard-config"];
 };
 
@@ -2184,8 +2310,11 @@ var transformResponse = function transformResponse(type, MdmsRes, moduleCode, te
     case "RentalDeatils":
       return getRentalDetailsCategory(MdmsRes);
 
+    case "ChargeSlabs":
+      return getChargeSlabsCategory(MdmsRes);
+
     case "DssDashboard":
-      return getDssDashboard();
+      return getDssDashboard(MdmsRes);
 
     case "BusinessService":
       return GetMCollectBusinessService(MdmsRes);
@@ -2214,6 +2343,18 @@ var transformResponse = function transformResponse(type, MdmsRes, moduleCode, te
     case "CheckList":
       return GetChecklist(MdmsRes);
 
+    case "FSMGenderType":
+      return getFSMGenderType(MdmsRes);
+
+    case "FSTPORejectionReason":
+      return GetFSTPORejectionReason(MdmsRes);
+
+    case "PaymentType":
+      return GetPaymentType(MdmsRes);
+
+    case "TripNumber":
+      return GetTripNumber(MdmsRes);
+
     default:
       return MdmsRes;
   }
@@ -2443,6 +2584,9 @@ var MdmsService = {
   getRentalDetails: function getRentalDetails(tenantId, moduleCode) {
     return MdmsService.getDataByCriteria(tenantId, getRentalDetailsCategoryCriteria(tenantId, moduleCode), moduleCode);
   },
+  getChargeSlabs: function getChargeSlabs(tenantId, moduleCode) {
+    return MdmsService.getDataByCriteria(tenantId, getChargeSlabsCategoryCriteria(tenantId, moduleCode), moduleCode);
+  },
   getDssDashboard: function getDssDashboard(tenantId, moduleCode) {
     return MdmsService.getDataByCriteria(tenantId, getDssDashboardCriteria(tenantId, moduleCode), moduleCode);
   },
@@ -2502,6 +2646,18 @@ var MdmsService = {
   },
   getTradeTypeRoleTypes: function getTradeTypeRoleTypes(tenantId, moduleCode, type) {
     return MdmsService.getDataByCriteria(tenantId, getTradeTypeRoleCriteria(tenantId, moduleCode, type), moduleCode);
+  },
+  getFSMGenderType: function getFSMGenderType(tenantId, moduleCode, type) {
+    return MdmsService.getDataByCriteria(tenantId, getGenderTypeList(tenantId, moduleCode, type), moduleCode);
+  },
+  getFSTPORejectionReason: function getFSTPORejectionReason(tenantId, moduleCode, type) {
+    return MdmsService.getDataByCriteria(tenantId, getFSTPORejectionReasonCriteria(tenantId, moduleCode, type), moduleCode);
+  },
+  getFSMPaymentType: function getFSMPaymentType(tenantId, moduleCode, type) {
+    return MdmsService.getDataByCriteria(tenantId, getFSMPaymentTypeCriteria(tenantId, moduleCode, type), moduleCode);
+  },
+  getFSMTripNumber: function getFSMTripNumber(tenantId, moduleCode, type) {
+    return MdmsService.getDataByCriteria(tenantId, getFSMTripNumberCriteria(tenantId, moduleCode, type), moduleCode);
   }
 };
 
@@ -2577,7 +2733,7 @@ var StoreService = {
   digitInitData: function (stateCode, enabledModules) {
     try {
       return Promise.resolve(MdmsService.init(stateCode)).then(function (_ref) {
-        var _MdmsRes$tenant, _MdmsRes$DIGITUI, _MdmsRes$tenant2;
+        var _MdmsRes$tenant, _MdmsRes$tenant$citym, _MdmsRes$DIGITUI, _MdmsRes$tenant2;
 
         var MdmsRes = _ref.MdmsRes;
         var stateInfo = MdmsRes["common-masters"].StateInfo[0];
@@ -2597,10 +2753,12 @@ var StoreService = {
             bannerUrl: stateInfo.bannerUrl
           },
           localizationModules: stateInfo.localizationModules,
-          modules: MdmsRes === null || MdmsRes === void 0 ? void 0 : (_MdmsRes$tenant = MdmsRes.tenant) === null || _MdmsRes$tenant === void 0 ? void 0 : _MdmsRes$tenant.citymodule.filter(function (module) {
-            return module.active;
+          modules: MdmsRes === null || MdmsRes === void 0 ? void 0 : (_MdmsRes$tenant = MdmsRes.tenant) === null || _MdmsRes$tenant === void 0 ? void 0 : (_MdmsRes$tenant$citym = _MdmsRes$tenant.citymodule.filter(function (module) {
+            return module === null || module === void 0 ? void 0 : module.active;
           }).filter(function (module) {
-            return enabledModules.includes(module.code);
+            return enabledModules === null || enabledModules === void 0 ? void 0 : enabledModules.includes(module === null || module === void 0 ? void 0 : module.code);
+          })) === null || _MdmsRes$tenant$citym === void 0 ? void 0 : _MdmsRes$tenant$citym.sort(function (x, y) {
+            return (x === null || x === void 0 ? void 0 : x.order) - (y === null || y === void 0 ? void 0 : y.order);
           })
         };
         initData.selectedLanguage = Digit.SessionStorage.get("locale") || initData.languages[0].value;
@@ -2612,11 +2770,7 @@ var StoreService = {
             return item.code === ele.code;
           }) ? unique : [].concat(unique, [ele]);
         }, []);
-        initData.tenants = MdmsRes === null || MdmsRes === void 0 ? void 0 : (_MdmsRes$tenant2 = MdmsRes.tenant) === null || _MdmsRes$tenant2 === void 0 ? void 0 : _MdmsRes$tenant2.tenants.filter(function (item) {
-          return !!moduleTenants.find(function (mt) {
-            return mt.code === item.code;
-          });
-        }).map(function (tenant) {
+        initData.tenants = MdmsRes === null || MdmsRes === void 0 ? void 0 : (_MdmsRes$tenant2 = MdmsRes.tenant) === null || _MdmsRes$tenant2 === void 0 ? void 0 : _MdmsRes$tenant2.tenants.map(function (tenant) {
           return _extends({
             i18nKey: "TENANT_TENANTS_" + tenant.code.replace(".", "_").toUpperCase()
           }, tenant);
@@ -2754,7 +2908,7 @@ var initI18n = function initI18n(callback) {
 var UploadServices = {
   Filestorage: function (module, filedata, tenantId) {
     try {
-      var _window, _window$globalConfigs;
+      var _window, _window$globalConfigs, _Digit$UserService$ge;
 
       var formData = new FormData();
       formData.append("file", filedata, filedata.name);
@@ -2764,7 +2918,10 @@ var UploadServices = {
       var config = {
         method: "post",
         url: "" + Urls.FileStore + tenantInfo,
-        data: formData
+        data: formData,
+        headers: {
+          "auth-token": Digit.UserService.getUser() ? (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.access_token : null
+        }
       };
       return Promise.resolve(Axios(config));
     } catch (e) {
@@ -2773,6 +2930,8 @@ var UploadServices = {
   },
   MultipleFilesStorage: function (module, filesData, tenantId) {
     try {
+      var _window2, _window2$globalConfig;
+
       var formData = new FormData();
       var filesArray = Array.from(filesData);
       filesArray === null || filesArray === void 0 ? void 0 : filesArray.forEach(function (fileData, index) {
@@ -2780,12 +2939,14 @@ var UploadServices = {
       });
       formData.append("tenantId", tenantId);
       formData.append("module", module);
+      var tenantInfo = (_window2 = window) !== null && _window2 !== void 0 && (_window2$globalConfig = _window2.globalConfigs) !== null && _window2$globalConfig !== void 0 && _window2$globalConfig.getConfig("ENABLE_SINGLEINSTANCE") ? "?tenantId=" + tenantId : "";
       var config = {
         method: "post",
-        url: Urls.FileStore,
+        url: "" + Urls.FileStore + tenantInfo,
         data: formData,
         headers: {
-          'Content-Type': 'multipart/form-data'
+          'Content-Type': 'multipart/form-data',
+          "auth-token": Digit.UserService.getUser().access_token
         }
       };
       return Promise.resolve(Axios(config));
@@ -2795,9 +2956,12 @@ var UploadServices = {
   },
   Filefetch: function (filesArray, tenantId) {
     try {
+      var _window3, _window3$globalConfig;
+
+      var tenantInfo = (_window3 = window) !== null && _window3 !== void 0 && (_window3$globalConfig = _window3.globalConfigs) !== null && _window3$globalConfig !== void 0 && _window3$globalConfig.getConfig("ENABLE_SINGLEINSTANCE") ? "?tenantId=" + tenantId : "";
       var config = {
         method: "get",
-        url: Urls.FileFetch,
+        url: "" + Urls.FileFetch + tenantInfo,
         params: {
           tenantId: tenantId,
           fileStoreIds: filesArray === null || filesArray === void 0 ? void 0 : filesArray.join(",")
@@ -3132,7 +3296,7 @@ var FSMService = {
     });
   },
   vehicleUpdate: function vehicleUpdate(details) {
-    Request({
+    return Request({
       url: Urls.fsm.vehilceUpdate,
       data: details,
       useCache: false,
@@ -3319,7 +3483,7 @@ var ConvertTimestampToDate = function ConvertTimestampToDate(timestamp, dateForm
   return timestamp ? dateFns.format(dateFns.toDate(timestamp), dateFormat) : null;
 };
 var ConvertEpochToDate = function ConvertEpochToDate(dateEpoch) {
-  if (dateEpoch == null || dateEpoch == undefined || dateEpoch == '') {
+  if (dateEpoch == null || dateEpoch == undefined || dateEpoch == "") {
     return "NA";
   }
 
@@ -3331,11 +3495,26 @@ var ConvertEpochToDate = function ConvertEpochToDate(dateEpoch) {
   day = (day > 9 ? "" : "0") + day;
   return day + "/" + month + "/" + year;
 };
+var ConvertEpochToTimeInHours = function ConvertEpochToTimeInHours(dateEpoch) {
+  if (dateEpoch == null || dateEpoch == undefined || dateEpoch == "") {
+    return "NA";
+  }
+
+  var dateFromApi = new Date(dateEpoch);
+  var hour = dateFromApi.getHours();
+  var min = dateFromApi.getMinutes();
+  var period = hour > 12 ? "PM" : "AM";
+  hour = hour > 12 ? hour - 12 : hour;
+  hour = (hour > 9 ? "" : "0") + hour;
+  min = (min > 9 ? "" : "0") + min;
+  return hour + ":" + min + " " + period;
+};
 
 var dateUtils = {
   __proto__: null,
   ConvertTimestampToDate: ConvertTimestampToDate,
-  ConvertEpochToDate: ConvertEpochToDate
+  ConvertEpochToDate: ConvertEpochToDate,
+  ConvertEpochToTimeInHours: ConvertEpochToTimeInHours
 };
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -33911,6 +34090,22 @@ var reactDom = createCommonjsModule(function (module) {
   }
 });
 
+var changeClasses = function changeClasses(class1, class2) {
+  var elements = document.getElementsByClassName(class1);
+  Array.prototype.map.call(elements, function (testElement) {
+    testElement.classList.add(class2);
+    testElement.classList.remove(class1);
+  });
+};
+
+var revertCss = function revertCss() {
+  changeClasses("dss-white-pre-temp", 'dss-white-pre-line');
+};
+
+var applyCss = function applyCss() {
+  changeClasses('dss-white-pre-line', "dss-white-pre-temp");
+};
+
 var Download = {
   Image: function Image(node, fileName, share, resolve) {
     if (resolve === void 0) {
@@ -33953,36 +34148,105 @@ var Download = {
     wb.Sheets[filename] = ws;
     XLSX.writeFile(wb, filename + ".xlsx");
   },
-  PDF: function PDF(node, fileName, share) {
-    var getPDF = function getPDF(canvas) {
-      var width = canvas.width;
-      var height = canvas.height;
-      var o = width > height ? "l" : "p";
-      var format = "a4";
-      return new jsPDF(o, "mm", format);
+  PDF: function PDF(node, fileName, share, resolve) {
+    if (resolve === void 0) {
+      resolve = null;
+    }
+
+    var saveAs = function saveAs(uri, filename) {
+      var link = document.createElement("a");
+
+      if (typeof link.download === "string") {
+        link.href = uri;
+        link.download = filename;
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+      } else {
+        window.open(uri);
+      }
     };
 
+    var dataURItoBlob = function dataURItoBlob(dataURI) {
+      var binary = atob(dataURI.split(',')[1]);
+      var array = [];
+
+      for (var i = 0; i < binary.length; i++) {
+        array.push(binary.charCodeAt(i));
+      }
+
+      return new Blob([new Uint8Array(array)], {
+        type: 'image/jpeg'
+      });
+    };
+
+    changeClasses('dss-white-pre-line', "dss-white-pre-temp");
+    applyCss();
     var element = reactDom.findDOMNode(node.current);
-    return html2canvas(element, {
-      scrollY: -window.scrollY,
-      scrollX: 0,
-      useCORS: true,
-      scale: 1.5,
-      windowWidth: document.documentElement.offsetWidth,
-      windowHeight: document.documentElement.offsetHeight
-    }).then(function (canvas) {
-      var pdf = getPDF(canvas);
-      var jpegImage = canvas.toDataURL("image/jpeg");
-      var imgProps = pdf.getImageProperties(jpegImage);
-      var pageHeight = 295;
-      var pdfWidth = imgProps.width * pageHeight / imgProps.height;
-      var pdfHeight = imgProps.height * pdfWidth / imgProps.width;
-      var x = (pdf.internal.pageSize.width - pdfWidth) / 2;
-      var position = 5;
-      pdf.addImage(jpegImage, "JPEG", x, position, pdfWidth, pdfHeight, "a", "FAST");
-      return share ? new File([pdf.output("blob")], fileName + ".pdf", {
-        type: "application/pdf"
-      }) : pdf.save(fileName + ".pdf");
+    return domtoimage.toJpeg(element, {
+      quality: 1,
+      bgcolor: 'white',
+      filter: function filter(node) {
+        var _node$className, _node$className$inclu;
+
+        return !(node !== null && node !== void 0 && (_node$className = node.className) !== null && _node$className !== void 0 && (_node$className$inclu = _node$className.includes) !== null && _node$className$inclu !== void 0 && _node$className$inclu.call(_node$className, "divToBeHidden"));
+      },
+      style: {
+        margin: '25px'
+      }
+    }).then(function (dataUrl) {
+      changeClasses("dss-white-pre-temp", 'dss-white-pre-line');
+      revertCss();
+      var blobData = dataURItoBlob(dataUrl);
+      revertCss();
+      return share ? resolve(new File([blobData], fileName + ".jpeg", {
+        type: "image/jpeg"
+      })) : saveAs(dataUrl, fileName + ".jpeg");
+    });
+  },
+  IndividualChartImage: function IndividualChartImage(node, fileName, share, resolve) {
+    if (resolve === void 0) {
+      resolve = null;
+    }
+
+    var saveAs = function saveAs(uri, filename) {
+      var link = document.createElement("a");
+
+      if (typeof link.download === "string") {
+        link.href = uri;
+        link.download = filename;
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+      } else {
+        window.open(uri);
+      }
+    };
+
+    var dataURItoBlob = function dataURItoBlob(dataURI) {
+      var binary = atob(dataURI.split(',')[1]);
+      var array = [];
+
+      for (var i = 0; i < binary.length; i++) {
+        array.push(binary.charCodeAt(i));
+      }
+
+      return new Blob([new Uint8Array(array)], {
+        type: 'image/jpeg'
+      });
+    };
+
+    changeClasses('dss-white-pre-line', "dss-white-pre-temp");
+    var element = reactDom.findDOMNode(node.current);
+    return domtoimage.toJpeg(element, {
+      quality: 1,
+      bgcolor: 'white'
+    }).then(function (dataUrl) {
+      var blobData = dataURItoBlob(dataUrl);
+      changeClasses("dss-white-pre-temp", 'dss-white-pre-line');
+      return share ? resolve(new File([blobData], fileName + ".jpeg", {
+        type: "image/jpeg"
+      })) : saveAs(dataUrl, fileName + ".jpeg");
     });
   }
 };
@@ -34303,6 +34567,19 @@ function _catch(body, recover) {
 
   return result;
 }
+function _finallyRethrows(body, finalizer) {
+  try {
+    var result = body();
+  } catch (e) {
+    return finalizer(true, e);
+  }
+
+  if (result && result.then) {
+    return result.then(finalizer.bind(null, false), finalizer.bind(null, true));
+  }
+
+  return finalizer(false, result);
+}
 
 function listCacheClear() {
   this.__data__ = [];
@@ -35329,8 +35606,8 @@ function initCloneArray(array) {
 
 var _initCloneArray = initCloneArray;
 
-var Uint8Array = _root.Uint8Array;
-var _Uint8Array = Uint8Array;
+var Uint8Array$1 = _root.Uint8Array;
+var _Uint8Array = Uint8Array$1;
 
 function cloneArrayBuffer(arrayBuffer) {
   var result = new arrayBuffer.constructor(arrayBuffer.byteLength);
@@ -35618,6 +35895,7 @@ var cloneDeep_1 = cloneDeep;
 
 var getThumbnails = function getThumbnails(ids, tenantId) {
   try {
+    tenantId = window.location.href.includes("/obps/") ? Digit.ULBService.getStateId() : tenantId;
     return Promise.resolve(Digit.UploadServices.Filefetch(ids, tenantId)).then(function (res) {
       if (res.data.fileStoreIds && res.data.fileStoreIds.length !== 0) {
         return {
@@ -35722,7 +36000,8 @@ var WorkflowService = {
     var tenantId = _ref.tenantId,
         id = _ref.id,
         moduleCode = _ref.moduleCode,
-        role = _ref.role;
+        role = _ref.role,
+        getTripData = _ref.getTripData;
 
     try {
       return Promise.resolve(Digit.WorkflowService.getByBusinessId(tenantId, id)).then(function (workflow) {
@@ -35736,13 +36015,13 @@ var WorkflowService = {
 
           var _exit = false;
 
-          function _temp8(_result2) {
+          function _temp14(_result2) {
             return _exit ? _result2 : {};
           }
 
           var businessServiceResponse = _Digit$WorkflowServic === null || _Digit$WorkflowServic === void 0 ? void 0 : (_Digit$WorkflowServic2 = _Digit$WorkflowServic.BusinessServices[0]) === null || _Digit$WorkflowServic2 === void 0 ? void 0 : _Digit$WorkflowServic2.states;
 
-          var _temp7 = function () {
+          var _temp13 = function () {
             if (workflow && workflow.ProcessInstances) {
               var _processInstances$, _businessServiceRespo;
 
@@ -35770,7 +36049,7 @@ var WorkflowService = {
               });
 
               if (currentState && currentState !== null && currentState !== void 0 && currentState.isStateUpdatable) {
-                if (moduleCode === "FSM" || moduleCode === "FSM_VEHICLE_TRIP" || moduleCode === "PGR" || moduleCode === "OBPS") null;else nextActions.push({
+                if (moduleCode === "FSM" || moduleCode === "FSM_POST_PAY_SERVICE" || moduleCode === "FSM_VEHICLE_TRIP" || moduleCode === "PGR" || moduleCode === "OBPS") null;else nextActions.push({
                   action: "EDIT",
                   state: currentState
                 });
@@ -35823,7 +36102,36 @@ var WorkflowService = {
               return function () {
                 if (processInstances.length > 0) {
                   return Promise.resolve(makeCommentsSubsidariesOfPreviousActions(processInstances)).then(function (TLEnrichedWithWorflowData) {
-                    var _workflow$ProcessInst, _workflow$ProcessInst2;
+                    function _temp12() {
+                      var _workflow$ProcessInst, _workflow$ProcessInst2;
+
+                      var nextActions = actionRolePair;
+
+                      if (role !== "CITIZEN" && moduleCode === "PGR") {
+                        var _timeline;
+
+                        var onlyPendingForAssignmentStatusArray = (_timeline = timeline) === null || _timeline === void 0 ? void 0 : _timeline.filter(function (e) {
+                          return (e === null || e === void 0 ? void 0 : e.status) === "PENDINGFORASSIGNMENT";
+                        });
+                        var duplicateCheckpointOfPendingForAssignment = onlyPendingForAssignmentStatusArray.at(-1);
+                        timeline.push(_extends({}, duplicateCheckpointOfPendingForAssignment, {
+                          status: "COMPLAINT_FILED"
+                        }));
+                      }
+
+                      if (timeline[timeline.length - 1].status !== "CREATED" && (moduleCode === "FSM" || moduleCode === "FSM_POST_PAY_SERVICE")) timeline.push({
+                        status: "CREATED"
+                      });
+                      var details = {
+                        timeline: timeline,
+                        nextActions: nextActions,
+                        actionState: actionState,
+                        applicationBusinessService: workflow === null || workflow === void 0 ? void 0 : (_workflow$ProcessInst = workflow.ProcessInstances) === null || _workflow$ProcessInst === void 0 ? void 0 : (_workflow$ProcessInst2 = _workflow$ProcessInst[0]) === null || _workflow$ProcessInst2 === void 0 ? void 0 : _workflow$ProcessInst2.businessService,
+                        processInstances: applicationProcessInstance
+                      };
+                      _exit = true;
+                      return details;
+                    }
 
                     var timeline = TLEnrichedWithWorflowData.map(function (instance, ind) {
                       var _instance$thumbnailsT, _instance$thumbnailsT2;
@@ -35861,40 +36169,148 @@ var WorkflowService = {
                       };
                       return checkPoint;
                     });
-                    var nextActions = actionRolePair;
 
-                    if (role !== "CITIZEN" && moduleCode === "PGR") {
-                      var onlyPendingForAssignmentStatusArray = timeline === null || timeline === void 0 ? void 0 : timeline.filter(function (e) {
-                        return (e === null || e === void 0 ? void 0 : e.status) === "PENDINGFORASSIGNMENT";
-                      });
-                      var duplicateCheckpointOfPendingForAssignment = onlyPendingForAssignmentStatusArray.at(-1);
-                      timeline.push(_extends({}, duplicateCheckpointOfPendingForAssignment, {
-                        status: "COMPLAINT_FILED"
-                      }));
-                    }
+                    var _temp11 = function () {
+                      if (getTripData) {
+                        var _temp15 = _catch(function () {
+                          var filters = {
+                            businessService: 'FSM_VEHICLE_TRIP',
+                            refernceNos: id
+                          };
+                          return Promise.resolve(Digit.FSMService.vehicleSearch(tenantId, filters)).then(function (tripSearchResp) {
+                            var _temp9 = function () {
+                              if (tripSearchResp && tripSearchResp.vehicleTrip && tripSearchResp.vehicleTrip.length) {
+                                var _temp16 = function _temp16() {
+                                  var tripTimeline = [];
+                                  var disposalInProgressPosition = timeline.findIndex(function (data) {
+                                    return data.status === "DISPOSAL_IN_PROGRESS";
+                                  });
+
+                                  if (disposalInProgressPosition !== -1) {
+                                    var _timeline2;
+
+                                    timeline[disposalInProgressPosition].numberOfTrips = _numberOfTrips;
+
+                                    (_timeline2 = timeline).splice.apply(_timeline2, [disposalInProgressPosition + 1, 0].concat(_waitingForDisposedAction));
+
+                                    tripTimeline = _disposedAction;
+                                  } else {
+                                    tripTimeline = _disposedAction.concat(_waitingForDisposedAction);
+                                  }
+
+                                  var feedbackPosition = timeline.findIndex(function (data) {
+                                    return data.status === "CITIZEN_FEEDBACK_PENDING";
+                                  });
+
+                                  if (feedbackPosition !== -1) {
+                                    var _timeline3;
+
+                                    (_timeline3 = timeline).splice.apply(_timeline3, [feedbackPosition + 1, 0].concat(tripTimeline));
+                                  } else {
+                                    timeline = tripTimeline.concat(timeline);
+                                  }
+                                };
+
+                                var _numberOfTrips = tripSearchResp.vehicleTrip.length;
+                                var cretaedTime = 0;
+                                var lastModifiedTime = 0;
+                                var waitingForDisposedCount = 0;
+                                var disposedCount = 0;
+                                var _waitingForDisposedAction = [];
+                                var _disposedAction = [];
+
+                                var _temp17 = _forOf(tripSearchResp.vehicleTrip, function (data) {
+                                  return Promise.resolve(Digit.WorkflowService.getByBusinessId(tenantId, data.applicationNo)).then(function (resp) {
+                                    var _resp$ProcessInstance;
+
+                                    resp === null || resp === void 0 ? void 0 : (_resp$ProcessInstance = resp.ProcessInstances) === null || _resp$ProcessInstance === void 0 ? void 0 : _resp$ProcessInstance.map(function (instance, ind) {
+                                      if (instance.state.applicationStatus === "WAITING_FOR_DISPOSAL") {
+                                        var _instance$thumbnailsT3, _instance$thumbnailsT4;
+
+                                        waitingForDisposedCount++;
+                                        cretaedTime = Digit.DateUtils.ConvertEpochToDate(instance.auditDetails.createdTime);
+                                        lastModifiedTime = Digit.DateUtils.ConvertEpochToDate(instance.auditDetails.lastModifiedTime);
+                                        _waitingForDisposedAction = [{
+                                          performedAction: instance.action,
+                                          status: instance.state.applicationStatus,
+                                          state: instance.state.state,
+                                          assigner: instance === null || instance === void 0 ? void 0 : instance.assigner,
+                                          rating: instance === null || instance === void 0 ? void 0 : instance.rating,
+                                          thumbnailsToShow: {
+                                            thumbs: instance === null || instance === void 0 ? void 0 : (_instance$thumbnailsT3 = instance.thumbnailsToShow) === null || _instance$thumbnailsT3 === void 0 ? void 0 : _instance$thumbnailsT3.thumbs,
+                                            fullImage: instance === null || instance === void 0 ? void 0 : (_instance$thumbnailsT4 = instance.thumbnailsToShow) === null || _instance$thumbnailsT4 === void 0 ? void 0 : _instance$thumbnailsT4.images
+                                          },
+                                          assignes: instance.assignes,
+                                          caption: instance.assignes ? instance.assignes.map(function (assignee) {
+                                            return {
+                                              name: assignee.name,
+                                              mobileNumber: assignee.mobileNumber
+                                            };
+                                          }) : null,
+                                          auditDetails: {
+                                            created: cretaedTime,
+                                            lastModified: lastModifiedTime
+                                          },
+                                          numberOfTrips: _numberOfTrips
+                                        }];
+                                      }
+
+                                      if (instance.state.applicationStatus === "DISPOSED") {
+                                        var _instance$thumbnailsT5, _instance$thumbnailsT6;
+
+                                        disposedCount++;
+                                        cretaedTime = instance.auditDetails.createdTime > cretaedTime ? Digit.DateUtils.ConvertEpochToDate(instance.auditDetails.createdTime) : cretaedTime;
+                                        lastModifiedTime = instance.auditDetails.lastModifiedTime > lastModifiedTime ? Digit.DateUtils.ConvertEpochToDate(instance.auditDetails.lastModifiedTime) : lastModifiedTime;
+                                        _disposedAction = [{
+                                          performedAction: instance.action,
+                                          status: instance.state.applicationStatus,
+                                          state: instance.state.state,
+                                          assigner: instance === null || instance === void 0 ? void 0 : instance.assigner,
+                                          rating: instance === null || instance === void 0 ? void 0 : instance.rating,
+                                          thumbnailsToShow: {
+                                            thumbs: instance === null || instance === void 0 ? void 0 : (_instance$thumbnailsT5 = instance.thumbnailsToShow) === null || _instance$thumbnailsT5 === void 0 ? void 0 : _instance$thumbnailsT5.thumbs,
+                                            fullImage: instance === null || instance === void 0 ? void 0 : (_instance$thumbnailsT6 = instance.thumbnailsToShow) === null || _instance$thumbnailsT6 === void 0 ? void 0 : _instance$thumbnailsT6.images
+                                          },
+                                          assignes: instance.assignes,
+                                          caption: instance.assignes ? instance.assignes.map(function (assignee) {
+                                            return {
+                                              name: assignee.name,
+                                              mobileNumber: assignee.mobileNumber
+                                            };
+                                          }) : null,
+                                          auditDetails: {
+                                            created: cretaedTime,
+                                            lastModified: lastModifiedTime
+                                          },
+                                          numberOfTrips: disposedCount
+                                        }];
+                                      }
+                                    });
+                                  });
+                                });
+
+                                return _temp17 && _temp17.then ? _temp17.then(_temp16) : _temp16(_temp17);
+                              }
+                            }();
+
+                            if (_temp9 && _temp9.then) return _temp9.then(function () {});
+                          });
+                        }, function () {});
+
+                        if (_temp15 && _temp15.then) return _temp15.then(function () {});
+                      }
+                    }();
 
-                    if (timeline[timeline.length - 1].status !== "CREATED" && moduleCode === "FSM") timeline.push({
-                      status: "CREATED"
-                    });
-                    var details = {
-                      timeline: timeline,
-                      nextActions: nextActions,
-                      actionState: actionState,
-                      applicationBusinessService: workflow === null || workflow === void 0 ? void 0 : (_workflow$ProcessInst = workflow.ProcessInstances) === null || _workflow$ProcessInst === void 0 ? void 0 : (_workflow$ProcessInst2 = _workflow$ProcessInst[0]) === null || _workflow$ProcessInst2 === void 0 ? void 0 : _workflow$ProcessInst2.businessService,
-                      processInstances: applicationProcessInstance
-                    };
-                    _exit = true;
-                    return details;
+                    return _temp11 && _temp11.then ? _temp11.then(_temp12) : _temp12(_temp11);
                   });
                 }
               }();
             } else {
-              console.warn("error fetching workflow services");
               throw new Error("error fetching workflow services");
             }
           }();
 
-          return _temp7 && _temp7.then ? _temp7.then(_temp8) : _temp8(_temp7);
+          return _temp13 && _temp13.then ? _temp13.then(_temp14) : _temp14(_temp13);
         });
       });
     } catch (e) {
@@ -35991,6 +36407,7 @@ var Complaint = {
         documentUid: "",
         additionalDetails: {}
       }] : null;
+      if (!uploadedDocument) complaintDetails.workflow.verificationDocuments = [];
       return Promise.resolve(Digit.PGRService.update(complaintDetails, tenantId));
     } catch (e) {
       return Promise.reject(e);
@@ -36050,19 +36467,22 @@ var UserService = {
     try {
       var userType = UserService.getType();
 
-      var _temp2 = _catch(function () {
-        return Promise.resolve(UserService.logoutUser()).then(function () {
-          window.localStorage.clear();
-          window.sessionStorage.clear();
+      var _temp2 = _finallyRethrows(function () {
+        return _catch(function () {
+          return Promise.resolve(UserService.logoutUser()).then(function () {});
+        }, function () {});
+      }, function (_wasThrown, _result) {
+        window.localStorage.clear();
+        window.sessionStorage.clear();
 
-          if (userType === "citizen") {
-            window.location.replace("/digit-ui/citizen");
-          } else {
-            window.location.replace("/digit-ui/employee/user/language-selection");
-          }
-        });
-      }, function (e) {
-        console.error(e);
+        if (userType === "citizen") {
+          window.location.replace("/digit-ui/citizen");
+        } else {
+          window.location.replace("/digit-ui/employee/user/language-selection");
+        }
+
+        if (_wasThrown) throw _result;
+        return _result;
       });
 
       return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(function () {}) : void 0);
@@ -36135,8 +36555,9 @@ var UserService = {
   changePassword: function changePassword(details, stateCode) {
     return ServiceRequest({
       serviceName: "changePassword",
-      url: Urls.ChangePassword,
+      url: Urls.ChangePassword1,
       data: _extends({}, details),
+      auth: true,
       params: {
         tenantId: stateCode
       }
@@ -36191,13 +36612,15 @@ var PTService = {
   },
   fetchPaymentDetails: function fetchPaymentDetails(_ref2) {
     var tenantId = _ref2.tenantId,
-        consumerCodes = _ref2.consumerCodes;
+        consumerCodes = _ref2.consumerCodes,
+        _ref2$auth = _ref2.auth,
+        auth = _ref2$auth === void 0 ? true : _ref2$auth;
     return Request({
       url: Urls.pt.fetch_payment_details,
       useCache: false,
       method: "POST",
-      auth: true,
-      userService: true,
+      auth: auth === false ? auth : true,
+      userService: auth === false ? auth : true,
       params: {
         tenantId: tenantId,
         consumerCode: consumerCodes,
@@ -36268,6 +36691,53 @@ var PTService = {
         tenantId: tenantId
       }, filters)
     });
+  },
+  paymentsearch: function paymentsearch(_ref4) {
+    var tenantId = _ref4.tenantId,
+        filters = _ref4.filters,
+        auth = _ref4.auth;
+    return Request({
+      url: Urls.pt.payment_search,
+      useCache: false,
+      method: "POST",
+      auth: auth === false ? auth : true,
+      userService: auth === false ? auth : true,
+      params: _extends({
+        tenantId: tenantId
+      }, filters)
+    });
+  },
+  ptCalculateMutation: function ptCalculateMutation(details, tenantId) {
+    return Request({
+      url: Urls.pt.pt_calculate_mutation,
+      data: details,
+      useCache: false,
+      userService: true,
+      method: "POST",
+      params: {
+        tenantId: tenantId
+      },
+      auth: true
+    });
+  }
+};
+
+var WSService = {
+  search: function search(_ref) {
+    var tenantId = _ref.tenantId,
+        filters = _ref.filters,
+        businessService = _ref.businessService;
+    return Request({
+      url: businessService === "WS" ? Urls.ws.water_search : Urls.ws.sewarage_search,
+      useCache: false,
+      method: "POST",
+      auth: filters !== null && filters !== void 0 && filters.locality ? false : true,
+      userService: filters !== null && filters !== void 0 && filters.locality ? false : true,
+      setTimeParam: false,
+      params: _extends({
+        tenantId: tenantId
+      }, filters)
+    });
   }
 };
 
@@ -36594,8 +37064,10 @@ var Events = {
     });
   },
   Update: function Update(data) {
+    var _window, _window$globalConfigs;
+
     return Request({
-      url: Urls.events.updateEvent,
+      url: (_window = window) !== null && _window !== void 0 && (_window$globalConfigs = _window.globalConfigs) !== null && _window$globalConfigs !== void 0 && _window$globalConfigs.getConfig("ENABLE_SINGLEINSTANCE") ? Urls.events.updateEventCDG : Urls.events.updateEvent,
       useCache: false,
       method: "POST",
       auth: true,
@@ -36667,7 +37139,7 @@ var ShareFiles = {
     try {
       return Promise.resolve(UploadServices.Filestorage("DSS", data, tenantId)).then(function (fileUploadId) {
         return Promise.resolve(UploadServices.Filefetch([fileUploadId.data.files[0].fileStoreId], fileUploadId.data.files[0].tenantId)).then(function (fileUrl) {
-          return UrlShortener(fileUrl.data[fileUploadId.data.files[0].fileStoreId].split(",")[0]);
+          return UrlShortener(Digit.Utils.getFileUrl(fileUrl.data[fileUploadId.data.files[0].fileStoreId]));
         });
       });
     } catch (e) {
@@ -36703,6 +37175,38 @@ var ShareFiles = {
     } catch (e) {
       return Promise.reject(e);
     }
+  },
+  IndividualChartImage: function (tenantId, node, filename, target) {
+    try {
+      return Promise.resolve(new Promise(function (resolve) {
+        return Download.IndividualChartImage(node, filename, true, resolve);
+      })).then(function (imageData) {
+        return !target && navigator.share ? navigator.share({
+          files: [imageData],
+          title: filename
+        }) : Promise.resolve(ShareFiles.getShortener(tenantId, imageData)).then(function (shortUrl) {
+          ShareFiles.targetLink(target, shortUrl);
+        });
+      });
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  },
+  DownloadImage: function (tenantId, node, filename, target) {
+    try {
+      return Promise.resolve(new Promise(function (resolve) {
+        return Download.PDF(node, filename, true, resolve);
+      })).then(function (imageData) {
+        return !target && navigator.share ? navigator.share({
+          files: [imageData],
+          title: filename
+        }) : Promise.resolve(ShareFiles.getShortener(tenantId, imageData)).then(function (shortUrl) {
+          ShareFiles.targetLink(target, shortUrl);
+        });
+      });
+    } catch (e) {
+      return Promise.reject(e);
+    }
   }
 };
 
@@ -36773,7 +37277,7 @@ var GetServiceDefinitions = {
 
 var ULBService = {
   getCurrentTenantId: function getCurrentTenantId() {
-    var _user$info, _user$info2, _user$info3;
+    var _user$info, _user$info2, _user$info3, _window;
 
     var user = UserService.getUser();
 
@@ -36787,13 +37291,13 @@ var ULBService = {
       }
     }
 
-    var tenantId = (user === null || user === void 0 ? void 0 : (_user$info = user.info) === null || _user$info === void 0 ? void 0 : _user$info.type) === "EMPLOYEE" && user !== null && user !== void 0 && (_user$info2 = user.info) !== null && _user$info2 !== void 0 && _user$info2.tenantId ? user === null || user === void 0 ? void 0 : (_user$info3 = user.info) === null || _user$info3 === void 0 ? void 0 : _user$info3.tenantId : globalConfigs.getConfig("STATE_LEVEL_TENANT_ID");
+    var tenantId = (user === null || user === void 0 ? void 0 : (_user$info = user.info) === null || _user$info === void 0 ? void 0 : _user$info.type) === "EMPLOYEE" && user !== null && user !== void 0 && (_user$info2 = user.info) !== null && _user$info2 !== void 0 && _user$info2.tenantId ? user === null || user === void 0 ? void 0 : (_user$info3 = user.info) === null || _user$info3 === void 0 ? void 0 : _user$info3.tenantId : (_window = window) === null || _window === void 0 ? void 0 : _window.globalConfigs.getConfig("STATE_LEVEL_TENANT_ID");
     return tenantId;
   },
   getStateId: function getStateId() {
-    var _window, _window$globalConfigs;
+    var _window2, _window2$globalConfig;
 
-    return (_window = window) === null || _window === void 0 ? void 0 : (_window$globalConfigs = _window.globalConfigs) === null || _window$globalConfigs === void 0 ? void 0 : _window$globalConfigs.getConfig("STATE_LEVEL_TENANT_ID");
+    return (_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$globalConfig = _window2.globalConfigs) === null || _window2$globalConfig === void 0 ? void 0 : _window2$globalConfig.getConfig("STATE_LEVEL_TENANT_ID");
   },
   getCurrentUlb: function getCurrentUlb() {
     var initData = StoreService.getInitData();
@@ -36801,6 +37305,98 @@ var ULBService = {
     return initData.tenants.find(function (tenant) {
       return tenant.code === tenantId;
     });
+  },
+  getCitizenCurrentTenant: function getCitizenCurrentTenant(selectedCity) {
+    var _Digit$SessionStorage, _Digit$UserService$ge, _Digit$UserService$ge2;
+
+    if (selectedCity === void 0) {
+      selectedCity = false;
+    }
+
+    var homeCity = (_Digit$SessionStorage = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.code;
+
+    if (selectedCity) {
+      return homeCity;
+    }
+
+    return homeCity || ((_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : (_Digit$UserService$ge2 = _Digit$UserService$ge.info) === null || _Digit$UserService$ge2 === void 0 ? void 0 : _Digit$UserService$ge2.permanentCity) || ULBService.getStateId();
+  },
+  getUserUlbs: function getUserUlbs(userRole) {
+    if (userRole === void 0) {
+      userRole = "";
+    }
+
+    var stringReplaceAll = function stringReplaceAll(str, searcher, replaceWith) {
+      if (str === void 0) {
+        str = "";
+      }
+
+      if (searcher === void 0) {
+        searcher = "";
+      }
+
+      if (replaceWith === void 0) {
+        replaceWith = "";
+      }
+
+      if (searcher == "") return str;
+
+      while ((_str = str) !== null && _str !== void 0 && _str.includes(searcher)) {
+        var _str, _str2;
+
+        str = (_str2 = str) === null || _str2 === void 0 ? void 0 : _str2.replace(searcher, replaceWith);
+      }
+
+      return str;
+    };
+
+    var userloggedValues = Digit.SessionStorage.get("citizen.userRequestObject");
+    var teantsArray = [],
+        filteredArray = [];
+
+    if (userRole === "") {
+      var _userloggedValues$inf, _userloggedValues$inf2;
+
+      userloggedValues === null || userloggedValues === void 0 ? void 0 : (_userloggedValues$inf = userloggedValues.info) === null || _userloggedValues$inf === void 0 ? void 0 : (_userloggedValues$inf2 = _userloggedValues$inf.roles) === null || _userloggedValues$inf2 === void 0 ? void 0 : _userloggedValues$inf2.forEach(function (role) {
+        return teantsArray.push(role.tenantId);
+      });
+      var unique = teantsArray.filter(function (item, i, ar) {
+        return ar.indexOf(item) === i;
+      });
+      unique === null || unique === void 0 ? void 0 : unique.forEach(function (uniCode) {
+        var _stringReplaceAll;
+
+        filteredArray.push({
+          i18nKey: "TENANT_TENANTS_" + ((_stringReplaceAll = stringReplaceAll(uniCode, ".", "_")) === null || _stringReplaceAll === void 0 ? void 0 : _stringReplaceAll.toUpperCase()),
+          value: uniCode,
+          code: uniCode,
+          name: uniCode.substring(uniCode.indexOf(".") + 1)
+        });
+      });
+      return filteredArray;
+    } else {
+      var _userloggedValues$inf3, _userloggedValues$inf4;
+
+      userloggedValues === null || userloggedValues === void 0 ? void 0 : (_userloggedValues$inf3 = userloggedValues.info) === null || _userloggedValues$inf3 === void 0 ? void 0 : (_userloggedValues$inf4 = _userloggedValues$inf3.roles) === null || _userloggedValues$inf4 === void 0 ? void 0 : _userloggedValues$inf4.forEach(function (role) {
+        if (userRole === role.code) teantsArray.push(role.tenantId);
+      });
+
+      var _unique = teantsArray.filter(function (item, i, ar) {
+        return ar.indexOf(item) === i;
+      });
+
+      _unique === null || _unique === void 0 ? void 0 : _unique.forEach(function (uniCode) {
+        var _stringReplaceAll2;
+
+        filteredArray.push({
+          i18nKey: "TENANT_TENANTS_" + ((_stringReplaceAll2 = stringReplaceAll(uniCode, ".", "_")) === null || _stringReplaceAll2 === void 0 ? void 0 : _stringReplaceAll2.toUpperCase()),
+          value: uniCode,
+          code: uniCode,
+          name: uniCode.substring(uniCode.indexOf(".") + 1)
+        });
+      });
+      return filteredArray;
+    }
   }
 };
 
@@ -36886,7 +37482,9 @@ var useWorkflowDetails = function useWorkflowDetails(_ref) {
       _ref$role = _ref.role,
       role = _ref$role === void 0 ? "CITIZEN" : _ref$role,
       getStaleData = _ref.getStaleData,
-      config = _ref.config;
+      config = _ref.config,
+      _ref$getTripData = _ref.getTripData,
+      getTripData = _ref$getTripData === void 0 ? false : _ref$getTripData;
   var queryClient = reactQuery.useQueryClient();
   var staleDataConfig = {
     staleTime: Infinity
@@ -36897,7 +37495,8 @@ var useWorkflowDetails = function useWorkflowDetails(_ref) {
       tenantId: tenantId,
       id: id,
       moduleCode: moduleCode,
-      role: role
+      role: role,
+      getTripData: getTripData
     });
   }, getStaleData ? _extends({}, staleDataConfig, config) : config),
       isLoading = _useQuery.isLoading,
@@ -36939,9 +37538,7 @@ var useSessionStorage = function useSessionStorage(key, initialValue) {
       var valueToStore = value instanceof Function ? value(storedValue) : value;
       setStoredValue(valueToStore);
       Digit.SessionStorage.set(key, valueToStore);
-    } catch (err) {
-      console.error(err);
-    }
+    } catch (err) {}
   };
 
   var clearValue = function clearValue() {
@@ -36962,16 +37559,20 @@ var useQueryParams = function useQueryParams() {
   return params;
 };
 
-var useOnClickOutside = function useOnClickOutside(ref, handler, isActive) {
+var useOnClickOutside = function useOnClickOutside(ref, handler, isActive, eventParam) {
+  if (eventParam === void 0) {
+    eventParam = false;
+  }
+
   React.useEffect(function () {
     if (isActive) {
-      document.addEventListener("click", handleClickOutSide, false);
+      document.addEventListener("click", handleClickOutSide, eventParam);
     } else {
-      document.removeEventListener("click", handleClickOutSide, false);
+      document.removeEventListener("click", handleClickOutSide, eventParam);
     }
 
     return function () {
-      document.removeEventListener("click", handleClickOutSide, false);
+      document.removeEventListener("click", handleClickOutSide, eventParam);
     };
   }, [isActive]);
 
@@ -37057,7 +37658,6 @@ var useFetchBillsForBuissnessService = function useFetchBillsForBuissnessService
     return Digit.PaymentService.fetchBill(_tenantId, params);
   }, _extends({
     retry: function retry(count, err) {
-      console.error(err, "inside the payment hook");
       return false;
     }
   }, config)),
@@ -37086,10 +37686,56 @@ var useFetchPayment = function useFetchPayment(_ref4, config) {
 
   var fetchBill = function fetchBill() {
     try {
-      return Promise.resolve(Digit.PaymentService.fetchBill(tenantId, {
-        consumerCode: consumerCode,
-        businessService: businessService
-      }));
+      if (businessService !== null && businessService !== void 0 && businessService.includes("PT")) {
+        return Promise.resolve(Digit.PaymentService.fetchBill(tenantId, {
+          consumerCode: consumerCode,
+          businessService: businessService
+        })).then(function (fetchedBill) {
+          var _fetchedBill$Bill, _fetchedBill$Bill$, _fetchedBill$Bill$$bi, _fetchedBill$Bill$$bi2, _fetchedBill$Bill3, _fetchedBill$Bill3$, _fetchedBill$Bill3$$b;
+
+          var billdetail = (fetchedBill === null || fetchedBill === void 0 ? void 0 : (_fetchedBill$Bill = fetchedBill.Bill) === null || _fetchedBill$Bill === void 0 ? void 0 : (_fetchedBill$Bill$ = _fetchedBill$Bill[0]) === null || _fetchedBill$Bill$ === void 0 ? void 0 : (_fetchedBill$Bill$$bi = _fetchedBill$Bill$.billDetails) === null || _fetchedBill$Bill$$bi === void 0 ? void 0 : (_fetchedBill$Bill$$bi2 = _fetchedBill$Bill$$bi.sort(function (a, b) {
+            return b.fromPeriod - a.fromPeriod;
+          })) === null || _fetchedBill$Bill$$bi2 === void 0 ? void 0 : _fetchedBill$Bill$$bi2[0]) || {};
+          fetchedBill.Bill[0].billDetails = fetchedBill.Bill[0].billDetails.map(function (ele) {
+            var _fetchedBill$Bill2, _fetchedBill$Bill2$;
+
+            return _extends({}, ele, {
+              currentBillNo: fetchedBill === null || fetchedBill === void 0 ? void 0 : (_fetchedBill$Bill2 = fetchedBill.Bill) === null || _fetchedBill$Bill2 === void 0 ? void 0 : (_fetchedBill$Bill2$ = _fetchedBill$Bill2[0]) === null || _fetchedBill$Bill2$ === void 0 ? void 0 : _fetchedBill$Bill2$.billNumber,
+              currentExpiryDate: billdetail === null || billdetail === void 0 ? void 0 : billdetail.expiryDate
+            });
+          });
+
+          if (fetchedBill && (fetchedBill === null || fetchedBill === void 0 ? void 0 : (_fetchedBill$Bill3 = fetchedBill.Bill) === null || _fetchedBill$Bill3 === void 0 ? void 0 : (_fetchedBill$Bill3$ = _fetchedBill$Bill3[0]) === null || _fetchedBill$Bill3$ === void 0 ? void 0 : (_fetchedBill$Bill3$$b = _fetchedBill$Bill3$.billDetails) === null || _fetchedBill$Bill3$$b === void 0 ? void 0 : _fetchedBill$Bill3$$b.length) > 1) {
+            var _fetchedBill$Bill4, _fetchedBill$Bill4$, _fetchedBill$Bill4$$b;
+
+            fetchedBill === null || fetchedBill === void 0 ? void 0 : (_fetchedBill$Bill4 = fetchedBill.Bill) === null || _fetchedBill$Bill4 === void 0 ? void 0 : (_fetchedBill$Bill4$ = _fetchedBill$Bill4[0]) === null || _fetchedBill$Bill4$ === void 0 ? void 0 : (_fetchedBill$Bill4$$b = _fetchedBill$Bill4$.billDetails) === null || _fetchedBill$Bill4$$b === void 0 ? void 0 : _fetchedBill$Bill4$$b.map(function (billdet) {
+              try {
+                return Promise.resolve(Digit.PaymentService.searchBill(tenantId, {
+                  consumerCode: consumerCode,
+                  fromPeriod: billdet === null || billdet === void 0 ? void 0 : billdet.fromPeriod,
+                  toPeriod: billdet === null || billdet === void 0 ? void 0 : billdet.toPeriod,
+                  service: businessService,
+                  retrieveOldest: true
+                })).then(function (searchBill) {
+                  var _searchBill$Bill, _searchBill$Bill$, _searchBill$Bill$$bil, _searchBill$Bill$$bil2, _searchBill$Bill2, _searchBill$Bill2$;
+
+                  billdet.expiryDate = searchBill === null || searchBill === void 0 ? void 0 : (_searchBill$Bill = searchBill.Bill) === null || _searchBill$Bill === void 0 ? void 0 : (_searchBill$Bill$ = _searchBill$Bill[0]) === null || _searchBill$Bill$ === void 0 ? void 0 : (_searchBill$Bill$$bil = _searchBill$Bill$.billDetails) === null || _searchBill$Bill$$bil === void 0 ? void 0 : (_searchBill$Bill$$bil2 = _searchBill$Bill$$bil[0]) === null || _searchBill$Bill$$bil2 === void 0 ? void 0 : _searchBill$Bill$$bil2.expiryDate;
+                  billdet.billNumber = searchBill === null || searchBill === void 0 ? void 0 : (_searchBill$Bill2 = searchBill.Bill) === null || _searchBill$Bill2 === void 0 ? void 0 : (_searchBill$Bill2$ = _searchBill$Bill2[0]) === null || _searchBill$Bill2$ === void 0 ? void 0 : _searchBill$Bill2$.billNumber;
+                });
+              } catch (e) {
+                return Promise.reject(e);
+              }
+            });
+          }
+
+          return fetchedBill;
+        });
+      } else {
+        return Promise.resolve(Digit.PaymentService.fetchBill(tenantId, {
+          consumerCode: consumerCode,
+          businessService: businessService
+        }));
+      }
     } catch (e) {
       return Promise.reject(e);
     }
@@ -37279,6 +37925,20 @@ var refObj = function refObj(tenantId, filters) {
       key: "consumerCode",
       label: "UC_CHALLAN_NO"
     },
+    ws: {
+      searchFn: function searchFn() {
+        return advtApplications(tenantId, filters);
+      },
+      key: "consumerCode",
+      label: "WS_MYCONNECTIONS_CONSUMER_NO"
+    },
+    sw: {
+      searchFn: function searchFn() {
+        return advtApplications(tenantId, filters);
+      },
+      key: "consumerCode",
+      label: "WS_MYCONNECTIONS_CONSUMER_NO"
+    },
     TL: {
       searchFn: function searchFn() {
         return tlApplications(tenantId, filters);
@@ -37739,12 +38399,11 @@ var defaultRawSearchHandler = function defaultRawSearchHandler(_ref2, searchKey,
 };
 
 var defaultCatchSearch = function defaultCatchSearch(Err) {
-  var _Err$response, _Err$response$data, _Err$response$data$Er, _Err$response2;
+  var _Err$response, _Err$response$data, _Err$response$data$Er;
 
   if (Err !== null && Err !== void 0 && (_Err$response = Err.response) !== null && _Err$response !== void 0 && (_Err$response$data = _Err$response.data) !== null && _Err$response$data !== void 0 && (_Err$response$data$Er = _Err$response$data.Errors) !== null && _Err$response$data$Er !== void 0 && _Err$response$data$Er.some(function (e) {
     return e.code === "EG_PT_INVALID_SEARCH" && e.message === " Search is not allowed on empty Criteria, Atleast one criteria should be provided with tenantId for EMPLOYEE";
   })) return [];
-  console.error(Err === null || Err === void 0 ? void 0 : (_Err$response2 = Err.response) === null || _Err$response2 === void 0 ? void 0 : _Err$response2.data, " this is error");
   throw Err;
 };
 
@@ -37976,11 +38635,13 @@ var useModuleTenants = function useModuleTenants(module, config) {
         ddr: data.modules.find(function (e) {
           return e.module === module;
         }).tenants.map(function (tenant) {
+          var _tenant$code, _tenant$code$toUpperC, _tenant$code$toUpperC2, _data$tenants$filter, _data$tenants$filter$, _data$tenants$filter$2, _data$tenants$filter$3;
+
           return _extends({}, tenant, {
-            ulbKey: t("TENANT_TENANTS_" + tenant.code.toUpperCase().replace(".", "_")),
-            ddrKey: t("DDR_" + data.tenants.filter(function (t) {
+            ulbKey: t("TENANT_TENANTS_" + (tenant === null || tenant === void 0 ? void 0 : (_tenant$code = tenant.code) === null || _tenant$code === void 0 ? void 0 : (_tenant$code$toUpperC = _tenant$code.toUpperCase) === null || _tenant$code$toUpperC === void 0 ? void 0 : (_tenant$code$toUpperC2 = _tenant$code$toUpperC.call(_tenant$code)) === null || _tenant$code$toUpperC2 === void 0 ? void 0 : _tenant$code$toUpperC2.replace(".", "_"))),
+            ddrKey: t("DDR_" + ((_data$tenants$filter = data.tenants.filter(function (t) {
               return t.code === tenant.code;
-            })[0].city.districtTenantCode.toUpperCase().replace(".", "_"))
+            })) === null || _data$tenants$filter === void 0 ? void 0 : (_data$tenants$filter$ = _data$tenants$filter[0].city) === null || _data$tenants$filter$ === void 0 ? void 0 : (_data$tenants$filter$2 = _data$tenants$filter$.districtTenantCode) === null || _data$tenants$filter$2 === void 0 ? void 0 : (_data$tenants$filter$3 = _data$tenants$filter$2.toUpperCase) === null || _data$tenants$filter$3 === void 0 ? void 0 : _data$tenants$filter$3.call(_data$tenants$filter$2).replace(".", "_")))
           });
         }).filter(function (item, i, arr) {
           return i === arr.findIndex(function (t) {
@@ -37990,11 +38651,13 @@ var useModuleTenants = function useModuleTenants(module, config) {
         ulb: data.modules.find(function (e) {
           return e.module === module;
         }).tenants.map(function (tenant) {
+          var _tenant$code2, _tenant$code2$toUpper, _tenant$code2$toUpper2, _data$tenants$filter2, _data$tenants$filter3, _data$tenants$filter4, _data$tenants$filter5;
+
           return _extends({}, tenant, {
-            ulbKey: t("TENANT_TENANTS_" + tenant.code.toUpperCase().replace(".", "_")),
-            ddrKey: t("DDR_" + data.tenants.filter(function (t) {
+            ulbKey: t("TENANT_TENANTS_" + (tenant === null || tenant === void 0 ? void 0 : (_tenant$code2 = tenant.code) === null || _tenant$code2 === void 0 ? void 0 : (_tenant$code2$toUpper = _tenant$code2.toUpperCase) === null || _tenant$code2$toUpper === void 0 ? void 0 : (_tenant$code2$toUpper2 = _tenant$code2$toUpper.call(_tenant$code2)) === null || _tenant$code2$toUpper2 === void 0 ? void 0 : _tenant$code2$toUpper2.replace(".", "_"))),
+            ddrKey: t("DDR_" + ((_data$tenants$filter2 = data.tenants.filter(function (t) {
               return t.code === tenant.code;
-            })[0].city.districtTenantCode.toUpperCase().replace(".", "_"))
+            })) === null || _data$tenants$filter2 === void 0 ? void 0 : (_data$tenants$filter3 = _data$tenants$filter2[0].city) === null || _data$tenants$filter3 === void 0 ? void 0 : (_data$tenants$filter4 = _data$tenants$filter3.districtTenantCode) === null || _data$tenants$filter4 === void 0 ? void 0 : (_data$tenants$filter5 = _data$tenants$filter4.toUpperCase) === null || _data$tenants$filter5 === void 0 ? void 0 : _data$tenants$filter5.call(_data$tenants$filter4).replace(".", "_")))
           });
         })
       };
@@ -38102,7 +38765,10 @@ var fetchImageLinksFromFilestoreIds = function fetchImageLinksFromFilestoreIds(f
 };
 
 var getTransformedLocale = function getTransformedLocale(label) {
+  var _label;
+
   if (typeof label === "number") return label;
+  label = (_label = label) === null || _label === void 0 ? void 0 : _label.trim();
   return label && label.toUpperCase().replace(/[.:-\s\/]/g, "_");
 };
 
@@ -38584,7 +39250,6 @@ var fetchComplaintDetails = function fetchComplaintDetails(tenantId, id) {
           }) : null;
           return ids ? Promise.resolve(getThumbnails$1(ids, service.tenantId)).then(_temp2) : _temp2(null);
         } else {
-          console.error("error fetching complaint details or service defs");
           return {};
         }
       });
@@ -39045,18 +39710,18 @@ var useApplicationStatus = function useApplicationStatus(select, isEnabled, stat
   var userRoles = userInfo.info.roles.map(function (roleData) {
     return roleData.code;
   });
-  var workflowOrder = ["CREATED", "PENDING_APPL_FEE_PAYMENT", "ASSING_DSO", "PENDING_DSO_APPROVAL", "DSO_REJECTED", "DSO_INPROGRESS", "REJECTED", "CANCELED", "COMPLETED", "CITIZEN_FEEDBACK_PENDING"];
+  var workflowOrder = ["CREATED", "PENDING_APPL_FEE_PAYMENT", "ASSING_DSO", "PENDING_DSO_APPROVAL", "DSO_REJECTED", "DSO_INPROGRESS", "REJECTED", "CANCELED", "COMPLETED", "CITIZEN_FEEDBACK_PENDING", "DISPOSAL_IN_PROGRESS"];
   var DSO = Digit.UserService.hasAccess(["FSM_DSO"]);
   var allowedStatusForDSO = ["PENDING_DSO_APPROVAL", "DSO_INPROGRESS", "COMPLETED", "DSO_REJECTED"];
   var tenantId = Digit.ULBService.getCurrentTenantId();
 
   var fetch = function fetch() {
     try {
-      return Promise.resolve(Digit.WorkflowService.init(tenantId, "FSM")).then(function (WorkflowService) {
+      return Promise.resolve(Digit.WorkflowService.init(tenantId, "FSM,FSM_POST_PAY_SERVICE")).then(function (WorkflowService) {
         return workflowOrder.map(function (status) {
-          var _WorkflowService$Busi;
+          var _getStates;
 
-          return (_WorkflowService$Busi = WorkflowService.BusinessServices[0].states) === null || _WorkflowService$Busi === void 0 ? void 0 : _WorkflowService$Busi.filter(function (workflowDetails) {
+          return (_getStates = getStates(WorkflowService.BusinessServices)) === null || _getStates === void 0 ? void 0 : _getStates.filter(function (workflowDetails) {
             return status === (workflowDetails === null || workflowDetails === void 0 ? void 0 : workflowDetails.state);
           })[0];
         });
@@ -39066,6 +39731,14 @@ var useApplicationStatus = function useApplicationStatus(select, isEnabled, stat
     }
   };
 
+  var getStates = function getStates(businessServices) {
+    var states = [];
+    businessServices.map(function (data) {
+      states = states.concat(data.states);
+    });
+    return states;
+  };
+
   var roleWiseSelect = function roleWiseSelect(WorkflowService) {
     var response = WorkflowService.filter(function (state) {
       return state.applicationStatus;
@@ -39089,9 +39762,9 @@ var useApplicationStatus = function useApplicationStatus(select, isEnabled, stat
       return {
         name: t("CS_COMMON_FSM_" + state.applicationStatus),
         code: state.applicationStatus,
-        id: (_statusMap = statusMap) === null || _statusMap === void 0 ? void 0 : (_statusMap$filter = _statusMap.filter(function (e) {
+        id: ((_statusMap = statusMap) === null || _statusMap === void 0 ? void 0 : (_statusMap$filter = _statusMap.filter(function (e) {
           return e.applicationstatus === state.applicationStatus;
-        })) === null || _statusMap$filter === void 0 ? void 0 : (_statusMap$filter$ = _statusMap$filter[0]) === null || _statusMap$filter$ === void 0 ? void 0 : _statusMap$filter$.statusid,
+        })) === null || _statusMap$filter === void 0 ? void 0 : (_statusMap$filter$ = _statusMap$filter[0]) === null || _statusMap$filter$ === void 0 ? void 0 : _statusMap$filter$.statusid) || state.uuid,
         roles: roles
       };
     });
@@ -39110,9 +39783,9 @@ var useApplicationStatus = function useApplicationStatus(select, isEnabled, stat
       return {
         name: t("CS_COMMON_FSM_" + state.applicationStatus),
         code: state.applicationStatus,
-        id: (_statusMap2 = statusMap) === null || _statusMap2 === void 0 ? void 0 : (_statusMap2$filter = _statusMap2.filter(function (e) {
+        id: ((_statusMap2 = statusMap) === null || _statusMap2 === void 0 ? void 0 : (_statusMap2$filter = _statusMap2.filter(function (e) {
           return e.applicationstatus === state.applicationStatus;
-        })) === null || _statusMap2$filter === void 0 ? void 0 : (_statusMap2$filter$ = _statusMap2$filter[0]) === null || _statusMap2$filter$ === void 0 ? void 0 : _statusMap2$filter$.statusid,
+        })) === null || _statusMap2$filter === void 0 ? void 0 : (_statusMap2$filter$ = _statusMap2$filter[0]) === null || _statusMap2$filter$ === void 0 ? void 0 : _statusMap2$filter$.statusid) || state.uuid,
         roles: roles
       };
     });
@@ -39243,6 +39916,30 @@ var useMDMS$1 = function useMDMS(tenantId, moduleCode, type, config, payload) {
     });
   };
 
+  var useGenderDetails = function useGenderDetails() {
+    return reactQuery.useQuery("FSM_GENDER_DETAILS", function () {
+      return MdmsService.getFSMGenderType(tenantId, moduleCode, type);
+    }, config);
+  };
+
+  var useFSTPORejectionReason = function useFSTPORejectionReason() {
+    return reactQuery.useQuery("FSM_FSTPO_REJECTION", function () {
+      return MdmsService.getFSTPORejectionReason(tenantId, moduleCode, type);
+    }, queryConfig);
+  };
+
+  var usePaymentType = function usePaymentType() {
+    return reactQuery.useQuery("FSM_PAYMENT_TYPE", function () {
+      return MdmsService.getFSMPaymentType(tenantId, moduleCode, type);
+    }, queryConfig);
+  };
+
+  var useTripNumber = function useTripNumber() {
+    return reactQuery.useQuery("FSM_TRIP_NUMBER", function () {
+      return MdmsService.getFSMTripNumber(tenantId, moduleCode, type);
+    }, queryConfig);
+  };
+
   switch (type) {
     case "SanitationType":
       return useSanitationType();
@@ -39285,6 +39982,21 @@ var useMDMS$1 = function useMDMS(tenantId, moduleCode, type, config, payload) {
 
     case "PostFieldsConfig":
       return usePostFieldsConfig();
+
+    case "FSMGenderType":
+      return useGenderDetails();
+
+    case "FSTPORejectionReason":
+      return useFSTPORejectionReason();
+
+    case "PaymentType":
+      return usePaymentType();
+
+    case "TripNumber":
+      return useTripNumber();
+
+    default:
+      return null;
   }
 };
 
@@ -39437,6 +40149,9 @@ var Search = {
                   }, {
                     title: "ES_APPLICATION_DETAILS_APPLICANT_MOBILE_NO",
                     value: response === null || response === void 0 ? void 0 : (_response$citizen2 = response.citizen) === null || _response$citizen2 === void 0 ? void 0 : _response$citizen2.mobileNumber
+                  }, {
+                    title: "ES_FSM_PAYMENT_PREFERENCE",
+                    value: "ES_ACTION_" + (response === null || response === void 0 ? void 0 : response.paymentPreference)
                   }]
                 }, {
                   title: "ES_APPLICATION_DETAILS_PROPERTY_DETAILS",
@@ -39508,20 +40223,31 @@ var Search = {
                   values: [{
                     title: "ES_APPLICATION_DETAILS_ASSIGNED_DSO",
                     value: ((_dsoDetails = dsoDetails) === null || _dsoDetails === void 0 ? void 0 : _dsoDetails.displayName) || "N/A"
-                  }, {
-                    title: "ES_APPLICATION_DETAILS_VEHICLE_MAKE",
-                    value: vehicleMake || "N/A"
                   }, {
                     title: "ES_APPLICATION_DETAILS_VEHICLE_NO",
                     value: ((_vehicle2 = vehicle) === null || _vehicle2 === void 0 ? void 0 : _vehicle2.registrationNumber) || "N/A"
                   }, {
                     title: "ES_APPLICATION_DETAILS_VEHICLE_CAPACITY",
-                    value: vehicleCapacity || "N/A"
+                    value: (response === null || response === void 0 ? void 0 : response.vehicleCapacity) || "N/A"
                   }, {
                     title: "ES_APPLICATION_DETAILS_POSSIBLE_SERVICE_DATE",
                     value: displayServiceDate(response === null || response === void 0 ? void 0 : response.possibleServiceDate) || "N/A"
                   }]
                 }];
+
+                if (userType !== "CITIZEN" && userType !== "DSO") {
+                  employeeResponse.map(function (data) {
+                    if (data.title === "ES_TITLE_APPLICANT_DETAILS" || data.title === "Applicant Details") {
+                      var _response$citizen3;
+
+                      data.values.push({
+                        title: "COMMON_APPLICANT_GENDER",
+                        value: response === null || response === void 0 ? void 0 : (_response$citizen3 = response.citizen) === null || _response$citizen3 === void 0 ? void 0 : _response$citizen3.gender
+                      });
+                    }
+                  });
+                }
+
                 if (userType !== "CITIZEN") return {
                   tenantId: response.tenantId,
                   applicationDetails: employeeResponse,
@@ -39551,6 +40277,7 @@ var Search = {
             });
           }
 
+          var paymentPreference = response === null || response === void 0 ? void 0 : response.paymentPreference;
           var slumLabel = "";
 
           var _temp = function () {
@@ -39691,9 +40418,9 @@ var useSearchAll = function useSearchAll(tenantId, filters, queryFn, config) {
   var defaultSelect = function defaultSelect(data) {
     return {
       data: {
-        table: data.fsm
+        table: data.fsm ? data.fsm : [data]
       },
-      totalCount: data.totalCount
+      totalCount: data.totalCount ? data.totalCount : 1
     };
   };
 
@@ -39741,12 +40468,12 @@ var useFSMInbox = function useFSMInbox(tenantId, filters, config, overRideUUID)
   var _filters = {
     tenantId: tenantId,
     processSearchCriteria: _extends({
-      businessService: ["FSM"]
+      businessService: ["FSM", "FSM_POST_PAY_SERVICE"]
     }, (filters === null || filters === void 0 ? void 0 : (_filters$applicationS = filters.applicationStatus) === null || _filters$applicationS === void 0 ? void 0 : _filters$applicationS.length) > 0 ? {
-      status: filters.applicationStatus.map(function (status) {
-        return status === null || status === void 0 ? void 0 : status.id;
-      })
-    } : {}),
+      status: getIds(filters.applicationStatus)
+    } : {}, {
+      moduleName: "fsm"
+    }),
     moduleSearchCriteria: _extends({}, mobileNumber ? {
       mobileNumber: mobileNumber
     } : {}, applicationNos ? {
@@ -39768,30 +40495,10 @@ var useFSMInbox = function useFSMInbox(tenantId, filters, config, overRideUUID)
     filters: _filters,
     config: _extends({
       select: function select(data) {
-        var _data$items;
-
         return {
           totalCount: data.totalCount,
           statuses: data.statusMap,
-          table: data === null || data === void 0 ? void 0 : (_data$items = data.items) === null || _data$items === void 0 ? void 0 : _data$items.map(function (application) {
-            var _application$ProcessI, _application$ProcessI2, _application$ProcessI3, _application$ProcessI4, _application$ProcessI5, _application$ProcessI6;
-
-            return {
-              tenantId: application.businessObject.tenantId,
-              totalCount: application.businessObject.totalCount,
-              applicationNo: application.businessObject.applicationNo,
-              createdTime: new Date(application.businessObject.auditDetails.createdTime),
-              locality: application.businessObject.address.locality.code,
-              status: application.businessObject.applicationStatus,
-              citizen: {
-                name: (_application$ProcessI = application.ProcessInstance) === null || _application$ProcessI === void 0 ? void 0 : (_application$ProcessI2 = _application$ProcessI.assigner) === null || _application$ProcessI2 === void 0 ? void 0 : _application$ProcessI2.name,
-                mobileNumber: (_application$ProcessI3 = application.ProcessInstance) === null || _application$ProcessI3 === void 0 ? void 0 : (_application$ProcessI4 = _application$ProcessI3.assigner) === null || _application$ProcessI4 === void 0 ? void 0 : _application$ProcessI4.mobileNumber
-              },
-              propertyUsage: application.businessObject.propertyUsage,
-              sla: Math.round(((_application$ProcessI5 = application.ProcessInstance) === null || _application$ProcessI5 === void 0 ? void 0 : _application$ProcessI5.businesssServiceSla) / (24 * 60 * 60 * 1000)) || "-",
-              mathsla: (_application$ProcessI6 = application.ProcessInstance) === null || _application$ProcessI6 === void 0 ? void 0 : _application$ProcessI6.businesssServiceSla
-            };
-          })
+          table: tableData(data)
         };
       }
     }, config)
@@ -39811,6 +40518,43 @@ var useFSMInbox = function useFSMInbox(tenantId, filters, config, overRideUUID)
   return _extends({}, appList);
 };
 
+var getIds = function getIds(status) {
+  var ids = [];
+  status === null || status === void 0 ? void 0 : status.map(function (data) {
+    var temp = data.id.split(',');
+    ids.push.apply(ids, temp);
+  });
+  return ids;
+};
+
+var tableData = function tableData(data) {
+  var result = [];
+
+  if (data && data.items && data.items.length) {
+    data.items.map(function (application) {
+      var _application$business, _application$business2, _application$business3, _application$business4, _application$business5, _application$business6, _application$business7, _application$business8, _application$business9, _application$ProcessI, _application$ProcessI2, _application$ProcessI3, _application$ProcessI4, _application$business10, _application$ProcessI5, _application$ProcessI6;
+
+      result.push({
+        tenantId: (application === null || application === void 0 ? void 0 : (_application$business = application.businessObject) === null || _application$business === void 0 ? void 0 : _application$business.tenantId) || '',
+        totalCount: (application === null || application === void 0 ? void 0 : (_application$business2 = application.businessObject) === null || _application$business2 === void 0 ? void 0 : _application$business2.totalCount) || '',
+        applicationNo: (application === null || application === void 0 ? void 0 : (_application$business3 = application.businessObject) === null || _application$business3 === void 0 ? void 0 : _application$business3.applicationNo) || '',
+        createdTime: application !== null && application !== void 0 && (_application$business4 = application.businessObject) !== null && _application$business4 !== void 0 && (_application$business5 = _application$business4.auditDetails) !== null && _application$business5 !== void 0 && _application$business5.createdTime ? new Date(application.businessObject.auditDetails.createdTime) : new Date(),
+        locality: (application === null || application === void 0 ? void 0 : (_application$business6 = application.businessObject) === null || _application$business6 === void 0 ? void 0 : (_application$business7 = _application$business6.address) === null || _application$business7 === void 0 ? void 0 : (_application$business8 = _application$business7.locality) === null || _application$business8 === void 0 ? void 0 : _application$business8.code) || '',
+        status: (application === null || application === void 0 ? void 0 : (_application$business9 = application.businessObject) === null || _application$business9 === void 0 ? void 0 : _application$business9.applicationStatus) || '',
+        citizen: {
+          name: (application === null || application === void 0 ? void 0 : (_application$ProcessI = application.ProcessInstance) === null || _application$ProcessI === void 0 ? void 0 : (_application$ProcessI2 = _application$ProcessI.assigner) === null || _application$ProcessI2 === void 0 ? void 0 : _application$ProcessI2.name) || '',
+          mobileNumber: (application === null || application === void 0 ? void 0 : (_application$ProcessI3 = application.ProcessInstance) === null || _application$ProcessI3 === void 0 ? void 0 : (_application$ProcessI4 = _application$ProcessI3.assigner) === null || _application$ProcessI4 === void 0 ? void 0 : _application$ProcessI4.mobileNumber) || ''
+        },
+        propertyUsage: (application === null || application === void 0 ? void 0 : (_application$business10 = application.businessObject) === null || _application$business10 === void 0 ? void 0 : _application$business10.propertyUsage) || '',
+        sla: Math.round((application === null || application === void 0 ? void 0 : (_application$ProcessI5 = application.ProcessInstance) === null || _application$ProcessI5 === void 0 ? void 0 : _application$ProcessI5.businesssServiceSla) / (24 * 60 * 60 * 1000)) || "-",
+        mathsla: (application === null || application === void 0 ? void 0 : (_application$ProcessI6 = application.ProcessInstance) === null || _application$ProcessI6 === void 0 ? void 0 : _application$ProcessI6.businesssServiceSla) || ''
+      });
+    });
+  }
+
+  return result;
+};
+
 var useApplicationUpdate = function useApplicationUpdate(tenantId) {
   return reactQuery.useMutation(function (details) {
     return FSMService.update(details, tenantId);
@@ -39874,11 +40618,11 @@ var usePropertySearch = function usePropertySearch(_ref, config) {
   };
 
   var defaultSelect = function defaultSelect(data) {
-    data.Properties[0].units = data.Properties[0].units || [];
-    data.Properties[0].units = data.Properties[0].units.filter(function (unit) {
+    if (data.Properties.length > 0) data.Properties[0].units = data.Properties[0].units || [];
+    if (data.Properties.length > 0) data.Properties[0].units = data.Properties[0].units.filter(function (unit) {
       return unit.active;
     });
-    data.Properties[0].owners = data.Properties[0].owners || [];
+    if (data.Properties.length > 0) data.Properties[0].owners = data.Properties[0].owners || [];
 
     if (searchedFrom == "myPropertyCitizen") {
       data.Properties.map(function (property) {
@@ -39898,18 +40642,108 @@ var usePropertySearch = function usePropertySearch(_ref, config) {
   }, config)),
       isLoading = _useQuery.isLoading,
       error = _useQuery.error,
-      data = _useQuery.data;
+      data = _useQuery.data,
+      isSuccess = _useQuery.isSuccess;
 
   return {
     isLoading: isLoading,
     error: error,
     data: data,
+    isSuccess: isSuccess,
     revalidate: function revalidate() {
       return client.invalidateQueries(["propertySearchList", tenantId, filters, auth]);
     }
   };
 };
 
+var usePropertySearchWithDue = function usePropertySearchWithDue(_ref) {
+  var _data$ConsumerCodes;
+
+  var tenantId = _ref.tenantId,
+      filters = _ref.filters,
+      _ref$auth = _ref.auth,
+      auth = _ref$auth === void 0 ? true : _ref$auth,
+      configs = _ref.configs;
+  var client = reactQuery.useQueryClient();
+
+  var defaultSelect = function defaultSelect(data) {
+    var consumerCodes = [];
+    var formattedData = {};
+    data.Properties.map(function (property) {
+      var _property$units, _property$owners, _property$owners2, _property$tenantId, _property$tenantId$re, _property$address, _property$address$loc;
+
+      property.status == "ACTIVE" && consumerCodes.push(property.propertyId);
+      property.units = property === null || property === void 0 ? void 0 : (_property$units = property.units) === null || _property$units === void 0 ? void 0 : _property$units.filter(function (unit) {
+        return unit.active;
+      });
+      property.owners = property === null || property === void 0 ? void 0 : (_property$owners = property.owners) === null || _property$owners === void 0 ? void 0 : _property$owners.filter(function (owner) {
+        return owner.status === (property === null || property === void 0 ? void 0 : property.status) === "INWORKFLOW" && (property === null || property === void 0 ? void 0 : property.creationReason) === "MUTATION" ? "INACTIVE" : "ACTIVE";
+      });
+      formattedData[property.propertyId] = {
+        propertyId: property === null || property === void 0 ? void 0 : property.propertyId,
+        name: property === null || property === void 0 ? void 0 : (_property$owners2 = property.owners) === null || _property$owners2 === void 0 ? void 0 : _property$owners2[0].name,
+        status: property === null || property === void 0 ? void 0 : property.status,
+        due: false,
+        locality: (property === null || property === void 0 ? void 0 : (_property$tenantId = property.tenantId) === null || _property$tenantId === void 0 ? void 0 : (_property$tenantId$re = _property$tenantId.replace(".", "_")) === null || _property$tenantId$re === void 0 ? void 0 : _property$tenantId$re.toUpperCase()) + "_REVENUE_" + (property === null || property === void 0 ? void 0 : (_property$address = property.address) === null || _property$address === void 0 ? void 0 : (_property$address$loc = _property$address.locality) === null || _property$address$loc === void 0 ? void 0 : _property$address$loc.code),
+        owners: property === null || property === void 0 ? void 0 : property.owners,
+        documents: property === null || property === void 0 ? void 0 : property.documents
+      };
+    });
+    data["ConsumerCodes"] = consumerCodes;
+    data["FormattedData"] = formattedData;
+    return data;
+  };
+
+  var _useQuery = reactQuery.useQuery(["propertySearchList", tenantId, filters, auth], function () {
+    return configs.enabled && Digit.PTService.search({
+      tenantId: tenantId,
+      filters: filters,
+      auth: auth
+    });
+  }, _extends({}, configs, {
+    select: defaultSelect
+  })),
+      isLoading = _useQuery.isLoading,
+      error = _useQuery.error,
+      data = _useQuery.data;
+
+  var consumerCodes = (data === null || data === void 0 ? void 0 : (_data$ConsumerCodes = data.ConsumerCodes) === null || _data$ConsumerCodes === void 0 ? void 0 : _data$ConsumerCodes.join(",")) || "";
+
+  var _useQuery2 = reactQuery.useQuery(["propertySearchBillList", tenantId, filters, data, auth, consumerCodes], function () {
+    return configs.enabled && data && Digit.PTService.fetchPaymentDetails({
+      tenantId: tenantId,
+      consumerCodes: consumerCodes,
+      auth: auth
+    });
+  }, _extends({}, configs, {
+    select: function select(billResp) {
+      var _billResp$Bill;
+
+      data["Bill"] = (billResp === null || billResp === void 0 ? void 0 : (_billResp$Bill = billResp.Bill) === null || _billResp$Bill === void 0 ? void 0 : _billResp$Bill.reduce(function (curr, acc) {
+        curr[acc === null || acc === void 0 ? void 0 : acc.consumerCode] = acc === null || acc === void 0 ? void 0 : acc.totalAmount;
+        data["FormattedData"][acc === null || acc === void 0 ? void 0 : acc.consumerCode]["due"] = acc === null || acc === void 0 ? void 0 : acc.totalAmount;
+        return curr;
+      }, {})) || {};
+      return billResp;
+    }
+  })),
+      billLoading = _useQuery2.isLoading,
+      billData = _useQuery2.data,
+      isSuccess = _useQuery2.isSuccess;
+
+  return {
+    isLoading: isLoading || billLoading,
+    error: error,
+    data: data,
+    billData: billData,
+    isSuccess: isSuccess,
+    revalidate: function revalidate() {
+      client.invalidateQueries(["propertySearchBillList", tenantId, filters, auth]);
+      client.invalidateQueries(["propertySearchList", tenantId, filters, auth]);
+    }
+  };
+};
+
 var usePropertyPayment = function usePropertyPayment(_ref) {
   var tenantId = _ref.tenantId,
       consumerCodes = _ref.consumerCodes;
@@ -40146,6 +40980,12 @@ var usePropertyMDMS = function usePropertyMDMS(tenantId, moduleCode, type, confi
     }, config);
   };
 
+  var useChargeSlabs = function useChargeSlabs() {
+    return reactQuery.useQuery("PT_RENTAL_DETAILS", function () {
+      return MdmsService.getChargeSlabs(tenantId, moduleCode);
+    }, config);
+  };
+
   var useFloorList = function useFloorList() {
     return reactQuery.useQuery("PT_FLOOR_LIST", function () {
       return MdmsService.getFloorList(tenantId, moduleCode);
@@ -40192,6 +41032,9 @@ var usePropertyMDMS = function usePropertyMDMS(tenantId, moduleCode, type, confi
     case "MapConfig":
       return useMapConfig();
 
+    case "ChargeSlabs":
+      return useChargeSlabs();
+
     default:
       return _default();
   }
@@ -40213,6 +41056,37 @@ var usePropertyAPI = function usePropertyAPI(tenantId, type) {
   }
 };
 
+var usePropertyCreateNUpdateAPI = function usePropertyCreateNUpdateAPI(tenantId, update) {
+  if (update === void 0) {
+    update = false;
+  }
+
+  var mutation = reactQuery.useMutation(function (data) {
+    try {
+      return Promise.resolve(PTService.create(data, tenantId)).then(function (createdProp) {
+        var _temp2 = function () {
+          var _createdProp$Response;
+
+          if (createdProp !== null && createdProp !== void 0 && createdProp.ResponseInfo && (createdProp === null || createdProp === void 0 ? void 0 : (_createdProp$Response = createdProp.ResponseInfo) === null || _createdProp$Response === void 0 ? void 0 : _createdProp$Response.status) === "successful") {
+            var _temp3 = function () {
+              if (update) {
+                return Promise.resolve(PTService.update(createdProp === null || createdProp === void 0 ? void 0 : createdProp.Properties[0], tenantId)).then(function () {});
+              }
+            }();
+
+            if (_temp3 && _temp3.then) return _temp3.then(function () {});
+          }
+        }();
+
+        if (_temp2 && _temp2.then) return _temp2.then(function () {});
+      });
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  });
+  return mutation;
+};
+
 var usePropertyDocumentSearch = function usePropertyDocumentSearch(_ref, config) {
   var _property$documents;
 
@@ -40260,6 +41134,102 @@ var getPropertyTypeLocale$1 = function getPropertyTypeLocale(value) {
 var getPropertySubtypeLocale$1 = function getPropertySubtypeLocale(value) {
   return "PROPERTYTAX_BILLING_SLAB_" + value;
 };
+var stringReplaceAll$1 = function stringReplaceAll(str, searcher, replaceWith) {
+  if (str === void 0) {
+    str = "";
+  }
+
+  if (searcher === void 0) {
+    searcher = "";
+  }
+
+  if (replaceWith === void 0) {
+    replaceWith = "";
+  }
+
+  if (searcher === "") return str;
+
+  while (str.includes(searcher)) {
+    str = str.replace(searcher, replaceWith);
+  }
+
+  return str;
+};
+var checkForNotNull = function checkForNotNull(value) {
+  if (value === void 0) {
+    value = "";
+  }
+
+  return value && value != null && value != undefined && value != "" ? true : false;
+};
+var convertDotValues = function convertDotValues(value) {
+  if (value === void 0) {
+    value = "";
+  }
+
+  return checkForNotNull(value) && (value.replaceAll && value.replaceAll(".", "_") || value.replace && stringReplaceAll$1(value, ".", "_")) || "NA";
+};
+var convertToLocale = function convertToLocale(value, key) {
+  if (value === void 0) {
+    value = "";
+  }
+
+  if (key === void 0) {
+    key = "";
+  }
+
+  var convertedValue = convertDotValues(value);
+
+  if (convertedValue === "NA") {
+    return "PT_NA";
+  }
+
+  return key + "_" + convertedValue;
+};
+var getMohallaLocale = function getMohallaLocale(value, tenantId) {
+  if (value === void 0) {
+    value = "";
+  }
+
+  if (tenantId === void 0) {
+    tenantId = "";
+  }
+
+  var convertedValue = convertDotValues(tenantId);
+
+  if (convertedValue === "NA" || !checkForNotNull(value)) {
+    return "PT_NA";
+  }
+
+  convertedValue = convertedValue.toUpperCase();
+  return convertToLocale(value, convertedValue + "_REVENUE");
+};
+var getCityLocale = function getCityLocale(value) {
+  if (value === void 0) {
+    value = "";
+  }
+
+  var convertedValue = convertDotValues(value);
+
+  if (convertedValue === "NA" || !checkForNotNull(value)) {
+    return "PT_NA";
+  }
+
+  convertedValue = convertedValue.toUpperCase();
+  return convertToLocale(convertedValue, "TENANT_TENANTS");
+};
+
+var pt = {
+  __proto__: null,
+  getPropertyTypeLocale: getPropertyTypeLocale$1,
+  getPropertySubtypeLocale: getPropertySubtypeLocale$1,
+  stringReplaceAll: stringReplaceAll$1,
+  checkForNotNull: checkForNotNull,
+  convertDotValues: convertDotValues,
+  convertToLocale: convertToLocale,
+  getMohallaLocale: getMohallaLocale,
+  getCityLocale: getCityLocale
+};
 
 var PTSearch = {
   all: function (tenantId, filters) {
@@ -40276,6 +41246,112 @@ var PTSearch = {
       return Promise.reject(e);
     }
   },
+  genericPropertyDetails: function (t, tenantId, propertyIds) {
+    try {
+      var filters = {
+        propertyIds: propertyIds
+      };
+      return Promise.resolve(PTSearch.application(tenantId, filters)).then(function (property) {
+        var _property$address, _property$address2, _property$tenantId, _property$tenantId$to, _property$tenantId$to2, _property$address3, _property$address3$lo, _property$address4, _property$address5, _property$owners$, _property$owners;
+
+        var addressDetails = {
+          title: "PT_PROPERTY_ADDRESS_SUB_HEADER",
+          asSectionHeader: true,
+          values: [{
+            title: "PT_PROPERTY_ADDRESS_PINCODE",
+            value: property === null || property === void 0 ? void 0 : (_property$address = property.address) === null || _property$address === void 0 ? void 0 : _property$address.pincode
+          }, {
+            title: "PT_PROPERTY_ADDRESS_CITY",
+            value: property === null || property === void 0 ? void 0 : (_property$address2 = property.address) === null || _property$address2 === void 0 ? void 0 : _property$address2.city
+          }, {
+            title: "PT_PROPERTY_ADDRESS_MOHALLA",
+            value: (property === null || property === void 0 ? void 0 : (_property$tenantId = property.tenantId) === null || _property$tenantId === void 0 ? void 0 : (_property$tenantId$to = _property$tenantId.toUpperCase()) === null || _property$tenantId$to === void 0 ? void 0 : (_property$tenantId$to2 = _property$tenantId$to.split(".")) === null || _property$tenantId$to2 === void 0 ? void 0 : _property$tenantId$to2.join("_")) + "_REVENUE_" + (property === null || property === void 0 ? void 0 : (_property$address3 = property.address) === null || _property$address3 === void 0 ? void 0 : (_property$address3$lo = _property$address3.locality) === null || _property$address3$lo === void 0 ? void 0 : _property$address3$lo.code)
+          }, {
+            title: "PT_PROPERTY_ADDRESS_HOUSE_NO",
+            value: property === null || property === void 0 ? void 0 : (_property$address4 = property.address) === null || _property$address4 === void 0 ? void 0 : _property$address4.doorNo
+          }, {
+            title: "PT_PROPERTY_ADDRESS_STREET_NAME",
+            value: property === null || property === void 0 ? void 0 : (_property$address5 = property.address) === null || _property$address5 === void 0 ? void 0 : _property$address5.street
+          }]
+        };
+        var assessmentDetails = {
+          title: "PT_ASSESMENT_INFO_SUB_HEADER",
+          values: [{
+            title: "PT_ASSESMENT_INFO_TYPE_OF_BUILDING",
+            value: getPropertyTypeLocale$1(property === null || property === void 0 ? void 0 : property.propertyType)
+          }, {
+            title: "PT_ASSESMENT_INFO_USAGE_TYPE",
+            value: getPropertySubtypeLocale$1(property === null || property === void 0 ? void 0 : property.usageCategory)
+          }, {
+            title: "PT_ASSESMENT_INFO_PLOT_SIZE",
+            value: property === null || property === void 0 ? void 0 : property.landArea
+          }, {
+            title: "PT_ASSESMENT_INFO_NO_OF_FLOOR",
+            value: property === null || property === void 0 ? void 0 : property.noOfFloors
+          }]
+        };
+        var propertyDetail = {
+          title: "PT_DETAILS",
+          values: [{
+            title: "TL_PROPERTY_ID",
+            value: (property === null || property === void 0 ? void 0 : property.propertyId) || "NA"
+          }, {
+            title: "PT_OWNER_NAME",
+            value: (property === null || property === void 0 ? void 0 : (_property$owners$ = property.owners[0]) === null || _property$owners$ === void 0 ? void 0 : _property$owners$.name) || "NA"
+          }, {
+            title: "PT_SEARCHPROPERTY_TABEL_STATUS",
+            value: Digit.Utils.locale.getTransformedLocale("WF_PT_" + (property === null || property === void 0 ? void 0 : property.status)) || "NA"
+          }]
+        };
+        var ownerdetails = {
+          title: "PT_OWNERSHIP_INFO_SUB_HEADER",
+          additionalDetails: {
+            owners: property === null || property === void 0 ? void 0 : (_property$owners = property.owners) === null || _property$owners === void 0 ? void 0 : _property$owners.filter(function (owner) {
+              return owner.status === "ACTIVE";
+            }).map(function (owner, index) {
+              return {
+                status: owner.status,
+                title: "ES_OWNER",
+                values: [{
+                  title: "PT_OWNERSHIP_INFO_NAME",
+                  value: owner === null || owner === void 0 ? void 0 : owner.name
+                }, {
+                  title: "PT_OWNERSHIP_INFO_GENDER",
+                  value: owner === null || owner === void 0 ? void 0 : owner.gender
+                }, {
+                  title: "PT_OWNERSHIP_INFO_MOBILE_NO",
+                  value: owner === null || owner === void 0 ? void 0 : owner.mobileNumber
+                }, {
+                  title: "PT_OWNERSHIP_INFO_USER_CATEGORY",
+                  value: "COMMON_MASTERS_OWNERTYPE_" + (owner === null || owner === void 0 ? void 0 : owner.ownerType) || "NA"
+                }, {
+                  title: "PT_SEARCHPROPERTY_TABEL_GUARDIANNAME",
+                  value: owner === null || owner === void 0 ? void 0 : owner.fatherOrHusbandName
+                }, {
+                  title: "PT_FORM3_OWNERSHIP_TYPE",
+                  value: property === null || property === void 0 ? void 0 : property.ownershipCategory
+                }, {
+                  title: "PT_OWNERSHIP_INFO_EMAIL_ID",
+                  value: owner === null || owner === void 0 ? void 0 : owner.emailId
+                }, {
+                  title: "PT_OWNERSHIP_INFO_CORR_ADDR",
+                  value: owner === null || owner === void 0 ? void 0 : owner.correspondenceAddress
+                }]
+              };
+            })
+          }
+        };
+        var applicationDetails = [propertyDetail, addressDetails, assessmentDetails, ownerdetails];
+        return {
+          tenantId: property === null || property === void 0 ? void 0 : property.tenantId,
+          applicationDetails: applicationDetails,
+          applicationData: property
+        };
+      });
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  },
   application: function (tenantId, filters) {
     if (filters === void 0) {
       filters = {};
@@ -40591,7 +41667,82 @@ var usePTGenderMDMS = function usePTGenderMDMS(tenantId, moduleCode, type, confi
   switch (type) {
     case "GenderType":
       return usePTGenders();
+
+    default:
+      return null;
+  }
+};
+
+var getOwnerForPayments = function getOwnerForPayments(propertyData, data) {
+  var _data$Payments;
+
+  var newPayments = [];
+  data && (data === null || data === void 0 ? void 0 : (_data$Payments = data.Payments) === null || _data$Payments === void 0 ? void 0 : _data$Payments.map(function (payment) {
+    var _propertyData$filter$;
+
+    var owner = propertyData === null || propertyData === void 0 ? void 0 : (_propertyData$filter$ = propertyData.filter(function (ob) {
+      var _payment$paymentDetai, _payment$paymentDetai2, _payment$paymentDetai3;
+
+      return ob.propertyId === (payment === null || payment === void 0 ? void 0 : (_payment$paymentDetai = payment.paymentDetails) === null || _payment$paymentDetai === void 0 ? void 0 : (_payment$paymentDetai2 = _payment$paymentDetai[0]) === null || _payment$paymentDetai2 === void 0 ? void 0 : (_payment$paymentDetai3 = _payment$paymentDetai2.bill) === null || _payment$paymentDetai3 === void 0 ? void 0 : _payment$paymentDetai3.consumerCode);
+    })[0]) === null || _propertyData$filter$ === void 0 ? void 0 : _propertyData$filter$.owners;
+    newPayments.push(_extends({}, payment, {
+      owners: owner
+    }));
+  }));
+  data ? data["Payments"] = [].concat(newPayments) : "";
+  return data;
+};
+
+var useMyPropertyPayments = function useMyPropertyPayments(_ref, config) {
+  var _config;
+
+  var tenantId = _ref.tenantId,
+      filters = _ref.filters;
+
+  if (config === void 0) {
+    config = {};
+  }
+
+  var client = reactQuery.useQueryClient();
+  var paymentargs = tenantId ? {
+    tenantId: tenantId,
+    filters: filters
+  } : {
+    filters: filters
+  };
+
+  var _useQuery = reactQuery.useQuery(["paymentpropertySearchList", tenantId, filters], function () {
+    return Digit.PTService.paymentsearch(paymentargs);
+  }, _extends({}, config)),
+      isLoading = _useQuery.isLoading,
+      error = _useQuery.error,
+      data = _useQuery.data;
+
+  var updatedData = getOwnerForPayments((_config = config) === null || _config === void 0 ? void 0 : _config.propertyData, data);
+  return {
+    isLoading: isLoading,
+    error: error,
+    data: data,
+    revalidate: function revalidate() {
+      return client.invalidateQueries(["paymentpropertySearchList", tenantId, filters]);
+    }
+  };
+};
+
+var useGenericViewProperty = function useGenericViewProperty(t, tenantId, propertyIds, config, userType) {
+  if (config === void 0) {
+    config = {};
   }
+
+  var defaultSelect = function defaultSelect(data) {
+    return _extends({}, data);
+  };
+
+  return reactQuery.useQuery(["VIEW_GENERIC_PROPERTY", propertyIds, tenantId], function () {
+    return PTSearch.genericPropertyDetails(t, tenantId, propertyIds);
+  }, _extends({
+    select: defaultSelect
+  }, config));
 };
 
 var useDssMDMS = function useDssMDMS(tenantId, moduleCode, type, config) {
@@ -40601,9 +41752,18 @@ var useDssMDMS = function useDssMDMS(tenantId, moduleCode, type, config) {
     }, config);
   };
 
+  var _default = function _default() {
+    return reactQuery.useQuery([tenantId, moduleCode, type], function () {
+      return MdmsService.getMultipleTypes(tenantId, moduleCode, type);
+    }, config);
+  };
+
   switch (type) {
     case "DssDashboard":
       return useDssDashboard();
+
+    default:
+      return _default();
   }
 };
 
@@ -40665,6 +41825,29 @@ var getRequest = function getRequest(type, code, requestDate, filters) {
   };
 };
 
+var defaultSelect = function defaultSelect(data) {
+  if (data !== null && data !== void 0 && data.responseData) {
+    var _data$responseData;
+
+    if (data !== null && data !== void 0 && (_data$responseData = data.responseData) !== null && _data$responseData !== void 0 && _data$responseData.data) {
+      var _data$responseData2, _data$responseData2$d, _data$responseData$da;
+
+      data.responseData.data = (data === null || data === void 0 ? void 0 : (_data$responseData2 = data.responseData) === null || _data$responseData2 === void 0 ? void 0 : (_data$responseData2$d = _data$responseData2.data) === null || _data$responseData2$d === void 0 ? void 0 : _data$responseData2$d.filter(function (col) {
+        return col;
+      })) || [];
+      (_data$responseData$da = data.responseData.data) === null || _data$responseData$da === void 0 ? void 0 : _data$responseData$da.forEach(function (row) {
+        if (row !== null && row !== void 0 && row.plots) {
+          row.plots = (row === null || row === void 0 ? void 0 : row.plots.filter(function (col) {
+            return col;
+          })) || [];
+        }
+      });
+    }
+  }
+
+  return data;
+};
+
 var useGetChart = function useGetChart(args) {
   var key = args.key,
       type = args.type,
@@ -40677,6 +41860,8 @@ var useGetChart = function useGetChart(args) {
         tenantId: tenantId
       }
     }));
+  }, {
+    select: defaultSelect
   });
 };
 
@@ -40703,6 +41888,9 @@ var useMCollectMDMS = function useMCollectMDMS(tenantId, moduleCode, type, filte
 
     case "applicationStatus":
       return useMCollectApplcationStatus();
+
+    default:
+      return null;
   }
 };
 
@@ -40886,6 +42074,8 @@ var useTenants$4 = function useTenants() {
   return tenants;
 };
 
+var _excluded$2 = ["code", "value"];
+
 var useTradeLicenseMDMS = function useTradeLicenseMDMS(tenantId, moduleCode, type, filter, config) {
   if (config === void 0) {
     config = {};
@@ -40915,6 +42105,104 @@ var useTradeLicenseMDMS = function useTradeLicenseMDMS(tenantId, moduleCode, typ
     }, config);
   };
 
+  var useTradeOwnershipSubType = function useTradeOwnershipSubType() {
+    return reactQuery.useQuery("TL_TRADE_OWNERSHIP_CATEGORY", function () {
+      return MdmsService.GetTradeOwnerShipCategory(tenantId, moduleCode, type);
+    }, _extends({
+      select: function select(data) {
+        var _data$commonMasters = data["common-masters"];
+        _data$commonMasters = _data$commonMasters === void 0 ? {} : _data$commonMasters;
+        var categoryData = _data$commonMasters.OwnerShipCategory;
+        var filteredSubtypesData = categoryData.filter(function (e) {
+          return e.code.includes(filter.keyToSearchOwnershipSubtype);
+        }).map(function (e) {
+          return _extends({}, e, {
+            i18nKey: "COMMON_MASTERS_OWNERSHIPCATEGORY_" + e.code.replaceAll(".", "_")
+          });
+        });
+        return filteredSubtypesData;
+      }
+    }, config));
+  };
+
+  var useOwnerTypeWithSubtypes = function useOwnerTypeWithSubtypes() {
+    return reactQuery.useQuery("TL_TRADE_OWNERSSHIP_TYPE", function () {
+      return MdmsService.GetTradeOwnerShipCategory(tenantId, moduleCode, type);
+    }, _extends({
+      select: function select(data) {
+        var _data$commonMasters2 = data["common-masters"];
+        _data$commonMasters2 = _data$commonMasters2 === void 0 ? {} : _data$commonMasters2;
+        var categoryData = _data$commonMasters2.OwnerShipCategory;
+        var OwnerShipCategory = {};
+        var ownerShipdropDown = [];
+
+        function getDropdwonForProperty(ownerShipdropDown) {
+          if ((filter === null || filter === void 0 ? void 0 : filter.userType) === "employee") {
+            var _ownerShipdropDown$fi;
+
+            var arr = ownerShipdropDown === null || ownerShipdropDown === void 0 ? void 0 : (_ownerShipdropDown$fi = ownerShipdropDown.filter(function (e) {
+              return e.code.split(".").length <= 2;
+            })) === null || _ownerShipdropDown$fi === void 0 ? void 0 : _ownerShipdropDown$fi.map(function (ownerShipDetails) {
+              return _extends({}, ownerShipDetails, {
+                i18nKey: "COMMON_MASTERS_OWNERSHIPCATEGORY_INDIVIDUAL_" + (ownerShipDetails.value.split(".")[1] ? ownerShipDetails.value.split(".")[1] : ownerShipDetails.value.split(".")[0])
+              });
+            });
+            var finalArr = arr.filter(function (data) {
+              return data.code.includes("INDIVIDUAL") || data.code.includes("OTHER");
+            });
+            return finalArr;
+          }
+
+          var res = ownerShipdropDown !== null && ownerShipdropDown !== void 0 && ownerShipdropDown.length ? ownerShipdropDown === null || ownerShipdropDown === void 0 ? void 0 : ownerShipdropDown.map(function (ownerShipDetails) {
+            return _extends({}, ownerShipDetails, {
+              i18nKey: "PT_OWNERSHIP_" + (ownerShipDetails.value.split(".")[1] ? ownerShipDetails.value.split(".")[1] : ownerShipDetails.value.split(".")[0])
+            });
+          }).reduce(function (acc, ownerShipDetails) {
+            if (ownerShipDetails.code.includes("INDIVIDUAL")) {
+              return [].concat(acc, [ownerShipDetails]);
+            } else if (ownerShipDetails.code.includes("OTHER")) {
+              var code = ownerShipDetails.code,
+                  value = ownerShipDetails.value,
+                  everythingElse = _objectWithoutPropertiesLoose(ownerShipDetails, _excluded$2);
+
+              var mutatedOwnershipDetails = _extends({
+                code: code.split(".")[0],
+                value: value.split(".")[0]
+              }, everythingElse);
+
+              return [].concat(acc, [mutatedOwnershipDetails]);
+            } else {
+              return acc;
+            }
+          }, []) : null;
+          return res;
+        }
+
+        function formDropdown(category) {
+          var name = category.name,
+              code = category.code;
+          return {
+            label: name,
+            value: code,
+            code: code
+          };
+        }
+
+        categoryData.length > 0 ? categoryData === null || categoryData === void 0 ? void 0 : categoryData.map(function (category) {
+          OwnerShipCategory[category.code] = category;
+        }) : null;
+
+        if (OwnerShipCategory) {
+          Object.keys(OwnerShipCategory).forEach(function (category) {
+            ownerShipdropDown.push(formDropdown(OwnerShipCategory[category]));
+          });
+        }
+
+        return getDropdwonForProperty(ownerShipdropDown);
+      }
+    }, config));
+  };
+
   var useTLAccessoriesType = function useTLAccessoriesType() {
     return reactQuery.useQuery("TL_TRADE_ACCESSORY_CATEGORY", function () {
       return MdmsService.getTLAccessoriesType(tenantId, moduleCode, type);
@@ -40946,18 +42234,26 @@ var useTradeLicenseMDMS = function useTradeLicenseMDMS(tenantId, moduleCode, typ
     case "TLOwnerShipCategory":
       return useTradeOwnerShipCategory();
 
+    case "TLOwnerTypeWithSubtypes":
+      return useOwnerTypeWithSubtypes();
+
     case "AccessoryCategory":
       return useTLAccessoriesType();
 
     case "FinancialYear":
       return useTLFinancialYear();
 
+    case "TradeOwnershipSubType":
+      return useTradeOwnershipSubType();
+
     default:
       return _default();
   }
 };
 
 var useTLDocumentSearch = function useTLDocumentSearch(data1, config) {
+  var _data, _data$value, _data$value$owners, _data$value$owners$do, _data2, _data2$value, _data2$value$owners, _data2$value$owners$d, _data3, _data3$value, _data3$value$owners, _data3$value$owners$d;
+
   if (data1 === void 0) {
     data1 = {};
   }
@@ -40965,7 +42261,10 @@ var useTLDocumentSearch = function useTLDocumentSearch(data1, config) {
   var client = reactQuery.useQueryClient();
   var tenantId = Digit.ULBService.getCurrentTenantId();
   var tenant = Digit.ULBService.getStateId();
-  var filesArray = [data1.value.owners.documents["OwnerPhotoProof"].fileStoreId, data1.value.owners.documents["ProofOfIdentity"].fileStoreId, data1.value.owners.documents["ProofOfOwnership"].fileStoreId];
+  var filesArray = [];
+  if ((_data = data1) !== null && _data !== void 0 && (_data$value = _data.value) !== null && _data$value !== void 0 && (_data$value$owners = _data$value.owners) !== null && _data$value$owners !== void 0 && (_data$value$owners$do = _data$value$owners.documents["OwnerPhotoProof"]) !== null && _data$value$owners$do !== void 0 && _data$value$owners$do.fileStoreId) filesArray.push(data1.value.owners.documents["OwnerPhotoProof"].fileStoreId);
+  if ((_data2 = data1) !== null && _data2 !== void 0 && (_data2$value = _data2.value) !== null && _data2$value !== void 0 && (_data2$value$owners = _data2$value.owners) !== null && _data2$value$owners !== void 0 && (_data2$value$owners$d = _data2$value$owners.documents["ProofOfIdentity"]) !== null && _data2$value$owners$d !== void 0 && _data2$value$owners$d.fileStoreId) filesArray.push(data1.value.owners.documents["ProofOfIdentity"].fileStoreId);
+  if ((_data3 = data1) !== null && _data3 !== void 0 && (_data3$value = _data3.value) !== null && _data3$value !== void 0 && (_data3$value$owners = _data3$value.owners) !== null && _data3$value$owners !== void 0 && (_data3$value$owners$d = _data3$value$owners.documents["ProofOfOwnership"]) !== null && _data3$value$owners$d !== void 0 && _data3$value$owners$d.fileStoreId) filesArray.push(data1.value.owners.documents["ProofOfOwnership"].fileStoreId);
 
   var _useQuery = reactQuery.useQuery(["tlDocuments-" + 1, filesArray], function () {
     return Digit.UploadServices.Filefetch(filesArray, tenant);
@@ -41049,38 +42348,42 @@ var useTradeLicenseSearch = function useTradeLicenseSearch(_ref, config) {
   };
 };
 
+var mapWfBybusinessId$1 = function mapWfBybusinessId(workflowData) {
+  return workflowData === null || workflowData === void 0 ? void 0 : workflowData.reduce(function (acc, item) {
+    acc[item === null || item === void 0 ? void 0 : item.businessId] = item;
+    return acc;
+  }, {});
+};
+
+var combineResponse = function combineResponse(applications, workflowData, totalCount) {
+  var workflowInstances = mapWfBybusinessId$1(workflowData);
+  return applications.map(function (application) {
+    var _workflowInstances$ap, _workflowInstances$ap2, _workflowInstances$ap3, _workflowInstances$ap4, _workflowInstances$ap5, _workflowInstances$ap6;
+
+    return _extends({}, application, {
+      appAssignee: (_workflowInstances$ap = workflowInstances[application === null || application === void 0 ? void 0 : application.applicationNumber]) === null || _workflowInstances$ap === void 0 ? void 0 : (_workflowInstances$ap2 = _workflowInstances$ap.assignes) === null || _workflowInstances$ap2 === void 0 ? void 0 : (_workflowInstances$ap3 = _workflowInstances$ap2[0]) === null || _workflowInstances$ap3 === void 0 ? void 0 : _workflowInstances$ap3.name,
+      SLA: (_workflowInstances$ap4 = workflowInstances[application === null || application === void 0 ? void 0 : application.applicationNumber]) === null || _workflowInstances$ap4 === void 0 ? void 0 : _workflowInstances$ap4.businesssServiceSla,
+      appState: (_workflowInstances$ap5 = workflowInstances[application === null || application === void 0 ? void 0 : application.applicationNumber]) === null || _workflowInstances$ap5 === void 0 ? void 0 : (_workflowInstances$ap6 = _workflowInstances$ap5.state) === null || _workflowInstances$ap6 === void 0 ? void 0 : _workflowInstances$ap6.state,
+      Count: totalCount
+    });
+  });
+};
+
 var useTLSearch = function useTLSearch(params, config) {
   return function () {
     try {
       return Promise.resolve(Digit.TLService.search(params, config)).then(function (data) {
-        var UpdatedData = [];
-        return function () {
-          if (data && data !== null && data !== void 0 && data.Licenses && Array.isArray(data.Licenses) && data.Licenses.length > 0) {
-            var _data$Licenses;
+        var _data$Licenses, _data$Licenses$;
 
-            return Promise.resolve(Promise.all((_data$Licenses = data.Licenses) === null || _data$Licenses === void 0 ? void 0 : _data$Licenses.map(function (service) {
-              try {
-                return Promise.resolve(Digit.WorkflowService.getDetailsById({
-                  tenantId: service.tenantId,
-                  id: service.applicationNumber,
-                  moduleCode: "TL",
-                  role: "CITIZEN"
-                }).then(function (workflowdata) {
-                  return workflowdata;
-                })).then(function (workflowdata) {
-                  var res = Object.assign({}, service, {
-                    SLA: workflowdata === null || workflowdata === void 0 ? void 0 : workflowdata.processInstances[0].businesssServiceSla
-                  });
-                  return res;
-                });
-              } catch (e) {
-                return Promise.reject(e);
-              }
-            }))).then(function (_Promise$all) {
-              return UpdatedData = _Promise$all;
-            });
-          }
-        }();
+        var tenant = data === null || data === void 0 ? void 0 : (_data$Licenses = data.Licenses) === null || _data$Licenses === void 0 ? void 0 : (_data$Licenses$ = _data$Licenses[0]) === null || _data$Licenses$ === void 0 ? void 0 : _data$Licenses$.tenantId;
+        var businessIds = data === null || data === void 0 ? void 0 : data.Licenses.map(function (application) {
+          return application.applicationNumber;
+        });
+        return Promise.resolve(Digit.WorkflowService.getAllApplication(tenant, {
+          businessIds: businessIds.join()
+        })).then(function (workflowRes) {
+          return combineResponse(data === null || data === void 0 ? void 0 : data.Licenses, workflowRes === null || workflowRes === void 0 ? void 0 : workflowRes.ProcessInstances, data === null || data === void 0 ? void 0 : data.Count);
+        });
       });
     } catch (e) {
       return Promise.reject(e);
@@ -41099,17 +42402,18 @@ var useTLSearchApplication = function useTLSearchApplication(params, config, t)
     staleTime: Infinity,
     select: function select(data) {
       return data.map(function (i) {
-        var _i$tradeLicenseDetail, _i$tradeLicenseDetail2;
+        var _i$tradeLicenseDetail, _i$tradeLicenseDetail2, _i$tradeLicenseDetail3, _i$tradeLicenseDetail4, _i$tradeLicenseDetail5, _i$tradeLicenseDetail6, _i$tradeLicenseDetail7;
 
         return {
           TL_COMMON_TABLE_COL_APP_NO: i.applicationNumber,
           TL_APPLICATION_CATEGORY: "ACTION_TEST_TRADE_LICENSE",
-          TL_COMMON_TABLE_COL_OWN_NAME: i === null || i === void 0 ? void 0 : (_i$tradeLicenseDetail = i.tradeLicenseDetail) === null || _i$tradeLicenseDetail === void 0 ? void 0 : (_i$tradeLicenseDetail2 = _i$tradeLicenseDetail.owners) === null || _i$tradeLicenseDetail2 === void 0 ? void 0 : _i$tradeLicenseDetail2.map(function (ele, index) {
+          TL_COMMON_TABLE_COL_OWN_NAME: i !== null && i !== void 0 && (_i$tradeLicenseDetail = i.tradeLicenseDetail) !== null && _i$tradeLicenseDetail !== void 0 && _i$tradeLicenseDetail.subOwnerShipCategory.includes("INSTITUTION") ? i === null || i === void 0 ? void 0 : (_i$tradeLicenseDetail2 = i.tradeLicenseDetail) === null || _i$tradeLicenseDetail2 === void 0 ? void 0 : (_i$tradeLicenseDetail3 = _i$tradeLicenseDetail2.institution) === null || _i$tradeLicenseDetail3 === void 0 ? void 0 : _i$tradeLicenseDetail3.name : i === null || i === void 0 ? void 0 : (_i$tradeLicenseDetail4 = i.tradeLicenseDetail) === null || _i$tradeLicenseDetail4 === void 0 ? void 0 : (_i$tradeLicenseDetail5 = _i$tradeLicenseDetail4.owners) === null || _i$tradeLicenseDetail5 === void 0 ? void 0 : _i$tradeLicenseDetail5.map(function (ele, index) {
             return index == 0 ? multiownername = ele.name : multiownername = multiownername + " , " + ele.name;
           }),
           TL_COMMON_TABLE_COL_STATUS: "WF_NEWTL_" + (i === null || i === void 0 ? void 0 : i.status),
           TL_COMMON_TABLE_COL_SLA_NAME: Math.round((i === null || i === void 0 ? void 0 : i.SLA) / (1000 * 60 * 60 * 24)) + " " + t("TL_SLA_DAYS"),
           TL_COMMON_TABLE_COL_TRD_NAME: i === null || i === void 0 ? void 0 : i.tradeName,
+          TL_INSTITUTION_TYPE_LABEL: i !== null && i !== void 0 && (_i$tradeLicenseDetail6 = i.tradeLicenseDetail) !== null && _i$tradeLicenseDetail6 !== void 0 && _i$tradeLicenseDetail6.subOwnerShipCategory.includes("INSTITUTION") ? "TL_" + (i === null || i === void 0 ? void 0 : (_i$tradeLicenseDetail7 = i.tradeLicenseDetail) === null || _i$tradeLicenseDetail7 === void 0 ? void 0 : _i$tradeLicenseDetail7.subOwnerShipCategory) : null,
           raw: i
         };
       });
@@ -41145,7 +42449,7 @@ var useTLPaymentHistory = function useTLPaymentHistory(tenantId, id, config) {
   }, _extends({}, config));
 };
 
-var stringReplaceAll$1 = function stringReplaceAll(str, searcher, replaceWith) {
+var stringReplaceAll$2 = function stringReplaceAll(str, searcher, replaceWith) {
   if (str === void 0) {
     str = "";
   }
@@ -41234,217 +42538,362 @@ var TLSearch = {
         applicationNumber: applicationNumber
       };
       return Promise.resolve(TLSearch.application(tenantId, filter)).then(function (response) {
-        function _temp2() {
-          var _response$tradeLicens, _response$tradeLicens2, _response$tradeLicens3, _response$tradeLicens4, _response$tradeLicens5, _response$tradeLicens6, _response$tradeLicens7, _response$tradeLicens8, _response$tradeLicens9, _response$tradeLicens10, _response$tradeLicens11, _response$tradeLicens12, _response$tradeLicens13, _response$tradeLicens14, _response$tradeLicens15, _response$tradeLicens16, _response$tradeLicens17, _response$tradeLicens18, _response$tradeLicens19, _response$tradeLicens20, _response$tradeLicens21, _response$tradeLicens22, _response$tradeLicens23, _response$tradeLicens24, _response$tradeLicens25, _response$tradeLicens26, _response$tradeLicens27, _response$tradeLicens28, _response$tradeLicens29, _response$tradeLicens30, _response$tradeLicens33, _response$tradeLicens34, _response$tradeLicens37, _response$tradeLicens38, _response$tradeLicens39;
+        var _response$tradeLicens60, _response$tradeLicens61, _response$tradeLicens62, _response$tradeLicens63;
 
-          var employeeResponse = [];
-          var tradedetails = {
-            title: "TL_COMMON_TR_DETAILS",
-            asSectionHeader: true,
-            values: [{
-              title: "TL_FINANCIAL_YEAR_LABEL",
-              value: response !== null && response !== void 0 && response.financialYear ? "FY" + (response === null || response === void 0 ? void 0 : response.financialYear) : "NA"
-            }, {
-              title: "TL_NEW_TRADE_DETAILS_LIC_TYPE_LABEL",
-              value: response !== null && response !== void 0 && response.licenseType ? "TRADELICENSE_LICENSETYPE_" + (response === null || response === void 0 ? void 0 : response.licenseType) : "NA"
-            }, {
-              title: "TL_COMMON_TABLE_COL_TRD_NAME",
-              value: response === null || response === void 0 ? void 0 : response.tradeName
-            }, {
-              title: "TL_NEW_TRADE_DETAILS_STRUCT_TYPE_LABEL",
-              value: response !== null && response !== void 0 && (_response$tradeLicens = response.tradeLicenseDetail) !== null && _response$tradeLicens !== void 0 && _response$tradeLicens.structureType ? "COMMON_MASTERS_STRUCTURETYPE_" + (response === null || response === void 0 ? void 0 : (_response$tradeLicens2 = response.tradeLicenseDetail) === null || _response$tradeLicens2 === void 0 ? void 0 : (_response$tradeLicens3 = _response$tradeLicens2.structureType) === null || _response$tradeLicens3 === void 0 ? void 0 : _response$tradeLicens3.split('.')[0]) : "NA"
-            }, {
-              title: "TL_NEW_TRADE_DETAILS_STRUCT_SUB_TYPE_LABEL",
-              value: response !== null && response !== void 0 && (_response$tradeLicens4 = response.tradeLicenseDetail) !== null && _response$tradeLicens4 !== void 0 && _response$tradeLicens4.structureType ? "COMMON_MASTERS_STRUCTURETYPE_" + stringReplaceAll$1(response === null || response === void 0 ? void 0 : (_response$tradeLicens5 = response.tradeLicenseDetail) === null || _response$tradeLicens5 === void 0 ? void 0 : _response$tradeLicens5.structureType, ".", "_") : "NA"
-            }, {
-              title: "TL_NEW_TRADE_DETAILS_TRADE_COMM_DATE_LABEL",
-              value: response !== null && response !== void 0 && response.commencementDate ? convertEpochToDate(response === null || response === void 0 ? void 0 : response.commencementDate) : "NA"
-            }, {
-              title: "TL_NEW_GST_NUMBER_LABEL",
-              value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens6 = response.tradeLicenseDetail) === null || _response$tradeLicens6 === void 0 ? void 0 : (_response$tradeLicens7 = _response$tradeLicens6.additionalDetail) === null || _response$tradeLicens7 === void 0 ? void 0 : _response$tradeLicens7.gstNo) || "NA"
-            }, {
-              title: "TL_NEW_OPERATIONAL_SQ_FT_AREA_LABEL",
-              value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens8 = response.tradeLicenseDetail) === null || _response$tradeLicens8 === void 0 ? void 0 : _response$tradeLicens8.operationalArea) || "NA"
-            }, {
-              title: "TL_NEW_NUMBER_OF_EMPLOYEES_LABEL",
-              value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens9 = response.tradeLicenseDetail) === null || _response$tradeLicens9 === void 0 ? void 0 : _response$tradeLicens9.noOfEmployees) || "NA"
-            }]
-          };
-          var tradeUnits = {
-            title: "TL_TRADE_UNITS_HEADER",
-            additionalDetails: {
-              units: response === null || response === void 0 ? void 0 : (_response$tradeLicens10 = response.tradeLicenseDetail) === null || _response$tradeLicens10 === void 0 ? void 0 : (_response$tradeLicens11 = _response$tradeLicens10.tradeUnits) === null || _response$tradeLicens11 === void 0 ? void 0 : _response$tradeLicens11.map(function (unit, index) {
-                var _unit$tradeType, _unit$tradeType2;
-
-                var tradeSubType = stringReplaceAll$1(unit === null || unit === void 0 ? void 0 : unit.tradeType, ".", "_");
-                tradeSubType = stringReplaceAll$1(tradeSubType, "-", "_");
-                return {
-                  title: "TL_UNIT_HEADER",
-                  values: [{
-                    title: "TRADELICENSE_TRADECATEGORY_LABEL",
-                    value: unit !== null && unit !== void 0 && unit.tradeType ? "TRADELICENSE_TRADETYPE_" + (unit === null || unit === void 0 ? void 0 : (_unit$tradeType = unit.tradeType) === null || _unit$tradeType === void 0 ? void 0 : _unit$tradeType.split('.')[0]) : "NA"
-                  }, {
-                    title: "TRADELICENSE_TRADETYPE_LABEL",
-                    value: unit !== null && unit !== void 0 && unit.tradeType ? "TRADELICENSE_TRADETYPE_" + (unit === null || unit === void 0 ? void 0 : (_unit$tradeType2 = unit.tradeType) === null || _unit$tradeType2 === void 0 ? void 0 : _unit$tradeType2.split('.')[1]) : "NA"
-                  }, {
-                    title: "TL_NEW_TRADE_SUB_TYPE_LABEL",
-                    value: tradeSubType ? "TRADELICENSE_TRADETYPE_" + tradeSubType : "NA"
-                  }, {
-                    title: "TL_NEW_TRADE_DETAILS_UOM_UOM_PLACEHOLDER",
-                    value: (unit === null || unit === void 0 ? void 0 : unit.uom) || "NA"
-                  }, {
-                    title: "TL_NEW_TRADE_DETAILS_UOM_VALUE_LABEL",
-                    value: (unit === null || unit === void 0 ? void 0 : unit.uomValue) || "NA"
-                  }]
-                };
-              })
-            }
-          };
-          var accessories = {
-            title: "TL_NEW_TRADE_DETAILS_HEADER_ACC",
-            additionalDetails: {
-              accessories: response === null || response === void 0 ? void 0 : (_response$tradeLicens12 = response.tradeLicenseDetail) === null || _response$tradeLicens12 === void 0 ? void 0 : (_response$tradeLicens13 = _response$tradeLicens12.accessories) === null || _response$tradeLicens13 === void 0 ? void 0 : _response$tradeLicens13.map(function (unit, index) {
-                var accessoryCategory = "NA";
-
-                if (unit !== null && unit !== void 0 && unit.accessoryCategory) {
-                  accessoryCategory = stringReplaceAll$1(unit === null || unit === void 0 ? void 0 : unit.accessoryCategory, ".", "_");
-                  accessoryCategory = "TRADELICENSE_ACCESSORIESCATEGORY_" + stringReplaceAll$1(accessoryCategory, "-", "_");
+        function _temp3(propertyDetails) {
+          function _temp2() {
+            var _propertyDetails$Prop, _response$tradeLicens2, _response$tradeLicens3, _response$tradeLicens4, _response$tradeLicens5, _response$tradeLicens6, _response$tradeLicens7, _response$tradeLicens8, _response$tradeLicens9, _response$tradeLicens10, _response$tradeLicens11, _response$tradeLicens12, _response$tradeLicens13, _response$tradeLicens14, _propertyDetails$Prop39, _propertyDetails$Prop40, _propertyDetails$Prop41, _propertyDetails$Prop42, _propertyDetails$Prop43, _propertyDetails$Prop44, _propertyDetails$Prop45, _propertyDetails$Prop46, _propertyDetails$Prop47, _response$tradeLicens15, _response$tradeLicens16, _response$tradeLicens17, _response$tradeLicens18, _response$tradeLicens19, _response$tradeLicens20, _response$tradeLicens21, _response$tradeLicens22, _response$tradeLicens23, _response$tradeLicens24, _response$tradeLicens25, _response$tradeLicens26, _response$tradeLicens27, _response$tradeLicens28, _response$tradeLicens29, _response$tradeLicens30, _response$tradeLicens31, _response$tradeLicens32, _response$tradeLicens47, _response$tradeLicens48, _response$tradeLicens49, _response$tradeLicens50, _response$tradeLicens53, _response$tradeLicens54, _response$tradeLicens57, _response$tradeLicens58, _propertyDetails$Prop48, _propertyDetails$Prop49, _response$tradeLicens59;
+
+            var propertyAddress = "";
+
+            if (propertyDetails && propertyDetails !== null && propertyDetails !== void 0 && (_propertyDetails$Prop = propertyDetails.Properties) !== null && _propertyDetails$Prop !== void 0 && _propertyDetails$Prop.length) {
+              var _propertyDetails$Prop2, _propertyDetails$Prop3, _propertyDetails$Prop8, _propertyDetails$Prop9, _propertyDetails$Prop14, _propertyDetails$Prop15, _propertyDetails$Prop21, _propertyDetails$Prop22, _propertyDetails$Prop23, _propertyDetails$Prop29, _propertyDetails$Prop30, _propertyDetails$Prop35, _propertyDetails$Prop36;
+
+              if (propertyDetails !== null && propertyDetails !== void 0 && (_propertyDetails$Prop2 = propertyDetails.Properties[0]) !== null && _propertyDetails$Prop2 !== void 0 && (_propertyDetails$Prop3 = _propertyDetails$Prop2.address) !== null && _propertyDetails$Prop3 !== void 0 && _propertyDetails$Prop3.doorNo) {
+                var _propertyDetails$Prop4, _propertyDetails$Prop5, _propertyDetails$Prop6, _propertyDetails$Prop7;
+
+                propertyAddress += propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop4 = propertyDetails.Properties[0]) === null || _propertyDetails$Prop4 === void 0 ? void 0 : (_propertyDetails$Prop5 = _propertyDetails$Prop4.address) === null || _propertyDetails$Prop5 === void 0 ? void 0 : _propertyDetails$Prop5.doorNo;
+
+                if (propertyDetails !== null && propertyDetails !== void 0 && (_propertyDetails$Prop6 = propertyDetails.Properties[0]) !== null && _propertyDetails$Prop6 !== void 0 && (_propertyDetails$Prop7 = _propertyDetails$Prop6.address) !== null && _propertyDetails$Prop7 !== void 0 && _propertyDetails$Prop7.street) {
+                  propertyAddress += ", ";
                 }
+              }
 
-                return {
-                  title: "TL_ACCESSORY_LABEL",
-                  values: [{
-                    title: "TL_NEW_TRADE_DETAILS_ACC_LABEL",
-                    value: accessoryCategory
-                  }, {
-                    title: "TL_NEW_TRADE_DETAILS_UOM_UOM_PLACEHOLDER",
-                    value: (unit === null || unit === void 0 ? void 0 : unit.uom) || "NA"
-                  }, {
-                    title: "TL_NEW_TRADE_DETAILS_UOM_VALUE_LABEL",
-                    value: (unit === null || unit === void 0 ? void 0 : unit.uomValue) || "NA"
-                  }, {
-                    title: "TL_ACCESSORY_COUNT_LABEL",
-                    value: (unit === null || unit === void 0 ? void 0 : unit.count) || "NA"
-                  }]
-                };
-              })
+              if (propertyDetails !== null && propertyDetails !== void 0 && (_propertyDetails$Prop8 = propertyDetails.Properties[0]) !== null && _propertyDetails$Prop8 !== void 0 && (_propertyDetails$Prop9 = _propertyDetails$Prop8.address) !== null && _propertyDetails$Prop9 !== void 0 && _propertyDetails$Prop9.street) {
+                var _propertyDetails$Prop10, _propertyDetails$Prop11, _propertyDetails$Prop12, _propertyDetails$Prop13;
+
+                propertyAddress += propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop10 = propertyDetails.Properties[0]) === null || _propertyDetails$Prop10 === void 0 ? void 0 : (_propertyDetails$Prop11 = _propertyDetails$Prop10.address) === null || _propertyDetails$Prop11 === void 0 ? void 0 : _propertyDetails$Prop11.street;
+
+                if (propertyDetails !== null && propertyDetails !== void 0 && (_propertyDetails$Prop12 = propertyDetails.Properties[0]) !== null && _propertyDetails$Prop12 !== void 0 && (_propertyDetails$Prop13 = _propertyDetails$Prop12.address) !== null && _propertyDetails$Prop13 !== void 0 && _propertyDetails$Prop13.landmark) {
+                  propertyAddress += ", ";
+                }
+              }
+
+              if (propertyDetails !== null && propertyDetails !== void 0 && (_propertyDetails$Prop14 = propertyDetails.Properties[0]) !== null && _propertyDetails$Prop14 !== void 0 && (_propertyDetails$Prop15 = _propertyDetails$Prop14.address) !== null && _propertyDetails$Prop15 !== void 0 && _propertyDetails$Prop15.landmark) {
+                var _propertyDetails$Prop16, _propertyDetails$Prop17, _propertyDetails$Prop18, _propertyDetails$Prop19, _propertyDetails$Prop20;
+
+                propertyAddress += propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop16 = propertyDetails.Properties[0]) === null || _propertyDetails$Prop16 === void 0 ? void 0 : (_propertyDetails$Prop17 = _propertyDetails$Prop16.address) === null || _propertyDetails$Prop17 === void 0 ? void 0 : _propertyDetails$Prop17.landmark;
+
+                if (propertyDetails !== null && propertyDetails !== void 0 && (_propertyDetails$Prop18 = propertyDetails.Properties[0]) !== null && _propertyDetails$Prop18 !== void 0 && (_propertyDetails$Prop19 = _propertyDetails$Prop18.address) !== null && _propertyDetails$Prop19 !== void 0 && (_propertyDetails$Prop20 = _propertyDetails$Prop19.locality) !== null && _propertyDetails$Prop20 !== void 0 && _propertyDetails$Prop20.name) {
+                  propertyAddress += ", ";
+                }
+              }
+
+              if (propertyDetails !== null && propertyDetails !== void 0 && (_propertyDetails$Prop21 = propertyDetails.Properties[0]) !== null && _propertyDetails$Prop21 !== void 0 && (_propertyDetails$Prop22 = _propertyDetails$Prop21.address) !== null && _propertyDetails$Prop22 !== void 0 && (_propertyDetails$Prop23 = _propertyDetails$Prop22.locality) !== null && _propertyDetails$Prop23 !== void 0 && _propertyDetails$Prop23.name) {
+                var _propertyDetails$Prop24, _propertyDetails$Prop25, _propertyDetails$Prop26, _propertyDetails$Prop27, _propertyDetails$Prop28;
+
+                propertyAddress += propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop24 = propertyDetails.Properties[0]) === null || _propertyDetails$Prop24 === void 0 ? void 0 : (_propertyDetails$Prop25 = _propertyDetails$Prop24.address) === null || _propertyDetails$Prop25 === void 0 ? void 0 : (_propertyDetails$Prop26 = _propertyDetails$Prop25.locality) === null || _propertyDetails$Prop26 === void 0 ? void 0 : _propertyDetails$Prop26.name;
+
+                if (propertyDetails !== null && propertyDetails !== void 0 && (_propertyDetails$Prop27 = propertyDetails.Properties[0]) !== null && _propertyDetails$Prop27 !== void 0 && (_propertyDetails$Prop28 = _propertyDetails$Prop27.address) !== null && _propertyDetails$Prop28 !== void 0 && _propertyDetails$Prop28.city) {
+                  propertyAddress += ", ";
+                }
+              }
+
+              if (propertyDetails !== null && propertyDetails !== void 0 && (_propertyDetails$Prop29 = propertyDetails.Properties[0]) !== null && _propertyDetails$Prop29 !== void 0 && (_propertyDetails$Prop30 = _propertyDetails$Prop29.address) !== null && _propertyDetails$Prop30 !== void 0 && _propertyDetails$Prop30.city) {
+                var _propertyDetails$Prop31, _propertyDetails$Prop32, _propertyDetails$Prop33, _propertyDetails$Prop34;
+
+                propertyAddress += propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop31 = propertyDetails.Properties[0]) === null || _propertyDetails$Prop31 === void 0 ? void 0 : (_propertyDetails$Prop32 = _propertyDetails$Prop31.address) === null || _propertyDetails$Prop32 === void 0 ? void 0 : _propertyDetails$Prop32.city;
+
+                if (propertyDetails !== null && propertyDetails !== void 0 && (_propertyDetails$Prop33 = propertyDetails.Properties[0]) !== null && _propertyDetails$Prop33 !== void 0 && (_propertyDetails$Prop34 = _propertyDetails$Prop33.address) !== null && _propertyDetails$Prop34 !== void 0 && _propertyDetails$Prop34.pincode) {
+                  propertyAddress += ", ";
+                }
+              }
+
+              if (propertyDetails !== null && propertyDetails !== void 0 && (_propertyDetails$Prop35 = propertyDetails.Properties[0]) !== null && _propertyDetails$Prop35 !== void 0 && (_propertyDetails$Prop36 = _propertyDetails$Prop35.address) !== null && _propertyDetails$Prop36 !== void 0 && _propertyDetails$Prop36.pincode) {
+                var _propertyDetails$Prop37, _propertyDetails$Prop38;
+
+                propertyAddress += propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop37 = propertyDetails.Properties[0]) === null || _propertyDetails$Prop37 === void 0 ? void 0 : (_propertyDetails$Prop38 = _propertyDetails$Prop37.address) === null || _propertyDetails$Prop38 === void 0 ? void 0 : _propertyDetails$Prop38.pincode;
+              }
             }
-          };
-          var cityOfApp = cloneDeep_1(response === null || response === void 0 ? void 0 : (_response$tradeLicens14 = response.tradeLicenseDetail) === null || _response$tradeLicens14 === void 0 ? void 0 : (_response$tradeLicens15 = _response$tradeLicens14.address) === null || _response$tradeLicens15 === void 0 ? void 0 : _response$tradeLicens15.city);
-          var localityCode = cloneDeep_1(response === null || response === void 0 ? void 0 : (_response$tradeLicens16 = response.tradeLicenseDetail) === null || _response$tradeLicens16 === void 0 ? void 0 : (_response$tradeLicens17 = _response$tradeLicens16.address) === null || _response$tradeLicens17 === void 0 ? void 0 : (_response$tradeLicens18 = _response$tradeLicens17.locality) === null || _response$tradeLicens18 === void 0 ? void 0 : _response$tradeLicens18.code);
-          var tradeAddress = {
-            title: "TL_CHECK_ADDRESS",
-            values: [{
-              title: "CORE_COMMON_PINCODE",
-              value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens19 = response.tradeLicenseDetail) === null || _response$tradeLicens19 === void 0 ? void 0 : (_response$tradeLicens20 = _response$tradeLicens19.address) === null || _response$tradeLicens20 === void 0 ? void 0 : _response$tradeLicens20.pincode) || "NA"
-            }, {
-              title: "MYCITY_CODE_LABEL",
-              value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens21 = response.tradeLicenseDetail) === null || _response$tradeLicens21 === void 0 ? void 0 : (_response$tradeLicens22 = _response$tradeLicens21.address) === null || _response$tradeLicens22 === void 0 ? void 0 : _response$tradeLicens22.city) || "NA"
-            }, {
-              title: "TL_LOCALIZATION_LOCALITY",
-              value: stringReplaceAll$1(cityOfApp === null || cityOfApp === void 0 ? void 0 : cityOfApp.toUpperCase(), ".", "_") + "_REVENUE_" + localityCode
-            }, {
-              title: "TL_LOCALIZATION_BUILDING_NO",
-              value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens23 = response.tradeLicenseDetail) === null || _response$tradeLicens23 === void 0 ? void 0 : (_response$tradeLicens24 = _response$tradeLicens23.address) === null || _response$tradeLicens24 === void 0 ? void 0 : _response$tradeLicens24.doorNo) || "NA"
-            }, {
-              title: "TL_LOCALIZATION_STREET_NAME",
-              value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens25 = response.tradeLicenseDetail) === null || _response$tradeLicens25 === void 0 ? void 0 : (_response$tradeLicens26 = _response$tradeLicens25.address) === null || _response$tradeLicens26 === void 0 ? void 0 : _response$tradeLicens26.street) || "NA"
-            }]
-          };
-          var checkOwnerLength = (response === null || response === void 0 ? void 0 : (_response$tradeLicens27 = response.tradeLicenseDetail) === null || _response$tradeLicens27 === void 0 ? void 0 : (_response$tradeLicens28 = _response$tradeLicens27.owners) === null || _response$tradeLicens28 === void 0 ? void 0 : _response$tradeLicens28.length) || 1;
-          var owners = {
-            title: "ES_NEW_APPLICATION_OWNERSHIP_DETAILS",
-            additionalDetails: {
-              owners: response === null || response === void 0 ? void 0 : (_response$tradeLicens29 = response.tradeLicenseDetail) === null || _response$tradeLicens29 === void 0 ? void 0 : (_response$tradeLicens30 = _response$tradeLicens29.owners) === null || _response$tradeLicens30 === void 0 ? void 0 : _response$tradeLicens30.map(function (owner, index) {
-                var _response$tradeLicens31, _response$tradeLicens32;
-
-                var subOwnerShipCategory = response !== null && response !== void 0 && (_response$tradeLicens31 = response.tradeLicenseDetail) !== null && _response$tradeLicens31 !== void 0 && _response$tradeLicens31.subOwnerShipCategory ? "COMMON_MASTERS_OWNERSHIPCATEGORY_" + stringReplaceAll$1(response === null || response === void 0 ? void 0 : (_response$tradeLicens32 = response.tradeLicenseDetail) === null || _response$tradeLicens32 === void 0 ? void 0 : _response$tradeLicens32.subOwnerShipCategory, ".", "_") : "NA";
-                return {
-                  title: Number(checkOwnerLength) > 1 ? "TL_PAYMENT_PAID_BY_PLACEHOLDER" : "",
-                  values: [{
-                    title: "TL_NEW_OWNER_DETAILS_OWNERSHIP_TYPE_LABEL",
-                    value: subOwnerShipCategory
-                  }, {
-                    title: "TL_OWNER_S_NAME_LABEL",
-                    value: (owner === null || owner === void 0 ? void 0 : owner.name) || "NA"
-                  }, {
-                    title: "TL_OWNER_S_MOBILE_NUM_LABEL",
-                    value: (owner === null || owner === void 0 ? void 0 : owner.mobileNumber) || "NA"
-                  }, {
-                    title: "TL_NEW_OWNER_DETAILS_GENDER_LABEL",
-                    value: (owner === null || owner === void 0 ? void 0 : owner.gender) || "NA"
-                  }, {
-                    title: "TL_NEW_OWNER_DETAILS_EMAIL_LABEL",
-                    value: (owner === null || owner === void 0 ? void 0 : owner.emailId) || "NA"
-                  }, {
-                    title: "TL_OWNER_SPECIAL_CATEGORY",
-                    value: owner !== null && owner !== void 0 && owner.ownerType ? "COMMON_MASTERS_OWNERTYPE_" + (owner === null || owner === void 0 ? void 0 : owner.ownerType) : "NA"
-                  }, {
-                    title: "TL_NEW_OWNER_DETAILS_ADDR_LABEL",
-                    value: (owner === null || owner === void 0 ? void 0 : owner.permanentAddress) || "NA"
-                  }]
-                };
-              }),
-              documents: [{
-                title: "PT_COMMON_DOCS",
-                values: response === null || response === void 0 ? void 0 : (_response$tradeLicens33 = response.tradeLicenseDetail) === null || _response$tradeLicens33 === void 0 ? void 0 : (_response$tradeLicens34 = _response$tradeLicens33.applicationDocuments) === null || _response$tradeLicens34 === void 0 ? void 0 : _response$tradeLicens34.map(function (document) {
+
+            var employeeResponse = [];
+            var tradedetails = {
+              title: "TL_COMMON_TR_DETAILS",
+              asSectionHeader: true,
+              values: [{
+                title: "TL_FINANCIAL_YEAR_LABEL",
+                value: response !== null && response !== void 0 && response.financialYear ? "FY" + (response === null || response === void 0 ? void 0 : response.financialYear) : "NA"
+              }, {
+                title: "TL_NEW_TRADE_DETAILS_LIC_TYPE_LABEL",
+                value: response !== null && response !== void 0 && response.licenseType ? "TRADELICENSE_LICENSETYPE_" + (response === null || response === void 0 ? void 0 : response.licenseType) : "NA"
+              }, {
+                title: "TL_COMMON_TABLE_COL_TRD_NAME",
+                value: response === null || response === void 0 ? void 0 : response.tradeName
+              }, {
+                title: "TL_NEW_TRADE_DETAILS_STRUCT_TYPE_LABEL",
+                value: response !== null && response !== void 0 && (_response$tradeLicens2 = response.tradeLicenseDetail) !== null && _response$tradeLicens2 !== void 0 && _response$tradeLicens2.structureType ? "COMMON_MASTERS_STRUCTURETYPE_" + (response === null || response === void 0 ? void 0 : (_response$tradeLicens3 = response.tradeLicenseDetail) === null || _response$tradeLicens3 === void 0 ? void 0 : (_response$tradeLicens4 = _response$tradeLicens3.structureType) === null || _response$tradeLicens4 === void 0 ? void 0 : _response$tradeLicens4.split(".")[0]) : "NA"
+              }, {
+                title: "TL_NEW_TRADE_DETAILS_STRUCT_SUB_TYPE_LABEL",
+                value: response !== null && response !== void 0 && (_response$tradeLicens5 = response.tradeLicenseDetail) !== null && _response$tradeLicens5 !== void 0 && _response$tradeLicens5.structureType ? "COMMON_MASTERS_STRUCTURETYPE_" + stringReplaceAll$2(response === null || response === void 0 ? void 0 : (_response$tradeLicens6 = response.tradeLicenseDetail) === null || _response$tradeLicens6 === void 0 ? void 0 : _response$tradeLicens6.structureType, ".", "_") : "NA"
+              }, {
+                title: "TL_NEW_TRADE_DETAILS_TRADE_COMM_DATE_LABEL",
+                value: response !== null && response !== void 0 && response.commencementDate ? convertEpochToDate(response === null || response === void 0 ? void 0 : response.commencementDate) : "NA"
+              }, {
+                title: "TL_NEW_GST_NUMBER_LABEL",
+                value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens7 = response.tradeLicenseDetail) === null || _response$tradeLicens7 === void 0 ? void 0 : (_response$tradeLicens8 = _response$tradeLicens7.additionalDetail) === null || _response$tradeLicens8 === void 0 ? void 0 : _response$tradeLicens8.gstNo) || "NA"
+              }, {
+                title: "TL_NEW_OPERATIONAL_SQ_FT_AREA_LABEL",
+                value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens9 = response.tradeLicenseDetail) === null || _response$tradeLicens9 === void 0 ? void 0 : _response$tradeLicens9.operationalArea) || "NA"
+              }, {
+                title: "TL_NEW_NUMBER_OF_EMPLOYEES_LABEL",
+                value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens10 = response.tradeLicenseDetail) === null || _response$tradeLicens10 === void 0 ? void 0 : _response$tradeLicens10.noOfEmployees) || "NA"
+              }]
+            };
+            var tradeUnits = {
+              title: "TL_TRADE_UNITS_HEADER",
+              additionalDetails: {
+                units: response === null || response === void 0 ? void 0 : (_response$tradeLicens11 = response.tradeLicenseDetail) === null || _response$tradeLicens11 === void 0 ? void 0 : (_response$tradeLicens12 = _response$tradeLicens11.tradeUnits) === null || _response$tradeLicens12 === void 0 ? void 0 : _response$tradeLicens12.map(function (unit, index) {
+                  var _unit$tradeType, _unit$tradeType2;
+
+                  var tradeSubType = stringReplaceAll$2(unit === null || unit === void 0 ? void 0 : unit.tradeType, ".", "_");
+                  tradeSubType = stringReplaceAll$2(tradeSubType, "-", "_");
                   return {
-                    title: "TL_NEW_" + (document === null || document === void 0 ? void 0 : document.documentType.replace(".", "_")),
-                    documentType: document === null || document === void 0 ? void 0 : document.documentType,
-                    documentUid: document === null || document === void 0 ? void 0 : document.documentUid,
-                    fileStoreId: document === null || document === void 0 ? void 0 : document.fileStoreId
+                    title: "TL_UNIT_HEADER",
+                    values: [{
+                      title: "TRADELICENSE_TRADECATEGORY_LABEL",
+                      value: unit !== null && unit !== void 0 && unit.tradeType ? "TRADELICENSE_TRADETYPE_" + (unit === null || unit === void 0 ? void 0 : (_unit$tradeType = unit.tradeType) === null || _unit$tradeType === void 0 ? void 0 : _unit$tradeType.split(".")[0]) : "NA"
+                    }, {
+                      title: "TRADELICENSE_TRADETYPE_LABEL",
+                      value: unit !== null && unit !== void 0 && unit.tradeType ? "TRADELICENSE_TRADETYPE_" + (unit === null || unit === void 0 ? void 0 : (_unit$tradeType2 = unit.tradeType) === null || _unit$tradeType2 === void 0 ? void 0 : _unit$tradeType2.split(".")[1]) : "NA"
+                    }, {
+                      title: "TL_NEW_TRADE_SUB_TYPE_LABEL",
+                      value: tradeSubType ? "TRADELICENSE_TRADETYPE_" + tradeSubType : "NA"
+                    }, {
+                      title: "TL_NEW_TRADE_DETAILS_UOM_UOM_PLACEHOLDER",
+                      value: (unit === null || unit === void 0 ? void 0 : unit.uom) || "NA"
+                    }, {
+                      title: "TL_NEW_TRADE_DETAILS_UOM_VALUE_LABEL",
+                      value: (unit === null || unit === void 0 ? void 0 : unit.uomValue) || "NA"
+                    }]
                   };
                 })
-              }]
-            }
-          };
+              }
+            };
+            var accessories = {
+              title: "TL_NEW_TRADE_DETAILS_HEADER_ACC",
+              additionalDetails: {
+                accessories: response === null || response === void 0 ? void 0 : (_response$tradeLicens13 = response.tradeLicenseDetail) === null || _response$tradeLicens13 === void 0 ? void 0 : (_response$tradeLicens14 = _response$tradeLicens13.accessories) === null || _response$tradeLicens14 === void 0 ? void 0 : _response$tradeLicens14.map(function (unit, index) {
+                  var accessoryCategory = "NA";
 
-          if ((response === null || response === void 0 ? void 0 : response.workflowCode) == "NewTL" && (response === null || response === void 0 ? void 0 : response.status) !== "APPROVED") {
-            var _response$tradeLicens35, _response$tradeLicens36;
+                  if (unit !== null && unit !== void 0 && unit.accessoryCategory) {
+                    accessoryCategory = stringReplaceAll$2(unit === null || unit === void 0 ? void 0 : unit.accessoryCategory, ".", "_");
+                    accessoryCategory = "TRADELICENSE_ACCESSORIESCATEGORY_" + stringReplaceAll$2(accessoryCategory, "-", "_");
+                  }
 
-            var details = {
-              title: "",
+                  return {
+                    title: "TL_ACCESSORY_LABEL",
+                    values: [{
+                      title: "TL_NEW_TRADE_DETAILS_ACC_LABEL",
+                      value: accessoryCategory
+                    }, {
+                      title: "TL_NEW_TRADE_DETAILS_UOM_UOM_PLACEHOLDER",
+                      value: (unit === null || unit === void 0 ? void 0 : unit.uom) || "NA"
+                    }, {
+                      title: "TL_NEW_TRADE_DETAILS_UOM_VALUE_LABEL",
+                      value: (unit === null || unit === void 0 ? void 0 : unit.uomValue) || "NA"
+                    }, {
+                      title: "TL_ACCESSORY_COUNT_LABEL",
+                      value: (unit === null || unit === void 0 ? void 0 : unit.count) || "NA"
+                    }]
+                  };
+                })
+              }
+            };
+            var PropertyDetail = {
+              title: "PT_DETAILS",
               values: [{
-                title: "TL_COMMON_TABLE_COL_APP_NO",
-                value: (response === null || response === void 0 ? void 0 : response.applicationNumber) || "NA"
+                title: "TL_PROPERTY_ID",
+                value: (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop39 = propertyDetails.Properties) === null || _propertyDetails$Prop39 === void 0 ? void 0 : (_propertyDetails$Prop40 = _propertyDetails$Prop39[0]) === null || _propertyDetails$Prop40 === void 0 ? void 0 : _propertyDetails$Prop40.propertyId) || "NA"
+              }, {
+                title: "PT_OWNER_NAME",
+                value: (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop41 = propertyDetails.Properties) === null || _propertyDetails$Prop41 === void 0 ? void 0 : (_propertyDetails$Prop42 = _propertyDetails$Prop41[0]) === null || _propertyDetails$Prop42 === void 0 ? void 0 : (_propertyDetails$Prop43 = _propertyDetails$Prop42.owners[0]) === null || _propertyDetails$Prop43 === void 0 ? void 0 : _propertyDetails$Prop43.name) || "NA"
               }, {
-                title: "TL_APPLICATION_CHALLAN_LABEL",
-                value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens35 = response.tradeLicenseDetail) === null || _response$tradeLicens35 === void 0 ? void 0 : _response$tradeLicens35.channel) && "TL_CHANNEL_" + (response === null || response === void 0 ? void 0 : (_response$tradeLicens36 = response.tradeLicenseDetail) === null || _response$tradeLicens36 === void 0 ? void 0 : _response$tradeLicens36.channel) || "NA"
+                title: "PROPERTY_ADDRESS",
+                value: propertyAddress || "NA"
+              }, {
+                title: "TL_VIEW_PROPERTY_DETAIL",
+                to: "/digit-ui/employee/commonpt/view-property?propertyId=" + (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop44 = propertyDetails.Properties) === null || _propertyDetails$Prop44 === void 0 ? void 0 : (_propertyDetails$Prop45 = _propertyDetails$Prop44[0]) === null || _propertyDetails$Prop45 === void 0 ? void 0 : _propertyDetails$Prop45.propertyId) + "&tenantId=" + (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop46 = propertyDetails.Properties) === null || _propertyDetails$Prop46 === void 0 ? void 0 : (_propertyDetails$Prop47 = _propertyDetails$Prop46[0]) === null || _propertyDetails$Prop47 === void 0 ? void 0 : _propertyDetails$Prop47.tenantId),
+                value: "",
+                isLink: true
               }]
             };
-            response && employeeResponse.push(details);
-          }
+            var cityOfApp = cloneDeep_1(response === null || response === void 0 ? void 0 : (_response$tradeLicens15 = response.tradeLicenseDetail) === null || _response$tradeLicens15 === void 0 ? void 0 : (_response$tradeLicens16 = _response$tradeLicens15.address) === null || _response$tradeLicens16 === void 0 ? void 0 : _response$tradeLicens16.city);
+            var localityCode = cloneDeep_1(response === null || response === void 0 ? void 0 : (_response$tradeLicens17 = response.tradeLicenseDetail) === null || _response$tradeLicens17 === void 0 ? void 0 : (_response$tradeLicens18 = _response$tradeLicens17.address) === null || _response$tradeLicens18 === void 0 ? void 0 : (_response$tradeLicens19 = _response$tradeLicens18.locality) === null || _response$tradeLicens19 === void 0 ? void 0 : _response$tradeLicens19.code);
+            var tradeAddress = {
+              title: "TL_CHECK_ADDRESS",
+              values: [{
+                title: "CORE_COMMON_PINCODE",
+                value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens20 = response.tradeLicenseDetail) === null || _response$tradeLicens20 === void 0 ? void 0 : (_response$tradeLicens21 = _response$tradeLicens20.address) === null || _response$tradeLicens21 === void 0 ? void 0 : _response$tradeLicens21.pincode) || "NA"
+              }, {
+                title: "MYCITY_CODE_LABEL",
+                value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens22 = response.tradeLicenseDetail) === null || _response$tradeLicens22 === void 0 ? void 0 : (_response$tradeLicens23 = _response$tradeLicens22.address) === null || _response$tradeLicens23 === void 0 ? void 0 : _response$tradeLicens23.city) || "NA"
+              }, {
+                title: "TL_LOCALIZATION_LOCALITY",
+                value: stringReplaceAll$2(cityOfApp === null || cityOfApp === void 0 ? void 0 : cityOfApp.toUpperCase(), ".", "_") + "_REVENUE_" + localityCode
+              }, {
+                title: "TL_LOCALIZATION_BUILDING_NO",
+                value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens24 = response.tradeLicenseDetail) === null || _response$tradeLicens24 === void 0 ? void 0 : (_response$tradeLicens25 = _response$tradeLicens24.address) === null || _response$tradeLicens25 === void 0 ? void 0 : _response$tradeLicens25.doorNo) || "NA"
+              }, {
+                title: "TL_LOCALIZATION_STREET_NAME",
+                value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens26 = response.tradeLicenseDetail) === null || _response$tradeLicens26 === void 0 ? void 0 : (_response$tradeLicens27 = _response$tradeLicens26.address) === null || _response$tradeLicens27 === void 0 ? void 0 : _response$tradeLicens27.street) || "NA"
+              }]
+            };
+            var checkOwnerLength = (response === null || response === void 0 ? void 0 : (_response$tradeLicens28 = response.tradeLicenseDetail) === null || _response$tradeLicens28 === void 0 ? void 0 : (_response$tradeLicens29 = _response$tradeLicens28.owners) === null || _response$tradeLicens29 === void 0 ? void 0 : _response$tradeLicens29.length) || 1;
+            var owners = response !== null && response !== void 0 && (_response$tradeLicens30 = response.tradeLicenseDetail) !== null && _response$tradeLicens30 !== void 0 && _response$tradeLicens30.subOwnerShipCategory.includes("INSTITUTIONAL") ? {
+              title: "ES_NEW_APPLICATION_OWNERSHIP_DETAILS",
+              additionalDetails: {
+                owners: response === null || response === void 0 ? void 0 : (_response$tradeLicens31 = response.tradeLicenseDetail) === null || _response$tradeLicens31 === void 0 ? void 0 : (_response$tradeLicens32 = _response$tradeLicens31.owners) === null || _response$tradeLicens32 === void 0 ? void 0 : _response$tradeLicens32.map(function (owner, index) {
+                  var _response$tradeLicens33, _response$tradeLicens34, _response$tradeLicens35, _response$tradeLicens36, _response$tradeLicens37, _response$tradeLicens38, _response$tradeLicens39, _response$tradeLicens40, _response$tradeLicens41, _response$tradeLicens42, _response$tradeLicens43, _response$tradeLicens44, _response$tradeLicens45, _response$tradeLicens46;
 
-          response && employeeResponse.push(tradedetails);
-          (response === null || response === void 0 ? void 0 : (_response$tradeLicens37 = response.tradeLicenseDetail) === null || _response$tradeLicens37 === void 0 ? void 0 : _response$tradeLicens37.tradeUnits) && employeeResponse.push(tradeUnits);
-          (response === null || response === void 0 ? void 0 : (_response$tradeLicens38 = response.tradeLicenseDetail) === null || _response$tradeLicens38 === void 0 ? void 0 : _response$tradeLicens38.accessories) && employeeResponse.push(accessories);
-          response && employeeResponse.push(tradeAddress);
-          (response === null || response === void 0 ? void 0 : (_response$tradeLicens39 = response.tradeLicenseDetail) === null || _response$tradeLicens39 === void 0 ? void 0 : _response$tradeLicens39.owners) && employeeResponse.push(owners);
-          return {
-            tenantId: response.tenantId,
-            applicationDetails: employeeResponse,
-            additionalDetails: response === null || response === void 0 ? void 0 : response.additionalDetails,
-            applicationData: response,
-            numOfApplications: numOfApplications
-          };
-        }
+                  var subOwnerShipCategory = response !== null && response !== void 0 && (_response$tradeLicens33 = response.tradeLicenseDetail) !== null && _response$tradeLicens33 !== void 0 && _response$tradeLicens33.subOwnerShipCategory ? "COMMON_MASTERS_OWNERSHIPCATEGORY_" + stringReplaceAll$2(response === null || response === void 0 ? void 0 : (_response$tradeLicens34 = response.tradeLicenseDetail) === null || _response$tradeLicens34 === void 0 ? void 0 : _response$tradeLicens34.subOwnerShipCategory, ".", "_") : "NA";
+                  return {
+                    title: Number(checkOwnerLength) > 1 ? "TL_PAYMENT_PAID_BY_PLACEHOLDER" : "",
+                    values: [{
+                      title: "TL_NEW_OWNER_DETAILS_OWNERSHIP_TYPE_LABEL",
+                      value: subOwnerShipCategory
+                    }, {
+                      title: "TL_INSTITUTION_NAME_LABEL",
+                      value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens35 = response.tradeLicenseDetail) === null || _response$tradeLicens35 === void 0 ? void 0 : (_response$tradeLicens36 = _response$tradeLicens35.institution) === null || _response$tradeLicens36 === void 0 ? void 0 : _response$tradeLicens36.instituionName) || "NA"
+                    }, {
+                      title: "TL_NEW_OWNER_DESIG_LABEL",
+                      value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens37 = response.tradeLicenseDetail) === null || _response$tradeLicens37 === void 0 ? void 0 : (_response$tradeLicens38 = _response$tradeLicens37.institution) === null || _response$tradeLicens38 === void 0 ? void 0 : _response$tradeLicens38.designation) || "NA"
+                    }, {
+                      title: "TL_TELEPHONE_NUMBER_LABEL",
+                      value: response !== null && response !== void 0 && (_response$tradeLicens39 = response.tradeLicenseDetail) !== null && _response$tradeLicens39 !== void 0 && (_response$tradeLicens40 = _response$tradeLicens39.institution) !== null && _response$tradeLicens40 !== void 0 && _response$tradeLicens40.contactNo || (response === null || response === void 0 ? void 0 : (_response$tradeLicens41 = response.tradeLicenseDetail) === null || _response$tradeLicens41 === void 0 ? void 0 : (_response$tradeLicens42 = _response$tradeLicens41.institution) === null || _response$tradeLicens42 === void 0 ? void 0 : _response$tradeLicens42.contactNo) !== "" ? response === null || response === void 0 ? void 0 : (_response$tradeLicens43 = response.tradeLicenseDetail) === null || _response$tradeLicens43 === void 0 ? void 0 : (_response$tradeLicens44 = _response$tradeLicens43.institution) === null || _response$tradeLicens44 === void 0 ? void 0 : _response$tradeLicens44.contactNo : "NA"
+                    }, {
+                      title: "TL_OWNER_S_MOBILE_NUM_LABEL",
+                      value: (owner === null || owner === void 0 ? void 0 : owner.mobileNumber) || "NA"
+                    }, {
+                      title: "TL_NEW_OWNER_DETAILS_NAME_LABEL",
+                      value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens45 = response.tradeLicenseDetail) === null || _response$tradeLicens45 === void 0 ? void 0 : (_response$tradeLicens46 = _response$tradeLicens45.institution) === null || _response$tradeLicens46 === void 0 ? void 0 : _response$tradeLicens46.name) || "NA"
+                    }, {
+                      title: "TL_NEW_OWNER_DETAILS_EMAIL_LABEL",
+                      value: owner !== null && owner !== void 0 && owner.emailId || (owner === null || owner === void 0 ? void 0 : owner.emailId) !== "" ? owner === null || owner === void 0 ? void 0 : owner.emailId : "NA"
+                    }]
+                  };
+                }),
+                documents: [{
+                  title: "PT_COMMON_DOCS",
+                  values: response === null || response === void 0 ? void 0 : (_response$tradeLicens47 = response.tradeLicenseDetail) === null || _response$tradeLicens47 === void 0 ? void 0 : (_response$tradeLicens48 = _response$tradeLicens47.applicationDocuments) === null || _response$tradeLicens48 === void 0 ? void 0 : _response$tradeLicens48.map(function (document) {
+                    return {
+                      title: "TL_NEW_" + (document === null || document === void 0 ? void 0 : document.documentType.replace(".", "_")),
+                      documentType: document === null || document === void 0 ? void 0 : document.documentType,
+                      documentUid: document === null || document === void 0 ? void 0 : document.documentUid,
+                      fileStoreId: document === null || document === void 0 ? void 0 : document.fileStoreId
+                    };
+                  })
+                }]
+              }
+            } : {
+              title: "ES_NEW_APPLICATION_OWNERSHIP_DETAILS",
+              additionalDetails: {
+                owners: response === null || response === void 0 ? void 0 : (_response$tradeLicens49 = response.tradeLicenseDetail) === null || _response$tradeLicens49 === void 0 ? void 0 : (_response$tradeLicens50 = _response$tradeLicens49.owners) === null || _response$tradeLicens50 === void 0 ? void 0 : _response$tradeLicens50.map(function (owner, index) {
+                  var _response$tradeLicens51, _response$tradeLicens52;
 
-        var numOfApplications = [];
+                  var subOwnerShipCategory = response !== null && response !== void 0 && (_response$tradeLicens51 = response.tradeLicenseDetail) !== null && _response$tradeLicens51 !== void 0 && _response$tradeLicens51.subOwnerShipCategory ? "COMMON_MASTERS_OWNERSHIPCATEGORY_" + stringReplaceAll$2(response === null || response === void 0 ? void 0 : (_response$tradeLicens52 = response.tradeLicenseDetail) === null || _response$tradeLicens52 === void 0 ? void 0 : _response$tradeLicens52.subOwnerShipCategory, ".", "_") : "NA";
+                  return {
+                    title: Number(checkOwnerLength) > 1 ? "TL_PAYMENT_PAID_BY_PLACEHOLDER" : "",
+                    values: [{
+                      title: "TL_NEW_OWNER_DETAILS_OWNERSHIP_TYPE_LABEL",
+                      value: subOwnerShipCategory
+                    }, {
+                      title: "TL_OWNER_S_NAME_LABEL",
+                      value: (owner === null || owner === void 0 ? void 0 : owner.name) || "NA"
+                    }, {
+                      title: "TL_OWNER_S_MOBILE_NUM_LABEL",
+                      value: (owner === null || owner === void 0 ? void 0 : owner.mobileNumber) || "NA"
+                    }, {
+                      title: "TL_GUARDIAN_S_NAME_LABEL",
+                      value: (owner === null || owner === void 0 ? void 0 : owner.fatherOrHusbandName) || "NA"
+                    }, {
+                      title: "TL_RELATIONSHIP_WITH_GUARDIAN_LABEL",
+                      value: (owner === null || owner === void 0 ? void 0 : owner.relationship) || "NA"
+                    }, {
+                      title: "TL_NEW_OWNER_DETAILS_GENDER_LABEL",
+                      value: (owner === null || owner === void 0 ? void 0 : owner.gender) || "NA"
+                    }, {
+                      title: "TL_NEW_OWNER_DETAILS_EMAIL_LABEL",
+                      value: (owner === null || owner === void 0 ? void 0 : owner.emailId) || "NA"
+                    }, {
+                      title: "TL_OWNER_SPECIAL_CATEGORY",
+                      value: owner !== null && owner !== void 0 && owner.ownerType ? "COMMON_MASTERS_OWNERTYPE_" + (owner === null || owner === void 0 ? void 0 : owner.ownerType) : "NA"
+                    }, {
+                      title: "TL_NEW_OWNER_DETAILS_ADDR_LABEL",
+                      value: (owner === null || owner === void 0 ? void 0 : owner.permanentAddress) || "NA"
+                    }]
+                  };
+                }),
+                documents: [{
+                  title: "PT_COMMON_DOCS",
+                  values: response === null || response === void 0 ? void 0 : (_response$tradeLicens53 = response.tradeLicenseDetail) === null || _response$tradeLicens53 === void 0 ? void 0 : (_response$tradeLicens54 = _response$tradeLicens53.applicationDocuments) === null || _response$tradeLicens54 === void 0 ? void 0 : _response$tradeLicens54.map(function (document) {
+                    return {
+                      title: "TL_NEW_" + (document === null || document === void 0 ? void 0 : document.documentType.replace(".", "_")),
+                      documentType: document === null || document === void 0 ? void 0 : document.documentType,
+                      documentUid: document === null || document === void 0 ? void 0 : document.documentUid,
+                      fileStoreId: document === null || document === void 0 ? void 0 : document.fileStoreId
+                    };
+                  })
+                }]
+              }
+            };
 
-        var _temp = function () {
-          if (response !== null && response !== void 0 && response.licenseNumber) {
-            var licenseNumbers = response === null || response === void 0 ? void 0 : response.licenseNumber;
-            var filters = {
-              licenseNumbers: licenseNumbers,
-              offset: 0
+            if ((response === null || response === void 0 ? void 0 : response.workflowCode) == "NewTL" && (response === null || response === void 0 ? void 0 : response.status) !== "APPROVED") {
+              var _response$tradeLicens55, _response$tradeLicens56;
+
+              var details = {
+                title: "",
+                values: [{
+                  title: "TL_COMMON_TABLE_COL_APP_NO",
+                  value: (response === null || response === void 0 ? void 0 : response.applicationNumber) || "NA"
+                }, {
+                  title: "TL_APPLICATION_CHALLAN_LABEL",
+                  value: (response === null || response === void 0 ? void 0 : (_response$tradeLicens55 = response.tradeLicenseDetail) === null || _response$tradeLicens55 === void 0 ? void 0 : _response$tradeLicens55.channel) && "TL_CHANNEL_" + (response === null || response === void 0 ? void 0 : (_response$tradeLicens56 = response.tradeLicenseDetail) === null || _response$tradeLicens56 === void 0 ? void 0 : _response$tradeLicens56.channel) || "NA"
+                }]
+              };
+              response && employeeResponse.push(details);
+            }
+
+            response && employeeResponse.push(tradedetails);
+            (response === null || response === void 0 ? void 0 : (_response$tradeLicens57 = response.tradeLicenseDetail) === null || _response$tradeLicens57 === void 0 ? void 0 : _response$tradeLicens57.tradeUnits) && employeeResponse.push(tradeUnits);
+            (response === null || response === void 0 ? void 0 : (_response$tradeLicens58 = response.tradeLicenseDetail) === null || _response$tradeLicens58 === void 0 ? void 0 : _response$tradeLicens58.accessories) && employeeResponse.push(accessories);
+            (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop48 = propertyDetails.Properties) === null || _propertyDetails$Prop48 === void 0 ? void 0 : _propertyDetails$Prop48.length) > 0 && employeeResponse.push(PropertyDetail);
+            response && !((propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop49 = propertyDetails.Properties) === null || _propertyDetails$Prop49 === void 0 ? void 0 : _propertyDetails$Prop49.length) > 0) && employeeResponse.push(tradeAddress);
+            (response === null || response === void 0 ? void 0 : (_response$tradeLicens59 = response.tradeLicenseDetail) === null || _response$tradeLicens59 === void 0 ? void 0 : _response$tradeLicens59.owners) && employeeResponse.push(owners);
+            return {
+              tenantId: response.tenantId,
+              applicationDetails: employeeResponse,
+              additionalDetails: response === null || response === void 0 ? void 0 : response.additionalDetails,
+              applicationData: response,
+              numOfApplications: numOfApplications
             };
-            return Promise.resolve(TLSearch.numberOfApplications(tenantId, filters)).then(function (_TLSearch$numberOfApp) {
-              numOfApplications = _TLSearch$numberOfApp;
-            });
           }
-        }();
 
-        return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
+          var numOfApplications = [];
+
+          var _temp = function () {
+            if (response !== null && response !== void 0 && response.licenseNumber) {
+              var licenseNumbers = response === null || response === void 0 ? void 0 : response.licenseNumber;
+              var filters = {
+                licenseNumbers: licenseNumbers,
+                offset: 0
+              };
+              return Promise.resolve(TLSearch.numberOfApplications(tenantId, filters)).then(function (_TLSearch$numberOfApp) {
+                numOfApplications = _TLSearch$numberOfApp;
+              });
+            }
+          }();
+
+          return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
+        }
+
+        var _response$tradeLicens = response === null || response === void 0 ? void 0 : (_response$tradeLicens60 = response.tradeLicenseDetail) === null || _response$tradeLicens60 === void 0 ? void 0 : (_response$tradeLicens61 = _response$tradeLicens60.additionalDetail) === null || _response$tradeLicens61 === void 0 ? void 0 : _response$tradeLicens61.propertyId;
+
+        return _response$tradeLicens ? Promise.resolve(Digit.PTService.search({
+          tenantId: tenantId,
+          filters: {
+            propertyIds: response === null || response === void 0 ? void 0 : (_response$tradeLicens62 = response.tradeLicenseDetail) === null || _response$tradeLicens62 === void 0 ? void 0 : (_response$tradeLicens63 = _response$tradeLicens62.additionalDetail) === null || _response$tradeLicens63 === void 0 ? void 0 : _response$tradeLicens63.propertyId
+          }
+        })).then(_temp3) : _temp3(_response$tradeLicens);
       });
     } catch (e) {
       return Promise.reject(e);
@@ -41520,6 +42969,9 @@ var useTLGenderMDMS = function useTLGenderMDMS(tenantId, moduleCode, type, confi
   switch (type) {
     case "GenderType":
       return useTLGenders();
+
+    default:
+      return null;
   }
 };
 
@@ -41790,21 +43242,45 @@ var ReceiptsService = {
       }, filters, searchParams)
     });
   },
-  receipt_download: function receipt_download(bussinessService, consumerCode, tenantId, pdfKey) {
+  receipt_download: function receipt_download(bussinessService, consumerCode, tenantId, pdfKey, receiptNumbers) {
+    var newParam = {
+      bussinessService: bussinessService,
+      tenantId: tenantId
+    };
+
+    if (receiptNumbers) {
+      newParam['receiptNumbers'] = receiptNumbers;
+    } else {
+      newParam['consumerCode'] = consumerCode;
+    }
+
     return Request({
-      url: Urls.receipts.receipt_download,
+      url: Urls.mcollect.receipt_download,
       data: {},
       useCache: true,
       method: "POST",
-      params: {
-        bussinessService: bussinessService,
-        consumerCode: consumerCode,
-        tenantId: tenantId,
-        pdfKey: pdfKey
-      },
+      params: _extends({}, newParam),
+      auth: window.location.href.includes("pt/property/my-payments") ? false : true,
+      locale: true,
+      userService: window.location.href.includes("pt/property/my-payments") ? false : true,
+      userDownload: true
+    });
+  },
+  bill_download: function bill_download(bussinessService, consumerCode, tenantId, pdfKey) {
+    var newParam = {
+      bussinessService: bussinessService,
+      tenantId: tenantId,
+      consumerCode: consumerCode
+    };
+    return Request({
+      url: Urls.mcollect.bill_download,
+      data: {},
+      useCache: true,
+      method: "POST",
+      params: _extends({}, newParam),
       auth: true,
-      userService: true,
       locale: true,
+      userService: true,
       userDownload: true
     });
   },
@@ -41823,7 +43299,7 @@ var ReceiptsService = {
   }
 };
 
-var _excluded$2 = ["isLoading", "error", "data"];
+var _excluded$3 = ["isLoading", "error", "data"];
 var useReceiptsSearch = function useReceiptsSearch(searchparams, tenantId, filters, isupdated, config) {
   if (config === void 0) {
     config = {};
@@ -41838,7 +43314,7 @@ var useReceiptsSearch = function useReceiptsSearch(searchparams, tenantId, filte
       isLoading = _useQuery.isLoading,
       error = _useQuery.error,
       data = _useQuery.data,
-      rest = _objectWithoutPropertiesLoose(_useQuery, _excluded$2);
+      rest = _objectWithoutPropertiesLoose(_useQuery, _excluded$3);
 
   return _extends({
     isLoading: isLoading,
@@ -42009,6 +43485,9 @@ var useReceiptsMDMS = function useReceiptsMDMS(tenantId, type, config) {
 
     case "CancelReceiptReasonAndStatus":
       return useCancelReceiptReasonAndStatus();
+
+    default:
+      return null;
   }
 };
 
@@ -42072,6 +43551,46 @@ var SearchMdmsTypes = {
       }
     });
   },
+  useBPAServiceTypes: function useBPAServiceTypes(tenantId) {
+    return reactQuery.useQuery([tenantId, "BPA_MDMS_SERVICE_STATUS"], function () {
+      return MdmsService.getDataByCriteria(tenantId, {
+        details: {
+          tenantId: tenantId,
+          moduleDetails: [{
+            moduleName: "BPA",
+            masterDetails: [{
+              name: "BPAAppicationMapping"
+            }]
+          }]
+        }
+      }, "BPA");
+    }, {
+      select: function select(data) {
+        var _data$BPA3, _data$BPA3$BPAAppicat;
+
+        return [].concat(data === null || data === void 0 ? void 0 : (_data$BPA3 = data.BPA) === null || _data$BPA3 === void 0 ? void 0 : (_data$BPA3$BPAAppicat = _data$BPA3.BPAAppicationMapping) === null || _data$BPA3$BPAAppicat === void 0 ? void 0 : _data$BPA3$BPAAppicat.filter(function (currentObject) {
+          var _currentObject$roles;
+
+          var flag = 0;
+          currentObject === null || currentObject === void 0 ? void 0 : (_currentObject$roles = currentObject.roles) === null || _currentObject$roles === void 0 ? void 0 : _currentObject$roles.map(function (bpaRole) {
+            var _Digit$UserService$ge, _Digit$UserService$ge2;
+
+            var found = (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : (_Digit$UserService$ge2 = _Digit$UserService$ge.info) === null || _Digit$UserService$ge2 === void 0 ? void 0 : _Digit$UserService$ge2.roles.some(function (role) {
+              return (role === null || role === void 0 ? void 0 : role.code) === bpaRole;
+            });
+            if (found == true) flag = 1;
+          });
+          if (flag == 1) return true;else return false;
+        }).map(function (type) {
+          return {
+            code: type.code,
+            i18nKey: "BPA_SERVICETYPE_" + type.code,
+            applicationType: type.applicationType
+          };
+        }));
+      }
+    });
+  },
   getFormConfig: function getFormConfig(tenantId, config) {
     return reactQuery.useQuery([tenantId, "FORM_CONFIG"], function () {
       return MdmsService.getDataByCriteria(tenantId, {
@@ -42142,15 +43661,15 @@ var useMDMS$4 = function useMDMS(tenantId, moduleCode, type, config, payload) {
   }
 };
 
-var mapWfBybusinessId$1 = function mapWfBybusinessId(workflowData) {
+var mapWfBybusinessId$2 = function mapWfBybusinessId(workflowData) {
   return workflowData === null || workflowData === void 0 ? void 0 : workflowData.reduce(function (acc, item) {
     acc[item === null || item === void 0 ? void 0 : item.businessId] = item;
     return acc;
   }, {});
 };
 
-var combineResponse = function combineResponse(applications, workflowData, totalCount) {
-  var workflowInstances = mapWfBybusinessId$1(workflowData);
+var combineResponse$1 = function combineResponse(applications, workflowData, totalCount) {
+  var workflowInstances = mapWfBybusinessId$2(workflowData);
   return applications.map(function (application) {
     var _workflowInstances$ap, _workflowInstances$ap2, _workflowInstances$ap3, _workflowInstances$ap4, _workflowInstances$ap5;
 
@@ -42169,7 +43688,6 @@ var useEmpBPAREGSearch = function useEmpBPAREGSearch(tenantId, filters, params,
 
   return reactQuery.useQuery(['BPA_REG_WORK_SEARCH', tenantId, filters, params], function () {
     try {
-      var userInfo = Digit.UserService.getUser();
       return Promise.resolve(Digit.OBPSService.BPAREGSearch(tenantId, filters, params)).then(function (response) {
         var businessIds = response === null || response === void 0 ? void 0 : response.Licenses.map(function (application) {
           return application.applicationNumber;
@@ -42177,7 +43695,7 @@ var useEmpBPAREGSearch = function useEmpBPAREGSearch(tenantId, filters, params,
         return Promise.resolve(Digit.WorkflowService.getAllApplication(Digit.ULBService.getStateId(), {
           businessIds: businessIds.join()
         })).then(function (workflowRes) {
-          return combineResponse(response === null || response === void 0 ? void 0 : response.Licenses, workflowRes === null || workflowRes === void 0 ? void 0 : workflowRes.ProcessInstances, response === null || response === void 0 ? void 0 : response.Count);
+          return combineResponse$1(response === null || response === void 0 ? void 0 : response.Licenses, workflowRes === null || workflowRes === void 0 ? void 0 : workflowRes.ProcessInstances, response === null || response === void 0 ? void 0 : response.Count);
         });
       });
     } catch (e) {
@@ -42504,14 +44022,16 @@ var OBPSService = {
   BPADetailsPage: function (tenantId, filters) {
     try {
       return Promise.resolve(OBPSService.BPASearch(tenantId, filters)).then(function (response) {
-        var _response$BPA;
+        var _response$BPA, _response$BPA2, _response$BPA2$, _response$BPA2$$addit, _response$BPA3, _response$BPA3$, _response$BPA3$$addit;
 
         if (!(response !== null && response !== void 0 && (_response$BPA = response.BPA) !== null && _response$BPA !== void 0 && _response$BPA.length)) {
           return;
         }
 
-        var _response$BPA2 = response === null || response === void 0 ? void 0 : response.BPA,
-            BPA = _response$BPA2[0];
+        sessionStorage.setItem("BPA_ARCHITECT_NAME", JSON.stringify(response !== null && response !== void 0 && (_response$BPA2 = response.BPA) !== null && _response$BPA2 !== void 0 && (_response$BPA2$ = _response$BPA2[0]) !== null && _response$BPA2$ !== void 0 && (_response$BPA2$$addit = _response$BPA2$.additionalDetails) !== null && _response$BPA2$$addit !== void 0 && _response$BPA2$$addit.typeOfArchitect ? response === null || response === void 0 ? void 0 : (_response$BPA3 = response.BPA) === null || _response$BPA3 === void 0 ? void 0 : (_response$BPA3$ = _response$BPA3[0]) === null || _response$BPA3$ === void 0 ? void 0 : (_response$BPA3$$addit = _response$BPA3$.additionalDetails) === null || _response$BPA3$$addit === void 0 ? void 0 : _response$BPA3$$addit.typeOfArchitect : "ARCHITECT"));
+
+        var _response$BPA4 = response === null || response === void 0 ? void 0 : response.BPA,
+            BPA = _response$BPA4[0];
 
         return Promise.resolve(OBPSService.scrutinyDetails(BPA === null || BPA === void 0 ? void 0 : BPA.tenantId, {
           edcrNumber: BPA === null || BPA === void 0 ? void 0 : BPA.edcrNumber
@@ -42538,8 +44058,23 @@ var OBPSService = {
                   ocdcrNumber: BPA !== null && BPA !== void 0 && BPA.edcrNumber.includes("OCDCR") ? BPA === null || BPA === void 0 ? void 0 : BPA.edcrNumber : bpaResponse === null || bpaResponse === void 0 ? void 0 : (_bpaResponse$BPA = bpaResponse.BPA) === null || _bpaResponse$BPA === void 0 ? void 0 : (_bpaResponse$BPA$ = _bpaResponse$BPA[0]) === null || _bpaResponse$BPA$ === void 0 ? void 0 : _bpaResponse$BPA$.edcrNumber,
                   edcrNumber: bpaResponse !== null && bpaResponse !== void 0 && (_bpaResponse$BPA2 = bpaResponse.BPA) !== null && _bpaResponse$BPA2 !== void 0 && (_bpaResponse$BPA2$ = _bpaResponse$BPA2[0]) !== null && _bpaResponse$BPA2$ !== void 0 && _bpaResponse$BPA2$.edcrNumber.includes("OCDCR") ? BPA === null || BPA === void 0 ? void 0 : BPA.edcrNumber : bpaResponse === null || bpaResponse === void 0 ? void 0 : (_bpaResponse$BPA3 = bpaResponse.BPA) === null || _bpaResponse$BPA3 === void 0 ? void 0 : (_bpaResponse$BPA3$ = _bpaResponse$BPA3[0]) === null || _bpaResponse$BPA3$ === void 0 ? void 0 : _bpaResponse$BPA3$.edcrNumber
                 };
+
+                function ConvertEpochToValidityDate(dateEpoch) {
+                  if (dateEpoch == null || dateEpoch == undefined || dateEpoch == '') {
+                    return "NA";
+                  }
+
+                  var dateFromApi = new Date(dateEpoch);
+                  var month = dateFromApi.getMonth() + 1;
+                  var day = dateFromApi.getDate();
+                  var year = dateFromApi.getFullYear() - 3;
+                  month = (month > 9 ? "" : "0") + month;
+                  day = (day > 9 ? "" : "0") + day;
+                  return day + "/" + month + "/" + year;
+                }
+
                 return Promise.resolve(OBPSService.comparisionReport(BPA === null || BPA === void 0 ? void 0 : BPA.tenantId, _extends({}, comparisionRep))).then(function (comparisionReport) {
-                  var _BPA$additionalDetail, _BPA$additionalDetail2, _BPA$additionalDetail3, _BPA$additionalDetail4, _BPA$additionalDetail5, _permitcondn, _permitcondn2, _BPA$auditDetails, _BPA$auditDetails2, _edcr$planDetail3, _edcr$planDetail3$pla, _edcr$planDetail4, _edcr$planDetail4$pla, _edcr$planDetail5, _edcr$planDetail5$pla, _edcr$planDetail6, _edcr$planDetail6$pla, _edcr$planDetail7, _edcr$planDetail7$pla, _BPA$additionalDetail8, _BPA$additionalDetail9, _edcr$planDetail8, _edcr$planDetail8$blo, _edcr$planDetail8$blo2, _edcr$planDetail8$blo3, _edcr$planDetail9, _edcr$planDetail9$blo, _edcr$planDetail9$blo2, _edcr$planDetail9$blo3, _edcr$planDetail10, _edcr$planDetail10$bl, _edcr$planDetail10$bl2, _edcr$planDetail10$bl3, _edcr$planDetail11, _edcr$planDetail11$pl, _BPA$landInfo, _BPA$landInfo$address, _BPA$landInfo2, _BPA$landInfo2$addres, _BPA$landInfo3, _BPA$landInfo3$addres, _BPA$landInfo3$addres2, _BPA$landInfo4, _BPA$landInfo4$addres, _BPA$landInfo5, _BPA$landInfo5$addres, _BPA$landInfo6, _BPA$landInfo6$owners, _BPA$landInfo7, _BPA$landInfo7$owners, _BPA$landInfo9, _BPA$landInfo9$owners, _BPA$documents, _BPA$additionalDetail10, _BPA$additionalDetail11, _BPA$additionalDetail12, _BPA$additionalDetail13, _BPA$additionalDetail14, _BPA$additionalDetail15, _BPA$additionalDetail16, _details;
+                  var _BPA$additionalDetail, _BPA$additionalDetail2, _BPA$additionalDetail3, _BPA$additionalDetail4, _BPA$additionalDetail5, _permitcondn, _permitcondn2, _BPA$auditDetails, _BPA$auditDetails2, _edcr$planDetail3, _edcr$planDetail3$pla, _edcr$planDetail4, _edcr$planDetail4$pla, _edcr$planDetail5, _edcr$planDetail5$pla, _edcr$planDetail6, _edcr$planDetail6$pla, _edcr$planDetail7, _edcr$planDetail7$pla, _BPA$additionalDetail9, _BPA$additionalDetail10, _edcr$planDetail8, _edcr$planDetail8$blo, _edcr$planDetail8$blo2, _edcr$planDetail8$blo3, _edcr$planDetail9, _edcr$planDetail9$blo, _edcr$planDetail9$blo2, _edcr$planDetail9$blo3, _edcr$planDetail10, _edcr$planDetail10$bl, _edcr$planDetail10$bl2, _edcr$planDetail10$bl3, _edcr$planDetail11, _edcr$planDetail11$pl, _BPA$landInfo, _BPA$landInfo$address, _BPA$landInfo2, _BPA$landInfo2$addres, _BPA$landInfo3, _BPA$landInfo3$addres, _BPA$landInfo3$addres2, _BPA$landInfo4, _BPA$landInfo4$addres, _BPA$landInfo5, _BPA$landInfo5$addres, _BPA$landInfo6, _BPA$landInfo6$owners, _BPA$landInfo7, _BPA$landInfo7$owners, _BPA$landInfo9, _BPA$landInfo9$owners, _BPA$documents, _BPA$additionalDetail11, _BPA$additionalDetail12, _BPA$additionalDetail13, _BPA$additionalDetail14, _BPA$additionalDetail15, _BPA$additionalDetail16, _BPA$additionalDetail17, _details;
 
                   var nocDetails = noc === null || noc === void 0 ? void 0 : noc.map(function (nocDetails, index) {
                     var _nocDetails$additiona, _nocDetails$additiona2, _nocDetails$additiona3, _nocDetails$auditDeta, _nocDetails$documents;
@@ -42650,6 +44185,18 @@ var OBPSService = {
                       value: (BPA === null || BPA === void 0 ? void 0 : BPA.applicationNo) || "NA"
                     }]
                   };
+
+                  if (BPA !== null && BPA !== void 0 && BPA.businessService.includes("BPA_OC")) {
+                    var _bpaResponse$BPA4, _bpaResponse$BPA4$, _bpaResponse$BPA5, _bpaResponse$BPA5$;
+
+                    applicationDetailsInfo["values"] = [].concat(applicationDetailsInfo === null || applicationDetailsInfo === void 0 ? void 0 : applicationDetailsInfo.values, [{
+                      title: "BPA_PERMIT_APP_NUMBER",
+                      to: "/digit-ui/employee/obps/bpa/" + (bpaResponse === null || bpaResponse === void 0 ? void 0 : (_bpaResponse$BPA4 = bpaResponse.BPA) === null || _bpaResponse$BPA4 === void 0 ? void 0 : (_bpaResponse$BPA4$ = _bpaResponse$BPA4[0]) === null || _bpaResponse$BPA4$ === void 0 ? void 0 : _bpaResponse$BPA4$.applicationNo),
+                      value: bpaResponse === null || bpaResponse === void 0 ? void 0 : (_bpaResponse$BPA5 = bpaResponse.BPA) === null || _bpaResponse$BPA5 === void 0 ? void 0 : (_bpaResponse$BPA5$ = _bpaResponse$BPA5[0]) === null || _bpaResponse$BPA5$ === void 0 ? void 0 : _bpaResponse$BPA5$.applicationNo,
+                      isLink: true
+                    }]);
+                  }
+
                   var permitcondn = [];
                   (BPA === null || BPA === void 0 ? void 0 : (_BPA$additionalDetail3 = BPA.additionalDetails) === null || _BPA$additionalDetail3 === void 0 ? void 0 : _BPA$additionalDetail3.pendingapproval) && (BPA === null || BPA === void 0 ? void 0 : (_BPA$additionalDetail4 = BPA.additionalDetails) === null || _BPA$additionalDetail4 === void 0 ? void 0 : _BPA$additionalDetail4.pendingapproval.length) > 0 && (BPA === null || BPA === void 0 ? void 0 : (_BPA$additionalDetail5 = BPA.additionalDetails) === null || _BPA$additionalDetail5 === void 0 ? void 0 : _BPA$additionalDetail5.pendingapproval.map(function (ob, index) {
                     permitcondn.push({
@@ -42674,7 +44221,7 @@ var OBPSService = {
                   }
 
                   if (BPA !== null && BPA !== void 0 && BPA.approvalNo) {
-                    var _applicationDetailsIn, _applicationDetailsIn2, _BPA$additionalDetail6, _BPA$additionalDetail7;
+                    var _applicationDetailsIn, _applicationDetailsIn2, _BPA$additionalDetail6, _BPA$additionalDetail7, _BPA$additionalDetail8;
 
                     applicationDetailsInfo === null || applicationDetailsInfo === void 0 ? void 0 : (_applicationDetailsIn = applicationDetailsInfo.values) === null || _applicationDetailsIn === void 0 ? void 0 : _applicationDetailsIn.push({
                       title: (BPA === null || BPA === void 0 ? void 0 : BPA.businessService) !== "BPA_OC" ? "BPA_PERMIT_NUMBER_LABEL" : "BPA_OC_PERMIT_NUMBER_LABEL",
@@ -42682,7 +44229,7 @@ var OBPSService = {
                     });
                     applicationDetailsInfo === null || applicationDetailsInfo === void 0 ? void 0 : (_applicationDetailsIn2 = applicationDetailsInfo.values) === null || _applicationDetailsIn2 === void 0 ? void 0 : _applicationDetailsIn2.push({
                       title: (BPA === null || BPA === void 0 ? void 0 : BPA.businessService) !== "BPA_OC" ? "BPA_PERMIT_VALIDITY" : "BPA_OC_PERMIT_VALIDITY",
-                      value: BPA !== null && BPA !== void 0 && (_BPA$additionalDetail6 = BPA.additionalDetails) !== null && _BPA$additionalDetail6 !== void 0 && _BPA$additionalDetail6.validityDate ? dateFns.format(new Date(BPA === null || BPA === void 0 ? void 0 : BPA.applicationDate), 'dd/MM/yyyy') + " - " + dateFns.format(new Date(BPA === null || BPA === void 0 ? void 0 : (_BPA$additionalDetail7 = BPA.additionalDetails) === null || _BPA$additionalDetail7 === void 0 ? void 0 : _BPA$additionalDetail7.validityDate), 'dd/MM/yyyy') : "NA"
+                      value: BPA !== null && BPA !== void 0 && (_BPA$additionalDetail6 = BPA.additionalDetails) !== null && _BPA$additionalDetail6 !== void 0 && _BPA$additionalDetail6.validityDate ? ConvertEpochToValidityDate(BPA === null || BPA === void 0 ? void 0 : (_BPA$additionalDetail7 = BPA.additionalDetails) === null || _BPA$additionalDetail7 === void 0 ? void 0 : _BPA$additionalDetail7.validityDate) + " - " + dateFns.format(new Date(BPA === null || BPA === void 0 ? void 0 : (_BPA$additionalDetail8 = BPA.additionalDetails) === null || _BPA$additionalDetail8 === void 0 ? void 0 : _BPA$additionalDetail8.validityDate), 'dd/MM/yyyy') : "NA"
                     });
                   }
 
@@ -42731,11 +44278,11 @@ var OBPSService = {
                       isNotTranslated: true
                     }, {
                       title: "BPA_HOLDING_NUMBER_LABEL",
-                      value: (BPA === null || BPA === void 0 ? void 0 : (_BPA$additionalDetail8 = BPA.additionalDetails) === null || _BPA$additionalDetail8 === void 0 ? void 0 : _BPA$additionalDetail8.holdingNo) || "NA",
+                      value: (BPA === null || BPA === void 0 ? void 0 : (_BPA$additionalDetail9 = BPA.additionalDetails) === null || _BPA$additionalDetail9 === void 0 ? void 0 : _BPA$additionalDetail9.holdingNo) || "NA",
                       isNotTranslated: true
                     }, {
                       title: "BPA_BOUNDARY_LAND_REG_DETAIL_LABEL",
-                      value: (BPA === null || BPA === void 0 ? void 0 : (_BPA$additionalDetail9 = BPA.additionalDetails) === null || _BPA$additionalDetail9 === void 0 ? void 0 : _BPA$additionalDetail9.registrationDetails) || "NA",
+                      value: (BPA === null || BPA === void 0 ? void 0 : (_BPA$additionalDetail10 = BPA.additionalDetails) === null || _BPA$additionalDetail10 === void 0 ? void 0 : _BPA$additionalDetail10.registrationDetails) || "NA",
                       isNotTranslated: true
                     }]
                   };
@@ -42928,7 +44475,7 @@ var OBPSService = {
                   var val;
                   var i;
                   var FieldInspectionData = [];
-                  inspectionReport && (BPA === null || BPA === void 0 ? void 0 : (_BPA$additionalDetail10 = BPA.additionalDetails) === null || _BPA$additionalDetail10 === void 0 ? void 0 : (_BPA$additionalDetail11 = _BPA$additionalDetail10.fieldinspection_pending) === null || _BPA$additionalDetail11 === void 0 ? void 0 : (_BPA$additionalDetail12 = _BPA$additionalDetail11[0]) === null || _BPA$additionalDetail12 === void 0 ? void 0 : _BPA$additionalDetail12.questions.length) > 0 && inspectionReport.map(function (ob, index) {
+                  inspectionReport && (BPA === null || BPA === void 0 ? void 0 : (_BPA$additionalDetail11 = BPA.additionalDetails) === null || _BPA$additionalDetail11 === void 0 ? void 0 : (_BPA$additionalDetail12 = _BPA$additionalDetail11.fieldinspection_pending) === null || _BPA$additionalDetail12 === void 0 ? void 0 : (_BPA$additionalDetail13 = _BPA$additionalDetail12[0]) === null || _BPA$additionalDetail13 === void 0 ? void 0 : _BPA$additionalDetail13.questions.length) > 0 && inspectionReport.map(function (ob, index) {
                     if (ob.title.includes("FI_REPORT")) FieldInspectionData = [].concat(FieldInspectionData, [{
                       title: ob.title,
                       additionalDetails: {
@@ -42969,10 +44516,10 @@ var OBPSService = {
                   var fiReports = {
                     title: "",
                     isFieldInspection: true,
-                    isNotAllowed: (BPA === null || BPA === void 0 ? void 0 : (_BPA$additionalDetail13 = BPA.additionalDetails) === null || _BPA$additionalDetail13 === void 0 ? void 0 : (_BPA$additionalDetail14 = _BPA$additionalDetail13.fieldinspection_pending) === null || _BPA$additionalDetail14 === void 0 ? void 0 : _BPA$additionalDetail14.length) > 0 ? false : true,
+                    isNotAllowed: (BPA === null || BPA === void 0 ? void 0 : (_BPA$additionalDetail14 = BPA.additionalDetails) === null || _BPA$additionalDetail14 === void 0 ? void 0 : (_BPA$additionalDetail15 = _BPA$additionalDetail14.fieldinspection_pending) === null || _BPA$additionalDetail15 === void 0 ? void 0 : _BPA$additionalDetail15.length) > 0 ? false : true,
                     additionalDetails: {
                       values: [],
-                      fiReport: (BPA === null || BPA === void 0 ? void 0 : (_BPA$additionalDetail15 = BPA.additionalDetails) === null || _BPA$additionalDetail15 === void 0 ? void 0 : (_BPA$additionalDetail16 = _BPA$additionalDetail15.fieldinspection_pending) === null || _BPA$additionalDetail16 === void 0 ? void 0 : _BPA$additionalDetail16.length) > 0 ? true : false
+                      fiReport: (BPA === null || BPA === void 0 ? void 0 : (_BPA$additionalDetail16 = BPA.additionalDetails) === null || _BPA$additionalDetail16 === void 0 ? void 0 : (_BPA$additionalDetail17 = _BPA$additionalDetail16.fieldinspection_pending) === null || _BPA$additionalDetail17 === void 0 ? void 0 : _BPA$additionalDetail17.length) > 0 ? true : false
                     }
                   };
 
@@ -43012,15 +44559,15 @@ var convertMillisecondsToDays = function convertMillisecondsToDays(milliseconds)
   return Math.round(milliseconds / (1000 * 60 * 60 * 24));
 };
 
-var mapWfBybusinessId$2 = function mapWfBybusinessId(workflowData) {
+var mapWfBybusinessId$3 = function mapWfBybusinessId(workflowData) {
   return workflowData === null || workflowData === void 0 ? void 0 : workflowData.reduce(function (acc, item) {
     acc[item === null || item === void 0 ? void 0 : item.businessId] = item;
     return acc;
   }, {});
 };
 
-var combineResponse$1 = function combineResponse(applications, workflowData) {
-  var workflowInstances = mapWfBybusinessId$2(workflowData);
+var combineResponse$2 = function combineResponse(applications, workflowData) {
+  var workflowInstances = mapWfBybusinessId$3(workflowData);
   return applications.map(function (application) {
     var _workflowInstances$ap, _workflowInstances$ap2, _workflowInstances$ap3, _workflowInstances$ap4, _workflowInstances$ap5, _workflowInstances$ap6;
 
@@ -43051,7 +44598,7 @@ var useBPASearch = function useBPASearch(tenantId, filters, config) {
         var _exit = false;
 
         function _temp5(_result3) {
-          return _exit ? _result3 : combineResponse$1(response === null || response === void 0 ? void 0 : response.BPA, processInstanceArray);
+          return _exit ? _result3 : combineResponse$2(response === null || response === void 0 ? void 0 : response.BPA, processInstanceArray);
         }
 
         var tenantMap = {},
@@ -43088,8 +44635,7 @@ var useBPASearch = function useBPASearch(tenantId, filters, config) {
               })).then(function (payload) {
                 processInstanceArray = processInstanceArray.concat(payload.ProcessInstances);
               });
-            }, function (error) {
-              console.error(error);
+            }, function () {
               var _temp = [];
               _exit = true;
               return _temp;
@@ -43303,13 +44849,13 @@ var useBPADetails = function useBPADetails(tenantId, filters, config) {
   }, config);
 };
 
-var _excluded$3 = ["tenantId", "businessService"];
+var _excluded$4 = ["tenantId", "businessService"];
 var useBPAREGgetbill = function useBPAREGgetbill(_ref, config) {
   var _Digit$UserService$ge, _Digit$UserService$ge2;
 
   var tenantId = _ref.tenantId,
       businessService = _ref.businessService,
-      filters = _objectWithoutPropertiesLoose(_ref, _excluded$3);
+      filters = _objectWithoutPropertiesLoose(_ref, _excluded$4);
 
   if (config === void 0) {
     config = {};
@@ -43467,6 +45013,10 @@ var useBPAInbox = function useBPAInbox(_ref) {
     tenantId = Digit.ULBService.getStateId();
   }
 
+  if (applicationType === "BUILDING_OC_PLAN_SCRUTINY" && window.location.href.includes("obps/inbox") && businessService) {
+    businessService = "BPA_OC";
+  }
+
   var _filters = {
     tenantId: tenantId,
     processSearchCriteria: _extends({
@@ -43488,10 +45038,8 @@ var useBPAInbox = function useBPAInbox(_ref) {
       sortOrder: sortOrder
     } : {}, sortBy ? {
       sortBy: sortBy
-    } : {}, (applicationType === null || applicationType === void 0 ? void 0 : applicationType.length) > 0 ? {
-      applicationType: applicationType.map(function (item) {
-        return item.code;
-      }).join(",")
+    } : {}, applicationType && (applicationType === null || applicationType === void 0 ? void 0 : applicationType.length) > 0 ? {
+      applicationType: applicationType
     } : {}, (locality === null || locality === void 0 ? void 0 : locality.length) > 0 ? {
       locality: locality.map(function (item) {
         return item.code.split("_").pop();
@@ -43571,7 +45119,7 @@ var useEDCRInbox = function useEDCRInbox(_ref2) {
   } : {}, status ? {
     status: status
   } : {}, sortOrder ? {
-    sortBy: sortOrder
+    orderBy: sortOrder
   } : {}, appliactionType ? {
     appliactionType: appliactionType
   } : {}, {
@@ -43668,9 +45216,7 @@ var useArchitectInbox = function useArchitectInbox(_ref) {
       tenantId: tenantId,
       processSearchCriteria: _extends({
         moduleName: moduleName ? moduleName : "bpa-services",
-        businessService: (businessService === null || businessService === void 0 ? void 0 : businessService.length) > 0 ? businessService.map(function (o) {
-          return o.code;
-        }) : ["BPA_LOW", "BPA", "BPA_OC"]
+        businessService: (businessService === null || businessService === void 0 ? void 0 : businessService.length) > 0 ? [businessService] : ["BPA_LOW", "BPA", "BPA_OC"]
       }, (applicationStatus === null || applicationStatus === void 0 ? void 0 : applicationStatus.length) > 0 ? {
         status: applicationStatus
       } : {}),
@@ -43678,7 +45224,7 @@ var useArchitectInbox = function useArchitectInbox(_ref) {
         assignee: assignee
       }, mobileNumber ? {
         mobileNumber: mobileNumber
-      } : {}, applicationType ? {
+      } : {}, applicationType && applicationType.length > 0 ? {
         applicationType: applicationType
       } : {}, serviceType ? {
         serviceType: serviceType
@@ -43730,9 +45276,7 @@ var useArchitectInbox = function useArchitectInbox(_ref) {
                     });
                   });
                 });
-              }, function (error) {
-                console.error("error", error);
-              });
+              }, function () {});
 
               if (_temp3 && _temp3.then) return _temp3.then(function () {});
             }
@@ -43835,16 +45379,12 @@ var useServiceTypeFromApplicationType = function useServiceTypeFromApplicationTy
   var _SearchMdmsTypes$useA = SearchMdmsTypes.useApplicationTypes(tenantId),
       applicationTypes = _SearchMdmsTypes$useA.data;
 
-  var _SearchMdmsTypes$useS = SearchMdmsTypes.useServiceTypes(tenantId),
-      serviceTypes = _SearchMdmsTypes$useS.data,
-      isLoadingServiceTypes = _SearchMdmsTypes$useS.isLoading;
+  var _SearchMdmsTypes$useB = SearchMdmsTypes.useBPAServiceTypes(tenantId),
+      serviceTypes = _SearchMdmsTypes$useB.data,
+      isLoadingServiceTypes = _SearchMdmsTypes$useB.isLoading;
 
   var ServiceTypes = React.useMemo(function () {
-    var serviceTypesWithStakeholer = [].concat(serviceTypes ? serviceTypes : [], [{
-      applicationType: ["BPA_STAKEHOLDER_REGISTRATION"],
-      code: "BPA_STAKEHOLDER_REGISTRATION",
-      i18nKey: "BPA_SERVICETYPE_BPA_STAKEHOLDER_REGISTRATION"
-    }]);
+    var serviceTypesWithStakeholer = [].concat(serviceTypes ? serviceTypes : []);
     return serviceTypesWithStakeholer === null || serviceTypesWithStakeholer === void 0 ? void 0 : serviceTypesWithStakeholer.filter(function (e) {
       return e.applicationType.includes(Applicationtype);
     }).map(function (e) {
@@ -43858,8 +45398,20 @@ var useServiceTypeFromApplicationType = function useServiceTypeFromApplicationTy
     code: "BPA_STAKEHOLDER_REGISTRATION",
     i18nKey: "WF_BPA_BPA_STAKEHOLDER_REGISTRATION"
   }]);
+  var filteredapplicationTypes = React.useMemo(function () {
+    return applicationTypesWithStakeholder.filter(function (curr) {
+      var temp = 0;
+      serviceTypes === null || serviceTypes === void 0 ? void 0 : serviceTypes.map(function (ob) {
+        var found = ob && (ob === null || ob === void 0 ? void 0 : ob.applicationType) && (ob === null || ob === void 0 ? void 0 : ob.applicationType.some(function (ap) {
+          return ap === curr.code;
+        }));
+        if (found) temp = 1;
+      });
+      if (temp == 1) return true;else return false;
+    });
+  }, [serviceTypes, applicationTypesWithStakeholder]);
   return {
-    applicationTypes: applicationTypesWithStakeholder,
+    applicationTypes: filteredapplicationTypes,
     ServiceTypes: ServiceTypes
   };
 };
@@ -43869,23 +45421,21 @@ var useBusinessServiceBasedOnServiceType = function useBusinessServiceBasedOnSer
   var configData = {
     BUILDING_PLAN_SCRUTINY: [{
       code: "BPA_LOW",
-      i18nKey: "WF_BPA_LOW"
+      i18nKey: "WF_BPA_LOW_LABEL"
     }, {
       code: "BPA",
-      i18nKey: "WF_BPA"
+      i18nKey: "WF_BPA_LABEL"
     }],
     BUILDING_OC_PLAN_SCRUTINY: [{
+      code: "BPA_OC_LOW",
+      i18nKey: "WF_BPA_LOW_LABEL"
+    }, {
       code: "BPA_OC",
-      i18nKey: "WF_BPA_OC"
+      i18nKey: "WF_BPA_LABEL"
     }]
   };
-  var selectedBusinessServicesObjectin2dArray = applicationType === null || applicationType === void 0 ? void 0 : applicationType.map(function (type) {
-    return configData[type.code];
-  });
-  var selectedBusinessServices = (selectedBusinessServicesObjectin2dArray === null || selectedBusinessServicesObjectin2dArray === void 0 ? void 0 : selectedBusinessServicesObjectin2dArray.length) > 0 ? selectedBusinessServicesObjectin2dArray === null || selectedBusinessServicesObjectin2dArray === void 0 ? void 0 : selectedBusinessServicesObjectin2dArray.reduce(function (acc, curr) {
-    return [].concat(acc, curr);
-  }, []) : null;
-  return selectedBusinessServices;
+  var selectedBusinessServicesObjectin2dArray = configData[applicationType];
+  return selectedBusinessServicesObjectin2dArray;
 };
 
 var useBusinessServiceData = function useBusinessServiceData(tenantId, businessServices, config) {
@@ -43950,7 +45500,7 @@ var useBPATaxDocuments = function useBPATaxDocuments(stateId, formData, PrevStat
   };
 };
 
-var combineResponse$2 = function combineResponse(data, users) {
+var combineResponse$3 = function combineResponse(data, users) {
   var _data$events;
 
   data.events = data === null || data === void 0 ? void 0 : (_data$events = data.events) === null || _data$events === void 0 ? void 0 : _data$events.map(function (event) {
@@ -43993,7 +45543,7 @@ var useInbox$2 = function useInbox(tenantId, data, filter, config) {
         return Promise.resolve(Digit.UserService.userSearch(null, {
           uuid: uuids
         }, {})).then(function (usersResponse) {
-          return combineResponse$2(eventData, usersResponse === null || usersResponse === void 0 ? void 0 : usersResponse.user);
+          return combineResponse$3(eventData, usersResponse === null || usersResponse === void 0 ? void 0 : usersResponse.user);
         });
       });
     } catch (e) {
@@ -44223,11 +45773,13 @@ var Surveys = {
   showResults: function showResults(details) {
     return Request({
       url: Urls.engagement.surveys.showResults,
-      data: details,
       useCache: true,
       userService: true,
       method: "POST",
-      auth: true
+      auth: true,
+      params: {
+        surveyId: details.surveyId
+      }
     });
   }
 };
@@ -44383,7 +45935,7 @@ var NOCSearch = {
       return Promise.resolve(NOCSearch.application(tenantId, filter)).then(function (response) {
         function _temp4() {
           function _temp2() {
-            var _bpaResponse, _bpaResponse$, _edcrResponse, _edcrResponse2, _edcrResponse3;
+            var _bpaResponse, _bpaResponse$, _bpaResponse2, _bpaResponse2$, _edcrResponse, _edcrResponse2, _edcrResponse3;
 
             var employeeResponse = [];
             var buildingDetails = {
@@ -44391,7 +45943,14 @@ var NOCSearch = {
               asSectionHeader: true,
               values: [{
                 title: "NOC_APP_NO_LABEL",
-                value: ((_bpaResponse = bpaResponse) === null || _bpaResponse === void 0 ? void 0 : (_bpaResponse$ = _bpaResponse[0]) === null || _bpaResponse$ === void 0 ? void 0 : _bpaResponse$.applicationNo) || "NA"
+                value: /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
+                  to: "/digit-ui/employee/obps/bpa/" + ((_bpaResponse = bpaResponse) === null || _bpaResponse === void 0 ? void 0 : (_bpaResponse$ = _bpaResponse[0]) === null || _bpaResponse$ === void 0 ? void 0 : _bpaResponse$.applicationNo)
+                }, /*#__PURE__*/React__default.createElement("span", {
+                  className: "link",
+                  style: {
+                    color: "#F47738"
+                  }
+                }, (_bpaResponse2 = bpaResponse) === null || _bpaResponse2 === void 0 ? void 0 : (_bpaResponse2$ = _bpaResponse2[0]) === null || _bpaResponse2$ === void 0 ? void 0 : _bpaResponse2$.applicationNo)))
               }, {
                 title: "NOC_MODULE_SOURCE_LABEL",
                 value: t(response === null || response === void 0 ? void 0 : response.source) || "NA"
@@ -44415,13 +45974,13 @@ var NOCSearch = {
           var edcrResponse = {};
 
           var _temp = function () {
-            var _bpaResponse2, _bpaResponse2$;
+            var _bpaResponse3, _bpaResponse3$;
 
-            if ((_bpaResponse2 = bpaResponse) !== null && _bpaResponse2 !== void 0 && (_bpaResponse2$ = _bpaResponse2[0]) !== null && _bpaResponse2$ !== void 0 && _bpaResponse2$.edcrNumber) {
-              var _bpaResponse3, _bpaResponse3$;
+            if ((_bpaResponse3 = bpaResponse) !== null && _bpaResponse3 !== void 0 && (_bpaResponse3$ = _bpaResponse3[0]) !== null && _bpaResponse3$ !== void 0 && _bpaResponse3$.edcrNumber) {
+              var _bpaResponse4, _bpaResponse4$;
 
               var bpaFilter = {
-                edcrNumber: (_bpaResponse3 = bpaResponse) === null || _bpaResponse3 === void 0 ? void 0 : (_bpaResponse3$ = _bpaResponse3[0]) === null || _bpaResponse3$ === void 0 ? void 0 : _bpaResponse3$.edcrNumber
+                edcrNumber: (_bpaResponse4 = bpaResponse) === null || _bpaResponse4 === void 0 ? void 0 : (_bpaResponse4$ = _bpaResponse4[0]) === null || _bpaResponse4$ === void 0 ? void 0 : _bpaResponse4$.edcrNumber
               };
               return Promise.resolve(NOCSearch.scrutinyDetails(tenantId, bpaFilter)).then(function (_NOCSearch$scrutinyDe) {
                 edcrResponse = _NOCSearch$scrutinyDe;
@@ -44475,7 +46034,8 @@ var useNOCInbox = function useNOCInbox(_ref) {
   var businessService = filterForm.businessService,
       applicationStatus = filterForm.applicationStatus,
       locality = filterForm.locality,
-      assignee = filterForm.assignee;
+      assignee = filterForm.assignee,
+      businessServiceArray = filterForm.businessServiceArray;
   var sourceRefId = searchForm.sourceRefId,
       applicationNo = searchForm.applicationNo;
   var sortBy = tableForm.sortBy,
@@ -44486,7 +46046,7 @@ var useNOCInbox = function useNOCInbox(_ref) {
     tenantId: tenantId,
     processSearchCriteria: _extends({
       moduleName: "noc-services",
-      businessService: businessService ? [businessService.code] : ["FIRE_NOC_SRV", "FIRE_NOC_OFFLINE", "AIRPORT_NOC_OFFLINE", "AIRPORT_NOC_SRV"]
+      businessService: businessService !== null && businessService !== void 0 && businessService.code ? [businessService === null || businessService === void 0 ? void 0 : businessService.code] : businessServiceArray
     }, (applicationStatus === null || applicationStatus === void 0 ? void 0 : applicationStatus.length) > 0 ? {
       status: applicationStatus
     } : {}),
@@ -44536,6 +46096,279 @@ var useNOCInbox = function useNOCInbox(_ref) {
   });
 };
 
+var useNOCSearchApplication = function useNOCSearchApplication(tenantId, filters, config) {
+  if (config === void 0) {
+    config = {};
+  }
+
+  return reactQuery.useQuery(["APPLICATION_SEARCH", "NOC_SEARCH", tenantId].concat(Object.entries(filters)), function () {
+    return NOCSearch.all(tenantId, filters);
+  }, config);
+};
+
+var WSSearchMdmsTypes = {
+  useWSServicesMasters: function useWSServicesMasters(tenantId) {
+    return reactQuery.useQuery([tenantId, "WS_WS_SERVICES_MASTERS"], function () {
+      return MdmsService.getDataByCriteria(tenantId, {
+        details: {
+          tenantId: tenantId,
+          moduleDetails: [{
+            moduleName: "ws-services-masters",
+            masterDetails: [{
+              name: "Documents"
+            }]
+          }]
+        }
+      }, "ws-services-masters");
+    }, {
+      select: function select(data) {
+        var _data$wsServicesMas, _data$wsServicesMas$D;
+
+        data === null || data === void 0 ? void 0 : (_data$wsServicesMas = data["ws-services-masters"]) === null || _data$wsServicesMas === void 0 ? void 0 : (_data$wsServicesMas$D = _data$wsServicesMas.Documents) === null || _data$wsServicesMas$D === void 0 ? void 0 : _data$wsServicesMas$D.forEach(function (type) {
+          type.code = type.code;
+          type.i18nKey = type.code ? type.code.replaceAll('.', '_') : "";
+          type.dropdownData.forEach(function (value) {
+            value.i18nKey = value.code ? value.code.replaceAll('.', '_') : "";
+          });
+        });
+        return data !== null && data !== void 0 && data["ws-services-masters"] ? data === null || data === void 0 ? void 0 : data["ws-services-masters"] : [];
+      }
+    });
+  },
+  useWSServicesCalculation: function useWSServicesCalculation(tenantId) {
+    return reactQuery.useQuery([tenantId, "WS_WS_SERVICES_CALCULATION"], function () {
+      return MdmsService.getDataByCriteria(tenantId, {
+        details: {
+          tenantId: tenantId,
+          moduleDetails: [{
+            moduleName: "ws-services-calculation",
+            masterDetails: [{
+              name: "PipeSize"
+            }]
+          }]
+        }
+      }, "ws-services-calculation");
+    }, {
+      select: function select(data) {
+        var _data$wsServicesCal, _data$wsServicesCal$P;
+
+        data === null || data === void 0 ? void 0 : (_data$wsServicesCal = data["ws-services-calculation"]) === null || _data$wsServicesCal === void 0 ? void 0 : (_data$wsServicesCal$P = _data$wsServicesCal.PipeSize) === null || _data$wsServicesCal$P === void 0 ? void 0 : _data$wsServicesCal$P.forEach(function (type) {
+          type.i18nKey = type.size ? type.size + " Inches" : "";
+        });
+        return data !== null && data !== void 0 && data["ws-services-calculation"] ? data === null || data === void 0 ? void 0 : data["ws-services-calculation"] : [];
+      }
+    });
+  }
+};
+
+var usewsTenants = function usewsTenants() {
+  var tenantInfo = Digit.SessionStorage.get("WS_TENANTS");
+
+  var _useState = React.useState(tenantInfo ? tenantInfo : null),
+      tenants = _useState[0];
+
+  return tenants;
+};
+
+var getDate = function getDate(epochdate) {
+  return epochdate ? new Date(epochdate).getDate() + "/" + (new Date(epochdate).getMonth() + 1) + "/" + new Date(epochdate).getFullYear().toString() : "NA";
+};
+
+var getAddress = function getAddress(address, t) {
+  return (address !== null && address !== void 0 && address.doorNo ? (address === null || address === void 0 ? void 0 : address.doorNo) + ", " : "") + " " + (address !== null && address !== void 0 && address.street ? (address === null || address === void 0 ? void 0 : address.street) + ", " : "") + (address !== null && address !== void 0 && address.landmark ? (address === null || address === void 0 ? void 0 : address.landmark) + ", " : "") + t(address === null || address === void 0 ? void 0 : address.locality.code) + ", " + t(address === null || address === void 0 ? void 0 : address.city.code) + "," + (t(address === null || address === void 0 ? void 0 : address.pincode) ? "" + address.pincode : " ");
+};
+
+var combineResponse$4 = function combineResponse(WaterConnections, properties, billData, t) {
+  if (WaterConnections && properties) return WaterConnections.map(function (app) {
+    var _properties$filter$, _properties$filter$$o, _billData$filter$, _billData$filter$$bil, _billData$filter$$bil2, _billData$filter$2, _billData$filter$2$bi, _billData$filter$2$bi2, _billData$filter$3, _billData$filter$3$bi, _billData$filter$3$bi2;
+
+    return {
+      ConsumerNumber: app === null || app === void 0 ? void 0 : app.connectionNo,
+      ConsumerName: app !== null && app !== void 0 && app.connectionHolders ? app === null || app === void 0 ? void 0 : app.connectionHolders.map(function (owner) {
+        return owner === null || owner === void 0 ? void 0 : owner.name;
+      }).join(",") : (_properties$filter$ = properties.filter(function (prop) {
+        return prop.propertyId === (app === null || app === void 0 ? void 0 : app.propertyId);
+      })[0]) === null || _properties$filter$ === void 0 ? void 0 : (_properties$filter$$o = _properties$filter$.owners) === null || _properties$filter$$o === void 0 ? void 0 : _properties$filter$$o.map(function (ow) {
+        return ow.name;
+      }).join(","),
+      Address: getAddress(properties.filter(function (prop) {
+        return prop.propertyId === (app === null || app === void 0 ? void 0 : app.propertyId);
+      })[0].address, t),
+      AmountDue: billData ? billData !== null && billData !== void 0 && (_billData$filter$ = billData.filter(function (bill) {
+        return (bill === null || bill === void 0 ? void 0 : bill.consumerCode) === (app === null || app === void 0 ? void 0 : app.connectionNo);
+      })[0]) !== null && _billData$filter$ !== void 0 && (_billData$filter$$bil = _billData$filter$.billDetails) !== null && _billData$filter$$bil !== void 0 && (_billData$filter$$bil2 = _billData$filter$$bil[0]) !== null && _billData$filter$$bil2 !== void 0 && _billData$filter$$bil2.amount ? billData === null || billData === void 0 ? void 0 : (_billData$filter$2 = billData.filter(function (bill) {
+        return (bill === null || bill === void 0 ? void 0 : bill.consumerCode) === (app === null || app === void 0 ? void 0 : app.connectionNo);
+      })[0]) === null || _billData$filter$2 === void 0 ? void 0 : (_billData$filter$2$bi = _billData$filter$2.billDetails) === null || _billData$filter$2$bi === void 0 ? void 0 : (_billData$filter$2$bi2 = _billData$filter$2$bi[0]) === null || _billData$filter$2$bi2 === void 0 ? void 0 : _billData$filter$2$bi2.amount : "NA" : "NA",
+      DueDate: billData ? getDate(billData === null || billData === void 0 ? void 0 : (_billData$filter$3 = billData.filter(function (bill) {
+        return (bill === null || bill === void 0 ? void 0 : bill.consumerCode) === (app === null || app === void 0 ? void 0 : app.connectionNo);
+      })[0]) === null || _billData$filter$3 === void 0 ? void 0 : (_billData$filter$3$bi = _billData$filter$3.billDetails) === null || _billData$filter$3$bi === void 0 ? void 0 : (_billData$filter$3$bi2 = _billData$filter$3$bi[0]) === null || _billData$filter$3$bi2 === void 0 ? void 0 : _billData$filter$3$bi2.expiryDate) : "NA"
+    };
+  });else return undefined;
+};
+
+var useWaterSearch = function useWaterSearch(_ref, config) {
+  var _response$data, _response$data$WaterC, _response$data2, _response$data2$Sewer, _response$data3, _properties$data, _billData$data;
+
+  var tenantId = _ref.tenantId,
+      _ref$filters = _ref.filters,
+      filters = _ref$filters === void 0 ? {} : _ref$filters,
+      _ref$BusinessService = _ref.BusinessService,
+      BusinessService = _ref$BusinessService === void 0 ? "WS" : _ref$BusinessService,
+      t = _ref.t;
+
+  if (config === void 0) {
+    config = {};
+  }
+
+  var response = reactQuery.useQuery(['WS_SEARCH', tenantId, filters, BusinessService], function () {
+    try {
+      return Promise.resolve(WSService.search({
+        tenantId: tenantId,
+        filters: _extends({}, filters),
+        businessService: BusinessService
+      }));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, config);
+  var propertyids = "";
+  var consumercodes = "";
+  if (BusinessService === "WS") response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$WaterC = _response$data.WaterConnection) === null || _response$data$WaterC === void 0 ? void 0 : _response$data$WaterC.forEach(function (item) {
+    propertyids = propertyids + (item === null || item === void 0 ? void 0 : item.propertyId) + ",";
+    consumercodes = consumercodes + (item === null || item === void 0 ? void 0 : item.connectionNo) + ",";
+  });else response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$Sewer = _response$data2.SewerageConnections) === null || _response$data2$Sewer === void 0 ? void 0 : _response$data2$Sewer.forEach(function (item) {
+    propertyids = propertyids + (item === null || item === void 0 ? void 0 : item.propertyId) + ",";
+    consumercodes = consumercodes + (item === null || item === void 0 ? void 0 : item.connectionNo) + ",";
+  });
+  var propertyfilter = {
+    propertyIds: propertyids.substring(0, propertyids.length - 1)
+  };
+  if (propertyids !== "" && filters !== null && filters !== void 0 && filters.locality) propertyfilter.locality = filters === null || filters === void 0 ? void 0 : filters.locality;
+  config = {
+    enabled: propertyids !== "" ? true : false
+  };
+  var properties = reactQuery.useQuery(['WSP_SEARCH', tenantId, propertyfilter, BusinessService], function () {
+    try {
+      return Promise.resolve(PTService.search({
+        tenantId: tenantId,
+        filters: propertyfilter,
+        auth: filters !== null && filters !== void 0 && filters.locality ? false : true
+      }));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, config);
+  var billData = reactQuery.useQuery(['BILL_SEARCH', tenantId, consumercodes, BusinessService], function () {
+    try {
+      return Promise.resolve(Digit.PaymentService.fetchBill(tenantId, {
+        businessService: BusinessService,
+        consumerCode: consumercodes.substring(0, propertyids.length - 1)
+      }));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, config);
+  return combineResponse$4(response === null || response === void 0 ? void 0 : (_response$data3 = response.data) === null || _response$data3 === void 0 ? void 0 : _response$data3.WaterConnection, properties === null || properties === void 0 ? void 0 : (_properties$data = properties.data) === null || _properties$data === void 0 ? void 0 : _properties$data.Properties, billData === null || billData === void 0 ? void 0 : (_billData$data = billData.data) === null || _billData$data === void 0 ? void 0 : _billData$data.Bill, t);
+};
+
+var getDate$1 = function getDate(epochdate) {
+  return epochdate ? new Date(epochdate).getDate() + "/" + (new Date(epochdate).getMonth() + 1) + "/" + new Date(epochdate).getFullYear().toString() : "NA";
+};
+
+var getAddress$1 = function getAddress(address, t) {
+  return (address !== null && address !== void 0 && address.doorNo ? (address === null || address === void 0 ? void 0 : address.doorNo) + ", " : "") + " " + (address !== null && address !== void 0 && address.street ? (address === null || address === void 0 ? void 0 : address.street) + ", " : "") + (address !== null && address !== void 0 && address.landmark ? (address === null || address === void 0 ? void 0 : address.landmark) + ", " : "") + t(address === null || address === void 0 ? void 0 : address.locality.code) + ", " + t(address === null || address === void 0 ? void 0 : address.city.code) + "," + (t(address === null || address === void 0 ? void 0 : address.pincode) ? "" + address.pincode : " ");
+};
+
+var combineResponse$5 = function combineResponse(WaterConnections, properties, billData, t) {
+  if (WaterConnections && properties) return WaterConnections.map(function (app) {
+    var _properties$filter$, _properties$filter$$o, _billData$filter$0$bi, _billData$filter$0$bi2, _billData$filter$0$bi3, _billData$filter$0$bi4, _billData$filter$0$bi5, _billData$filter$0$bi6;
+
+    return {
+      ConsumerNumber: app === null || app === void 0 ? void 0 : app.connectionNo,
+      ConsumerName: app !== null && app !== void 0 && app.connectionHolders ? app === null || app === void 0 ? void 0 : app.connectionHolders.map(function (owner) {
+        return owner === null || owner === void 0 ? void 0 : owner.name;
+      }).join(",") : (_properties$filter$ = properties.filter(function (prop) {
+        return prop.propertyId === (app === null || app === void 0 ? void 0 : app.propertyId);
+      })[0]) === null || _properties$filter$ === void 0 ? void 0 : (_properties$filter$$o = _properties$filter$.owners) === null || _properties$filter$$o === void 0 ? void 0 : _properties$filter$$o.map(function (ow) {
+        return ow.name;
+      }).join(","),
+      Address: getAddress$1(properties.filter(function (prop) {
+        return prop.propertyId === (app === null || app === void 0 ? void 0 : app.propertyId);
+      })[0].address, t),
+      AmountDue: billData ? billData !== null && billData !== void 0 && (_billData$filter$0$bi = billData.filter(function (bill) {
+        return (bill === null || bill === void 0 ? void 0 : bill.consumerCode) === (app === null || app === void 0 ? void 0 : app.connectionNo);
+      })[0].billDetails) !== null && _billData$filter$0$bi !== void 0 && (_billData$filter$0$bi2 = _billData$filter$0$bi[0]) !== null && _billData$filter$0$bi2 !== void 0 && _billData$filter$0$bi2.amount ? billData === null || billData === void 0 ? void 0 : (_billData$filter$0$bi3 = billData.filter(function (bill) {
+        return (bill === null || bill === void 0 ? void 0 : bill.consumerCode) === (app === null || app === void 0 ? void 0 : app.connectionNo);
+      })[0].billDetails) === null || _billData$filter$0$bi3 === void 0 ? void 0 : (_billData$filter$0$bi4 = _billData$filter$0$bi3[0]) === null || _billData$filter$0$bi4 === void 0 ? void 0 : _billData$filter$0$bi4.amount : "NA" : "NA",
+      DueDate: billData ? getDate$1(billData === null || billData === void 0 ? void 0 : (_billData$filter$0$bi5 = billData.filter(function (bill) {
+        return (bill === null || bill === void 0 ? void 0 : bill.consumerCode) === (app === null || app === void 0 ? void 0 : app.connectionNo);
+      })[0].billDetails) === null || _billData$filter$0$bi5 === void 0 ? void 0 : (_billData$filter$0$bi6 = _billData$filter$0$bi5[0]) === null || _billData$filter$0$bi6 === void 0 ? void 0 : _billData$filter$0$bi6.expiryDate) : "NA"
+    };
+  });else return undefined;
+};
+
+var useSewarageSearch = function useSewarageSearch(_ref, config) {
+  var _response$data, _response$data$Sewera, _response$data2, _properties$data, _billData$data;
+
+  var tenantId = _ref.tenantId,
+      _ref$filters = _ref.filters,
+      filters = _ref$filters === void 0 ? {} : _ref$filters,
+      _ref$BusinessService = _ref.BusinessService,
+      BusinessService = _ref$BusinessService === void 0 ? "WS" : _ref$BusinessService,
+      t = _ref.t;
+
+  if (config === void 0) {
+    config = {};
+  }
+
+  var response = reactQuery.useQuery(['WS_SEARCH', tenantId, filters, BusinessService], function () {
+    try {
+      return Promise.resolve(WSService.search({
+        tenantId: tenantId,
+        filters: _extends({}, filters),
+        businessService: BusinessService
+      }));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, config);
+  var propertyids = "";
+  var consumercodes = "";
+  response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$Sewera = _response$data.SewerageConnections) === null || _response$data$Sewera === void 0 ? void 0 : _response$data$Sewera.forEach(function (item) {
+    propertyids = propertyids + (item === null || item === void 0 ? void 0 : item.propertyId) + ",";
+    consumercodes = consumercodes + (item === null || item === void 0 ? void 0 : item.connectionNo) + ",";
+  });
+  var propertyfilter = {
+    propertyIds: propertyids.substring(0, propertyids.length - 1)
+  };
+  if (propertyids !== "" && filters !== null && filters !== void 0 && filters.locality) propertyfilter.locality = filters === null || filters === void 0 ? void 0 : filters.locality;
+  config = {
+    enabled: propertyids !== "" ? true : false
+  };
+  var properties = reactQuery.useQuery(['WSP_SEARCH', tenantId, propertyfilter, BusinessService], function () {
+    try {
+      return Promise.resolve(PTService.search({
+        tenantId: tenantId,
+        filters: propertyfilter,
+        auth: filters !== null && filters !== void 0 && filters.locality ? false : true
+      }));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, config);
+  var billData = reactQuery.useQuery(['BILL_SEARCH', tenantId, consumercodes, BusinessService], function () {
+    try {
+      return Promise.resolve(Digit.PaymentService.fetchBill(tenantId, {
+        businessService: BusinessService,
+        consumerCode: consumercodes.substring(0, propertyids.length - 2)
+      }));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, config);
+  return combineResponse$5(response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : _response$data2.SewerageConnections, properties === null || properties === void 0 ? void 0 : (_properties$data = properties.data) === null || _properties$data === void 0 ? void 0 : _properties$data.Properties, billData === null || billData === void 0 ? void 0 : (_billData$data = billData.data) === null || _billData$data === void 0 ? void 0 : _billData$data.Bill, t);
+};
+
 var pgr = {
   useComplaintDetails: useComplaintDetails,
   useComplaintsList: useComplaintsList,
@@ -44577,11 +46410,13 @@ var fsm = {
   useSlum: useSlum,
   usePaymentHistory: usePaymentHistory
 };
-var pt = {
+var pt$1 = {
   usePropertySearch: usePropertySearch,
   usePropertyPayment: usePropertyPayment,
   usePropertyMDMS: usePropertyMDMS,
+  usePropertySearchWithDue: usePropertySearchWithDue,
   usePropertyAPI: usePropertyAPI,
+  usePropertyCreateNUpdateAPI: usePropertyCreateNUpdateAPI,
   usePropertyDocumentSearch: usePropertyDocumentSearch,
   useTenants: useTenants$3,
   useApplicationDetail: useApplicationDetail$1,
@@ -44590,7 +46425,9 @@ var pt = {
   usePropertyAssessment: usePropertyAssessment,
   usePtCalculationEstimate: usePtCalculationEstimate,
   useGenderMDMS: useGenderMDMS,
-  usePTGenderMDMS: usePTGenderMDMS
+  usePTGenderMDMS: usePTGenderMDMS,
+  useMyPropertyPayments: useMyPropertyPayments,
+  useGenericViewProperty: useGenericViewProperty
 };
 var dss = {
   useMDMS: useDssMDMS,
@@ -44694,7 +46531,14 @@ var survey = {
 var noc = {
   useNOCDetails: useNOCDetails,
   useNOCApplicationActions: useNOCApplicationActions,
-  useInbox: useNOCInbox
+  useInbox: useNOCInbox,
+  useNOCSearchApplication: useNOCSearchApplication
+};
+var ws = {
+  WSSearchMdmsTypes: WSSearchMdmsTypes,
+  usewsTenants: usewsTenants,
+  useWaterSearch: useWaterSearch,
+  useSewarageSearch: useSewarageSearch
 };
 var Hooks = {
   useSessionStorage: useSessionStorage,
@@ -44726,7 +46570,7 @@ var Hooks = {
   useInbox: useTLInbox,
   pgr: pgr,
   fsm: fsm,
-  pt: pt,
+  pt: pt$1,
   dss: dss,
   mcollect: mcollect,
   hrms: hrms,
@@ -44736,7 +46580,8 @@ var Hooks = {
   events: events,
   engagement: engagement,
   survey: survey,
-  noc: noc
+  noc: noc,
+  ws: ws
 };
 
 var checkWebview = function checkWebview() {
@@ -44753,7 +46598,6 @@ var mobileCheck = function mobileCheck() {
     if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4))) check = true;
   })(navigator.userAgent || navigator.vendor || window.opera);
 
-  console.debug("check", check);
   return check;
 };
 
@@ -44762,7 +46606,7 @@ var BrowserUtil = {
   isMobile: mobileCheck
 };
 
-function getDate(timestamp) {
+function getDate$2(timestamp) {
   var dt = timestamp ? new Date(timestamp) : new Date();
   var dd = dt.getDate();
   var mm = dt.getMonth() + 1;
@@ -44783,7 +46627,7 @@ var monthNames = ["Jan", "Feb", "March", "Apr", "May", "June", "July", "Aug", "S
 
 var date = {
   __proto__: null,
-  getDate: getDate,
+  getDate: getDate$2,
   monthNames: monthNames
 };
 
@@ -44792,12 +46636,15 @@ var amountFormatter = function amountFormatter(value, denomination) {
     currency: "INR"
   });
 
+  var _useTranslation = reactI18next.useTranslation(),
+      t = _useTranslation.t;
+
   switch (denomination) {
     case "Lac":
-      return "\u20B9 " + currencyFormatter.format((value / 100000).toFixed(2) || 0) + " Lac";
+      return "\u20B9 " + currencyFormatter.format((value / 100000).toFixed(2) || 0) + " " + t("ES_DSS_LAC");
 
     case "Cr":
-      return "\u20B9 " + currencyFormatter.format((value / 10000000).toFixed(2) || 0) + " Cr";
+      return "\u20B9 " + currencyFormatter.format((value / 10000000).toFixed(2) || 0) + " " + t("ES_DSS_CR");
 
     case "Unit":
       return "\u20B9 " + currencyFormatter.format((value === null || value === void 0 ? void 0 : value.toFixed(2)) || 0);
@@ -44818,6 +46665,9 @@ var formatter = function formatter(value, symbol, unit, commaSeparated) {
     case "amount":
       return amountFormatter(value, unit);
 
+    case "Amount":
+      return amountFormatter(value, unit);
+
     case "number":
       if (!commaSeparated) {
         return parseInt(value);
@@ -44863,12 +46713,57 @@ var getInitialRange = function getInitialRange() {
     duration: duration
   };
 };
+var getDefaultFinacialYear = function getDefaultFinacialYear() {
+  var currDate = new Date().getMonth();
+
+  if (currDate < 3) {
+    return {
+      startDate: dateFns.subYears(dateFns.addMonths(dateFns.startOfYear(new Date()), 3), 1),
+      endDate: dateFns.endOfToday(new Date())
+    };
+  } else {
+    return {
+      startDate: dateFns.addMonths(dateFns.startOfYear(new Date()), 3),
+      endDate: dateFns.endOfToday(new Date())
+    };
+  }
+};
+var getCurrentModuleName = function getCurrentModuleName() {
+  var allPaths = window.location.pathname.split('/');
+  return allPaths[allPaths.length - 1];
+};
+var checkSelected = function checkSelected(e, selectedDDRs) {
+  if (!selectedDDRs || (selectedDDRs === null || selectedDDRs === void 0 ? void 0 : selectedDDRs.length) == 0) {
+    return true;
+  } else if (selectedDDRs.find(function (ddr) {
+    return ddr.ddrKey == e.ddrKey;
+  })) {
+    return true;
+  } else {
+    return false;
+  }
+};
+var getCitiesAvailable = function getCitiesAvailable(e, selectedDDRs) {
+  if (!selectedDDRs || (selectedDDRs === null || selectedDDRs === void 0 ? void 0 : selectedDDRs.length) == 0) {
+    return true;
+  } else if (selectedDDRs.find(function (ddr) {
+    return ddr == e.ddrKey;
+  })) {
+    return true;
+  } else {
+    return false;
+  }
+};
 
 var dss$1 = {
   __proto__: null,
   formatter: formatter,
   getDuration: getDuration,
-  getInitialRange: getInitialRange
+  getInitialRange: getInitialRange,
+  getDefaultFinacialYear: getDefaultFinacialYear,
+  getCurrentModuleName: getCurrentModuleName,
+  checkSelected: checkSelected,
+  getCitiesAvailable: getCitiesAvailable
 };
 
 var getLocalityCode = function getLocalityCode(locality, tenantId) {
@@ -44877,7 +46772,7 @@ var getLocalityCode = function getLocalityCode(locality, tenantId) {
 var getRevenueLocalityCode = function getRevenueLocalityCode(locality, tenantId) {
   if (typeof locality === "string") return locality.includes("_") ? locality : tenantId.replace(".", "_").toUpperCase() + "_REVENUE_" + locality;else if (locality.code) return locality.code.includes("_") ? locality : tenantId.replace(".", "_").toUpperCase() + "_REVENUE_" + locality.code;
 };
-var stringReplaceAll$2 = function stringReplaceAll(str, searcher, replaceWith) {
+var stringReplaceAll$3 = function stringReplaceAll(str, searcher, replaceWith) {
   if (str === void 0) {
     str = "";
   }
@@ -44898,21 +46793,21 @@ var stringReplaceAll$2 = function stringReplaceAll(str, searcher, replaceWith) {
 
   return str;
 };
-var checkForNotNull = function checkForNotNull(value) {
+var checkForNotNull$1 = function checkForNotNull(value) {
   if (value === void 0) {
     value = "";
   }
 
   return value && value != null && value != undefined && value != "" ? true : false;
 };
-var convertDotValues = function convertDotValues(value) {
+var convertDotValues$1 = function convertDotValues(value) {
   if (value === void 0) {
     value = "";
   }
 
-  return checkForNotNull(value) && (value.replaceAll && value.replaceAll(".", "_") || value.replace && stringReplaceAll$2(value, ".", "_")) || "NA";
+  return checkForNotNull$1(value) && (value.replaceAll && value.replaceAll(".", "_") || value.replace && stringReplaceAll$3(value, ".", "_")) || "NA";
 };
-var convertToLocale = function convertToLocale(value, key) {
+var convertToLocale$1 = function convertToLocale(value, key) {
   var _convertDotValues;
 
   if (value === void 0) {
@@ -44923,7 +46818,7 @@ var convertToLocale = function convertToLocale(value, key) {
     key = "";
   }
 
-  var convertedValue = (_convertDotValues = convertDotValues(value)) === null || _convertDotValues === void 0 ? void 0 : _convertDotValues.toUpperCase();
+  var convertedValue = (_convertDotValues = convertDotValues$1(value)) === null || _convertDotValues === void 0 ? void 0 : _convertDotValues.toUpperCase();
 
   if (convertedValue == "NA") {
     return "COMMON_NA";
@@ -44931,7 +46826,7 @@ var convertToLocale = function convertToLocale(value, key) {
 
   return key + "_" + convertedValue;
 };
-var getMohallaLocale = function getMohallaLocale(value, tenantId) {
+var getMohallaLocale$1 = function getMohallaLocale(value, tenantId) {
   if (value === void 0) {
     value = "";
   }
@@ -44940,28 +46835,28 @@ var getMohallaLocale = function getMohallaLocale(value, tenantId) {
     tenantId = "";
   }
 
-  var convertedValue = convertDotValues(tenantId);
+  var convertedValue = convertDotValues$1(tenantId);
 
-  if (convertedValue == "NA" || !checkForNotNull(value)) {
+  if (convertedValue == "NA" || !checkForNotNull$1(value)) {
     return "COMMON_NA";
   }
 
   convertedValue = convertedValue.toUpperCase();
-  return convertToLocale(value, convertedValue + "_REVENUE");
+  return convertToLocale$1(value, convertedValue + "_REVENUE");
 };
-var getCityLocale = function getCityLocale(value) {
+var getCityLocale$1 = function getCityLocale(value) {
   if (value === void 0) {
     value = "";
   }
 
-  var convertedValue = convertDotValues(value);
+  var convertedValue = convertDotValues$1(value);
 
-  if (convertedValue == "NA" || !checkForNotNull(value)) {
+  if (convertedValue == "NA" || !checkForNotNull$1(value)) {
     return "COMMON_NA";
   }
 
   convertedValue = convertedValue.toUpperCase();
-  return convertToLocale(convertedValue, "TENANT_TENANTS");
+  return convertToLocale$1(convertedValue, "TENANT_TENANTS");
 };
 var convertToLocaleData = function convertToLocaleData(dropdownValues, key, t) {
   if (dropdownValues === void 0) {
@@ -44973,7 +46868,7 @@ var convertToLocaleData = function convertToLocaleData(dropdownValues, key, t) {
   }
 
   return dropdownValues.map(function (ele) {
-    ele["i18text"] = convertToLocale(ele.code, key);
+    ele["i18text"] = convertToLocale$1(ele.code, key);
 
     if (t) {
       ele["i18text"] = t(ele["i18text"]);
@@ -44982,18 +46877,26 @@ var convertToLocaleData = function convertToLocaleData(dropdownValues, key, t) {
     return ele;
   });
 };
+var getTransformedLocale$1 = function getTransformedLocale(label) {
+  var _label;
+
+  if (typeof label === "number") return label;
+  label = (_label = label) === null || _label === void 0 ? void 0 : _label.trim();
+  return label && label.toUpperCase().replace(/[.:-\s\/]/g, "_");
+};
 
 var locale = {
   __proto__: null,
   getLocalityCode: getLocalityCode,
   getRevenueLocalityCode: getRevenueLocalityCode,
-  stringReplaceAll: stringReplaceAll$2,
-  checkForNotNull: checkForNotNull,
-  convertDotValues: convertDotValues,
-  convertToLocale: convertToLocale,
-  getMohallaLocale: getMohallaLocale,
-  getCityLocale: getCityLocale,
-  convertToLocaleData: convertToLocaleData
+  stringReplaceAll: stringReplaceAll$3,
+  checkForNotNull: checkForNotNull$1,
+  convertDotValues: convertDotValues$1,
+  convertToLocale: convertToLocale$1,
+  getMohallaLocale: getMohallaLocale$1,
+  getCityLocale: getCityLocale$1,
+  convertToLocaleData: convertToLocaleData,
+  getTransformedLocale: getTransformedLocale$1
 };
 
 var calculateRiskType = function calculateRiskType(riskTypes, plotArea, blocks) {
@@ -45079,7 +46982,6 @@ function getBase64Image(tenantId) {
     ctx.drawImage(img, 0, 0);
     return canvas.toDataURL("image/png");
   } catch (e) {
-    console.error("asd", e);
     return "";
   }
 }
@@ -45402,20 +47304,46 @@ var downloadPdf = function downloadPdf(blob, fileName) {
   }
 };
 
-var downloadReceipt = function downloadReceipt(consumerCode, businessService, pdfKey) {
+var downloadReceipt = function downloadReceipt(consumerCode, businessService, pdfKey, tenantId, receiptNumber) {
   if (pdfKey === void 0) {
     pdfKey = "consolidatedreceipt";
   }
 
+  if (receiptNumber === void 0) {
+    receiptNumber = null;
+  }
+
+  try {
+    if (tenantId === undefined) tenantId = Digit.ULBService.getCurrentTenantId();
+    return Promise.resolve(Digit.ReceiptsService.receipt_download(businessService, consumerCode, tenantId, pdfKey, receiptNumber)).then(function (response) {
+      var responseStatus = parseInt(response.status, 10);
+
+      if (responseStatus === 201 || responseStatus === 200) {
+        var filename = receiptNumber ? "receiptNumber-" + receiptNumber + ".pdf" : "consumer-" + consumerCode + ".pdf";
+        downloadPdf(new Blob([response.data], {
+          type: "application/pdf"
+        }), filename);
+      }
+    });
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+var downloadBill = function downloadBill(consumerCode, businessService, pdfKey, tenantId) {
+  if (pdfKey === void 0) {
+    pdfKey = "consolidatedbill";
+  }
+
   try {
-    var tenantId = Digit.ULBService.getCurrentTenantId();
-    return Promise.resolve(Digit.ReceiptsService.receipt_download(businessService, consumerCode, tenantId, pdfKey)).then(function (response) {
+    if (tenantId === undefined) tenantId = Digit.ULBService.getCurrentTenantId();
+    return Promise.resolve(Digit.ReceiptsService.bill_download(businessService, consumerCode, tenantId, pdfKey)).then(function (response) {
       var responseStatus = parseInt(response.status, 10);
 
       if (responseStatus === 201 || responseStatus === 200) {
+        var filename = consumerCode ? "consumerCode-" + consumerCode + ".pdf" : "consumer-" + consumerCode + ".pdf";
         downloadPdf(new Blob([response.data], {
           type: "application/pdf"
-        }), "consumer-" + consumerCode + ".pdf");
+        }), filename);
       }
     });
   } catch (e) {
@@ -45586,6 +47514,12 @@ var getPattern = function getPattern(type) {
   }
 };
 
+var getUnique$1 = function getUnique(arr) {
+  return arr.filter(function (value, index, self) {
+    return self.indexOf(value) === index;
+  });
+};
+
 var getStaticMapUrl = function getStaticMapUrl(latitude, longitude) {
   var _globalConfigs;
 
@@ -45612,19 +47546,21 @@ var routeSubscription = function routeSubscription(pathname) {
 };
 
 var didEmployeeHasRole = function didEmployeeHasRole(role) {
-  var _userInfo$info;
+  var _userInfo$info, _userInfo$info$roles;
 
   var tenantId = Digit.ULBService.getCurrentTenantId();
   var userInfo = Digit.UserService.getUser();
-  var rolearray = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info = userInfo.info) === null || _userInfo$info === void 0 ? void 0 : _userInfo$info.roles.filter(function (item) {
+  var rolearray = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info = userInfo.info) === null || _userInfo$info === void 0 ? void 0 : (_userInfo$info$roles = _userInfo$info.roles) === null || _userInfo$info$roles === void 0 ? void 0 : _userInfo$info$roles.filter(function (item) {
     if (item.code == role && item.tenantId === tenantId) return true;
   });
   return rolearray === null || rolearray === void 0 ? void 0 : rolearray.length;
 };
 
 var pgrAccess = function pgrAccess() {
+  var _userInfo$info2, _userInfo$info2$roles;
+
   var userInfo = Digit.UserService.getUser();
-  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : userInfo.info.roles.map(function (roleData) {
+  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info2 = userInfo.info) === null || _userInfo$info2 === void 0 ? void 0 : (_userInfo$info2$roles = _userInfo$info2.roles) === null || _userInfo$info2$roles === void 0 ? void 0 : _userInfo$info2$roles.map(function (roleData) {
     return roleData.code;
   });
   var pgrRoles = ["PGR_LME", "PGR-ADMIN", "CSR", "CEMP", "FEMP", "DGRO", "ULB Operator", "GRO", "GO", "RO", "GA"];
@@ -45635,8 +47571,10 @@ var pgrAccess = function pgrAccess() {
 };
 
 var fsmAccess = function fsmAccess() {
+  var _userInfo$info3, _userInfo$info3$roles;
+
   var userInfo = Digit.UserService.getUser();
-  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : userInfo.info.roles.map(function (roleData) {
+  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info3 = userInfo.info) === null || _userInfo$info3 === void 0 ? void 0 : (_userInfo$info3$roles = _userInfo$info3.roles) === null || _userInfo$info3$roles === void 0 ? void 0 : _userInfo$info3$roles.map(function (roleData) {
     return roleData.code;
   });
   var fsmRoles = ["FSM_CREATOR_EMP", "FSM_EDITOR_EMP", "FSM_VIEW_EMP", "FSM_REPORT_VIEWER", "FSM_DASHBOARD_VIEWER", "FSM_ADMIN", "FSM_DSO", "FSM_DRIVER", "FSM_EMP_FSTPO", "FSM_COLLECTOR"];
@@ -45647,8 +47585,10 @@ var fsmAccess = function fsmAccess() {
 };
 
 var NOCAccess = function NOCAccess() {
+  var _userInfo$info4, _userInfo$info4$roles;
+
   var userInfo = Digit.UserService.getUser();
-  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : userInfo.info.roles.map(function (roleData) {
+  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info4 = userInfo.info) === null || _userInfo$info4 === void 0 ? void 0 : (_userInfo$info4$roles = _userInfo$info4.roles) === null || _userInfo$info4$roles === void 0 ? void 0 : _userInfo$info4$roles.map(function (roleData) {
     return roleData.code;
   });
   var NOC_ROLES = ["NOC_CEMP", "NOC_DOC_VERIFIER", "NOC_FIELD_INSPECTOR", "NOC_APPROVER", "BPA_NOC_VERIFIER", "AIRPORT_AUTHORITY_APPROVER", "FIRE_NOC_APPROVER", "NOC_DEPT_APPROVER"];
@@ -45659,8 +47599,10 @@ var NOCAccess = function NOCAccess() {
 };
 
 var BPAREGAccess = function BPAREGAccess() {
+  var _userInfo$info5, _userInfo$info5$roles;
+
   var userInfo = Digit.UserService.getUser();
-  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : userInfo.info.roles.map(function (roleData) {
+  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info5 = userInfo.info) === null || _userInfo$info5 === void 0 ? void 0 : (_userInfo$info5$roles = _userInfo$info5.roles) === null || _userInfo$info5$roles === void 0 ? void 0 : _userInfo$info5$roles.map(function (roleData) {
     return roleData.code;
   });
   var BPAREG_ROLES = ["BPAREG_APPROVER", "BPAREG_DOC_VERIFIER"];
@@ -45671,8 +47613,10 @@ var BPAREGAccess = function BPAREGAccess() {
 };
 
 var BPAAccess = function BPAAccess() {
+  var _userInfo$info6, _userInfo$info6$roles;
+
   var userInfo = Digit.UserService.getUser();
-  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : userInfo.info.roles.map(function (roleData) {
+  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info6 = userInfo.info) === null || _userInfo$info6 === void 0 ? void 0 : (_userInfo$info6$roles = _userInfo$info6.roles) === null || _userInfo$info6$roles === void 0 ? void 0 : _userInfo$info6$roles.map(function (roleData) {
     return roleData.code;
   });
   var BPA_ROLES = ["BPA_VERIFIER", "CEMP", "BPA_APPROVER", "BPA_FIELD_INSPECTOR", "BPA_NOC_VERIFIER", "AIRPORT_AUTHORITY_APPROVER", "FIRE_NOC_APPROVER", "NOC_DEPT_APPROVER", "BPA_NOC_VERIFIER", "BPA_TOWNPLANNER", "BPA_ENGINEER", "BPA_BUILDER", "BPA_STRUCTURALENGINEER", "BPA_SUPERVISOR", "BPA_DOC_VERIFIER", "EMPLOYEE"];
@@ -45683,8 +47627,10 @@ var BPAAccess = function BPAAccess() {
 };
 
 var ptAccess = function ptAccess() {
+  var _userInfo$info7, _userInfo$info7$roles;
+
   var userInfo = Digit.UserService.getUser();
-  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : userInfo.info.roles.map(function (roleData) {
+  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info7 = userInfo.info) === null || _userInfo$info7 === void 0 ? void 0 : (_userInfo$info7$roles = _userInfo$info7.roles) === null || _userInfo$info7$roles === void 0 ? void 0 : _userInfo$info7$roles.map(function (roleData) {
     return roleData.code;
   });
   var ptRoles = ["PT_APPROVER", "PT_CEMP", "PT_DOC_VERIFIER", "PT_FIELD_INSPECTOR"];
@@ -45695,8 +47641,10 @@ var ptAccess = function ptAccess() {
 };
 
 var tlAccess = function tlAccess() {
+  var _userInfo$info8, _userInfo$info8$roles;
+
   var userInfo = Digit.UserService.getUser();
-  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : userInfo.info.roles.map(function (roleData) {
+  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info8 = userInfo.info) === null || _userInfo$info8 === void 0 ? void 0 : (_userInfo$info8$roles = _userInfo$info8.roles) === null || _userInfo$info8$roles === void 0 ? void 0 : _userInfo$info8$roles.map(function (roleData) {
     return roleData.code;
   });
   var tlRoles = ["TL_CEMP", "TL_APPROVER", "TL_FIELD_INSPECTOR", "TL_DOC_VERIFIER"];
@@ -45707,8 +47655,10 @@ var tlAccess = function tlAccess() {
 };
 
 var mCollectAccess = function mCollectAccess() {
+  var _userInfo$info9, _userInfo$info9$roles;
+
   var userInfo = Digit.UserService.getUser();
-  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : userInfo.info.roles.map(function (roleData) {
+  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info9 = userInfo.info) === null || _userInfo$info9 === void 0 ? void 0 : (_userInfo$info9$roles = _userInfo$info9.roles) === null || _userInfo$info9$roles === void 0 ? void 0 : _userInfo$info9$roles.map(function (roleData) {
     return roleData.code;
   });
   var mCollectRoles = ["UC_EMP"];
@@ -45719,8 +47669,10 @@ var mCollectAccess = function mCollectAccess() {
 };
 
 var receiptsAccess = function receiptsAccess() {
+  var _userInfo$info10, _userInfo$info10$role;
+
   var userInfo = Digit.UserService.getUser();
-  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : userInfo.info.roles.map(function (roleData) {
+  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info10 = userInfo.info) === null || _userInfo$info10 === void 0 ? void 0 : (_userInfo$info10$role = _userInfo$info10.roles) === null || _userInfo$info10$role === void 0 ? void 0 : _userInfo$info10$role.map(function (roleData) {
     return roleData.code;
   });
   var receiptsRoles = ["CR_PT"];
@@ -45733,8 +47685,10 @@ var receiptsAccess = function receiptsAccess() {
 var hrmsRoles = ["HRMS_ADMIN"];
 
 var hrmsAccess = function hrmsAccess() {
+  var _userInfo$info11, _userInfo$info11$role;
+
   var userInfo = Digit.UserService.getUser();
-  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : userInfo.info.roles.map(function (roleData) {
+  var userRoles = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info11 = userInfo.info) === null || _userInfo$info11 === void 0 ? void 0 : (_userInfo$info11$role = _userInfo$info11.roles) === null || _userInfo$info11$role === void 0 ? void 0 : _userInfo$info11$role.map(function (roleData) {
     return roleData.code;
   });
   var HRMS_ACCESS = userRoles === null || userRoles === void 0 ? void 0 : userRoles.filter(function (role) {
@@ -45746,6 +47700,7 @@ var hrmsAccess = function hrmsAccess() {
 var Utils = {
   pdf: PDFUtil,
   downloadReceipt: downloadReceipt,
+  downloadBill: downloadBill,
   downloadPDFFromLink: downloadPDFFromLink,
   getFileUrl: getFileUrl,
   getFileTypeFromFileStoreURL: getFileTypeFromFileStoreURL,
@@ -45762,6 +47717,7 @@ var Utils = {
   BPAAccess: BPAAccess,
   dss: dss$1,
   obps: obps$1,
+  pt: pt,
   ptAccess: ptAccess,
   NOCAccess: NOCAccess,
   mCollectAccess: mCollectAccess,
@@ -45770,6 +47726,7 @@ var Utils = {
   hrmsAccess: hrmsAccess,
   getPattern: getPattern,
   hrmsRoles: hrmsRoles,
+  getUnique: getUnique$1,
   tlAccess: tlAccess
 };
 
@@ -45833,7 +47790,6 @@ var SubformRegistry = function SubformRegistry(registry) {
       var element = middlewares.filter(function (e) {
         return Object.keys(e)[0] === preceedingName;
       })[0] || null;
-      if (!element) console.error("no middleware with " + preceedingName + " found in " + key + " subForm ");
     }
   };
 
@@ -45902,6 +47858,7 @@ var initLibraries = function initLibraries() {
   setupLibraries("ComponentRegistryService", ComponentRegistryService);
   setupLibraries("StoreData", StoreData);
   setupLibraries("EventsServices", Events);
+  setupLibraries("WSService", WSService);
   setupLibraries("InboxGeneral", InboxGeneral);
   setupLibraries("ShareFiles", ShareFiles);
   setupLibraries("Contexts", Contexts);