Skip to content

Block change recovery key button while a change is ongoing. #30664

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

Merged
merged 12 commits into from
Sep 4, 2025
Merged

Block change recovery key button while a change is ongoing. #30664

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
04908ce
Block change recovery key button while a change is ongoing.
Half-Shot Sep 2, 2025
ec57695
Add disable check
Half-Shot Sep 2, 2025
e8e5902
lint
Half-Shot Sep 2, 2025
fcdab9d
Ensure we test that spamming the button doesn't break it.
Half-Shot Sep 2, 2025
8131ea9
Mock out modals
Half-Shot Sep 2, 2025
1c58b8b
Merge branch 'develop' into hs/fix-confirm-recovery-key-multi-press
Half-Shot Sep 2, 2025
d9d2ddd
lint
Half-Shot Sep 2, 2025
7f9e26d
add two more clicks
Half-Shot Sep 3, 2025
7b11a76
Merge remote-tracking branch 'origin/develop' into hs/fix-confirm-rec…
Half-Shot Sep 3, 2025
01108cc
lint
Half-Shot Sep 3, 2025
4eb30f6
Merge branch 'develop' into hs/fix-confirm-recovery-key-multi-press
Half-Shot Sep 4, 2025
0999677
Merge branch 'develop' into hs/fix-confirm-recovery-key-multi-press
andybalaam Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion playwright/e2e/settings/encryption-user-tab/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,10 @@ class Helpers {

const clipboardContent = await this.app.getClipboard();
await dialog.getByRole("textbox").fill(clipboardContent);
await dialog.getByRole("button", { name: confirmButtonLabel }).click();
const button = dialog.getByRole("button", { name: confirmButtonLabel });
await button.click();
// Button should disable immediately after clicking.
await expect(button).toBeDisabled();
await expect(this.getEncryptionRecoverySection()).toMatchScreenshot("default-recovery.png");
}
}
12 changes: 8 additions & 4 deletions src/components/views/settings/encryption/ChangeRecoveryKey.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Please see LICENSE files in the repository root for full details.
*/

import React, { type FormEventHandler, type JSX, type MouseEventHandler, useState } from "react";
import React, { type JSX, type MouseEventHandler, useState } from "react";
import {
Breadcrumb,
Button,
Expand Down Expand Up @@ -310,7 +310,7 @@ interface KeyFormProps {
/**
* Called when the form is submitted.
*/
onSubmit: FormEventHandler;
onSubmit: () => Promise<void>;
/**
* The recovery key to confirm.
*/
Expand All @@ -329,14 +329,18 @@ interface KeyFormProps {
function KeyForm({ onCancelClick, onSubmit, recoveryKey, submitButtonLabel }: KeyFormProps): JSX.Element {
// Undefined by default, as the key is not filled yet
const [isKeyValid, setIsKeyValid] = useState<boolean>();
const [isKeyChangeInProgress, setIsKeyChangeInProgress] = useState<boolean>(false);
const isKeyInvalidAndFilled = isKeyValid === false;

return (
<Root
className="mx_KeyForm"
onSubmit={(evt) => {
evt.preventDefault();
onSubmit(evt);
setIsKeyChangeInProgress(true);
onSubmit().finally(() => {
setIsKeyChangeInProgress(false);
});
}}
onChange={async (evt) => {
evt.preventDefault();
Expand All @@ -360,7 +364,7 @@ function KeyForm({ onCancelClick, onSubmit, recoveryKey, submitButtonLabel }: Ke
)}
</Field>
<EncryptionCardButtons>
<Button disabled={!isKeyValid}>{submitButtonLabel}</Button>
<Button disabled={!isKeyValid || isKeyChangeInProgress}>{submitButtonLabel}</Button>
<Button kind="tertiary" onClick={onCancelClick}>
{_t("action|cancel")}
</Button>
Expand Down
Loading