diff --git a/res/css/views/settings/_SecureBackupPanel.pcss b/res/css/views/settings/_SecureBackupPanel.pcss index 6dcc8321fd7..5ff3cba4040 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 20bb0eb8168..d595de80e06 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 13bcc82fab4..1d93965af7d 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 bc8f2400cc8..9b51ca323f3 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 -