From f6fc5cad5c742e29972b0d611667cb08edb8f4d7 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Thu, 27 Jul 2023 20:52:02 +0100
Subject: [PATCH] Remove display of key backup signatures from backup settings
(#11333)
* Remove display of Key backup signatures
This is *fiddly* to support in Element-R, and we don't really think it's
offering any value.
* update snapshot
* clean up i18n
---
.../views/settings/_SecureBackupPanel.pcss | 17 ---
.../views/settings/SecureBackupPanel.tsx | 100 ------------------
src/i18n/strings/en_EN.json | 11 --
.../SecureBackupPanel-test.tsx.snap | 3 -
4 files changed, 131 deletions(-)
diff --git a/res/css/views/settings/_SecureBackupPanel.pcss b/res/css/views/settings/_SecureBackupPanel.pcss
index 6dcc8321fd..5ff3cba404 100644
--- a/res/css/views/settings/_SecureBackupPanel.pcss
+++ b/res/css/views/settings/_SecureBackupPanel.pcss
@@ -15,23 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-.mx_SecureBackupPanel_sigValid,
-.mx_SecureBackupPanel_sigInvalid,
-.mx_SecureBackupPanel_deviceVerified,
-.mx_SecureBackupPanel_deviceNotVerified {
- font-weight: bold;
-}
-
-.mx_SecureBackupPanel_sigValid,
-.mx_SecureBackupPanel_deviceVerified {
- color: $e2e-verified-color;
-}
-
-.mx_SecureBackupPanel_sigInvalid,
-.mx_SecureBackupPanel_deviceNotVerified {
- color: $e2e-warning-color;
-}
-
.mx_SecureBackupPanel_deviceName {
font-style: italic;
}
diff --git a/src/components/views/settings/SecureBackupPanel.tsx b/src/components/views/settings/SecureBackupPanel.tsx
index 20bb0eb816..d595de80e0 100644
--- a/src/components/views/settings/SecureBackupPanel.tsx
+++ b/src/components/views/settings/SecureBackupPanel.tsx
@@ -295,105 +295,6 @@ export default class SecureBackupPanel extends React.PureComponent<{}, IState> {
);
}
- let backupSigStatuses: React.ReactNode | undefined = backupSigStatus?.sigs?.map((sig, i) => {
- const deviceName = sig.device ? sig.device.getDisplayName() || sig.device.deviceId : null;
- const validity = (sub: string): JSX.Element => (
-
- {sub}
-
- );
- const verify = (sub: string): JSX.Element => (
-
- {sub}
-
- );
- const device = (sub: string): JSX.Element => (
- {deviceName}
- );
- const fromThisDevice =
- sig.device && sig.device.getFingerprint() === MatrixClientPeg.safeGet().getDeviceEd25519Key();
- const fromThisUser =
- sig.crossSigningId && sig.deviceId === MatrixClientPeg.safeGet().getCrossSigningId();
- let sigStatus;
- if (sig.valid && fromThisUser) {
- sigStatus = _t(
- "Backup has a valid signature from this user",
- {},
- { validity },
- );
- } else if (!sig.valid && fromThisUser) {
- sigStatus = _t(
- "Backup has a invalid signature from this user",
- {},
- { validity },
- );
- } else if (sig.crossSigningId) {
- sigStatus = _t(
- "Backup has a signature from unknown user with ID %(deviceId)s",
- { deviceId: sig.deviceId },
- { verify },
- );
- } else if (!sig.device) {
- sigStatus = _t(
- "Backup has a signature from unknown session with ID %(deviceId)s",
- { deviceId: sig.deviceId },
- { verify },
- );
- } else if (sig.valid && fromThisDevice) {
- sigStatus = _t(
- "Backup has a valid signature from this session",
- {},
- { validity },
- );
- } else if (!sig.valid && fromThisDevice) {
- // it can happen...
- sigStatus = _t(
- "Backup has an invalid signature from this session",
- {},
- { validity },
- );
- } else if (sig.valid && sig.deviceTrust?.isVerified()) {
- sigStatus = _t(
- "Backup has a valid signature from " +
- "verified session ",
- {},
- { validity, verify, device },
- );
- } else if (sig.valid && !sig.deviceTrust?.isVerified()) {
- sigStatus = _t(
- "Backup has a valid signature from " +
- "unverified session ",
- {},
- { validity, verify, device },
- );
- } else if (!sig.valid && sig.deviceTrust?.isVerified()) {
- sigStatus = _t(
- "Backup has an invalid signature from " +
- "verified session ",
- {},
- { validity, verify, device },
- );
- } else if (!sig.valid && !sig.deviceTrust?.isVerified()) {
- sigStatus = _t(
- "Backup has an invalid signature from " +
- "unverified session ",
- {},
- { validity, verify, device },
- );
- }
-
- return {sigStatus}
;
- });
- if (!backupSigStatus?.sigs?.length) {
- backupSigStatuses = _t("Backup is not signed by any of your sessions");
- }
-
let trustedLocally: string | undefined;
if (backupSigStatus?.trusted_locally) {
trustedLocally = _t("This backup is trusted because it has been restored on this session");
@@ -415,7 +316,6 @@ export default class SecureBackupPanel extends React.PureComponent<{}, IState> {
extraDetails = (
<>
{uploadStatus}
- {backupSigStatuses}
{trustedLocally}
);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9e26286544..a909a69fab 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1472,17 +1472,6 @@
"Connect this session to Key Backup": "Connect this session to Key Backup",
"Backing up %(sessionsRemaining)s keys…": "Backing up %(sessionsRemaining)s keys…",
"All keys backed up": "All keys backed up",
- "Backup has a valid signature from this user": "Backup has a valid signature from this user",
- "Backup has a invalid signature from this user": "Backup has a invalid signature from this user",
- "Backup has a signature from unknown user with ID %(deviceId)s": "Backup has a signature from unknown user with ID %(deviceId)s",
- "Backup has a signature from unknown session with ID %(deviceId)s": "Backup has a signature from unknown session with ID %(deviceId)s",
- "Backup has a valid signature from this session": "Backup has a valid signature from this session",
- "Backup has an invalid signature from this session": "Backup has an invalid signature from this session",
- "Backup has a valid signature from verified session ": "Backup has a valid signature from verified session ",
- "Backup has a valid signature from unverified session ": "Backup has a valid signature from unverified session ",
- "Backup has an invalid signature from verified session ": "Backup has an invalid signature from verified session ",
- "Backup has an invalid signature from unverified session ": "Backup has an invalid signature from unverified session ",
- "Backup is not signed by any of your sessions": "Backup is not signed by any of your sessions",
"This backup is trusted because it has been restored on this session": "This backup is trusted because it has been restored on this session",
"Backup version:": "Backup version:",
"Algorithm:": "Algorithm:",
diff --git a/test/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap b/test/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap
index bc8f2400cc..9b51ca323f 100644
--- a/test/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap
+++ b/test/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap
@@ -93,9 +93,6 @@ exports[` suggests connecting session to key backup when ba
-
- Backup is not signed by any of your sessions
-