From a6e98b0b6340c7782cf4d7f5c5370f23fea9ca84 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 13 Sep 2024 12:09:41 +0100 Subject: [PATCH 1/5] Use `strong` over `b` for improved a11y semantics Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- res/css/views/auth/_AuthBody.pcss | 2 +- src/IdentityAuthClient.tsx | 2 +- src/RoomInvite.tsx | 2 +- .../auth/forgot-password/CheckEmail.tsx | 2 +- .../auth/forgot-password/EnterEmail.tsx | 2 +- .../auth/forgot-password/VerifyEmailModal.tsx | 2 +- .../auth/InteractiveAuthEntryComponents.tsx | 2 +- src/components/views/auth/LoginWithQRFlow.tsx | 2 +- .../dialogs/AnalyticsLearnMoreDialog.tsx | 4 ++-- .../views/dialogs/BugReportDialog.tsx | 6 ++--- .../views/dialogs/CreateRoomDialog.tsx | 8 +++++-- .../views/dialogs/CreateSubspaceDialog.tsx | 4 ++-- .../views/dialogs/LeaveSpaceDialog.tsx | 2 +- .../ManageRestrictedJoinRuleDialog.tsx | 2 +- .../ManualDeviceKeyVerificationDialog.tsx | 2 +- .../dialogs/RegistrationEmailPromptDialog.tsx | 2 +- .../dialogs/RoomUpgradeWarningDialog.tsx | 2 +- .../views/dialogs/UploadFailureDialog.tsx | 6 ++--- .../dialogs/devtools/SettingExplorer.tsx | 2 +- .../security/RestoreKeyBackupDialog.tsx | 8 +++++-- src/components/views/rooms/NewRoomIntro.tsx | 4 ++-- .../views/rooms/RoomPreviewCard.tsx | 2 +- .../views/rooms/RoomSearchAuxPanel.tsx | 2 +- .../views/rooms/RoomUpgradeWarningBar.tsx | 2 +- .../views/settings/CryptographyPanel.tsx | 2 +- .../views/settings/JoinRuleSettings.tsx | 4 ++-- .../views/settings/SecureBackupPanel.tsx | 8 +++++-- src/components/views/settings/SetIdServer.tsx | 14 +++++------ .../views/settings/SetIntegrationManager.tsx | 2 +- .../tabs/room/AdvancedRoomSettingsTab.tsx | 2 +- .../tabs/room/SecurityRoomSettingsTab.tsx | 4 ++-- .../tabs/user/HelpUserSettingsTab.tsx | 2 +- .../spaces/SpaceSettingsVisibilityTab.tsx | 4 +++- src/utils/exportUtils/HtmlExport.tsx | 6 ++--- src/widgets/CapabilityText.tsx | 24 +++++++++---------- 35 files changed, 80 insertions(+), 66 deletions(-) diff --git a/res/css/views/auth/_AuthBody.pcss b/res/css/views/auth/_AuthBody.pcss index de2052cc82..6a7082fc87 100644 --- a/res/css/views/auth/_AuthBody.pcss +++ b/res/css/views/auth/_AuthBody.pcss @@ -16,7 +16,7 @@ Please see LICENSE files in the repository root for full details. padding: 25px 60px; box-sizing: border-box; - b { + strong { font-weight: var(--cpd-font-weight-semibold); } diff --git a/src/IdentityAuthClient.tsx b/src/IdentityAuthClient.tsx index 6a3a1b081d..3b78d9e570 100644 --- a/src/IdentityAuthClient.tsx +++ b/src/IdentityAuthClient.tsx @@ -141,7 +141,7 @@ export default class IdentityAuthClient { "terms|identity_server_no_terms_description_1", {}, { - server: () => {abbreviateUrl(identityServerUrl)}, + server: () => {abbreviateUrl(identityServerUrl)}, }, )}

diff --git a/src/RoomInvite.tsx b/src/RoomInvite.tsx index c4ab2c506f..d4f156c91d 100644 --- a/src/RoomInvite.tsx +++ b/src/RoomInvite.tsx @@ -145,7 +145,7 @@ export function showAnyInviteErrors( "invite|room_failed_partial", {}, { - RoomName: () => {room.name}, + RoomName: () => {room.name}, }, )} diff --git a/src/components/structures/auth/forgot-password/CheckEmail.tsx b/src/components/structures/auth/forgot-password/CheckEmail.tsx index 77127df5fa..af563a8fa2 100644 --- a/src/components/structures/auth/forgot-password/CheckEmail.tsx +++ b/src/components/structures/auth/forgot-password/CheckEmail.tsx @@ -46,7 +46,7 @@ export const CheckEmail: React.FC = ({

{_t("auth|uia|email_auth_header")}

-

{_t("auth|check_email_explainer", { email: email }, { b: (t) => {t} })}

+

{_t("auth|check_email_explainer", { email: email }, { b: (t) => {t} })}

{_t("auth|check_email_wrong_email_prompt")} diff --git a/src/components/structures/auth/forgot-password/EnterEmail.tsx b/src/components/structures/auth/forgot-password/EnterEmail.tsx index 3f9cb5672e..98e091ec2a 100644 --- a/src/components/structures/auth/forgot-password/EnterEmail.tsx +++ b/src/components/structures/auth/forgot-password/EnterEmail.tsx @@ -57,7 +57,7 @@ export const EnterEmail: React.FC = ({

{_t("auth|enter_email_heading")}

- {_t("auth|enter_email_explainer", { homeserver }, { b: (t) => {t} })} + {_t("auth|enter_email_explainer", { homeserver }, { b: (t) => {t} })}

diff --git a/src/components/structures/auth/forgot-password/VerifyEmailModal.tsx b/src/components/structures/auth/forgot-password/VerifyEmailModal.tsx index 586106685c..238ddf2c3b 100644 --- a/src/components/structures/auth/forgot-password/VerifyEmailModal.tsx +++ b/src/components/structures/auth/forgot-password/VerifyEmailModal.tsx @@ -50,7 +50,7 @@ export const VerifyEmailModal: React.FC = ({ email, }, { - b: (sub) => {sub}, + b: (sub) => {sub}, }, )}

diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.tsx b/src/components/views/auth/InteractiveAuthEntryComponents.tsx index a0946564aa..05a8db0c54 100644 --- a/src/components/views/auth/InteractiveAuthEntryComponents.tsx +++ b/src/components/views/auth/InteractiveAuthEntryComponents.tsx @@ -465,7 +465,7 @@ export class EmailIdentityAuthEntry extends React.Component< />

{_t("auth|uia|email", { - emailAddress: {this.props.inputs.emailAddress}, + emailAddress: {this.props.inputs.emailAddress}, })}

{this.state.requesting ? ( diff --git a/src/components/views/auth/LoginWithQRFlow.tsx b/src/components/views/auth/LoginWithQRFlow.tsx index af4e75afc6..92a397d239 100644 --- a/src/components/views/auth/LoginWithQRFlow.tsx +++ b/src/components/views/auth/LoginWithQRFlow.tsx @@ -293,7 +293,7 @@ export default class LoginWithQRFlow extends React.Component
  • {_t("auth|qr_code_login|select_qr_code", { - scanQRCode: {_t("auth|qr_code_login|scan_qr_code")}, + scanQRCode: {_t("auth|qr_code_login|scan_qr_code")}, })}
  • {_t("auth|qr_code_login|point_the_camera")}
  • diff --git a/src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx b/src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx index b1e392d761..98e2921a60 100644 --- a/src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx +++ b/src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx @@ -72,8 +72,8 @@ export const AnalyticsLearnMoreDialog: React.FC = ({ {_t("analytics|pseudonymous_usage_data", { analyticsOwner })}
      -
    • {_t("analytics|bullet_1", {}, { Bold: (sub) => {sub} })}
    • -
    • {_t("analytics|bullet_2", {}, { Bold: (sub) => {sub} })}
    • +
    • {_t("analytics|bullet_1", {}, { Bold: (sub) => {sub} })}
    • +
    • {_t("analytics|bullet_2", {}, { Bold: (sub) => {sub} })}
    • {_t("analytics|disable_prompt")}
    {privacyPolicyLink} diff --git a/src/components/views/dialogs/BugReportDialog.tsx b/src/components/views/dialogs/BugReportDialog.tsx index f2db3eb553..22a7efacb9 100644 --- a/src/components/views/dialogs/BugReportDialog.tsx +++ b/src/components/views/dialogs/BugReportDialog.tsx @@ -205,7 +205,7 @@ export default class BugReportDialog extends React.Component { ) { warning = (

    - {_t("bug_reporting|unsupported_browser")} + {_t("bug_reporting|unsupported_browser")}

    ); } @@ -221,7 +221,7 @@ export default class BugReportDialog extends React.Component { {warning}

    {_t("bug_reporting|description")}

    - + {_t( "bug_reporting|before_submitting", {}, @@ -237,7 +237,7 @@ export default class BugReportDialog extends React.Component { ), }, )} - +

    diff --git a/src/components/views/dialogs/CreateRoomDialog.tsx b/src/components/views/dialogs/CreateRoomDialog.tsx index c4018ecc31..c5a8080e3f 100644 --- a/src/components/views/dialogs/CreateRoomDialog.tsx +++ b/src/components/views/dialogs/CreateRoomDialog.tsx @@ -280,7 +280,9 @@ export default class CreateRoomDialog extends React.Component { "create_room|join_rule_restricted_label", {}, { - SpaceName: () => {this.props.parentSpace?.name ?? _t("common|unnamed_space")}, + SpaceName: () => ( + {this.props.parentSpace?.name ?? _t("common|unnamed_space")} + ), }, )}   @@ -294,7 +296,9 @@ export default class CreateRoomDialog extends React.Component { "create_room|join_rule_public_parent_space_label", {}, { - SpaceName: () => {this.props.parentSpace?.name ?? _t("common|unnamed_space")}, + SpaceName: () => ( + {this.props.parentSpace?.name ?? _t("common|unnamed_space")} + ), }, )}   diff --git a/src/components/views/dialogs/CreateSubspaceDialog.tsx b/src/components/views/dialogs/CreateSubspaceDialog.tsx index db7adc0a20..6add812793 100644 --- a/src/components/views/dialogs/CreateSubspaceDialog.tsx +++ b/src/components/views/dialogs/CreateSubspaceDialog.tsx @@ -95,7 +95,7 @@ const CreateSubspaceDialog: React.FC = ({ space, onAddExistingSpaceClick "create_space|subspace_join_rule_restricted_description", {}, { - SpaceName: () => {parentSpace.name}, + SpaceName: () => {parentSpace.name}, }, )}

    @@ -107,7 +107,7 @@ const CreateSubspaceDialog: React.FC = ({ space, onAddExistingSpaceClick "create_space|subspace_join_rule_public_description", {}, { - SpaceName: () => {parentSpace.name}, + SpaceName: () => {parentSpace.name}, }, )}

    diff --git a/src/components/views/dialogs/LeaveSpaceDialog.tsx b/src/components/views/dialogs/LeaveSpaceDialog.tsx index acb34aaae5..50821694db 100644 --- a/src/components/views/dialogs/LeaveSpaceDialog.tsx +++ b/src/components/views/dialogs/LeaveSpaceDialog.tsx @@ -77,7 +77,7 @@ const LeaveSpaceDialog: React.FC = ({ space, onFinished }) => { "space|leave_dialog_description", {}, { - spaceName: () => {space.name}, + spaceName: () => {space.name}, }, )}   diff --git a/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx b/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx index 41ab8b8fc2..d124d97456 100644 --- a/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx +++ b/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx @@ -144,7 +144,7 @@ const ManageRestrictedJoinRuleDialog: React.FC = ({ room, selected = [], "room_settings|security|join_rule_restricted_dialog_description", {}, { - RoomName: () => {room.name}, + RoomName: () => {room.name}, }, )}

    diff --git a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx index 40cd60bd01..76e7580e01 100644 --- a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx +++ b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx @@ -69,7 +69,7 @@ export function ManualDeviceKeyVerificationDialog({ {" "} - {key} + {key} diff --git a/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx b/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx index ffaf01189b..a02098d3ed 100644 --- a/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx +++ b/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx @@ -54,7 +54,7 @@ const RegistrationEmailPromptDialog: React.FC = ({ onFinished }) => { "auth|registration|continue_without_email_description", {}, { - b: (sub) => {sub}, + b: (sub) => {sub}, }, )}

    diff --git a/src/components/views/dialogs/RoomUpgradeWarningDialog.tsx b/src/components/views/dialogs/RoomUpgradeWarningDialog.tsx index 5b80b7f3f3..48d0bef28c 100644 --- a/src/components/views/dialogs/RoomUpgradeWarningDialog.tsx +++ b/src/components/views/dialogs/RoomUpgradeWarningDialog.tsx @@ -181,7 +181,7 @@ export default class RoomUpgradeWarningDialog extends React.Component {sub}, + b: (sub) => {sub}, }, )}

    diff --git a/src/components/views/dialogs/UploadFailureDialog.tsx b/src/components/views/dialogs/UploadFailureDialog.tsx index 1e8d9d6624..ca7b1c14fd 100644 --- a/src/components/views/dialogs/UploadFailureDialog.tsx +++ b/src/components/views/dialogs/UploadFailureDialog.tsx @@ -46,7 +46,7 @@ export default class UploadFailureDialog extends React.Component { sizeOfThisFile: fileSize(this.props.badFiles[0].size), }, { - b: (sub) => {sub}, + b: (sub) => {sub}, }, ); buttons = ( @@ -64,7 +64,7 @@ export default class UploadFailureDialog extends React.Component { limit: fileSize(this.props.contentMessages.getUploadLimit()!), }, { - b: (sub) => {sub}, + b: (sub) => {sub}, }, ); buttons = ( @@ -82,7 +82,7 @@ export default class UploadFailureDialog extends React.Component { limit: fileSize(this.props.contentMessages.getUploadLimit()!), }, { - b: (sub) => {sub}, + b: (sub) => {sub}, }, ); const howManyOthers = this.props.totalFiles - this.props.badFiles.length; diff --git a/src/components/views/dialogs/devtools/SettingExplorer.tsx b/src/components/views/dialogs/devtools/SettingExplorer.tsx index 08ffb02da0..ed4b64d870 100644 --- a/src/components/views/dialogs/devtools/SettingExplorer.tsx +++ b/src/components/views/dialogs/devtools/SettingExplorer.tsx @@ -128,7 +128,7 @@ const EditSetting: React.FC = ({ setting, onBack }) => {
    - {_t("devtools|caution_colon")} {_t("devtools|use_at_own_risk")} + {_t("devtools|caution_colon")} {_t("devtools|use_at_own_risk")}
    diff --git a/src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx b/src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx index 73ec69a1fc..7dffba2148 100644 --- a/src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx +++ b/src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx @@ -391,7 +391,9 @@ export default class RestoreKeyBackupDialog extends React.PureComponent -

    {_t("restore_key_backup_dialog|key_backup_warning", {}, { b: (sub) => {sub} })}

    +

    + {_t("restore_key_backup_dialog|key_backup_warning", {}, { b: (sub) => {sub} })} +

    {_t("restore_key_backup_dialog|enter_phrase_description")}

    @@ -453,7 +455,9 @@ export default class RestoreKeyBackupDialog extends React.PureComponent -

    {_t("restore_key_backup_dialog|key_backup_warning", {}, { b: (sub) => {sub} })}

    +

    + {_t("restore_key_backup_dialog|key_backup_warning", {}, { b: (sub) => {sub} })} +

    {_t("restore_key_backup_dialog|enter_key_description")}

    diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx index 55b0b7c252..05912c482e 100644 --- a/src/components/views/rooms/NewRoomIntro.tsx +++ b/src/components/views/rooms/NewRoomIntro.tsx @@ -97,7 +97,7 @@ const NewRoomIntro: React.FC = () => { introMessage, {}, { - displayName: () => {displayName}, + displayName: () => {displayName}, }, )}

    @@ -241,7 +241,7 @@ const NewRoomIntro: React.FC = () => { "room|intro|start_of_room", {}, { - roomName: () => {room.name}, + roomName: () => {room.name}, }, )}

    diff --git a/src/components/views/rooms/RoomPreviewCard.tsx b/src/components/views/rooms/RoomPreviewCard.tsx index dd88de1a40..9b926e6518 100644 --- a/src/components/views/rooms/RoomPreviewCard.tsx +++ b/src/components/views/rooms/RoomPreviewCard.tsx @@ -95,7 +95,7 @@ const RoomPreviewCard: FC = ({ room, onJoinButtonClicked, onRejectButton "room|invites_you_text", {}, { - inviter: () => {inviter?.name || inviteSender}, + inviter: () => {inviter?.name || inviteSender}, }, )}
    diff --git a/src/components/views/rooms/RoomSearchAuxPanel.tsx b/src/components/views/rooms/RoomSearchAuxPanel.tsx index bfefeca408..e317e6161b 100644 --- a/src/components/views/rooms/RoomSearchAuxPanel.tsx +++ b/src/components/views/rooms/RoomSearchAuxPanel.tsx @@ -38,7 +38,7 @@ const RoomSearchAuxPanel: React.FC = ({ searchInfo, isRoomEncrypted, onSe _t( "room|search|summary", { count: searchInfo.count }, - { query: () => {searchInfo.term} }, + { query: () => {searchInfo.term} }, ) ) : ( diff --git a/src/components/views/rooms/RoomUpgradeWarningBar.tsx b/src/components/views/rooms/RoomUpgradeWarningBar.tsx index 76d1ff7364..66519fa766 100644 --- a/src/components/views/rooms/RoomUpgradeWarningBar.tsx +++ b/src/components/views/rooms/RoomUpgradeWarningBar.tsx @@ -69,7 +69,7 @@ export default class RoomUpgradeWarningBar extends React.PureComponent {sub}, + b: (sub) => {sub}, i: (sub) => {sub}, }, )} diff --git a/src/components/views/settings/CryptographyPanel.tsx b/src/components/views/settings/CryptographyPanel.tsx index b564a85208..c8837fd158 100644 --- a/src/components/views/settings/CryptographyPanel.tsx +++ b/src/components/views/settings/CryptographyPanel.tsx @@ -78,7 +78,7 @@ export default class CryptographyPanel extends React.Component { {_t("settings|security|session_key")} - {identityKey} + {identityKey} diff --git a/src/components/views/settings/JoinRuleSettings.tsx b/src/components/views/settings/JoinRuleSettings.tsx index 2b2824254b..a6c1e91241 100644 --- a/src/components/views/settings/JoinRuleSettings.tsx +++ b/src/components/views/settings/JoinRuleSettings.tsx @@ -281,7 +281,7 @@ const JoinRuleSettings: React.FC = ({ "room_settings|security|join_rule_restricted_description_active_space", {}, { - spaceName: () => {SpaceStore.instance.activeSpaceRoom!.name}, + spaceName: () => {SpaceStore.instance.activeSpaceRoom!.name}, }, ); } else { @@ -349,7 +349,7 @@ const JoinRuleSettings: React.FC = ({ (roomId) => !cli.getRoom(roomId)?.currentState.maySendStateEvent(EventType.SpaceChild, userId), ); if (unableToUpdateSomeParents) { - warning = {_t("room_settings|security|join_rule_restricted_upgrade_warning")}; + warning = {_t("room_settings|security|join_rule_restricted_upgrade_warning")}; } upgradeRequiredDialog( diff --git a/src/components/views/settings/SecureBackupPanel.tsx b/src/components/views/settings/SecureBackupPanel.tsx index 9694660cd6..54edac2d0e 100644 --- a/src/components/views/settings/SecureBackupPanel.tsx +++ b/src/components/views/settings/SecureBackupPanel.tsx @@ -259,7 +259,7 @@ export default class SecureBackupPanel extends React.PureComponent<{}, IState> { statusDescription = ( <> - {_t("settings|security|key_backup_inactive", {}, { b: (sub) => {sub} })} + {_t("settings|security|key_backup_inactive", {}, { b: (sub) => {sub} })} {_t("settings|security|key_backup_connect_prompt")} @@ -336,7 +336,11 @@ export default class SecureBackupPanel extends React.PureComponent<{}, IState> { statusDescription = ( <> - {_t("settings|security|key_backup_inactive_warning", {}, { b: (sub) => {sub} })} + {_t( + "settings|security|key_backup_inactive_warning", + {}, + { b: (sub) => {sub} }, + )} {_t("encryption|setup_secure_backup|explainer")} diff --git a/src/components/views/settings/SetIdServer.tsx b/src/components/views/settings/SetIdServer.tsx index eb863f095c..5b6645b164 100644 --- a/src/components/views/settings/SetIdServer.tsx +++ b/src/components/views/settings/SetIdServer.tsx @@ -188,8 +188,8 @@ export default class SetIdServer extends React.Component { "identity_server|change_prompt", {}, { - current: (sub) => {abbreviateUrl(currentClientIdServer)}, - new: (sub) => {abbreviateUrl(idServer)}, + current: (sub) => {abbreviateUrl(currentClientIdServer)}, + new: (sub) => {abbreviateUrl(idServer)}, }, ), button: _t("action|continue"), @@ -235,7 +235,7 @@ export default class SetIdServer extends React.Component { unboundMessage: _t( "identity_server|disconnect_server", {}, - { idserver: (sub) => {abbreviateUrl(this.state.currentClientIdServer)} }, + { idserver: (sub) => {abbreviateUrl(this.state.currentClientIdServer)} }, ), button: _t("action|disconnect"), }); @@ -278,8 +278,8 @@ export default class SetIdServer extends React.Component { let message; let danger = false; const messageElements = { - idserver: (sub: string) => {abbreviateUrl(currentClientIdServer)}, - b: (sub: string) => {sub}, + idserver: (sub: string) => {abbreviateUrl(currentClientIdServer)}, + b: (sub: string) => {sub}, }; if (!currentServerReachable) { message = ( @@ -356,13 +356,13 @@ export default class SetIdServer extends React.Component { bodyText = _t( "identity_server|description_connected", {}, - { server: (sub) => {abbreviateUrl(idServerUrl)} }, + { server: (sub) => {abbreviateUrl(idServerUrl)} }, ); if (this.props.missingTerms) { bodyText = _t( "identity_server|change_server_prompt", {}, - { server: (sub) => {abbreviateUrl(idServerUrl)} }, + { server: (sub) => {abbreviateUrl(idServerUrl)} }, ); } } else { diff --git a/src/components/views/settings/SetIntegrationManager.tsx b/src/components/views/settings/SetIntegrationManager.tsx index 5426f5c205..c129d0e2e1 100644 --- a/src/components/views/settings/SetIntegrationManager.tsx +++ b/src/components/views/settings/SetIntegrationManager.tsx @@ -58,7 +58,7 @@ export default class SetIntegrationManager extends React.Component {sub} }, + { b: (sub) => {sub} }, ); } else { bodyText = _t("integration_manager|use_im"); diff --git a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx index 97551c77a8..c32ac5150b 100644 --- a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx @@ -115,7 +115,7 @@ export default class AdvancedRoomSettingsTab extends React.Component {sub}, + b: (sub) => {sub}, i: (sub) => {sub}, }, )} diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx index b772344d67..064422b451 100644 --- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx @@ -117,7 +117,7 @@ export default class SecurityRoomSettingsTab extends React.Component {sub} }, + { b: (sub) => {sub} }, )}{" "}

    @@ -308,7 +308,7 @@ export default class SecurityRoomSettingsTab extends React.Component {" "} {_t("room_settings|security|encrypted_room_public_confirm_description_1", undefined, { - b: (sub) => {sub}, + b: (sub) => {sub}, })}{" "}

    diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx index 6b97be2e83..ec0e20fb32 100644 --- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx @@ -302,7 +302,7 @@ export default class HelpUserSettingsTab extends React.Component

    {_t("common|access_token")} - {_t("setting|help_about|access_token_detail")} + {_t("setting|help_about|access_token_detail")} this.context.getAccessToken()}> {this.context.getAccessToken()} diff --git a/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx b/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx index 7d77f59585..47f4fe8ce9 100644 --- a/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx +++ b/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx @@ -163,7 +163,9 @@ const SpaceSettingsVisibilityTab: React.FC = ({ matrixClient: cli, space

    {_t("room_settings|visibility|history_visibility_anyone_space_description")}
    - {_t("room_settings|visibility|history_visibility_anyone_space_recommendation")} + + {_t("room_settings|visibility|history_visibility_anyone_space_recommendation")} +

    diff --git a/src/utils/exportUtils/HtmlExport.tsx b/src/utils/exportUtils/HtmlExport.tsx index 3f3dffbfca..724652851b 100644 --- a/src/utils/exportUtils/HtmlExport.tsx +++ b/src/utils/exportUtils/HtmlExport.tsx @@ -98,7 +98,7 @@ export default class HTMLExporter extends Exporter { exportDate, }, { - roomName: () => {safeRoomName}, + roomName: () => {safeRoomName}, exporterDetails: () => ( {exporterName ? ( <> - {escapeHtml(exporterName)}I {" (" + safeExporter + ")"} + {escapeHtml(exporterName)}I {" (" + safeExporter + ")"} ) : ( - {safeExporter} + {safeExporter} )} ), diff --git a/src/widgets/CapabilityText.tsx b/src/widgets/CapabilityText.tsx index 2e1f4340dd..28ba117577 100644 --- a/src/widgets/CapabilityText.tsx +++ b/src/widgets/CapabilityText.tsx @@ -154,14 +154,14 @@ export class CapabilityText { if (room) { return ( - {room.name} + {room.name} ); } else { return ( - + {roomId} - + ); } }, @@ -209,7 +209,7 @@ export class CapabilityText { eventType: eventCap.eventType, }, { - b: (sub) => {sub}, + b: (sub) => {sub}, }, ), byline: CapabilityText.bylineFor(eventCap), @@ -222,7 +222,7 @@ export class CapabilityText { eventType: eventCap.eventType, }, { - b: (sub) => {sub}, + b: (sub) => {sub}, }, ), byline: CapabilityText.bylineFor(eventCap), @@ -238,7 +238,7 @@ export class CapabilityText { eventType: eventCap.eventType, }, { - b: (sub) => {sub}, + b: (sub) => {sub}, }, ), byline: CapabilityText.bylineFor(eventCap), @@ -251,7 +251,7 @@ export class CapabilityText { eventType: eventCap.eventType, }, { - b: (sub) => {sub}, + b: (sub) => {sub}, }, ), byline: CapabilityText.bylineFor(eventCap), @@ -266,7 +266,7 @@ export class CapabilityText { "widget|capability|capability", { capability }, { - b: (sub) => {sub}, + b: (sub) => {sub}, }, ), }; @@ -390,7 +390,7 @@ export class CapabilityText { msgtype: eventCap.keyStr, }, { - b: (sub) => {sub}, + b: (sub) => {sub}, }, ); } else { @@ -400,7 +400,7 @@ export class CapabilityText { msgtype: eventCap.keyStr, }, { - b: (sub) => {sub}, + b: (sub) => {sub}, }, ); } @@ -412,7 +412,7 @@ export class CapabilityText { msgtype: eventCap.keyStr, }, { - b: (sub) => {sub}, + b: (sub) => {sub}, }, ); } else { @@ -422,7 +422,7 @@ export class CapabilityText { msgtype: eventCap.keyStr, }, { - b: (sub) => {sub}, + b: (sub) => {sub}, }, ); } From 8044ce4c013a3b93ed522fc8833969c12e801f79 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 13 Sep 2024 12:34:15 +0100 Subject: [PATCH 2/5] Fix tests Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../structures/__snapshots__/RoomView-test.tsx.snap | 12 ++++++------ .../InteractiveAuthEntryComponents-test.tsx.snap | 4 ++-- .../ManageRestrictedJoinRuleDialog-test.tsx.snap | 8 ++++---- .../ManualDeviceKeyVerificationDialog-test.tsx.snap | 8 ++++---- .../views/settings/CryptographyPanel-test.tsx | 2 +- .../__snapshots__/SecureBackupPanel-test.tsx.snap | 4 ++-- .../SetIntegrationManager-test.tsx.snap | 4 ++-- .../__snapshots__/LoginWithQRFlow-test.tsx.snap | 4 ++-- .../SecurityRoomSettingsTab-test.tsx.snap | 4 ++-- .../SecurityUserSettingsTab-test.tsx.snap | 8 ++++---- .../SpaceSettingsVisibilityTab-test.tsx.snap | 4 ++-- .../__snapshots__/HTMLExport-test.ts.snap | 2 +- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/test/components/structures/__snapshots__/RoomView-test.tsx.snap b/test/components/structures/__snapshots__/RoomView-test.tsx.snap index 569fe3640c..2432e30a22 100644 --- a/test/components/structures/__snapshots__/RoomView-test.tsx.snap +++ b/test/components/structures/__snapshots__/RoomView-test.tsx.snap @@ -370,9 +370,9 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]

    Send your first message to invite - + @user:example.com - + to chat

    @@ -625,9 +625,9 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =

    Send your first message to invite - + @user:example.com - + to chat

    @@ -952,9 +952,9 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t

    Send your first message to invite - + @user:example.com - + to chat

    diff --git a/test/components/views/auth/__snapshots__/InteractiveAuthEntryComponents-test.tsx.snap b/test/components/views/auth/__snapshots__/InteractiveAuthEntryComponents-test.tsx.snap index 65f86a35d2..4e03a26f02 100644 --- a/test/components/views/auth/__snapshots__/InteractiveAuthEntryComponents-test.tsx.snap +++ b/test/components/views/auth/__snapshots__/InteractiveAuthEntryComponents-test.tsx.snap @@ -8,9 +8,9 @@ exports[` should render 1`] = `

    To create your account, open the link in the email we just sent to - + alice@example.xyz - + .

    diff --git a/test/components/views/dialogs/__snapshots__/ManageRestrictedJoinRuleDialog-test.tsx.snap b/test/components/views/dialogs/__snapshots__/ManageRestrictedJoinRuleDialog-test.tsx.snap index 08f299fec7..cf01ac63b6 100644 --- a/test/components/views/dialogs/__snapshots__/ManageRestrictedJoinRuleDialog-test.tsx.snap +++ b/test/components/views/dialogs/__snapshots__/ManageRestrictedJoinRuleDialog-test.tsx.snap @@ -26,9 +26,9 @@ exports[` should list spaces which are not par

    Decide which spaces can access this room. If a space is selected, its members can find and join - + !roomId:server - + .

    @@ -176,9 +176,9 @@ exports[` should render empty state 1`] = `

    Decide which spaces can access this room. If a space is selected, its members can find and join - + !roomId:server - + .

    diff --git a/test/components/views/dialogs/__snapshots__/ManualDeviceKeyVerificationDialog-test.tsx.snap b/test/components/views/dialogs/__snapshots__/ManualDeviceKeyVerificationDialog-test.tsx.snap index 8d493a9655..1186f06f38 100644 --- a/test/components/views/dialogs/__snapshots__/ManualDeviceKeyVerificationDialog-test.tsx.snap +++ b/test/components/views/dialogs/__snapshots__/ManualDeviceKeyVerificationDialog-test.tsx.snap @@ -66,9 +66,9 @@ exports[`ManualDeviceKeyVerificationDialog should display the device 1`] = ` - + ABCD EFGH - + @@ -181,9 +181,9 @@ exports[`ManualDeviceKeyVerificationDialog should display the device of another - + ABCD EFGH - + diff --git a/test/components/views/settings/CryptographyPanel-test.tsx b/test/components/views/settings/CryptographyPanel-test.tsx index a993829e37..712ca18b53 100644 --- a/test/components/views/settings/CryptographyPanel-test.tsx +++ b/test/components/views/settings/CryptographyPanel-test.tsx @@ -18,7 +18,7 @@ describe("CryptographyPanel", () => { it("shows the session ID and key", () => { const sessionId = "ABCDEFGHIJ"; const sessionKey = "AbCDeFghIJK7L/m4nOPqRSTUVW4xyzaBCDef6gHIJkl"; - const sessionKeyFormatted = "AbCD eFgh IJK7 L/m4 nOPq RSTU VW4x yzaB CDef 6gHI Jkl"; + const sessionKeyFormatted = "AbCD eFgh IJK7 L/m4 nOPq RSTU VW4x yzaB CDef 6gHI Jkl"; TestUtils.stubClient(); const client: MatrixClient = MatrixClientPeg.safeGet(); diff --git a/test/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap b/test/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap index 718df62fee..ca51d4dc59 100644 --- a/test/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap +++ b/test/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap @@ -79,9 +79,9 @@ exports[` suggests connecting session to key backup when ba > This session is - + not backing up your keys - + , but you do have an existing backup you can restore from and add to going forward.
    diff --git a/test/components/views/settings/__snapshots__/SetIntegrationManager-test.tsx.snap b/test/components/views/settings/__snapshots__/SetIntegrationManager-test.tsx.snap index cde822f6ab..9dab61f8b2 100644 --- a/test/components/views/settings/__snapshots__/SetIntegrationManager-test.tsx.snap +++ b/test/components/views/settings/__snapshots__/SetIntegrationManager-test.tsx.snap @@ -41,9 +41,9 @@ exports[`SetIntegrationManager should render manage integrations sections 1`] = > Use an integration manager - + (scalar.vector.im) - + to manage bots, widgets, and sticker packs.
    diff --git a/test/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap b/test/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap index 49a5f271b1..d9f6518f52 100644 --- a/test/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap +++ b/test/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap @@ -1067,9 +1067,9 @@ exports[` renders QR code 1`] = `
  • Select " - + Sign in with QR code - + "
  • diff --git a/test/components/views/settings/tabs/room/__snapshots__/SecurityRoomSettingsTab-test.tsx.snap b/test/components/views/settings/tabs/room/__snapshots__/SecurityRoomSettingsTab-test.tsx.snap index 5f3851cd83..a4579bc970 100644 --- a/test/components/views/settings/tabs/room/__snapshots__/SecurityRoomSettingsTab-test.tsx.snap +++ b/test/components/views/settings/tabs/room/__snapshots__/SecurityRoomSettingsTab-test.tsx.snap @@ -178,9 +178,9 @@ exports[` join rule warns when trying to make an encr

    - + It's not recommended to make encrypted rooms public. - + It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower. diff --git a/test/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap b/test/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap index 4ccca2a02c..8a01587e16 100644 --- a/test/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap +++ b/test/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap @@ -48,9 +48,9 @@ exports[` renders security section 1`] = ` > Use an integration manager - + (scalar.vector.im) - + to manage bots, widgets, and sticker packs. @@ -332,9 +332,9 @@ exports[` renders security section 1`] = ` - + <not supported> - + diff --git a/test/components/views/spaces/__snapshots__/SpaceSettingsVisibilityTab-test.tsx.snap b/test/components/views/spaces/__snapshots__/SpaceSettingsVisibilityTab-test.tsx.snap index 60a1dac734..16528bce19 100644 --- a/test/components/views/spaces/__snapshots__/SpaceSettingsVisibilityTab-test.tsx.snap +++ b/test/components/views/spaces/__snapshots__/SpaceSettingsVisibilityTab-test.tsx.snap @@ -143,9 +143,9 @@ exports[` renders container 1`] = `

    Allow people to preview your space before they join.
    - + Recommended for public spaces. - +

    diff --git a/test/utils/exportUtils/__snapshots__/HTMLExport-test.ts.snap b/test/utils/exportUtils/__snapshots__/HTMLExport-test.ts.snap index 4eb9720b9b..cd1f63aa8b 100644 --- a/test/utils/exportUtils/__snapshots__/HTMLExport-test.ts.snap +++ b/test/utils/exportUtils/__snapshots__/HTMLExport-test.ts.snap @@ -58,7 +58,7 @@ exports[`HTMLExport should export 1`] = `
    !

    !myroom:example.org

    -

    created this room.

    This is the start of export of !myroom:example.org. Exported by @userId:matrix.org at 11/17/2022.

    +

    created this room.

    This is the start of export of !myroom:example.org. Exported by @userId:matrix.org at 11/17/2022.


    From 3c267f9aa4fb4ea41bd698e8f1a8eec6a3b119fa Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 24 Sep 2024 10:53:44 +0100 Subject: [PATCH 3/5] Update snapshots --- .../RestoreKeyBackupDialog-test.tsx.snap | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/components/views/dialogs/security/__snapshots__/RestoreKeyBackupDialog-test.tsx.snap b/test/components/views/dialogs/security/__snapshots__/RestoreKeyBackupDialog-test.tsx.snap index de0bddbe33..5990d482b8 100644 --- a/test/components/views/dialogs/security/__snapshots__/RestoreKeyBackupDialog-test.tsx.snap +++ b/test/components/views/dialogs/security/__snapshots__/RestoreKeyBackupDialog-test.tsx.snap @@ -29,9 +29,9 @@ exports[` should display an error when recovery key is

    - + Warning - + : you should only set up key backup from a trusted computer.

    @@ -129,9 +129,9 @@ exports[` should not raise an error when recovery is v

    - + Warning - + : you should only set up key backup from a trusted computer.

    @@ -228,9 +228,9 @@ exports[` should render 1`] = `

    - + Warning - + : you should only set up key backup from a trusted computer.

    From 9e4348e8f1b4bed5b129c2bc9ecad2c3a3442849 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 25 Sep 2024 17:27:42 +0100 Subject: [PATCH 4/5] Update test assertions Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- test/components/views/settings/CryptographyPanel-test.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/components/views/settings/CryptographyPanel-test.tsx b/test/components/views/settings/CryptographyPanel-test.tsx index ed8b4dc26c..caaf813cdb 100644 --- a/test/components/views/settings/CryptographyPanel-test.tsx +++ b/test/components/views/settings/CryptographyPanel-test.tsx @@ -37,7 +37,7 @@ describe("CryptographyPanel", () => { expect(codes[0].innerHTML).toEqual(sessionId); // Initially a placeholder - expect(codes[1].innerHTML).toEqual("..."); + expect(codes[1].innerHTML).toEqual("..."); // Then the actual key await flushPromises(); @@ -60,7 +60,7 @@ describe("CryptographyPanel", () => { const codes = rendered.container.querySelectorAll("code"); // Initially a placeholder - expect(codes[1].innerHTML).toEqual("..."); + expect(codes[1].innerHTML).toEqual("..."); // Then "not supported key await flushPromises(); From e6404daf3c8fba0c27018bce559e00c2a2d8134b Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 25 Sep 2024 17:34:06 +0100 Subject: [PATCH 5/5] Update test assertions Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- test/components/views/settings/CryptographyPanel-test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/components/views/settings/CryptographyPanel-test.tsx b/test/components/views/settings/CryptographyPanel-test.tsx index caaf813cdb..aa0442e65a 100644 --- a/test/components/views/settings/CryptographyPanel-test.tsx +++ b/test/components/views/settings/CryptographyPanel-test.tsx @@ -64,6 +64,6 @@ describe("CryptographyPanel", () => { // Then "not supported key await flushPromises(); - expect(codes[1].innerHTML).toEqual("<not supported>"); + expect(codes[1].innerHTML).toEqual("<not supported>"); }); });