This repository was archived by the owner on Sep 11, 2024. It is now read-only.
Invite dialog: display MXID on its own line #11756
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dbkr
approved these changes
Oct 17, 2023
dbkr
approved these changes
Oct 23, 2023
t3chguy
suggested changes
Jul 29, 2024
| subTitle = [avatar, _t("room|invite_subtitle", {}, { userName: () => inviterElement })]; | ||
| primaryActionLabel = _t("action|accept"); | ||
| } | ||
| subTitle = [avatar, inviterElement]; |
There was a problem hiding this comment.
these don't have keys so shouldn't be an array, use a React Fragment instead please
There was a problem hiding this comment.
subTitle currently has a type of string | ReactNode[] | undefined; is a React Fragment a ReactNode[] or should the type of subTitle be expanded to include it?
And is something like the below what you're after? It's a pattern used elsewhere in this function.
subTitle = [
<>
{avatar}
{inviterElement}
</>,
];
There was a problem hiding this comment.
Fragment would qualify as ReactNode, but if using an array must be given a key otherwise https://react.dev/learn/rendering-lists#keeping-list-items-in-order-with-key
Your snippet would work but would trigger the warning due to missing a key
There was a problem hiding this comment.
Oh looks like the code further down inserts a key based on position, that's not ideal but good enough
subTitleElements = subTitle.map((t, i) => <p key={subTitle${i}}>{t}</p>);
t3chguy
approved these changes
Aug 1, 2024
Signed-off-by: Andrew Ferrazzutti <andrewf@element.io>
Signed-off-by: Andrew Ferrazzutti <andrewf@element.io>
bmwiedemann
pushed a commit
to bmwiedemann/openSUSE
that referenced
this pull request
Sep 9, 2024
https://build.opensuse.org/request/show/1196036 by user dheidler + anag+factory - Version 1.11.75 # Security - Fixes for GHSA-vhr5-g3pm-49fm (CVE-2024-42369). - Version 1.11.74 ## ✨ Features * Update unsupported browser react component to new designs (element-hq/element-web#27857). Contributed by @t3chguy. * Invite dialog: display MXID on its own line (matrix-org/matrix-react-sdk#11756). Contributed by @AndrewFerr. * Align RoomSummaryCard styles with Figma (matrix-org/matrix-react-sdk#12793). Contributed by @t3chguy. * Extract Extensions into their own right panel tab (matrix-org/matrix-react-sdk#12844). Contributed by @t3chguy. * Remove topic from new room header and expand right panel topic (http
bmwiedemann
pushed a commit
to bmwiedemann/openSUSE
that referenced
this pull request
Sep 9, 2024
https://build.opensuse.org/request/show/1196035 by user dheidler + anag+factory - Version 1.11.75 * Fixes for CVE-2024-42369 / GHSA-vhr5-g3pm-49fm. - Version 1.11.74 ## ✨ Features * Update unsupported browser react component to new designs (element-hq/element-web#27857). Contributed by @t3chguy. * Invite dialog: display MXID on its own line (matrix-org/matrix-react-sdk#11756). Contributed by @AndrewFerr. * Align RoomSummaryCard styles with Figma (matrix-org/matrix-react-sdk#12793). Contributed by @t3chguy. * Extract Extensions into their own right panel tab (matrix-org/matrix-react-sdk#12844). Contributed by @t3chguy. * Remove topic from new room header and expand right panel topic (matrix-org/matrix-react-sdk#12842). Contributed by @t3c
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The reason for doing this is to make the invite dialog more readable when the inviter's MXID is very long, which tends to be the case when the inviter is a bridged user with a machine-generated MXID.
Screenshots
DM invite
Before
After
Room invite
Before
After
Checklist
Here's what your changelog entry will look like:
✨ Features