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

Feature/1897 psk #1961

Merged
merged 39 commits into from
Nov 14, 2023
Merged

Feature/1897 psk #1961

merged 39 commits into from
Nov 14, 2023

Conversation

EmiM
Copy link
Contributor

@EmiM EmiM commented Oct 12, 2023

Pull Request Checklist

  • I have linked this PR to related GitHub issue.
  • I have updated the CHANGELOG.md file with relevant changes (the file is located at the root of monorepo).

(Optional) Mobile checklist

Please ensure you completed the following checks if you did any changes to the mobile package:

  • I have run e2e tests for mobile
  • I have updated base screenshots for visual regression tests

Task related:

  • Generate and save psk
  • Handle new invitation link format
  • Handle invalid psk error
  • Handle invalid invitation link errors
  • Adjust tests

@EmiM EmiM force-pushed the feature/1897-psk branch from 8ae801d to 294945c Compare October 24, 2023 12:33
@EmiM EmiM marked this pull request as ready for review October 24, 2023 20:50
@EmiM EmiM requested review from leblowl, vinkabuki and siepra October 24, 2023 20:50
Copy link
Contributor

@siepra siepra left a comment

Choose a reason for hiding this comment

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

I see Android e2e tests have failed, can you make sure it's not because of the changes you made? https://github.com/TryQuiet/quiet/actions/runs/6632205761/job/18017378690?pr=1961
We had a similar situation with @Kacper-RF in some other PR and it turned out to actually be a problem with the code

packages/backend/src/nest/common/utils.ts Outdated Show resolved Hide resolved
packages/backend/src/nest/common/utils.ts Outdated Show resolved Hide resolved
packages/backend/src/nest/common/utils.ts Outdated Show resolved Hide resolved
packages/common/src/static.ts Outdated Show resolved Hide resolved
packages/common/src/tests.ts Show resolved Hide resolved
packages/desktop/libssl.so Outdated Show resolved Hide resolved
Copy link
Collaborator

@leblowl leblowl left a comment

Choose a reason for hiding this comment

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

Looks good overall. Thanks @EmiM! I have some mostly minor suggestions.

packages/backend/src/nest/libp2p/libp2p.service.ts Outdated Show resolved Hide resolved
packages/backend/package.json Show resolved Hide resolved
packages/common/src/invitationCode.ts Outdated Show resolved Hide resolved
packages/types/src/socket.ts Outdated Show resolved Hide resolved
Copy link
Collaborator

@leblowl leblowl left a comment

Choose a reason for hiding this comment

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

Awesome work! Thanks so much for doing this! I don't want to approve as a gatekeeper, but rather as a "+1", as a partner. There are a lot of different ways of doing things and there really isn't an ultimately right way, so it's important to keep our minds open to our creative inspiration.

@EmiM EmiM merged commit 8fcf1f3 into develop Nov 14, 2023
24 of 30 checks passed
@siepra siepra deleted the feature/1897-psk branch December 8, 2023 12:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants