From f84a98b933ee0028de1abd0e3e4c3f5d67d6110e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Tue, 21 Sep 2021 08:18:49 +0200 Subject: [PATCH] Fix enum casing once again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- .../views/dialogs/UntrustedDeviceDialog.tsx | 4 +-- .../views/right_panel/VerificationPanel.tsx | 6 ++-- src/components/views/rooms/E2EIcon.tsx | 26 ++++++++--------- src/components/views/rooms/EntityTile.tsx | 4 +-- src/components/views/rooms/EventTile.tsx | 28 +++++++++---------- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/components/views/dialogs/UntrustedDeviceDialog.tsx b/src/components/views/dialogs/UntrustedDeviceDialog.tsx index b1a35d965b..8c503e340d 100644 --- a/src/components/views/dialogs/UntrustedDeviceDialog.tsx +++ b/src/components/views/dialogs/UntrustedDeviceDialog.tsx @@ -19,7 +19,7 @@ import { User } from "matrix-js-sdk/src/models/user"; import { _t } from "../../../languageHandler"; import { MatrixClientPeg } from "../../../MatrixClientPeg"; -import E2EIcon, { E2E_STATE } from "../rooms/E2EIcon"; +import E2EIcon, { E2EState } from "../rooms/E2EIcon"; import AccessibleButton from "../elements/AccessibleButton"; import BaseDialog from "./BaseDialog"; import { IDialogProps } from "./IDialogProps"; @@ -47,7 +47,7 @@ const UntrustedDeviceDialog: React.FC = ({ device, user, onFinished }) = onFinished={onFinished} className="mx_UntrustedDeviceDialog" title={<> - + { _t("Not Trusted") } } > diff --git a/src/components/views/right_panel/VerificationPanel.tsx b/src/components/views/right_panel/VerificationPanel.tsx index d4caf80a29..8ed56bb2c3 100644 --- a/src/components/views/right_panel/VerificationPanel.tsx +++ b/src/components/views/right_panel/VerificationPanel.tsx @@ -28,7 +28,7 @@ import { SAS } from "matrix-js-sdk/src/crypto/verification/SAS"; import VerificationQRCode from "../elements/crypto/VerificationQRCode"; import { _t } from "../../../languageHandler"; import SdkConfig from "../../../SdkConfig"; -import E2EIcon, { E2E_STATE } from "../rooms/E2EIcon"; +import E2EIcon, { E2EState } from "../rooms/E2EIcon"; import { Phase } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest"; import Spinner from "../elements/Spinner"; import { replaceableComponent } from "../../../utils/replaceableComponent"; @@ -189,7 +189,7 @@ export default class VerificationPanel extends React.PureComponent

{ description }

- +

{ _t("Verified") }

{ description }

- + { text ?

{ text }

: null } { _t("Got it") } diff --git a/src/components/views/rooms/E2EIcon.tsx b/src/components/views/rooms/E2EIcon.tsx index 15025ea64c..1a6db4606c 100644 --- a/src/components/views/rooms/E2EIcon.tsx +++ b/src/components/views/rooms/E2EIcon.tsx @@ -23,7 +23,7 @@ import AccessibleButton from "../elements/AccessibleButton"; import Tooltip from "../elements/Tooltip"; import { E2EStatus } from "../../../utils/ShieldUtils"; -export enum E2E_STATE { +export enum E2EState { Verified = "verified", Warning = "warning", Unknown = "unknown", @@ -31,20 +31,20 @@ export enum E2E_STATE { Unauthenticated = "unauthenticated", } -const crossSigningUserTitles: { [key in E2E_STATE]?: string } = { - [E2E_STATE.Warning]: _td("This user has not verified all of their sessions."), - [E2E_STATE.Normal]: _td("You have not verified this user."), - [E2E_STATE.Verified]: _td("You have verified this user. This user has verified all of their sessions."), +const crossSigningUserTitles: { [key in E2EState]?: string } = { + [E2EState.Warning]: _td("This user has not verified all of their sessions."), + [E2EState.Normal]: _td("You have not verified this user."), + [E2EState.Verified]: _td("You have verified this user. This user has verified all of their sessions."), }; -const crossSigningRoomTitles: { [key in E2E_STATE]?: string } = { - [E2E_STATE.Warning]: _td("Someone is using an unknown session"), - [E2E_STATE.Normal]: _td("This room is end-to-end encrypted"), - [E2E_STATE.Verified]: _td("Everyone in this room is verified"), +const crossSigningRoomTitles: { [key in E2EState]?: string } = { + [E2EState.Warning]: _td("Someone is using an unknown session"), + [E2EState.Normal]: _td("This room is end-to-end encrypted"), + [E2EState.Verified]: _td("Everyone in this room is verified"), }; interface IProps { isUser?: boolean; - status?: E2E_STATE | E2EStatus; + status?: E2EState | E2EStatus; className?: string; size?: number; onClick?: () => void; @@ -58,9 +58,9 @@ const E2EIcon: React.FC = ({ isUser, status, className, size, onClick, h const classes = classNames({ mx_E2EIcon: true, mx_E2EIcon_bordered: bordered, - mx_E2EIcon_warning: status === E2E_STATE.Warning, - mx_E2EIcon_normal: status === E2E_STATE.Normal, - mx_E2EIcon_verified: status === E2E_STATE.Verified, + mx_E2EIcon_warning: status === E2EState.Warning, + mx_E2EIcon_normal: status === E2EState.Normal, + mx_E2EIcon_verified: status === E2EState.Verified, }, className); let e2eTitle; diff --git a/src/components/views/rooms/EntityTile.tsx b/src/components/views/rooms/EntityTile.tsx index 2897bb5566..d7dd4b1092 100644 --- a/src/components/views/rooms/EntityTile.tsx +++ b/src/components/views/rooms/EntityTile.tsx @@ -20,7 +20,7 @@ import React from 'react'; import AccessibleButton from '../elements/AccessibleButton'; import { _td } from '../../../languageHandler'; import classNames from "classnames"; -import E2EIcon, { E2E_STATE } from './E2EIcon'; +import E2EIcon, { E2EState } from './E2EIcon'; import { replaceableComponent } from "../../../utils/replaceableComponent"; import BaseAvatar from '../avatars/BaseAvatar'; import PresenceLabel from "./PresenceLabel"; @@ -75,7 +75,7 @@ interface IProps { suppressOnHover?: boolean; showPresence?: boolean; subtextLabel?: string; - e2eStatus?: E2E_STATE; + e2eStatus?: E2EState; powerStatus?: PowerStatus; } diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx index 6b7a7f7281..2cf9a2dc02 100644 --- a/src/components/views/rooms/EventTile.tsx +++ b/src/components/views/rooms/EventTile.tsx @@ -33,7 +33,7 @@ import { formatTime } from "../../../DateUtils"; import { MatrixClientPeg } from '../../../MatrixClientPeg'; import { ALL_RULE_TYPES } from "../../../mjolnir/BanList"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; -import { E2E_STATE } from "./E2EIcon"; +import { E2EState } from "./E2EIcon"; import { toRem } from "../../../utils/units"; import { WidgetType } from "../../../widgets/WidgetType"; import RoomAvatar from "../avatars/RoomAvatar"; @@ -605,7 +605,7 @@ export default class EventTile extends React.Component { if (encryptionInfo.mismatchedSender) { // something definitely wrong is going on here this.setState({ - verified: E2E_STATE.Warning, + verified: E2EState.Warning, }, this.props.onHeightChanged); // Decryption may have caused a change in size return; } @@ -613,7 +613,7 @@ export default class EventTile extends React.Component { if (!userTrust.isCrossSigningVerified()) { // user is not verified, so default to everything is normal this.setState({ - verified: E2E_STATE.Normal, + verified: E2EState.Normal, }, this.props.onHeightChanged); // Decryption may have caused a change in size return; } @@ -623,27 +623,27 @@ export default class EventTile extends React.Component { ); if (!eventSenderTrust) { this.setState({ - verified: E2E_STATE.Unknown, + verified: E2EState.Unknown, }, this.props.onHeightChanged); // Decryption may have caused a change in size return; } if (!eventSenderTrust.isVerified()) { this.setState({ - verified: E2E_STATE.Warning, + verified: E2EState.Warning, }, this.props.onHeightChanged); // Decryption may have caused a change in size return; } if (!encryptionInfo.authenticated) { this.setState({ - verified: E2E_STATE.Unauthenticated, + verified: E2EState.Unauthenticated, }, this.props.onHeightChanged); // Decryption may have caused a change in size return; } this.setState({ - verified: E2E_STATE.Verified, + verified: E2EState.Verified, }, this.props.onHeightChanged); // Decryption may have caused a change in size } @@ -850,13 +850,13 @@ export default class EventTile extends React.Component { // event is encrypted, display padlock corresponding to whether or not it is verified if (ev.isEncrypted()) { - if (this.state.verified === E2E_STATE.Normal) { + if (this.state.verified === E2EState.Normal) { return; // no icon if we've not even cross-signed the user - } else if (this.state.verified === E2E_STATE.Verified) { + } else if (this.state.verified === E2EState.Verified) { return; // no icon for verified - } else if (this.state.verified === E2E_STATE.Unauthenticated) { + } else if (this.state.verified === E2EState.Unauthenticated) { return (); - } else if (this.state.verified === E2E_STATE.Unknown) { + } else if (this.state.verified === E2EState.Unknown) { return (); } else { return (); @@ -961,9 +961,9 @@ export default class EventTile extends React.Component { mx_EventTile_lastInSection: this.props.lastInSection, mx_EventTile_contextual: this.props.contextual, mx_EventTile_actionBarFocused: this.state.actionBarFocused, - mx_EventTile_verified: !isBubbleMessage && this.state.verified === E2E_STATE.Verified, - mx_EventTile_unverified: !isBubbleMessage && this.state.verified === E2E_STATE.Warning, - mx_EventTile_unknown: !isBubbleMessage && this.state.verified === E2E_STATE.Unknown, + mx_EventTile_verified: !isBubbleMessage && this.state.verified === E2EState.Verified, + mx_EventTile_unverified: !isBubbleMessage && this.state.verified === E2EState.Warning, + mx_EventTile_unknown: !isBubbleMessage && this.state.verified === E2EState.Unknown, mx_EventTile_bad: isEncryptionFailure, mx_EventTile_emote: msgtype === 'm.emote', mx_EventTile_noSender: this.props.hideSender,