From 567b7a2b1a69ca65a898fb9014dd9ddfbfebab7d Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Thu, 1 Oct 2026 08:07:46 -0400
Subject: [PATCH] fix(chat): put Find Someone by Username first on New Chat

Moves the username row above Create a Public Group and renames it to
"Find Someone by Username", matching iOS.
---
 apps/flipcash/core/src/main/res/values/strings.xml     |  2 +-
 .../kotlin/com/flipcash/app/tipping/NewChatScreen.kt   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/flipcash/core/src/main/res/values/strings.xml b/apps/flipcash/core/src/main/res/values/strings.xml
index d21c7193e2..8fcdd1d370 100644
--- a/apps/flipcash/core/src/main/res/values/strings.xml
+++ b/apps/flipcash/core/src/main/res/values/strings.xml
@@ -1078,7 +1078,7 @@
          (node 10127:117987). -->
     <string name="title_startNewChat">New Chat</string>
     <string name="action_createPublicGroup">Create a Public Group</string>
-    <string name="action_findByUsername">Find by Username</string>
+    <string name="action_findByUsername">Find Someone by Username</string>
 
     <!-- Creating a public group (node 10153:22901). -->
     <string name="title_newPublicGroup">New Public Group</string>
diff --git a/apps/flipcash/features/tipping/src/main/kotlin/com/flipcash/app/tipping/NewChatScreen.kt b/apps/flipcash/features/tipping/src/main/kotlin/com/flipcash/app/tipping/NewChatScreen.kt
index 845140ef58..c10ed9295a 100644
--- a/apps/flipcash/features/tipping/src/main/kotlin/com/flipcash/app/tipping/NewChatScreen.kt
+++ b/apps/flipcash/features/tipping/src/main/kotlin/com/flipcash/app/tipping/NewChatScreen.kt
@@ -43,6 +43,11 @@ fun NewChatScreen() {
                 .padding(top = CodeTheme.dimens.grid.x3),
             verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x2),
         ) {
+            ChoiceRow(
+                label = stringResource(R.string.action_findByUsername),
+                icon = R.drawable.ic_at,
+                onClick = { navigator.push(AppRoute.Messaging.FindByUsername) },
+            )
             ChoiceRow(
                 label = stringResource(R.string.action_createPublicGroup),
                 icon = R.drawable.ic_group_3,
@@ -51,11 +56,6 @@ fun NewChatScreen() {
                     navigator.push(AppRoute.Messaging.NewGroup)
                 },
             )
-            ChoiceRow(
-                label = stringResource(R.string.action_findByUsername),
-                icon = R.drawable.ic_at,
-                onClick = { navigator.push(AppRoute.Messaging.FindByUsername) },
-            )
         }
     }
 }