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.

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

Element-R: Implement VerificationRequest.accept #3526

Merged
merged 4 commits into from
Jul 3, 2023

Conversation

richvdh
Copy link
Member

@richvdh richvdh commented Jun 28, 2023

Part of element-hq/element-web#25320

Based on #3528


This change is marked as an internal change (Task), so will not be included in the changelog.

@richvdh richvdh added the T-Task Tasks for the team like planning label Jun 28, 2023
@richvdh
Copy link
Member Author

richvdh commented Jun 28, 2023

needs matrix-org/matrix-rust-sdk#2177 to pass the tests

Base automatically changed from rav/element-r/32_emit_request_received to develop June 28, 2023 14:49
@richvdh richvdh force-pushed the rav/element-r/33_accept_request branch from f440461 to 7a1ddec Compare June 29, 2023 13:45
@richvdh richvdh marked this pull request as ready for review June 29, 2023 14:01
@richvdh richvdh requested review from a team as code owners June 29, 2023 14:01
@richvdh richvdh changed the base branch from develop to rav/element-r/34_start_sas June 29, 2023 14:59
Base automatically changed from rav/element-r/34_start_sas to develop June 29, 2023 16:48
src/rust-crypto/verification.ts Outdated Show resolved Hide resolved
Comment on lines +1430 to +1432
version "0.1.0"
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0.tgz#766580036d4df12120ded223e13b5640e77db136"
integrity sha512-ra/bcFdleC1iRNms2I96UXA0NvQYWpMsHrV5EfJRS7qV1PtnQNvgsvMfjMbkx8QT2ErEmIhsvB5fPCpfp8BSuw==
Copy link
Member Author

Choose a reason for hiding this comment

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

0.1.0 fixes a bug in cancellation which you'll likely never notice unless you happen to be an integration test

@richvdh richvdh added this pull request to the merge queue Jul 3, 2023
Merged via the queue into develop with commit 3a8a138 Jul 3, 2023
@richvdh richvdh deleted the rav/element-r/33_accept_request branch July 3, 2023 11:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
T-Task Tasks for the team like planning
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants