From 2ebf94eed84ee0c482c95256613d0c2e5cc2ab17 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Tue, 5 Aug 2025 11:42:51 +0300
Subject: [PATCH] update checks, disable button if unavailable

---
 src/screens/Signup/StepHandle.tsx | 79 ++++++++++++++++---------------
 1 file changed, 41 insertions(+), 38 deletions(-)

diff --git a/src/screens/Signup/StepHandle.tsx b/src/screens/Signup/StepHandle.tsx
index 502529112c..d1f76dd98b 100644
--- a/src/screens/Signup/StepHandle.tsx
+++ b/src/screens/Signup/StepHandle.tsx
@@ -126,11 +126,14 @@ export function StepHandle() {
     )
   }
 
+  const isHandleTaken =
+    !isPending &&
+    queryEnabled &&
+    isHandleAvailable &&
+    !isHandleAvailable.available
+
   const textFieldInvalid =
-    (!isPending &&
-      queryEnabled &&
-      isHandleAvailable &&
-      !isHandleAvailable.available) ||
+    isHandleTaken ||
     !validCheck.frontLengthNotTooLong ||
     !validCheck.handleChars ||
     !validCheck.hyphenStartOrEnd ||
@@ -175,38 +178,35 @@ export function StepHandle() {
                 <RequirementText>{state.error}</RequirementText>
               </Requirement>
             )}
-            {queryEnabled &&
-              isHandleAvailable &&
-              !isHandleAvailable.available &&
-              validCheck.overall && (
-                <>
-                  <Requirement>
-                    <RequirementText>
-                      <Trans>
-                        {createFullHandle(draftValue, state.userDomain)} is not
-                        available
-                      </Trans>
-                    </RequirementText>
-                  </Requirement>
-                  {isHandleAvailable.suggestions &&
-                    isHandleAvailable.suggestions.length > 0 && (
-                      <HandleSuggestions
-                        suggestions={isHandleAvailable.suggestions}
-                        onSelect={suggestion => {
-                          setDraftValue(
-                            suggestion.handle.slice(
-                              0,
-                              state.userDomain.length * -1,
-                            ),
-                          )
-                          logger.metric('signup:handleSuggestionSelected', {
-                            method: suggestion.method,
-                          })
-                        }}
-                      />
-                    )}
-                </>
-              )}
+            {isHandleTaken && validCheck.overall && (
+              <>
+                <Requirement>
+                  <RequirementText>
+                    <Trans>
+                      {createFullHandle(draftValue, state.userDomain)} is not
+                      available
+                    </Trans>
+                  </RequirementText>
+                </Requirement>
+                {isHandleAvailable.suggestions &&
+                  isHandleAvailable.suggestions.length > 0 && (
+                    <HandleSuggestions
+                      suggestions={isHandleAvailable.suggestions}
+                      onSelect={suggestion => {
+                        setDraftValue(
+                          suggestion.handle.slice(
+                            0,
+                            state.userDomain.length * -1,
+                          ),
+                        )
+                        logger.metric('signup:handleSuggestionSelected', {
+                          method: suggestion.method,
+                        })
+                      }}
+                    />
+                  )}
+              </>
+            )}
             {(!validCheck.handleChars || !validCheck.hyphenStartOrEnd) && (
               <Requirement>
                 {!validCheck.hyphenStartOrEnd ? (
@@ -215,7 +215,10 @@ export function StepHandle() {
                   </RequirementText>
                 ) : (
                   <RequirementText>
-                    <Trans>Only contains letters, numbers, and hyphens</Trans>
+                    <Trans>
+                      Username must only contain letters (a-z), numbers, and
+                      hyphens
+                    </Trans>
                   </RequirementText>
                 )}
               </Requirement>
@@ -240,7 +243,7 @@ export function StepHandle() {
       <Animated.View layout={native(LinearTransition)}>
         <BackNextButtons
           isLoading={isNextLoading}
-          isNextDisabled={!validCheck.overall || !!state.error}
+          isNextDisabled={!validCheck.overall || !!state.error || isHandleTaken}
           onBackPress={onBackPress}
           onNextPress={onNextPress}
         />