Merge pull request #1082

4c9e2c1 [Issue 1080] Fixed undefined variable for password rewrite when changing wallet initial block height

2 files changed, 4 insertions, 4 deletions

diff --git a/main.qml b/main.qml
index 8838eb29..73d36eed 100644
--- a/main.qml
+++ b/main.qml
@@ -224,7 +224,7 @@ ApplicationWindow {
             var wallet_path = walletPath();
             if(isIOS)
                 wallet_path = moneroAccountsDir + wallet_path;
-            // console.log("opening wallet at: ", wallet_path, "with password: ", appWindow.password);
+            // console.log("opening wallet at: ", wallet_path, "with password: ", appWindow.walletPassword);
             console.log("opening wallet at: ", wallet_path, ", testnet: ", persistentSettings.testnet);
             walletManager.openWalletAsync(wallet_path, walletPassword,
                                               persistentSettings.testnet);
diff --git a/pages/Settings.qml b/pages/Settings.qml
index c4e3f50e..f5b25f74 100644
--- a/pages/Settings.qml
+++ b/pages/Settings.qml
@@ -128,7 +128,7 @@ Rectangle {
                     confirmationDialog.onAcceptedCallback = function() {
                         walletManager.closeWallet();
                         walletManager.clearWalletCache(persistentSettings.wallet_path);
-                        walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.password,
+                        walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.walletPassword,
                                                           persistentSettings.testnet);
                     }
 
@@ -580,7 +580,7 @@ Rectangle {
                 onClicked: {
                     currentWallet.walletCreationHeight = restoreHeight.text
                     // Restore height is saved in .keys file. Set password to trigger rewrite.
-                    currentWallet.setPassword(appWindow.password)
+                    currentWallet.setPassword(appWindow.walletPassword)
                     restoreHeightRow.visible = false
 
                     // Show confirmation dialog
@@ -597,7 +597,7 @@ Rectangle {
                     confirmationDialog.onAcceptedCallback = function() {
                         walletManager.closeWallet();
                         walletManager.clearWalletCache(persistentSettings.wallet_path);
-                        walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.password,
+                        walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.walletPassword,
                                                           persistentSettings.testnet);
                     }