Merge pull request #3795

2566f44 wizard: clear password field after wallet creation (selsta)
This commit is contained in:
luigi1111 2022-01-01 12:49:38 -05:00
commit d0950499da
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
7 changed files with 13 additions and 8 deletions

View file

@ -104,7 +104,6 @@ ColumnLayout {
labelFontSize: 14
password: true
labelText: qsTr("Password") + translationManager.emptyString
text: walletOptionsPassword
}
ColumnLayout {
@ -170,7 +169,6 @@ ColumnLayout {
labelFontSize: 14
passwordLinked: passwordInput
labelText: qsTr("Password (confirm)") + translationManager.emptyString
text: walletOptionsPassword
onTextChanged:{
if (passwordInputConfirm.text.length == passwordInput.text.length) {
firstUserInput = false;

View file

@ -194,6 +194,8 @@ Rectangle {
btnNext.enabled: walletInput.verify();
btnPrev.text: qsTr("Back to menu") + translationManager.emptyString
onPrevClicked: {
wizardController.wizardStateView.wizardCreateWallet2View.pwField = "";
wizardController.wizardStateView.wizardCreateWallet2View.pwConfirmField = "";
wizardStateView.state = "wizardHome";
}
onNextClicked: {

View file

@ -38,6 +38,8 @@ Rectangle {
color: "transparent"
property alias pageHeight: pageRoot.height
property string viewName: "wizardCreateWallet2"
property alias pwField: passwordFields.password
property alias pwConfirmField: passwordFields.passwordConfirm
ColumnLayout {
id: pageRoot
@ -64,9 +66,6 @@ Rectangle {
progress: 1
btnNext.enabled: passwordFields.calcStrengthAndVerify();
onPrevClicked: {
passwordFields.password = "";
passwordFields.passwordConfirm = "";
if(wizardController.walletOptionsIsRecoveringFromDevice){
wizardStateView.state = "wizardCreateDevice1";
} else {

View file

@ -77,6 +77,8 @@ Rectangle {
}
}
onNextClicked: {
wizardController.wizardStateView.wizardCreateWallet2View.pwField = "";
wizardController.wizardStateView.wizardCreateWallet2View.pwConfirmField = "";
wizardController.writeWallet(function() {
wizardController.useMoneroClicked();
wizardController.walletOptionsIsRecoveringFromDevice = false;

View file

@ -296,6 +296,8 @@ Rectangle {
btnNext.enabled: wizardRestoreWallet1.verify();
btnPrev.text: qsTr("Back to menu") + translationManager.emptyString
onPrevClicked: {
wizardController.wizardStateView.wizardRestoreWallet2View.pwField = "";
wizardController.wizardStateView.wizardRestoreWallet2View.pwConfirmField = "";
wizardStateView.state = "wizardHome";
}
onNextClicked: {

View file

@ -41,6 +41,9 @@ Rectangle {
property alias pageHeight: pageRoot.height
property string viewName: "wizardRestoreWallet2"
property int recoveryMode: 1
property alias pwField: passwordFields.password
property alias pwConfirmField: passwordFields.passwordConfirm
ColumnLayout {
id: pageRoot
@ -67,9 +70,6 @@ Rectangle {
progress: 1
btnNext.enabled: passwordFields.calcStrengthAndVerify();
onPrevClicked: {
passwordFields.password = "";
passwordFields.passwordConfirm = "";
wizardStateView.state = "wizardRestoreWallet1";
}
onNextClicked: {

View file

@ -77,6 +77,8 @@ Rectangle {
}
}
onNextClicked: {
wizardController.wizardStateView.wizardRestoreWallet2View.pwField = "";
wizardController.wizardStateView.wizardRestoreWallet2View.pwConfirmField = "";
wizardController.recoveryWallet();
wizardController.writeWallet(function() {
wizardController.useMoneroClicked();