Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Fix voice messages with multiple composers#9208

Merged
justjanne merged 11 commits intomatrix-org:developfrom
grimhilt:vm-thread
Sep 5, 2022
Merged

Fix voice messages with multiple composers#9208
justjanne merged 11 commits intomatrix-org:developfrom
grimhilt:vm-thread

Conversation

@grimhilt
Copy link
Copy Markdown
Contributor

@grimhilt grimhilt commented Aug 19, 2022 •
edited by github-actions bot
Loading

Type: Defect
Fixes: element-hq/element-web#23023

Signed-off-by: Grimhilt grimhilt@proton.me

Here's what your changelog entry will look like:

🐛 Bug Fixes

Fix composer behavior with voice messages when several composers are shown (#9208). Fixes element-hq/element-web#23023. Contributed by @grimhilt.

Here's what your changelog entry will look like:

🐛 Bug Fixes

@grimhilt grimhilt requested a review from a team as a code owner August 19, 2022 16:35
@github-actions github-actions bot added the Z-Community-PR Issue is solved by a community member's PR label Aug 19, 2022
@github-actions github-actions bot added the T-Defect Bugs, crashes, hangs, vulnerabilities, or other reported problems label Aug 22, 2022
justjanne
justjanne reviewed Aug 22, 2022
View reviewed changes
@grimhilt grimhilt requested review from justjanne and removed request for andybalaam and duxovni August 22, 2022 21:49
justjanne
justjanne reviewed Aug 24, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@justjanne justjanne left a comment

Choose a reason for hiding this comment

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

Overall already much better, but you’ve accidentally made typos while fixing the previous typos, and I’d recommend to make the getVoiceRecordingId method static.

@grimhilt grimhilt requested a review from justjanne August 24, 2022 13:25
@justjanne
Copy link
Copy Markdown
Contributor

justjanne commented Aug 24, 2022

Code-wise, it looks great now.

From what I can tell, all that’s missing now is a sign-off. Note our sign-off policy:

We accept contributions under a legally identifiable name, such as your name on government documentation or common-law names (names claimed by legitimate usage or repute). Unfortunately, we cannot accept anonymous contributions at this time.

@grimhilt
Copy link
Copy Markdown
Contributor Author

grimhilt commented Aug 24, 2022

I updated the first message with my real name and a valid email address.

@justjanne
Copy link
Copy Markdown
Contributor

justjanne commented Aug 26, 2022

Is it alright with you if I merge the current develop branch into your PR branch and re-run CI to get it to pass?

@grimhilt
Copy link
Copy Markdown
Contributor Author

grimhilt commented Aug 26, 2022

No problem.

justjanne
justjanne suggested changes Aug 26, 2022
View reviewed changes
@germain-gg germain-gg requested a review from justjanne August 31, 2022 09:29
@justjanne justjanne merged commit 6d03cb3 into matrix-org:develop Sep 5, 2022
@grimhilt
Copy link
Copy Markdown
Contributor Author

grimhilt commented Sep 5, 2022

Thank you for reviewing @justjanne

@grimhilt grimhilt deleted the vm-thread branch September 5, 2022 19:32
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.
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 subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@justjanne justjanne justjanne approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

T-Defect Bugs, crashes, hangs, vulnerabilities, or other reported problems Z-Community-PR Issue is solved by a community member's PR

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Voice messages break when two composers are shown (main + thread)

2 participants

@grimhilt @justjanne