From aec32385906f40e242bb80e2f9add677495d8ad2 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Fri, 5 May 2023 11:16:58 +0800
Subject: [PATCH] Fix issue where incorrect username validation message was
 displayed during signup

---
 .../networking/queries/useValidateUsernameQuery.tsx    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/web/lib/networking/queries/useValidateUsernameQuery.tsx b/packages/web/lib/networking/queries/useValidateUsernameQuery.tsx
index 8df55571b..c40dd9fc0 100644
--- a/packages/web/lib/networking/queries/useValidateUsernameQuery.tsx
+++ b/packages/web/lib/networking/queries/useValidateUsernameQuery.tsx
@@ -24,8 +24,12 @@ export function useValidateUsernameQuery({
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const isUsernameValid = (data as any)?.validateUsername ?? false
-  const usernameErrorMessage = validationErrorMessage(username)
+  if (isUsernameValid) {
+    return { isUsernameValid }
+  }
 
+  // Try to figure out why the username is invalid
+  const usernameErrorMessage = validationErrorMessage(username.toLowerCase())
   if (usernameErrorMessage) {
     return {
       isUsernameValid: false,
@@ -33,10 +37,6 @@ export function useValidateUsernameQuery({
     }
   }
 
-  if (isUsernameValid) {
-    return { isUsernameValid }
-  }
-
   return {
     isUsernameValid: false,
     usernameErrorMessage: 'This username is not available',