Skip to content

Fix: add missing tooltip and aria-label to lock icon next to composer #30623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 26, 2025
Merged

Fix: add missing tooltip and aria-label to lock icon next to composer #30623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1769f8f
fix: add missing tooltip and aria-label to lock icon next to composer
florianduros Aug 26, 2025
06f5ef3
test: update snapshot
florianduros Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/components/views/rooms/MessageComposer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,12 +531,15 @@ export class MessageComposer extends React.Component<IProps, IState> {
if (!this.props.e2eStatus) {
leftIcon = (
<div className="mx_MessageComposer_e2eIconWrapper">
<LockOffIcon
width={12}
height={12}
color="var(--cpd-color-icon-info-primary)"
className="mx_E2EIcon mx_MessageComposer_e2eIcon"
/>
<Tooltip label={_t("composer|room_unencrypted")}>
<LockOffIcon
aria-label={_t("composer|room_unencrypted")}
width={12}
height={12}
color="var(--cpd-color-icon-info-primary)"
className="mx_E2EIcon mx_MessageComposer_e2eIcon"
/>
</Tooltip>
</div>
);
} else if (this.props.e2eStatus !== E2EStatus.Normal) {
Expand Down
1 change: 1 addition & 0 deletions src/i18n/strings/en_EN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,7 @@
"poll_button_no_perms_description": "You do not have permission to start polls in this room.",
"poll_button_no_perms_title": "Permission Required",
"replying_title": "Replying",
"room_unencrypted": "Messages in this room are not end-to-end encrypted",
"room_upgraded_link": "The conversation continues here.",
"room_upgraded_notice": "This room has been replaced and is no longer active.",
"send_button_title": "Send message",
Expand Down
78 changes: 42 additions & 36 deletions test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ exports[`RoomView for a local room in state CREATING should match the snapshot 1
style="--cpd-icon-button-size: 100%;"
>
<svg
aria-labelledby="«rg4»"
aria-labelledby="«rh2»"
fill="currentColor"
height="1em"
viewBox="0 0 24 24"
Expand All @@ -75,7 +75,7 @@ exports[`RoomView for a local room in state CREATING should match the snapshot 1
<button
aria-disabled="false"
aria-label="Voice call"
aria-labelledby="«rg9»"
aria-labelledby="«rh7»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand All @@ -101,7 +101,7 @@ exports[`RoomView for a local room in state CREATING should match the snapshot 1
</button>
<button
aria-label="Threads"
aria-labelledby="«rge»"
aria-labelledby="«rhc»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand All @@ -128,7 +128,7 @@ exports[`RoomView for a local room in state CREATING should match the snapshot 1
</button>
<button
aria-label="Room info"
aria-labelledby="«rgj»"
aria-labelledby="«rhh»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand Down Expand Up @@ -158,7 +158,7 @@ exports[`RoomView for a local room in state CREATING should match the snapshot 1
>
<div
aria-label="2 members"
aria-labelledby="«rgo»"
aria-labelledby="«rhm»"
class="mx_AccessibleButton mx_FacePile"
role="button"
tabindex="0"
Expand Down Expand Up @@ -278,7 +278,7 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
style="--cpd-icon-button-size: 100%;"
>
<svg
aria-labelledby="«rh2»"
aria-labelledby="«ri0»"
fill="currentColor"
height="1em"
viewBox="0 0 24 24"
Expand All @@ -294,7 +294,7 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
<button
aria-disabled="false"
aria-label="Voice call"
aria-labelledby="«rh7»"
aria-labelledby="«ri5»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand All @@ -320,7 +320,7 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
</button>
<button
aria-label="Threads"
aria-labelledby="«rhc»"
aria-labelledby="«ria»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand All @@ -347,7 +347,7 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
</button>
<button
aria-label="Room info"
aria-labelledby="«rhh»"
aria-labelledby="«rif»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand Down Expand Up @@ -377,7 +377,7 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
>
<div
aria-label="2 members"
aria-labelledby="«rhm»"
aria-labelledby="«rik»"
class="mx_AccessibleButton mx_FacePile"
role="button"
tabindex="0"
Expand Down Expand Up @@ -583,7 +583,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
style="--cpd-icon-button-size: 100%;"
>
<svg
aria-labelledby="«rbo»"
aria-labelledby="«rca»"
fill="currentColor"
height="1em"
viewBox="0 0 24 24"
Expand All @@ -599,7 +599,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
<button
aria-disabled="false"
aria-label="Voice call"
aria-labelledby="«rbt»"
aria-labelledby="«rcf»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand All @@ -625,7 +625,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
</button>
<button
aria-label="Threads"
aria-labelledby="«rc2»"
aria-labelledby="«rck»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand All @@ -652,7 +652,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
</button>
<button
aria-label="Room info"
aria-labelledby="«rc7»"
aria-labelledby="«rcp»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand Down Expand Up @@ -682,7 +682,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
>
<div
aria-label="2 members"
aria-labelledby="«rcc»"
aria-labelledby="«rcu»"
class="mx_AccessibleButton mx_FacePile"
role="button"
tabindex="0"
Expand Down Expand Up @@ -800,6 +800,8 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
class="mx_MessageComposer_e2eIconWrapper"
>
<svg
aria-label="Messages in this room are not end-to-end encrypted"
aria-labelledby="«rd7»"
class="mx_E2EIcon mx_MessageComposer_e2eIcon"
color="var(--cpd-color-icon-info-primary)"
fill="currentColor"
Expand Down Expand Up @@ -982,7 +984,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
style="--cpd-icon-button-size: 100%;"
>
<svg
aria-labelledby="«rdu»"
aria-labelledby="«rem»"
fill="currentColor"
height="1em"
viewBox="0 0 24 24"
Expand All @@ -998,7 +1000,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
<button
aria-disabled="false"
aria-label="Voice call"
aria-labelledby="«re3»"
aria-labelledby="«rer»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand All @@ -1024,7 +1026,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
</button>
<button
aria-label="Threads"
aria-labelledby="«re8»"
aria-labelledby="«rf0»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand All @@ -1051,7 +1053,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
</button>
<button
aria-label="Room info"
aria-labelledby="«red»"
aria-labelledby="«rf5»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand Down Expand Up @@ -1081,7 +1083,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
>
<div
aria-label="2 members"
aria-labelledby="«rei»"
aria-labelledby="«rfa»"
class="mx_AccessibleButton mx_FacePile"
role="button"
tabindex="0"
Expand Down Expand Up @@ -1194,6 +1196,8 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
class="mx_MessageComposer_e2eIconWrapper"
>
<svg
aria-label="Messages in this room are not end-to-end encrypted"
aria-labelledby="«rfj»"
class="mx_E2EIcon mx_MessageComposer_e2eIcon"
color="var(--cpd-color-icon-info-primary)"
fill="currentColor"
Expand Down Expand Up @@ -1462,7 +1466,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
style="--cpd-icon-button-size: 100%;"
>
<svg
aria-labelledby="«r2c»"
aria-labelledby="«r2i»"
fill="currentColor"
height="1em"
viewBox="0 0 24 24"
Expand All @@ -1478,7 +1482,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
<button
aria-disabled="false"
aria-label="Voice call"
aria-labelledby="«r2h»"
aria-labelledby="«r2n»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand All @@ -1504,7 +1508,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
</button>
<button
aria-label="Threads"
aria-labelledby="«r2m»"
aria-labelledby="«r2s»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand All @@ -1531,7 +1535,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
</button>
<button
aria-label="Room info"
aria-labelledby="«r2r»"
aria-labelledby="«r31»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand Down Expand Up @@ -1561,7 +1565,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
>
<div
aria-label="0 members"
aria-labelledby="«r30»"
aria-labelledby="«r36»"
class="mx_AccessibleButton mx_FacePile"
role="button"
tabindex="0"
Expand Down Expand Up @@ -1674,7 +1678,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
style="--cpd-icon-button-size: 100%;"
>
<svg
aria-labelledby="«r2c»"
aria-labelledby="«r2i»"
fill="currentColor"
height="1em"
viewBox="0 0 24 24"
Expand All @@ -1690,7 +1694,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
<button
aria-disabled="false"
aria-label="Voice call"
aria-labelledby="«r2h»"
aria-labelledby="«r2n»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand All @@ -1716,7 +1720,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
</button>
<button
aria-label="Threads"
aria-labelledby="«r2m»"
aria-labelledby="«r2s»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand All @@ -1743,7 +1747,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
</button>
<button
aria-label="Room info"
aria-labelledby="«r2r»"
aria-labelledby="«r31»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand Down Expand Up @@ -1773,7 +1777,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
>
<div
aria-label="0 members"
aria-labelledby="«r30»"
aria-labelledby="«r36»"
class="mx_AccessibleButton mx_FacePile"
role="button"
tabindex="0"
Expand Down Expand Up @@ -1841,7 +1845,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
tabindex="0"
>
<div
aria-labelledby="«r3e»"
aria-labelledby="«r3k»"
class="mx_E2EIcon mx_E2EIcon_verified mx_MessageComposer_e2eIcon"
data-testid="e2e-icon"
>
Expand Down Expand Up @@ -2052,7 +2056,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
</button>
<button
aria-label="Chat"
aria-labelledby="«r7c»"
aria-labelledby="«r7i»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand All @@ -2079,7 +2083,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
</button>
<button
aria-label="Threads"
aria-labelledby="«r7h»"
aria-labelledby="«r7n»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand All @@ -2106,7 +2110,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
</button>
<button
aria-label="Room info"
aria-labelledby="«r7m»"
aria-labelledby="«r7s»"
class="_icon-button_1pz9o_8"
data-kind="primary"
role="button"
Expand Down Expand Up @@ -2136,7 +2140,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
>
<div
aria-label="0 members"
aria-labelledby="«r7r»"
aria-labelledby="«r81»"
class="mx_AccessibleButton mx_FacePile"
role="button"
tabindex="0"
Expand Down Expand Up @@ -2212,7 +2216,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
</p>
</div>
<button
aria-labelledby="«r84»"
aria-labelledby="«r8a»"
class="_icon-button_1pz9o_8"
data-kind="secondary"
data-testid="base-card-close-button"
Expand Down Expand Up @@ -2271,6 +2275,8 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
class="mx_MessageComposer_e2eIconWrapper"
>
<svg
aria-label="Messages in this room are not end-to-end encrypted"
aria-labelledby="«r8j»"
class="mx_E2EIcon mx_MessageComposer_e2eIcon"
color="var(--cpd-color-icon-info-primary)"
fill="currentColor"
Expand Down
Loading