From 35a0f25b5702a13696aec4bc679d0c25b576ca17 Mon Sep 17 00:00:00 2001 From: selsta Date: Mon, 1 Jul 2019 11:44:33 +0200 Subject: PasswordDialog: merge components and bug fixes This commit merges PasswordDialog, PassphraseDialog and NewPasswordDialog. Also the following bugs were fixed: - Wizard pages still being active when opening a wallet from wizard. - Capslock detection was buggy when copy pasting password, I replaced it with native implementations for each platform. - isAlpha could throw errors when using special characters. --- wizard/WizardController.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'wizard') diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml index f4728ac2..c209faf0 100644 --- a/wizard/WizardController.qml +++ b/wizard/WizardController.qml @@ -498,15 +498,15 @@ Rectangle { splash.close() console.log(">>> wallet passphrase needed: "); - passphraseDialog.onAcceptedCallback = function() { - walletManager.onPassphraseEntered(passphraseDialog.passphrase); + passwordDialog.onAcceptedPassphraseCallback = function() { + walletManager.onPassphraseEntered(passwordDialog.password); creatingWalletDeviceSplash(); } - passphraseDialog.onRejectedCallback = function() { + passwordDialog.onRejectedPassphraseCallback = function() { walletManager.onPassphraseEntered("", true); creatingWalletDeviceSplash(); } - passphraseDialog.open() + passwordDialog.openPassphraseDialog() } function onDeviceButtonRequest(code){ -- cgit v1.2.3