Skip to content
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

Jump to bottom

Use room name as room intro #9231

Merged
merged 8 commits into from
Sep 6, 2022
Merged

Use room name as room intro #9231

merged 8 commits into from
Sep 6, 2022

Conversation

weeman1337
Copy link
Contributor

@weeman1337 weeman1337 commented Sep 1, 2022 •
edited by github-actions bot
Loading

Checklist

  • Tests written for new code (and old code if feasible)
  • Linter and other CI checks pass
  • Sign-off given on the changes (see CONTRIBUTING.md)

Notes: Description of DM room with more than two other people is now being displayed correctly

fixes element-hq/element-web#23094

Here's what your changelog entry will look like:

🐛 Bug Fixes

@weeman1337 weeman1337 added the T-Defect Bugs, crashes, hangs, vulnerabilities, or other reported problems label Sep 1, 2022
@SimonBrandner SimonBrandner changed the title Use roon name as room intro Use room name as room intro Sep 1, 2022
@weeman1337 weeman1337 marked this pull request as ready for review September 1, 2022 15:18
@weeman1337 weeman1337 requested a review from a team as a code owner September 1, 2022 15:18
t3chguy
t3chguy reviewed Sep 1, 2022
View reviewed changes
src/components/views/rooms/NewRoomIntro.tsx Outdated
if (dmPartner) {
let introMessage = _t("This is the beginning of your direct message history with <displayName/>.");
let caption;
let captionElement: JSX.Element = <></>;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't ever initialise to empty fragments, shouldn't we stay self-consistent, e.g. with L58 for example

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If not initialising it, tsc in strict mode complains about using captionElement before assignment here https://github.com/matrix-org/matrix-react-sdk/pull/9231/files/e4c4b73b814288ba29a3f95605a6eb4830721d07#diff-c509de2dd1c9eb2add4073f662ec42078874b71b98d13e34d141abff5bb65f32L90 .

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

null is valid for rendering, but you should be consistent with both vars either way

@weeman1337 weeman1337 merged commit 9f7165e into develop Sep 6, 2022
@weeman1337 weeman1337 deleted the weeman1337/fix-room-intro branch September 6, 2022 07:54
estellecomment added a commit to tchapgouv/tchap-web-v4 that referenced this pull request Sep 14, 2022
@estellecomment
Merge tag 'v1.11.5' into upgrade/element-web-v1.11.5
5afa0e9 
* Device manager - hide unverified security recommendation when only current session is unverified ([\#9228](matrix-org/matrix-react-sdk#9228)). Contributed by @kerryarchibald.
* Device manager - scroll to filtered list from security recommendations ([\#9227](matrix-org/matrix-react-sdk#9227)). Contributed by @kerryarchibald.
* Device manager - updated dropdown style in filtered device list ([\#9226](matrix-org/matrix-react-sdk#9226)). Contributed by @kerryarchibald.
* Device manager - device type and verification icons on device tile ([\#9197](matrix-org/matrix-react-sdk#9197)). Contributed by @kerryarchibald.
* Description of DM room with more than two other people is now being displayed correctly ([\#9231](matrix-org/matrix-react-sdk#9231)). Fixes #23094.
* Fix voice messages with multiple composers ([\#9208](matrix-org/matrix-react-sdk#9208)). Fixes #23023. Contributed by @grimhilt.
* Fix suggested rooms going missing ([\#9236](matrix-org/matrix-react-sdk#9236)). Fixes #23190.
* Fix tooltip infinitely recursing ([\#9235](matrix-org/matrix-react-sdk#9235)). Fixes matrix-org/element-web-rageshakes#15107, matrix-org/element-web-rageshakes#15093 matrix-org/element-web-rageshakes#15092 and matrix-org/element-web-rageshakes#15077.
* Fix plain text export saving ([\#9230](matrix-org/matrix-react-sdk#9230)). Contributed by @jryans.
* Add missing space in SecurityRoomSettingsTab ([\#9222](matrix-org/matrix-react-sdk#9222)). Contributed by @gefgu.
* Make use of js-sdk roomNameGenerator to handle i18n for generated room names ([\#9209](matrix-org/matrix-react-sdk#9209)). Fixes #21369.
* Fix progress bar regression throughout the app ([\#9219](matrix-org/matrix-react-sdk#9219)). Fixes #23121.
* Reuse empty string & space string logic for event types in devtools ([\#9218](matrix-org/matrix-react-sdk#9218)). Fixes #23115.
@grimhilt
Copy link
Contributor

I think tsc.txt is unwanted.

su-ex added a commit to SchildiChat/element-desktop that referenced this pull request Sep 15, 2022
@su-ex
Merge tag 'v1.11.5' into sc
57d2087 
* Device manager - hide unverified security recommendation when only current session is unverified ([\#9228](matrix-org/matrix-react-sdk#9228)). Contributed by @kerryarchibald.
* Device manager - scroll to filtered list from security recommendations ([\#9227](matrix-org/matrix-react-sdk#9227)). Contributed by @kerryarchibald.
* Device manager - updated dropdown style in filtered device list ([\#9226](matrix-org/matrix-react-sdk#9226)). Contributed by @kerryarchibald.
* Device manager - device type and verification icons on device tile ([\#9197](matrix-org/matrix-react-sdk#9197)). Contributed by @kerryarchibald.
* Description of DM room with more than two other people is now being displayed correctly ([\#9231](matrix-org/matrix-react-sdk#9231)). Fixes element-hq/element-web#23094.
* Fix voice messages with multiple composers ([\#9208](matrix-org/matrix-react-sdk#9208)). Fixes element-hq/element-web#23023. Contributed by @grimhilt.
* Fix suggested rooms going missing ([\#9236](matrix-org/matrix-react-sdk#9236)). Fixes element-hq/element-web#23190.
* Fix tooltip infinitely recursing ([\#9235](matrix-org/matrix-react-sdk#9235)). Fixes matrix-org/element-web-rageshakes#15107, matrix-org/element-web-rageshakes#15093 matrix-org/element-web-rageshakes#15092 and matrix-org/element-web-rageshakes#15077.
* Fix plain text export saving ([\#9230](matrix-org/matrix-react-sdk#9230)). Contributed by @jryans.
* Add missing space in SecurityRoomSettingsTab ([\#9222](matrix-org/matrix-react-sdk#9222)). Contributed by @gefgu.
* Make use of js-sdk roomNameGenerator to handle i18n for generated room names ([\#9209](matrix-org/matrix-react-sdk#9209)). Fixes element-hq/element-web#21369.
* Fix progress bar regression throughout the app ([\#9219](matrix-org/matrix-react-sdk#9219)). Fixes element-hq/element-web#23121.
* Reuse empty string & space string logic for event types in devtools ([\#9218](matrix-org/matrix-react-sdk#9218)). Fixes element-hq/element-web#23115.
su-ex added a commit to SchildiChat/element-web that referenced this pull request Sep 15, 2022
@su-ex
Merge tag 'v1.11.5' into sc
5c1a172 
* Device manager - hide unverified security recommendation when only current session is unverified ([\element-hq#9228](matrix-org/matrix-react-sdk#9228)). Contributed by @kerryarchibald.
* Device manager - scroll to filtered list from security recommendations ([\element-hq#9227](matrix-org/matrix-react-sdk#9227)). Contributed by @kerryarchibald.
* Device manager - updated dropdown style in filtered device list ([\element-hq#9226](matrix-org/matrix-react-sdk#9226)). Contributed by @kerryarchibald.
* Device manager - device type and verification icons on device tile ([\element-hq#9197](matrix-org/matrix-react-sdk#9197)). Contributed by @kerryarchibald.
* Description of DM room with more than two other people is now being displayed correctly ([\element-hq#9231](matrix-org/matrix-react-sdk#9231)). Fixes element-hq#23094.
* Fix voice messages with multiple composers ([\element-hq#9208](matrix-org/matrix-react-sdk#9208)). Fixes element-hq#23023. Contributed by @grimhilt.
* Fix suggested rooms going missing ([\element-hq#9236](matrix-org/matrix-react-sdk#9236)). Fixes element-hq#23190.
* Fix tooltip infinitely recursing ([\element-hq#9235](matrix-org/matrix-react-sdk#9235)). Fixes matrix-org/element-web-rageshakes#15107, matrix-org/element-web-rageshakes#15093 matrix-org/element-web-rageshakes#15092 and matrix-org/element-web-rageshakes#15077.
* Fix plain text export saving ([\element-hq#9230](matrix-org/matrix-react-sdk#9230)). Contributed by @jryans.
* Add missing space in SecurityRoomSettingsTab ([\element-hq#9222](matrix-org/matrix-react-sdk#9222)). Contributed by @gefgu.
* Make use of js-sdk roomNameGenerator to handle i18n for generated room names ([\element-hq#9209](matrix-org/matrix-react-sdk#9209)). Fixes element-hq#21369.
* Fix progress bar regression throughout the app ([\element-hq#9219](matrix-org/matrix-react-sdk#9219)). Fixes element-hq#23121.
* Reuse empty string & space string logic for event types in devtools ([\element-hq#9218](matrix-org/matrix-react-sdk#9218)). Fixes element-hq#23115.
su-ex added a commit to SchildiChat/matrix-react-sdk that referenced this pull request Sep 15, 2022
@su-ex
Merge tag 'v3.54.0' into sc
56e7672 
* Device manager - hide unverified security recommendation when only current session is unverified ([\matrix-org#9228](matrix-org#9228)). Contributed by @kerryarchibald.
* Device manager - scroll to filtered list from security recommendations ([\matrix-org#9227](matrix-org#9227)). Contributed by @kerryarchibald.
* Device manager - updated dropdown style in filtered device list ([\matrix-org#9226](matrix-org#9226)). Contributed by @kerryarchibald.
* Device manager - device type and verification icons on device tile ([\matrix-org#9197](matrix-org#9197)). Contributed by @kerryarchibald.
* Description of DM room with more than two other people is now being displayed correctly ([\matrix-org#9231](matrix-org#9231)). Fixes element-hq/element-web#23094.
* Fix voice messages with multiple composers ([\matrix-org#9208](matrix-org#9208)). Fixes element-hq/element-web#23023. Contributed by @grimhilt.
* Fix suggested rooms going missing ([\matrix-org#9236](matrix-org#9236)). Fixes element-hq/element-web#23190.
* Fix tooltip infinitely recursing ([\matrix-org#9235](matrix-org#9235)). Fixes matrix-org/element-web-rageshakes#15107, matrix-org/element-web-rageshakes#15093 matrix-org/element-web-rageshakes#15092 and matrix-org/element-web-rageshakes#15077.
* Fix plain text export saving ([\matrix-org#9230](matrix-org#9230)). Contributed by @jryans.
* Add missing space in SecurityRoomSettingsTab ([\matrix-org#9222](matrix-org#9222)). Contributed by @gefgu.
* Make use of js-sdk roomNameGenerator to handle i18n for generated room names ([\matrix-org#9209](matrix-org#9209)). Fixes element-hq/element-web#21369.
* Fix progress bar regression throughout the app ([\matrix-org#9219](matrix-org#9219)). Fixes element-hq/element-web#23121.
* Reuse empty string & space string logic for event types in devtools ([\matrix-org#9218](matrix-org#9218)). Fixes element-hq/element-web#23115.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@t3chguy t3chguy t3chguy approved these changes

Assignees
No one assigned
Labels
T-Defect Bugs, crashes, hangs, vulnerabilities, or other reported problems
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

multi party "pre-DM" screen incorrect subheader
3 participants
@weeman1337 @grimhilt @t3chguy