From b42749e3c4e575c2dc512a76b8e2ef9931a49016 Mon Sep 17 00:00:00 2001
From: Elaine <138257830+elaine-signal@users.noreply.github.com>
Date: Wed, 14 Feb 2024 17:50:25 -0700
Subject: [PATCH] Prevent username discriminator text field from being focused
 when hidden

---
 .../UsernameSelectionViewController+UsernameTextField.swift  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Signal/src/Usernames/Selection/UsernameSelectionViewController+UsernameTextField.swift b/Signal/src/Usernames/Selection/UsernameSelectionViewController+UsernameTextField.swift
index ff806902da..05a8d83595 100644
--- a/Signal/src/Usernames/Selection/UsernameSelectionViewController+UsernameTextField.swift
+++ b/Signal/src/Usernames/Selection/UsernameSelectionViewController+UsernameTextField.swift
@@ -189,7 +189,10 @@ extension UsernameSelectionViewController {
 
             @discardableResult
             override func becomeFirstResponder() -> Bool {
-                discriminatorTextField.becomeFirstResponder()
+                guard !discriminatorTextField.isHidden else {
+                    return false
+                }
+                return discriminatorTextField.becomeFirstResponder()
             }
 
             /// Tapping the discriminator when it is not focused should start