From 4d0bfcc501a48198ab193fa5cda775bfa44bfb53 Mon Sep 17 00:00:00 2001
From: PavelS <armag_@mail.ru>
Date: Thu, 28 Jul 2022 17:04:37 +0300
Subject: [PATCH] fix(@desktop/onboarding): add password fields autofocus

- update views exposed functions

Closes: #6577
---
 ui/app/AppLayouts/Onboarding/views/ConfirmPasswordView.qml | 5 +++--
 ui/app/AppLayouts/Onboarding/views/CreatePasswordView.qml  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ui/app/AppLayouts/Onboarding/views/ConfirmPasswordView.qml b/ui/app/AppLayouts/Onboarding/views/ConfirmPasswordView.qml
index 5e70279ab5..961890b6bf 100644
--- a/ui/app/AppLayouts/Onboarding/views/ConfirmPasswordView.qml
+++ b/ui/app/AppLayouts/Onboarding/views/ConfirmPasswordView.qml
@@ -24,10 +24,9 @@ Item {
 
     Component.onCompleted: {
         root.password = root.startupStore.getPassword()
+        d.forcePasswordInputFocus()
     }
 
-    function forcePswInputFocus() { confPswInput.forceActiveFocus(Qt.MouseFocusReason)}
-
     QtObject {
         id: d
 
@@ -46,6 +45,8 @@ Item {
 
             root.startupStore.doPrimaryAction()
         }
+
+        function forcePasswordInputFocus() { confPswInput.forceActiveFocus(Qt.MouseFocusReason) }
     }
 
     Column {
diff --git a/ui/app/AppLayouts/Onboarding/views/CreatePasswordView.qml b/ui/app/AppLayouts/Onboarding/views/CreatePasswordView.qml
index a583bf86cf..2cede1a1c1 100644
--- a/ui/app/AppLayouts/Onboarding/views/CreatePasswordView.qml
+++ b/ui/app/AppLayouts/Onboarding/views/CreatePasswordView.qml
@@ -18,10 +18,9 @@ Item {
     Component.onCompleted: {
         view.newPswText = root.startupStore.getPassword()
         view.confirmationPswText = root.startupStore.getPassword()
+        d.forcePasswordInputFocus()
     }
 
-    function forceNewPswInputFocus() { view.forceNewPswInputFocus() }
-
     QtObject {
         id: d
         readonly property int zBehind: 1
@@ -31,6 +30,8 @@ Item {
             root.startupStore.setPassword(view.newPswText)
             root.startupStore.doPrimaryAction()
         }
+
+        function forcePasswordInputFocus() { view.forceNewPswInputFocus() }
     }
 
     Column {