From 107f5fee32ce204fa5d2b91a6cbdba98e59f073d Mon Sep 17 00:00:00 2001 From: William Holcombe Date: Sat, 4 Jul 2026 15:58:54 -0600 Subject: [PATCH] fix: make Message and ApprovalRequest text containers scrollable and remove Acknowledge button from loading screens --- .../meatbag/client/ComponentRegistry.kt | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/client/src/commonMain/kotlin/meatbag/client/ComponentRegistry.kt b/client/src/commonMain/kotlin/meatbag/client/ComponentRegistry.kt index db5f817..d5e07cb 100644 --- a/client/src/commonMain/kotlin/meatbag/client/ComponentRegistry.kt +++ b/client/src/commonMain/kotlin/meatbag/client/ComponentRegistry.kt @@ -304,8 +304,10 @@ fun ApprovalRequestComponent( Box( modifier = Modifier .fillMaxWidth() + .weight(1f, fill = false) .background(DeepBg, RoundedCornerShape(12.dp)) .border(1.dp, Color.White.copy(alpha = 0.1f), RoundedCornerShape(12.dp)) + .verticalScroll(rememberScrollState()) .padding(12.dp) ) { Text( @@ -459,8 +461,10 @@ fun MessageComponent( Box( modifier = Modifier .fillMaxWidth() + .weight(1f, fill = false) .background(DeepBg, RoundedCornerShape(12.dp)) .border(1.dp, Color.White.copy(alpha = 0.1f), RoundedCornerShape(12.dp)) + .verticalScroll(rememberScrollState()) .padding(16.dp) ) { Text( @@ -472,21 +476,23 @@ fun MessageComponent( ) } - Button( - onClick = { onAcknowledge(message.primaryAction?.id) }, - colors = ButtonDefaults.buttonColors(backgroundColor = MaterialTheme.colors.primary), - shape = RoundedCornerShape(12.dp), - modifier = Modifier - .fillMaxWidth() - .height(48.dp), - enabled = message.primaryAction?.enabled ?: true - ) { - Text( - text = message.primaryAction?.label ?: "Acknowledge", - color = MaterialTheme.colors.background, - fontWeight = FontWeight.Bold, - fontSize = 15.sp - ) + if (message.primaryAction != null) { + Button( + onClick = { onAcknowledge(message.primaryAction?.id) }, + colors = ButtonDefaults.buttonColors(backgroundColor = MaterialTheme.colors.primary), + shape = RoundedCornerShape(12.dp), + modifier = Modifier + .fillMaxWidth() + .height(48.dp), + enabled = message.primaryAction?.enabled ?: true + ) { + Text( + text = message.primaryAction?.label ?: "Acknowledge", + color = MaterialTheme.colors.background, + fontWeight = FontWeight.Bold, + fontSize = 15.sp + ) + } } } }