From 697611b9bcbeab994060b3d4fdcc8f10d2efef93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Tue, 22 Feb 2022 12:41:52 +0100
Subject: [PATCH] Fix focus issue on password form during account creation

---
 .../briarproject/briar/desktop/login/RegistrationScreen.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/org/briarproject/briar/desktop/login/RegistrationScreen.kt b/src/main/kotlin/org/briarproject/briar/desktop/login/RegistrationScreen.kt
index 02846c31c3..a92db09023 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/login/RegistrationScreen.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/login/RegistrationScreen.kt
@@ -166,8 +166,8 @@ fun PasswordForm(
         showErrorWhen = AFTER_FOCUS_LOST_ONCE,
         errorMessage = i18n("startup.error.password_too_weak"),
         keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password, imeAction = ImeAction.Next),
-        modifier = Modifier.fillMaxWidth().apply {
-            if (focusRequester != null) focusRequester(focusRequester)
+        modifier = Modifier.fillMaxWidth().run {
+            if (focusRequester != null) focusRequester(focusRequester) else this
         },
         onEnter = { focusManager.moveFocus(FocusDirection.Next) },
     )
-- 
GitLab