diff --git a/composeApp/src/commonMain/composeResources/values/strings.xml b/composeApp/src/commonMain/composeResources/values/strings.xml
index e146d902..5cd2d94f 100644
--- a/composeApp/src/commonMain/composeResources/values/strings.xml
+++ b/composeApp/src/commonMain/composeResources/values/strings.xml
@@ -553,6 +553,8 @@
%1$s hasn't set up messaging on Bennu yet. Try again later, or ask them to open Bennu.
Group onchain wallet
+
+ %1$s onchain wallet
Open a group onchain wallet
Not opened yet
Open on %1$s
diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ChatRoomDetailScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ChatRoomDetailScreen.kt
index b01ee84b..33ccd57d 100644
--- a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ChatRoomDetailScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ChatRoomDetailScreen.kt
@@ -6,6 +6,7 @@ import com.machankura.bennu.compose.nostr.wallet.GroupWalletStatementEvent
import bennu.composeapp.generated.resources.open_on_s
import bennu.composeapp.generated.resources.not_opened_yet
import bennu.composeapp.generated.resources.group_wallet
+import bennu.composeapp.generated.resources.s_onchain_wallet
import androidx.compose.material.icons.filled.AccountBalanceWallet
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
@@ -461,7 +462,9 @@ fun ChatRoomDetailScreen(
if (GroupWalletRollout.ENABLED) item {
SignedWorkRow(
icon = Icons.Default.AccountBalanceWallet,
- headline = stringResource(Res.string.group_wallet),
+ headline = chatRoomDetailUIState.localChatRoom.chatRoom.subject
+ ?.let { stringResource(Res.string.s_onchain_wallet, it) }
+ ?: stringResource(Res.string.group_wallet),
supporting = chatRoomDetailUIState.groupWallet?.let { wallet ->
stringResource(
Res.string.open_on_s,
diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupWalletScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupWalletScreen.kt
index ac7b0b4d..b5a2f5ad 100644
--- a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupWalletScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupWalletScreen.kt
@@ -71,6 +71,7 @@ import bennu.composeapp.generated.resources.each_member_s_share_is_stored_unencr
import bennu.composeapp.generated.resources.export_watch_only
import bennu.composeapp.generated.resources.finding_the_group_s_coins
import bennu.composeapp.generated.resources.group_wallet
+import bennu.composeapp.generated.resources.s_onchain_wallet
import bennu.composeapp.generated.resources.nothing_has_been_sent_to_this_wallet_yet
import bennu.composeapp.generated.resources.open_a_group_wallet
import bennu.composeapp.generated.resources.open_a_guarded_wallet
@@ -199,13 +200,22 @@ fun GroupWalletScreen(
onNavigateToRoute(FrostSigningRoute(activeUserPublicKey = activeUserPublicKey, chatRoomId = chatRoomId, sessionId = sessionId))
}
+ // Named for its group once the room is known; a room with no subject, and
+ // the moment before it loads, fall back to the generic name.
+ val groupName = when (val state = groupWalletViewModel.groupWalletUIState) {
+ is GroupWalletUIState.NotOpened -> state.localChatRoom.chatRoom.subject
+ is GroupWalletUIState.Loaded -> state.localChatRoom.chatRoom.subject
+ else -> null
+ }
+
Scaffold(
snackbarHost = { SnackbarHost(LocalSnackbarHostState.current) },
topBar = {
TopAppBar(
title = {
Text(
- text = stringResource(Res.string.group_wallet),
+ text = groupName?.let { stringResource(Res.string.s_onchain_wallet, it) }
+ ?: stringResource(Res.string.group_wallet),
maxLines = 1,
overflow = TextOverflow.Ellipsis
)