Merge pull request #248

6ca4e05 wizard: Reset password and account name fields on wizard restart (Jaquee)

4 files changed, 27 insertions, 1 deletions

diff --git a/wizard/WizardCreateWallet.qml b/wizard/WizardCreateWallet.qml
index 11d91e24..81ee9ba7 100644
--- a/wizard/WizardCreateWallet.qml
+++ b/wizard/WizardCreateWallet.qml
@@ -44,6 +44,11 @@ Item {
 
     onOpacityChanged: visible = opacity !== 0
 
+    function onWizardRestarted() {
+        // reset account name field
+        uiItem.accountNameText = defaultAccountName
+    }
+
     //! function called each time we display this page
 
     function onPageOpened(settingsOblect) {
@@ -98,4 +103,8 @@ Item {
         wordsTextItem.memoTextReadOnly: true
         restoreHeightVisible:false
     }
+
+    Component.onCompleted: {
+        parent.wizardRestarted.connect(onWizardRestarted)
+    }
 }
diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml
index c57727e7..eabbec8e 100644
--- a/wizard/WizardMain.qml
+++ b/wizard/WizardMain.qml
@@ -49,6 +49,7 @@ Rectangle {
     property string currentPath: "create_wallet"
     property var pages: paths[currentPath]
 
+    signal wizardRestarted();
     signal useMoneroClicked()
     signal openWalletFromFileClicked()
     border.color: "#DBDBDB"
@@ -60,6 +61,7 @@ Rectangle {
         wizard.settings = ({})
         wizard.currentPath = "create_wallet"
         wizard.pages = paths[currentPath]
+        wizardRestarted();
 
         //hide all pages except first
         for (var i = 1; i < wizard.pages.length; i++){
diff --git a/wizard/WizardPassword.qml b/wizard/WizardPassword.qml
index 8645a300..3c66f83c 100644
--- a/wizard/WizardPassword.qml
+++ b/wizard/WizardPassword.qml
@@ -64,6 +64,12 @@ Item {
         return true
     }
 
+    function onWizardRestarted(){
+        // Reset password fields
+        passwordItem.password = "";
+        retypePasswordItem.password = "";
+    }
+
     function handlePassword() {
         // allow to forward step only if passwords match
 
@@ -178,6 +184,6 @@ Item {
     }
 
     Component.onCompleted: {
-        console.log
+        parent.wizardRestarted.connect(onWizardRestarted)
     }
 }
diff --git a/wizard/WizardRecoveryWallet.qml b/wizard/WizardRecoveryWallet.qml
index 55f61475..c5ff8bc9 100644
--- a/wizard/WizardRecoveryWallet.qml
+++ b/wizard/WizardRecoveryWallet.qml
@@ -41,6 +41,11 @@ Item {
 
     onOpacityChanged: visible = opacity !== 0
 
+    function onWizardRestarted() {
+        // reset account name field
+        uiItem.accountNameText = defaultAccountName
+    }
+
     function onPageOpened(settingsObject) {
         checkNextButton();
         // Empty seedText when restoring multiple times in one session
@@ -95,4 +100,8 @@ Item {
             checkNextButton();
         }
     }
+
+    Component.onCompleted: {
+        parent.wizardRestarted.connect(onWizardRestarted)
+    }
 }