Skip to content

Continue button is disabled when uploading a recovery key file #29695

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
t3chguy merged 3 commits into from
Apr 10, 2025
Merged

Continue button is disabled when uploading a recovery key file #29695

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a68415
Wait for setState to complete before validating recovery key
Giwayume Apr 9, 2025
b7771f3
Linter fix
Giwayume Apr 9, 2025
4382e5c
Pass in recovery key to validateRecoveryKey function
Giwayume Apr 9, 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
13 changes: 7 additions & 6 deletions src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
};

private validateRecoveryKeyOnChange = debounce(async (): Promise<void> => {
await this.validateRecoveryKey();
await this.validateRecoveryKey(this.state.recoveryKey);
}, VALIDATION_THROTTLE_MS);

private async validateRecoveryKey(): Promise<void> {
if (this.state.recoveryKey === "") {
private async validateRecoveryKey(recoveryKey: string): Promise<void> {
if (recoveryKey === "") {
this.setState({
recoveryKeyValid: null,
recoveryKeyCorrect: null,
Expand All @@ -100,7 +100,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp

try {
const cli = MatrixClientPeg.safeGet();
const decodedKey = decodeRecoveryKey(this.state.recoveryKey);
const decodedKey = decodeRecoveryKey(recoveryKey);
const correct = await cli.secretStorage.checkKey(decodedKey, this.props.keyInfo);
this.setState({
recoveryKeyValid: true,
Expand Down Expand Up @@ -148,11 +148,12 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
// right number of characters, but it's really just to make sure that what we're reading is
// text because we'll put it in the text field.
if (/^[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz\s]+$/.test(contents)) {
const recoveryKey = contents.trim();
this.setState({
recoveryKeyFileError: null,
recoveryKey: contents.trim(),
recoveryKey,
});
await this.validateRecoveryKey();
await this.validateRecoveryKey(recoveryKey);
} else {
this.setState({
recoveryKeyFileError: true,
Expand Down
Loading