-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Update vector-im (compound-web to 8.2.1, design tokens is already at 6.0.0 on develop) #30373
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.
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
Changes from 26 commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
54f325e
Update vector-im
renovate[bot] a8856ca
Update snapshots
t3chguy 19e6aaf
Update tests
t3chguy b578393
Make BaseDialog's div keyboard focusable and fix test.
langleyd 97653c1
Merge branch 'develop' of github.com:vector-im/element-web into renov…
langleyd f76a535
Update more e2e tests to use switch instead of checkbox
langleyd 9dddaf7
Merge branch 'develop' of github.com:vector-im/element-web into renov…
langleyd e06d76e
fix useParticipants incorrectly returning an array when a map is expe…
langleyd c45ad30
Try again to fix calParticipants
langleyd f83093c
try fix RoomHeader tests again by also mocking useParticipants
langleyd e456782
Revert "try fix RoomHeader tests again by also mocking useParticipants"
langleyd fb502a6
Try with no dependencies
langleyd 92034aa
try mocking useCall rather than just useParticipantCount
langleyd 644be31
Mock the call store rather than the hook
langleyd 043d812
Only mock the call object for tests that expect it.
langleyd 8e67cfe
Revert "Only mock the call object for tests that expect it."
langleyd 667827e
Revert "Mock the call store rather than the hook"
langleyd 3900a1e
Revert "try mocking useCall rather than just useParticipantCount"
langleyd f396b28
Revert "Try with no dependencies"
langleyd 6cf8dc5
Reapply "try fix RoomHeader tests again by also mocking useParticipants"
langleyd db50519
Revert "try fix RoomHeader tests again by also mocking useParticipants"
langleyd f67825c
Revert "Try again to fix calParticipants"
langleyd fecb387
Revert "fix useParticipants incorrectly returning an array when a map…
langleyd 934c2dc
Merge branch 'develop' of github.com:vector-im/element-web into renov…
langleyd 1164141
bump compound-web
langleyd 35019df
Update snapshots
langleyd 0c907c5
Fix bad merge, we don't need the second call to escape. The comment a…
langleyd e2c1be4
Trigger build to fix licence/cla check
langleyd File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
given the test is "calls onFinished when Escape is pressed", not "... when Escape is pressed twice", this looks wrong. At the very least it needs some comments to explain it.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh that's a bad merge 🤦♂️. The purpose of one of the other PRS was to fix this. -> https://github.com/element-hq/element-web/pull/30631/files#diff-2cb6b3d0d6c9b34731feb5703b2b78b91e09869f01c92186797cb90abc8a3156R18.
Will correct it.