From b6bef33fee15713088f32fda2152373bb49ee254 Mon Sep 17 00:00:00 2001
From: Andre Rosado <arosado@bitwarden.com>
Date: Thu, 17 Sep 2026 16:20:31 +0100
Subject: [PATCH] improved firstFocusedOrNull method

---
 .../bitwarden/data/autofill/parser/AutofillParserImpl.kt  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/parser/AutofillParserImpl.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/parser/AutofillParserImpl.kt
index 6bc5577529..6804ddf754 100644
--- a/app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/parser/AutofillParserImpl.kt
+++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/parser/AutofillParserImpl.kt
@@ -353,10 +353,10 @@ private fun List<ViewNodeTraversalData>.selectCandidateAutofillViews(
  * if nothing is focused.
  */
 private fun List<AutofillView>.firstFocusedOrNull(): AutofillView? {
-    val focusedNonIdentity = firstOrNull { it.data.isFocused && it !is AutofillView.Identity }
-    val focusedAny = firstOrNull { it.data.isFocused }
-    val nonIdentity = firstOrNull { it !is AutofillView.Identity }
-    return focusedNonIdentity ?: focusedAny ?: nonIdentity ?: firstOrNull()
+    return this.firstOrNull { it.data.isFocused && it !is AutofillView.Identity }
+        ?: this.firstOrNull { it.data.isFocused }
+        ?: this.firstOrNull { it !is AutofillView.Identity }
+        ?: this.firstOrNull()
 }
 
 /**