status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-21 02:58:55 +00:00
Code Issues Projects Releases Wiki Activity

fix(@desktop/onboarding): Improve password validation and showing don't match error

Browse Source 
Fix #5319
This commit is contained in:
Michal Iskierko 2022-05-11 10:10:31 +02:00 committed by Michał Iskierko
parent 991e04ef95
commit 0bb594d05f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/imports/shared/views/PasswordView.qml
View File

@ -48,7 +48,11 @@ Column {
currentPswInput.forceActiveFocus(Qt.MouseFocusReason) currentPswInput.forceActiveFocus(Qt.MouseFocusReason)
} }
function checkPasswordMatches() { function checkPasswordMatches(onlyIfConfirmPasswordHasFocus = true) {
if (onlyIfConfirmPasswordHasFocus && !confirmPswInput.textField.focus) {
return
}
if(newPswInput.text.length >= root.minPswLen) { if(newPswInput.text.length >= root.minPswLen) {
errorTxt.text = "" errorTxt.text = ""
if(confirmPswInput.text !== newPswInput.text) { if(confirmPswInput.text !== newPswInput.text) {
@ -300,10 +304,13 @@ Column {
onTextChanged: { if(textField.text.length === newPswInput.text.length) root.checkPasswordMatches() } onTextChanged: { if(textField.text.length === newPswInput.text.length) root.checkPasswordMatches() }
textField.onFocusChanged: { textField.onFocusChanged: {
// When clicking into the confirmation input, validate if new password: // When clicking into the confirmation input, validate if new password:
if(textField.focus) d.passwordValidation() if(textField.focus) {
d.passwordValidation()
}
// When leaving the confirmation input because of the button or other input component is focused, check if password matches // When leaving the confirmation input because of the button or other input component is focused, check if password matches
else root.checkPasswordMatches(true) else {
root.checkPasswordMatches(false)
}
} }
StatusFlatRoundButton { StatusFlatRoundButton {