From 32657084aa8706086df84a4a0b30cc4572533399 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 13 Oct 2023 10:03:05 +0100 Subject: [PATCH] Remove E2EEBanner We have e2ee now --- src/E2EEBanner.module.css | 23 ------------------ src/E2EEBanner.tsx | 40 -------------------------------- src/home/RegisteredView.tsx | 2 -- src/home/UnauthenticatedView.tsx | 2 -- 4 files changed, 67 deletions(-) delete mode 100644 src/E2EEBanner.module.css delete mode 100644 src/E2EEBanner.tsx diff --git a/src/E2EEBanner.module.css b/src/E2EEBanner.module.css deleted file mode 100644 index dd777493..00000000 --- a/src/E2EEBanner.module.css +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2023 New Vector Ltd - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -.e2eeBanner { - display: flex; - flex-direction: row; - align-items: center; - gap: 12px; - font-size: var(--font-size-caption); -} diff --git a/src/E2EEBanner.tsx b/src/E2EEBanner.tsx deleted file mode 100644 index 8ce30482..00000000 --- a/src/E2EEBanner.tsx +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2023 New Vector Ltd - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -import { Trans } from "react-i18next"; -import { FC } from "react"; - -import { Banner } from "./Banner"; -import styles from "./E2EEBanner.module.css"; -import LockOffIcon from "./icons/LockOff.svg?react"; -import { useEnableE2EE } from "./settings/useSetting"; - -export const E2EEBanner: FC = () => { - const [e2eeEnabled] = useEnableE2EE(); - if (e2eeEnabled) return null; - - return ( - -
- - - Element Call is temporarily not end-to-end encrypted while we test - scalability. - -
-
- ); -}; diff --git a/src/home/RegisteredView.tsx b/src/home/RegisteredView.tsx index 4a130899..691ba18b 100644 --- a/src/home/RegisteredView.tsx +++ b/src/home/RegisteredView.tsx @@ -40,7 +40,6 @@ import { Caption } from "../typography/Typography"; import { Form } from "../form/Form"; import { useEnableE2EE, useOptInAnalytics } from "../settings/useSetting"; import { AnalyticsNotice } from "../analytics/AnalyticsNotice"; -import { E2EEBanner } from "../E2EEBanner"; interface Props { client: MatrixClient; @@ -156,7 +155,6 @@ export const RegisteredView: FC = ({ client }) => { )} - {error && ( diff --git a/src/home/UnauthenticatedView.tsx b/src/home/UnauthenticatedView.tsx index beb419db..18fc47cf 100644 --- a/src/home/UnauthenticatedView.tsx +++ b/src/home/UnauthenticatedView.tsx @@ -43,7 +43,6 @@ import { generateRandomName } from "../auth/generateRandomName"; import { AnalyticsNotice } from "../analytics/AnalyticsNotice"; import { useEnableE2EE, useOptInAnalytics } from "../settings/useSetting"; import { Config } from "../config/Config"; -import { E2EEBanner } from "../E2EEBanner"; export const UnauthenticatedView: FC = () => { const { setClient } = useClient(); @@ -201,7 +200,6 @@ export const UnauthenticatedView: FC = () => { - {error && (