From f592cbc2ed4556f0713ebee6894966eeab85964b Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 15 Jul 2026 15:47:53 +0000
Subject: [PATCH] fix: refine new-conversation chooser copy and audit fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Private Message trade-off now reads "Can't add users later" (accurate
  for NIP-17: you can't add members to an existing DM room).
- Darken the Concord/Public/Disappearing accents so the white icon-tile
  glyph and the white Create-button label meet WCAG AA contrast (the
  amber/teal/orange were ~2.6–3.4:1 on white text).
- Bound the row title/tagline/chip with maxLines + ellipsis so a longer
  localized string can't wrap and break the one-line row layout.
- Mark ConversationType/ConversationSection @Immutable so ConversationRow
  is skippable — an accordion toggle now recomposes only the two affected
  rows instead of all six.
- Fix ProConRow icon modifier order (padding before size) so the check/
  close glyph is nudged, not squished.
---
 .../chats/rooms/NewConversationScreen.kt       | 18 ++++++++++++++----
 amethyst/src/main/res/values/strings.xml       |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/NewConversationScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/NewConversationScreen.kt
index 6b5594c4ff..81fbf4efa4 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/NewConversationScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/NewConversationScreen.kt
@@ -46,6 +46,7 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -55,6 +56,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.lerp
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
@@ -75,10 +77,10 @@ import com.vitorpamplona.amethyst.ui.theme.grayText
 // dark ground (see [ConversationRow]); the solid tile keeps the saturated base either way.
 private val ColorPrivate = Color(0xFF7C3AED)
 private val ColorMarmot = Color(0xFF4F46E5)
-private val ColorConcord = Color(0xFF0D9488)
-private val ColorPublic = Color(0xFFD97706)
+private val ColorConcord = Color(0xFF0F766E)
+private val ColorPublic = Color(0xFFB45309)
 private val ColorRelay = Color(0xFF2563EB)
-private val ColorEphemeral = Color(0xFFEA580C)
+private val ColorEphemeral = Color(0xFFC2410C)
 
 /**
  * One selectable conversation type. Collapsed, a row shows only the icon, name, a short tagline, and
@@ -86,6 +88,7 @@ private val ColorEphemeral = Color(0xFFEA580C)
  * row expands it to reveal [bestFor] and the [pros]/[cons] before the [cta] button routes to that
  * type's existing creation (or browse) flow.
  */
+@Immutable
 private class ConversationType(
     val icon: MaterialSymbol,
     val color: Color,
@@ -99,6 +102,7 @@ private class ConversationType(
     val route: Route,
 )
 
+@Immutable
 private class ConversationSection(
     @StringRes val header: Int,
     val types: List<ConversationType>,
@@ -286,11 +290,15 @@ private fun ConversationRow(
                         text = stringRes(type.title),
                         style = MaterialTheme.typography.titleMedium,
                         fontWeight = FontWeight.Bold,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
                     )
                     Text(
                         text = stringRes(type.tagline),
                         style = MaterialTheme.typography.bodySmall,
                         color = MaterialTheme.colorScheme.grayText,
+                        maxLines = 2,
+                        overflow = TextOverflow.Ellipsis,
                     )
                 }
 
@@ -355,6 +363,8 @@ private fun AxisChip(
             style = MaterialTheme.typography.labelSmall,
             fontWeight = FontWeight.Bold,
             color = accent,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
             modifier = Modifier.padding(horizontal = 10.dp, vertical = 4.dp),
         )
     }
@@ -384,7 +394,7 @@ private fun ProConRow(
             symbol = if (isPro) MaterialSymbols.Check else MaterialSymbols.Close,
             contentDescription = null,
             tint = if (isPro) accent else MaterialTheme.colorScheme.grayText,
-            modifier = Modifier.size(15.dp).padding(top = 1.dp),
+            modifier = Modifier.padding(top = 1.dp).size(15.dp),
         )
         Spacer(Modifier.width(6.dp))
         Text(
diff --git a/amethyst/src/main/res/values/strings.xml b/amethyst/src/main/res/values/strings.xml
index 0b8d8cdec2..50ee88dc48 100644
--- a/amethyst/src/main/res/values/strings.xml
+++ b/amethyst/src/main/res/values/strings.xml
@@ -2067,7 +2067,7 @@
     <string name="new_conversation_dm_cta">New message</string>
     <string name="new_conversation_dm_pro_1">1-on-1 &amp; small groups</string>
     <string name="new_conversation_dm_pro_2">End-to-end encrypted</string>
-    <string name="new_conversation_dm_con_1">Not for big groups</string>
+    <string name="new_conversation_dm_con_1">Can\'t add users later</string>
 
     <string name="new_conversation_marmot_title">Marmot Group</string>
     <string name="new_conversation_marmot_tagline">Bigger private groups</string>