diff --git a/src/Components/Inputs/Select/index.jsx b/src/Components/Inputs/Select/index.jsx index f0a1d11c0..fa6108351 100644 --- a/src/Components/Inputs/Select/index.jsx +++ b/src/Components/Inputs/Select/index.jsx @@ -83,10 +83,25 @@ const Select = ({ name={name} inputProps={{ id: id }} IconComponent={KeyboardArrowDownIcon} - MenuProps={{ disableScrollLock: true }} + renderValue={(selected) => { + return ( + + {items.find((item) => item._id === selected)?.name} + + ); + }} sx={{ fontSize: 13, + maxWidth: "200px", minWidth: "125px", + "& fieldset": { borderRadius: theme.shape.borderRadius, borderColor: theme.palette.primary.lowContrast, diff --git a/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Area/index.jsx b/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Area/index.jsx index ac6b770ac..1102f72b8 100644 --- a/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Area/index.jsx +++ b/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Area/index.jsx @@ -63,7 +63,7 @@ const DistributedUptimeResponseAreaChart = ({ checks }) => { } minTickGap={0} axisLine={false} diff --git a/src/Pages/DistributedUptime/Details/index.jsx b/src/Pages/DistributedUptime/Details/index.jsx index 24c625c24..420291d22 100644 --- a/src/Pages/DistributedUptime/Details/index.jsx +++ b/src/Pages/DistributedUptime/Details/index.jsx @@ -75,7 +75,6 @@ const DistributedUptimeDetails = () => { ); } - return ( { gap={theme.spacing(8)} > diff --git a/src/Pages/DistributedUptime/Monitors/Hooks/useSubscribeToMonitors.jsx b/src/Pages/DistributedUptime/Monitors/Hooks/useSubscribeToMonitors.jsx index ffca50cd7..3b6c262ba 100644 --- a/src/Pages/DistributedUptime/Monitors/Hooks/useSubscribeToMonitors.jsx +++ b/src/Pages/DistributedUptime/Monitors/Hooks/useSubscribeToMonitors.jsx @@ -25,11 +25,7 @@ const useSubscribeToMonitors = (page, rowsPerPage) => { const initialDataRes = await networkService.getDistributedUptimeMonitors({ teamId: user.teamId, limit: 25, - types: [ - typeof import.meta.env.VITE_DEPIN_TESTING === "undefined" - ? "distributed_http" - : "distributed_test", - ], + types: ["distributed_http"], page, rowsPerPage, }); diff --git a/src/Pages/DistributedUptimeStatus/Status/index.jsx b/src/Pages/DistributedUptimeStatus/Status/index.jsx index b2fb0780f..33bfe6844 100644 --- a/src/Pages/DistributedUptimeStatus/Status/index.jsx +++ b/src/Pages/DistributedUptimeStatus/Status/index.jsx @@ -234,7 +234,7 @@ const DistributedUptimeStatus = () => { direction={{ s: "column", md: "row" }} > { />