From bbd533b07e88475193bcf6085bc029b6560d488c Mon Sep 17 00:00:00 2001 From: AdityaJ2305 Date: Mon, 26 Aug 2024 11:28:11 +0530 Subject: [PATCH] Fix: Render warning only on login page (#8403) --- src/App.tsx | 6 +----- src/Components/Auth/Login.tsx | 3 ++- src/Components/ErrorPages/BrowserWarning.tsx | 16 ++++++++-------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index a0c44478db3..3084755f749 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -8,14 +8,11 @@ import { import ThemedFavicon from "./CAREUI/misc/ThemedFavicon"; import Intergrations from "./Integrations"; import Loading from "./Components/Common/Loading"; -import BrowserWarning from "./Components/ErrorPages/BrowserWarning"; + const App = () => { return ( - <> - }> - @@ -28,7 +25,6 @@ const App = () => { - ); }; diff --git a/src/Components/Auth/Login.tsx b/src/Components/Auth/Login.tsx index 4d49c4458ed..d0114e8bd11 100644 --- a/src/Components/Auth/Login.tsx +++ b/src/Components/Auth/Login.tsx @@ -14,7 +14,7 @@ import rehypeRaw from "rehype-raw"; import { useAuthContext } from "../../Common/hooks/useAuthUser"; import FiltersCache from "../../Utils/FiltersCache"; import { classNames } from "../../Utils/utils"; - +import BrowserWarning from "../ErrorPages/BrowserWarning"; export const Login = (props: { forgot?: boolean }) => { const { signIn } = useAuthContext(); const { @@ -158,6 +158,7 @@ export const Login = (props: { forgot?: boolean }) => { return (
+ {!forgotPassword && }
diff --git a/src/Components/ErrorPages/BrowserWarning.tsx b/src/Components/ErrorPages/BrowserWarning.tsx index 0e427bfc92f..5622e85465c 100644 --- a/src/Components/ErrorPages/BrowserWarning.tsx +++ b/src/Components/ErrorPages/BrowserWarning.tsx @@ -1,10 +1,10 @@ -import React, { useEffect, useState } from "react"; +import { useEffect, useState } from "react"; import browserslist from "browserslist"; import { getUserAgentRegex } from "browserslist-useragent-regexp"; import packageJson from "../../../package.json"; const BrowserWarning = () => { - const [isSupported, setIsSupported] = useState(true); + const [isSupported, setIsSupported] = useState(true); useEffect(() => { const userAgent = window.navigator.userAgent; @@ -28,15 +28,15 @@ const BrowserWarning = () => { } return ( -
-

Unsupported Browser

-

- You are using an unsupported browser. Please switch to a supported - browser for the best experience. +

+
+

Unsupported Browser

+

+ You are using an unsupported browser. Please switch to a supported browser for the best experience.

+
); }; - export default BrowserWarning;