oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

Re-applied formatting fixes.

Browse source
This commit is contained in:
Warrick Corfe-Tan 2021-05-04 12:45:56 +10:00
parent 56b8dfacc1
commit 6079f43cd8
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ts/components/session/SessionPasswordModal.tsx
View file

@ -37,7 +37,7 @@ class SessionPasswordModalInner extends React.Component<Props, State> {
error: null,
currentPasswordEntered: null,
currentPasswordConfirmEntered: null,
currentPasswordRetypeEntered: null
currentPasswordRetypeEntered: null,
};
this.showError = this.showError.bind(this);
@ -61,7 +61,11 @@ class SessionPasswordModalInner extends React.Component<Props, State> {
const { action, onOk } = this.props;
const placeholders =
action === PasswordAction.Change
? [window.i18n('typeInOldPassword'), window.i18n('enterPassword'), window.i18n('confirmPassword')]
? [
window.i18n('typeInOldPassword'),
window.i18n('enterPassword'),
window.i18n('confirmPassword'),
]
: [window.i18n('enterPassword'), window.i18n('confirmPassword')];
const confirmButtonColor =
@ -196,7 +200,11 @@ class SessionPasswordModalInner extends React.Component<Props, State> {
this.closeDialog();
}
private async handleActionChange(oldPassword: string, newPassword: string, newConfirmedPassword: string) {
private async handleActionChange(
oldPassword: string,
newPassword: string,
newConfirmedPassword: string
) {
// We don't validate oldPassword on change: this is validate on the validatePasswordHash below
// we only validate the newPassword here
if (!this.validatePassword(newPassword)) {
@ -206,9 +214,9 @@ class SessionPasswordModalInner extends React.Component<Props, State> {
// Check the retyped password matches the new password
if (newPassword !== newConfirmedPassword) {
this.setState({
error: window.i18n('passwordsDoNotMatch')
})
return
error: window.i18n('passwordsDoNotMatch'),
});
return;
}
const isValidWithStoredInDB = Boolean(
@ -262,7 +270,7 @@ class SessionPasswordModalInner extends React.Component<Props, State> {
const {
currentPasswordEntered,
currentPasswordConfirmEntered,
currentPasswordRetypeEntered
currentPasswordRetypeEntered,
} = this.state;
const { Set, Remove, Change } = PasswordAction;