Skip to content

AccessSecretStorageDialog: fix inability to enter recovery key #30090

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

Merged
merged 5 commits into from
Jun 6, 2025

Conversation

richvdh
Copy link
Member

@richvdh richvdh commented Jun 5, 2025

Wrap AccessSecretStorageDialog in a BaseDialog. The main thing this achieves is a FocusLock.

Also, some fixes to the documentation on BaseDialog, and a playwright test.

Review commit-by-commit.

Fixes: #30089

Since `onFinished` isn't used if `hasCancel` is false, it's a bit silly to make
it mandatory.
@richvdh richvdh requested review from a team as code owners June 5, 2025 22:17
@richvdh richvdh requested review from andybalaam and t3chguy June 5, 2025 22:17
@richvdh richvdh force-pushed the rav/fix_recovery_key_entry branch from 9ae0cbf to 337a375 Compare June 5, 2025 22:21
@richvdh richvdh changed the title AccessSecretStorageDialog: fix inability to enter recovery key Wrap AccessSecretStorageDialog in a BaseDialog. The main thing this achieves is a FocusLock. AccessSecretStorageDialog: fix inability to enter recovery key Jun 5, 2025
richvdh added 3 commits June 6, 2025 10:14
Wrap AccessSecretStorageDialog in a `BaseDialog`. The main thing this achieves
is a `FocusLock`.
We have two copies of the same code, and we're about to add a third...
Copy link
Member

@andybalaam andybalaam left a comment

Choose a reason for hiding this comment

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

Great, thanks!

>
{content}
</EncryptionCard>
<BaseDialog fixedWidth={false} hasCancel={false}>
Copy link
Member

Choose a reason for hiding this comment

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

I went back and forth about that fact that this dialog does have a cancel button, so shouldn't it use the one provided by BaseDialog, and why shouldn't it have an X in the top right, but I think your change strictly makes things better so is fine for now.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fair point. I just made it match the designs.

@richvdh richvdh force-pushed the rav/fix_recovery_key_entry branch from 167507f to 18b9c36 Compare June 6, 2025 10:59
@richvdh richvdh added this pull request to the merge queue Jun 6, 2025
Merged via the queue into develop with commit 7eb16b3 Jun 6, 2025
34 checks passed
@richvdh richvdh deleted the rav/fix_recovery_key_entry branch June 6, 2025 11:36
snowping pushed a commit to Novaloop-AG/element-web that referenced this pull request Jun 22, 2025
…nt-hq#30090)

* BaseDialog: fix documentation, and make `onFinished` optional

Since `onFinished` isn't used if `hasCancel` is false, it's a bit silly to make
it mandatory.

* AccessSecretStorageDialog: fix inability to enter recovery key

Wrap AccessSecretStorageDialog in a `BaseDialog`. The main thing this achieves
is a `FocusLock`.

* playwright: factor out helper for verification

We have two copies of the same code, and we're about to add a third...

* playwright: test for verifying from Settings

* Add a unit test for BaseDialog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to verify by entering recovery key
3 participants