@mseva/digit-ui-module-rentandlease 1.0.21 → 1.0.23

package/dist/index.modern.js

@@ -10121,7 +10121,7 @@ const RentAndLeasePropertyDetails = ({
   config
 }) => {
   const dispatch = useDispatch();
-  const tenantId = window.location.href.includes("citizen") ? window.localStorage.getItem("CITIZEN.CITY") : window.localStorage.getItem("Employee.tenant-id");
+  const tenantId = window.localStorage.getItem("Employee.tenant-id");
   const filters = {
     tenantId,
     searchType: "1"
@@ -10135,16 +10135,6 @@ const RentAndLeasePropertyDetails = ({
     triggerLoader,
     triggerToast
   } = config === null || config === void 0 ? void 0 : config.currStepConfig[0];
-  useEffect(() => {
-    if (triggerLoader) {
-      triggerLoader(isLoading);
-    }
-  }, [isLoading, triggerLoader]);
-  useEffect(() => {
-    if (isError && triggerToast) {
-      triggerToast("ERROR_WHILE_FETCHING_PROPERTIES", true);
-    }
-  }, [isError, triggerToast]);
   const propertyTypeOptions = [{
     name: t("ON_RENT"),
     code: "rent",
@@ -10289,6 +10279,16 @@ const RentAndLeasePropertyDetails = ({
       });
     }
   }, [watch("startDate"), watch("endDate")]);
+  useEffect(() => {
+    if (triggerLoader) {
+      triggerLoader(isLoading);
+    }
+  }, [isLoading, triggerLoader]);
+  useEffect(() => {
+    if (isError && triggerToast) {
+      triggerToast("ERROR_WHILE_FETCHING_PROPERTIES", true);
+    }
+  }, [isError, triggerToast]);
   return /*#__PURE__*/React.createElement("form", {
     onSubmit: handleSubmit(onSubmit)
   }, /*#__PURE__*/React.createElement(CardSectionHeader, {
@@ -13456,7 +13456,7 @@ const MyProperties = ({
     }));
   };
   const handleMakePayment = id => {
-    history.push(`/digit-ui/citizen/payment/collect/rl-services/${id}/${tenantId}?tenantId=${tenantId}`);
+    history.push(`/digit-ui/citizen/payment/my-bills/rl-services/${id}`);
   };
   const submitAction = async (action, property) => {
     const updatedApplicant = {
@@ -13529,7 +13529,7 @@ const MyProperties = ({
     })), ((property === null || property === void 0 ? void 0 : property.status) == "PENDINGPAYMENT" || (property === null || property === void 0 ? void 0 : property.status) == "PENDING_FOR_PAYMENT" || (property === null || property === void 0 ? void 0 : property.status) == "PENDING_FOT_SETLEMENT" && (property === null || property === void 0 ? void 0 : property.amountToBeDeducted) > 0) && /*#__PURE__*/React.createElement(SubmitBar, {
       label: t("CS_APPLICATION_DETAILS_MAKE_PAYMENT"),
       onSubmit: () => handleMakePayment(property === null || property === void 0 ? void 0 : property.applicationNumber)
-    }), (property === null || property === void 0 ? void 0 : property.status) == "APPROVED" && /*#__PURE__*/React.createElement(SubmitBar, {
+    }), (property === null || property === void 0 ? void 0 : property.status) == "APPROVED" && !(property !== null && property !== void 0 && property.expireFlag) && /*#__PURE__*/React.createElement(SubmitBar, {
       label: t("REQUEST_FOR_DISCONNECTION"),
       onSubmit: () => submitAction("REQUEST_FOR_DISCONNECTION", property)
     })));