imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix submit button disabled breaking async task

Browse source
This commit is contained in:
Michael Telatynski 2020-02-09 14:49:54 +00:00
parent 150f2b3f84
commit 0393a57b5a
3 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
View file

@ -413,8 +413,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
"as trusted for other users.",
)}</p>
<div>{authPrompt}</div>
<DialogButtons primaryButton={nextCaption}
primaryIsSubmit={true}
<DialogButtons
primaryButton={nextCaption}
hasCancel={false}
primaryDisabled={this.state.canUploadKeysWithPasswordOnly && !this.state.accountPassword}
>
@ -458,7 +458,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
</div>;
}
return <form>
return <form onSubmit={this._onPassPhraseNextClick}>
<p>{_t(
"Set up encryption on this session to allow it to verify other sessions, " +
"granting them access to encrypted messages and marking them as trusted for other users.",
@ -495,7 +495,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
onPrimaryButtonClick={this._onPassPhraseNextClick}
hasCancel={false}
disabled={!this._passPhraseIsValid()}
primaryIsSubmit={true}
>
<button type="button"
onClick={this._onSkipSetupClick}
@ -542,7 +541,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
</div>;
}
const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
return <form>
return <form onSubmit={this._onPassPhraseConfirmNextClick}>
<p>{_t(
"Enter your passphrase a second time to confirm it.",
)}</p>
@ -565,7 +564,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
primaryButton={_t('Continue')}
onPrimaryButtonClick={this._onPassPhraseConfirmNextClick}
hasCancel={false}
primaryIsSubmit={true}
disabled={this.state.passPhrase !== this.state.passPhraseConfirm}
>
<button type="button"