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

Fix cancel button / prompt

Browse source
This commit is contained in:
David Baker 2020-06-23 16:43:52 +01:00
parent 0694776b25
commit 3716f9d82c
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -378,12 +378,12 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
this._bootstrapSecretStorage(); this._bootstrapSecretStorage();
} }
_onSkipSetupClick = () => { _onCancelClick = () => {
this.setState({phase: PHASE_CONFIRM_SKIP}); this.setState({phase: PHASE_CONFIRM_SKIP});
} }
_onSetUpClick = () => { _onGoBackClick = () => {
this.setState({phase: PHASE_PASSPHRASE}); this.setState({phase: PHASE_CHOOSE_KEY_PASSPHRASE});
} }
_onSkipPassPhraseClick = async () => { _onSkipPassPhraseClick = async () => {
@ -496,7 +496,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
<DialogButtons <DialogButtons
primaryButton={_t("Continue")} primaryButton={_t("Continue")}
onPrimaryButtonClick={this._onChooseKeyPassphraseFormSubmit} onPrimaryButtonClick={this._onChooseKeyPassphraseFormSubmit}
onCancel={this._onCancel} onCancel={this._onCancelClick}
hasCancel={true} hasCancel={true}
/> />
</form>; </form>;
@ -750,15 +750,17 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
_renderPhaseSkipConfirm() { _renderPhaseSkipConfirm() {
return <div> return <div>
{_t( <p>{_t(
"Without completing security on this session, it won’t have " + "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.",
"access to encrypted messages.", )}</p>
)} <p>{_t(
"You can also set up Secure Backup & manage your keys in Settings.",
)}</p>
<DialogButtons primaryButton={_t('Go back')} <DialogButtons primaryButton={_t('Go back')}
onPrimaryButtonClick={this._onSetUpClick} onPrimaryButtonClick={this._onGoBackClick}
hasCancel={false} hasCancel={false}
> >
<button type="button" className="danger" onClick={this._onCancel}>{_t('Skip')}</button> <button type="button" className="danger" onClick={this._onCancel}>{_t('Cancel')}</button>
</DialogButtons> </DialogButtons>
</div>; </div>;
} }

2
src/i18n/strings/en_EN.json
View file

@ -2198,6 +2198,8 @@
"Unable to query secret storage status": "Unable to query secret storage status", "Unable to query secret storage status": "Unable to query secret storage status",
"Retry": "Retry", "Retry": "Retry",
"You can now verify your other devices, and other users to keep your chats safe.": "You can now verify your other devices, and other users to keep your chats safe.", "You can now verify your other devices, and other users to keep your chats safe.": "You can now verify your other devices, and other users to keep your chats safe.",
"If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.",
"You can also set up Secure Backup & manage your keys in Settings.": "You can also set up Secure Backup & manage your keys in Settings.",
"Set up Secure backup": "Set up Secure backup", "Set up Secure backup": "Set up Secure backup",
"Upgrade your encryption": "Upgrade your encryption", "Upgrade your encryption": "Upgrade your encryption",
"Confirm recovery passphrase": "Confirm recovery passphrase", "Confirm recovery passphrase": "Confirm recovery passphrase",