Merge branch 'develop' into refactor/notification-service

client/src/Components/Breadcrumbs/index.jsx

@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import { Box, Breadcrumbs as MUIBreadcrumbs } from "@mui/material";
 import { useTheme } from "@emotion/react";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import ArrowRight from "../../assets/icons/right-arrow.svg?react";
 
 import "./index.css";

client/src/Components/Fallback/index.jsx

@@ -39,7 +39,11 @@ const Fallback = ({
 	const { t } = useTranslation();
 	const [settingsData, setSettingsData] = useState(undefined);
 
-	const [isLoading, error] = useFetchSettings({ setSettingsData });
+	const [isLoading, error] = useFetchSettings({
+		setSettingsData,
+		setIsApiKeySet: () => {},
+		setIsEmailPasswordSet: () => {},
+	});
 	// Custom warning message with clickable link
 	const renderWarningMessage = () => {
 		return (

client/src/Pages/Account/index.jsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import PropTypes from "prop-types";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { useSelector } from "react-redux";
 import { Box, Tab, useTheme } from "@mui/material";
 import CustomTabList from "../../Components/Tab";

client/src/Pages/Auth/CheckEmail.jsx

@@ -2,7 +2,7 @@ import { Box, Button, Stack, Typography } from "@mui/material";
 import { useEffect, useState } from "react";
 import { useTheme } from "@emotion/react";
 import { useDispatch } from "react-redux";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { createToast } from "../../Utils/toastUtils";
 import { forgotPassword } from "../../Features/Auth/authSlice";
 import { Trans, useTranslation } from "react-i18next";

client/src/Pages/Auth/NewPasswordConfirmed.jsx

@@ -1,6 +1,6 @@
 import { Box, Button, Stack, Typography } from "@mui/material";
 import { useTheme } from "@emotion/react";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { useDispatch } from "react-redux";
 import { clearAuthState } from "../../Features/Auth/authSlice";
 import Background from "../../assets/Images/background-grid.svg?react";

client/src/Pages/NotFound/index.jsx

@@ -1,8 +1,7 @@
-import React from "react";
 import PropTypes from "prop-types";
 import NotFoundSvg from "../../../src/assets/Images/sushi_404.svg";
 import { Button, Stack, Typography } from "@mui/material";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { useTheme } from "@emotion/react";
 import { useTranslation } from "react-i18next";
 

client/src/Pages/PageSpeed/Monitors/Components/Card/index.jsx

@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 import PageSpeedIcon from "../../../../../assets/icons/page-speed.svg?react";
 import { StatusLabel } from "../../../../../Components/Label";
 import { Box, Grid, Stack, Typography } from "@mui/material";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { useTheme } from "@emotion/react";
 import { Area, AreaChart, CartesianGrid, ResponsiveContainer, Tooltip } from "recharts";
 import { useSelector } from "react-redux";

client/src/Pages/ServerUnreachable.jsx

@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { Box, Typography, Button, Stack } from "@mui/material";
 import { useTheme } from "@emotion/react";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { networkService } from "../Utils/NetworkService";
 import Alert from "../Components/Alert";
 import { createToast } from "../Utils/toastUtils";

client/src/Pages/Uptime/BulkImport/index.jsx

@@ -10,7 +10,7 @@ import Breadcrumbs from "../../../Components/Breadcrumbs";
 import ConfigBox from "../../../Components/ConfigBox";
 import UploadFile from "./Upload";
 import { useSelector } from "react-redux";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { Trans, useTranslation } from "react-i18next";
 import { useCreateBulkMonitors } from "../../../Hooks/monitorHooks";
 

client/src/Utils/NetworkServiceProvider.jsx

@@ -1,5 +1,5 @@
 import { useDispatch } from "react-redux";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { setNetworkService } from "./NetworkService";
 import NetworkService, { networkService } from "./NetworkService";
 import { store } from "../store";