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

Fix reset identity with password stuck in loading state. #3317

Merged

Conversation

jmartinesp
Copy link
Member

Content

Make sure resetIdentityFlowManager.whenResetIsDone is registered after the previous reset attempt is cancelled, otherwise the current one will be cancelled instead.

Motivation and context

Fixes #3316.

Tests

  • Sign in using a HS with username + password login.
  • When asked to verify your account, reset it instead.
  • Make sure the reset works and takes you to the home screen.

Tested devices

  • Physical
  • Emulator
  • OS version(s): 14

Checklist

  • Changes have been tested on an Android device or Android emulator with API 23
  • UI change has been tested on both light and dark themes
  • Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility
  • Pull request is based on the develop branch
  • Pull request title will be used in the release note, it clearly define what will change for the user
  • Pull request includes screenshots or videos if containing UI changes
  • Pull request includes a sign off
  • You've made a self review of your PR

@jmartinesp jmartinesp added the PR-Bugfix For bug fix label Aug 20, 2024
@jmartinesp jmartinesp requested a review from a team as a code owner August 20, 2024 14:09
@jmartinesp jmartinesp requested review from bmarty and removed request for a team August 20, 2024 14:09
Make sure `resetIdentityFlowManager.whenResetIsDone` is registered *after* the previous reset attempt is cancelled, otherwise the current one will be cancelled instead.
Copy link
Contributor

github-actions bot commented Aug 20, 2024

📱 Scan the QR code below to install the build (arm64 only) for this PR.
QR code
If you can't scan the QR code you can install the build via this link: https://i.diawi.com/S7DSwy

Copy link

codecov bot commented Aug 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.71%. Comparing base (534e3a8) to head (ac792da).
Report is 1 commits behind head on develop.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #3317   +/-   ##
========================================
  Coverage    82.71%   82.71%           
========================================
  Files         1679     1679           
  Lines        39334    39334           
  Branches      4767     4767           
========================================
  Hits         32534    32534           
  Misses        5122     5122           
  Partials      1678     1678           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jmartinesp jmartinesp force-pushed the fix/jme/3316-reset-identity-not-stuck-in-loading-state branch from 8ef50f2 to ac792da Compare August 20, 2024 14:18
Copy link
Member

@bmarty bmarty left a comment

Choose a reason for hiding this comment

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

Make sense, thanks.

@bmarty bmarty added the Run-Maestro Starts a Maestro Cloud session to run integration tests label Aug 20, 2024
@github-actions github-actions bot removed the Run-Maestro Starts a Maestro Cloud session to run integration tests label Aug 20, 2024
Copy link

sonarcloud bot commented Aug 20, 2024

@jmartinesp jmartinesp enabled auto-merge (squash) August 20, 2024 14:42
@jmartinesp jmartinesp merged commit 0686745 into develop Aug 20, 2024
29 checks passed
@jmartinesp jmartinesp deleted the fix/jme/3316-reset-identity-not-stuck-in-loading-state branch August 20, 2024 19:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR-Bugfix For bug fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Reset identity seems to get completely stuck sometimes
2 participants