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

Adopt SelfVerification path from Element if cross-signing is activated #728

Merged
merged 3 commits into from
Feb 1, 2023
Merged

Adopt SelfVerification path from Element if cross-signing is activated #728

merged 3 commits into from
Feb 1, 2023

Conversation

NicolasBuquet
Copy link
Contributor

Pull Request Checklist

  • I read the contributing guide
  • UI change has been tested on both light and dark themes, in portrait and landscape orientations and on iPhone and iPad simulators
  • Accessibility has been taken into account.
  • Pull request is based on the develop branch
  • Pull request contains a changelog file in ./changelog.d
  • You've made a self review of your PR
  • Pull request includes screenshots or videos of UI changes
  • Pull request includes a sign off

@NicolasBuquet NicolasBuquet requested a review from giomfo January 31, 2023 17:12
@NicolasBuquet NicolasBuquet self-assigned this Jan 31, 2023
@NicolasBuquet NicolasBuquet linked an issue Jan 31, 2023 that may be closed by this pull request
Enable Key verification by QRCode #698
Closed
giomfo
giomfo approved these changes Feb 1, 2023
View reviewed changes
Copy link
Contributor

@giomfo giomfo left a comment

Choose a reason for hiding this comment

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

Approved, with a typo to fix

changelog.d/698.change Outdated
@@ -0,0 +1 @@
Adopt KeyVerification path from Element if cross-signing is activated
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Adopt KeyVerification path from Element if cross-signing is activated
Adopt SelfVerification path from Element if cross-signing is activated

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Modified as suggested by @giomfo

@NicolasBuquet NicolasBuquet changed the title Adopt KeyVerification path from Element if cross-signing is activated Adopt SelfVerification path from Element if cross-signing is activated Feb 1, 2023
@NicolasBuquet NicolasBuquet merged commit 8de34ab into develop Feb 1, 2023
@NicolasBuquet NicolasBuquet deleted the 698-enable-key-verification-by-qrcode branch February 1, 2023 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@giomfo giomfo giomfo approved these changes

Assignees

@NicolasBuquet NicolasBuquet

Labels
iOS
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Enable Key verification by QRCode
2 participants
@NicolasBuquet @giomfo