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

QR code reciprocation #4334

Merged
merged 11 commits into from
Apr 3, 2020
Merged

QR code reciprocation #4334

merged 11 commits into from
Apr 3, 2020

Conversation

bwindels
Copy link
Contributor

@bwindels bwindels commented Apr 2, 2020

Requires matrix-org/matrix-js-sdk#1297
Fixes element-hq/element-web#12201

This moves the QR code generation into the js-sdk, see the linked PR why.

Self-verification (the UX will need to be cleaned up here, leaving that as part of element-hq/element-web#12725):

reciprocate-self

User-verification:

reciprocate-user

@bwindels bwindels force-pushed the bwindels/qr-reciprocate branch from d6f5eb7 to 31ca52d Compare April 2, 2020 11:44
@bwindels bwindels requested a review from a team April 2, 2020 11:53
@bwindels bwindels changed the title QR Code reciprocation #1297 QR code reciprocation #1297 Apr 2, 2020
@bwindels
Copy link
Contributor Author

bwindels commented Apr 2, 2020

Actually polished the self-verification screen a bit more as part of this PR.

@bwindels bwindels changed the title QR code reciprocation #1297 QR code reciprocation Apr 3, 2020
@bwindels bwindels merged commit c15fa2b into develop Apr 3, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ask if the other user / device scanned the QR code
2 participants