diff --git a/Client/src/Pages/Uptime/NewDetails/Hooks/useCertificateFetch.jsx b/Client/src/Pages/Uptime/NewDetails/Hooks/useCertificateFetch.jsx index 33d2d71c5..9e1c3b44f 100644 --- a/Client/src/Pages/Uptime/NewDetails/Hooks/useCertificateFetch.jsx +++ b/Client/src/Pages/Uptime/NewDetails/Hooks/useCertificateFetch.jsx @@ -1,7 +1,7 @@ import { logger } from "../../../../Utils/Logger"; import { useEffect, useState } from "react"; import { networkService } from "../../../../main"; -import { formatDateWithTz } from "../../../../Utils/DateUtils"; +import { formatDateWithTz } from "../../../../Utils/timeUtils"; const useCertificateFetch = ({ monitor, @@ -38,7 +38,8 @@ const useCertificateFetch = ({ setCertificateIsLoading(false); } }; - }, [authToken, monitorId]); + fetchCertificate(); + }, [authToken, monitorId, certificateDateFormat, uiTimezone, monitor]); return { certificateExpiry, certificateIsLoading }; }; diff --git a/Client/src/Pages/Uptime/NewDetails/index.jsx b/Client/src/Pages/Uptime/NewDetails/index.jsx index 3467f8228..5494146e6 100644 --- a/Client/src/Pages/Uptime/NewDetails/index.jsx +++ b/Client/src/Pages/Uptime/NewDetails/index.jsx @@ -5,10 +5,11 @@ import Breadcrumbs from "../../../Components/Breadcrumbs"; import { Stack } from "@mui/material"; // Utils -import { useEffect, useState } from "react"; +import { useState } from "react"; import { useParams } from "react-router-dom"; import { useSelector } from "react-redux"; -import { useMonitorFetch } from "./Hooks/useMonitorFetch"; +import useMonitorFetch from "./Hooks/useMonitorFetch"; +import useCertificateFetch from "./Hooks/useCertificateFetch"; // Constants const BREADCRUMBS = [ { name: "uptime", path: "/uptime" }, @@ -36,8 +37,16 @@ const UptimeDetails = () => { dateRange, }); - console.log(monitor); + const { certificateExpiry, certificateIsLoading } = useCertificateFetch({ + monitor, + authToken, + monitorId, + certificateDateFormat, + uiTimezone, + }); + console.log(monitor); + console.log(certificateExpiry); return (