Merge pull request #2665

c6c094b SettingsWallet: cleanup on wallet close (xiphon)

2 files changed, 4 insertions, 6 deletions

diff --git a/main.qml b/main.qml
index 3989fcee..b11bfe2f 100644
--- a/main.qml
+++ b/main.qml
@@ -1113,6 +1113,9 @@ ApplicationWindow {
             rootItem.state = "wizard"
             // reset balance
             clearMoneroCardLabelText();
+            middlePanel.addressBookView.clearFields();
+            middlePanel.transferView.clearFields();
+            middlePanel.receiveView.clearFields();
             // disable timers
             userInActivityTimer.running = false;
             simpleModeConnectionTimer.running = false;
diff --git a/pages/settings/SettingsWallet.qml b/pages/settings/SettingsWallet.qml
index a17d60ef..877508d9 100644
--- a/pages/settings/SettingsWallet.qml
+++ b/pages/settings/SettingsWallet.qml
@@ -54,12 +54,7 @@ Rectangle {
             description: qsTr("Logs out of this wallet.") + translationManager.emptyString
             title: qsTr("Close this wallet") + translationManager.emptyString
 
-            onClicked: {
-                middlePanel.addressBookView.clearFields();
-                middlePanel.transferView.clearFields();
-                middlePanel.receiveView.clearFields();
-                appWindow.showWizard();
-            }
+            onClicked: appWindow.showWizard()
         }
 
         MoneroComponents.SettingsListItem {