Skip to content

chore(direct-send): remove phone number subtitle for contacts "on flipcash" #937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmc08gt merged 1 commit into from
Jun 18, 2026
Merged

chore(direct-send): remove phone number subtitle for contacts "on flipcash" #937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions ...ct-send/src/main/kotlin/com/flipcash/app/directsend/internal/screens/ContactListScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ private fun ContactList(
)
.then(modifier),
state = listState,
contentPadding = PaddingValues(bottom = CodeTheme.dimens.grid.x3),
) {
itemsIndexed(
items = items,
Expand Down Expand Up @@ -437,17 +438,21 @@ private fun ContactRowItem(
}
}

Text(
text = if (isOnFlipcash && !lastMessagePreview.isNullOrEmpty()) {
lastMessagePreview
} else {
contact.displayNumber.ifEmpty { contact.e164 }
},
style = CodeTheme.typography.textSmall,
color = CodeTheme.colors.textSecondary,
maxLines = 1,
overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,
)
val showSubtitle = lastMessagePreview != null || !isOnFlipcash

if (showSubtitle) {
Text(
text = if (isOnFlipcash && !lastMessagePreview.isNullOrEmpty()) {
lastMessagePreview
} else {
contact.displayNumber.ifEmpty { contact.e164 }
},
style = CodeTheme.typography.textSmall,
color = CodeTheme.colors.textSecondary,
maxLines = 1,
overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,
)
}
}

if (isOnFlipcash) {
Expand Down
8 changes: 4 additions & 4 deletions ...t-send/src/test/kotlin/com/flipcash/app/directsend/internal/SendFlowViewModelStateTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ class SendFlowViewModelStateTest {
@Test
fun `OnStepChanged to PhoneGate updates currentStep`() {
val updated = reduce(
SendFlowViewModel.Event.OnStepChanged(SendStep.Intro)
SendFlowViewModel.Event.OnStepChanged(SendStep.PhoneGate)
)(SendFlowViewModel.State())
assertEquals(SendStep.Intro, updated.currentStep)
assertEquals(SendStep.PhoneGate, updated.currentStep)
}

@Test
Expand All @@ -40,7 +40,7 @@ class SendFlowViewModelStateTest {

@Test
fun `OnStepChanged replaces previous step`() {
val state = SendFlowViewModel.State(currentStep = SendStep.Intro)
val state = SendFlowViewModel.State(currentStep = SendStep.PhoneGate)
val updated = reduce(
SendFlowViewModel.Event.OnStepChanged(SendStep.ContactList)
)(state)
Expand All @@ -50,7 +50,7 @@ class SendFlowViewModelStateTest {
@Test
fun `OnStepChanged does not affect other state`() {
val state = SendFlowViewModel.State(
steps = listOf(SendStep.Intro, SendStep.ContactList),
steps = listOf(SendStep.PhoneGate, SendStep.ContactList),
isPickerMode = true,
)
val updated = reduce(
Expand Down
5 changes: 4 additions & 1 deletion apps/flipcash/shared/chat-ui/src/main/kotlin/com/flipcash/shared/chat/ui/MessageBubble.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,10 @@ private fun CashBubble(
text = text,
style = CodeTheme.typography.displayMedium,
color = CodeTheme.colors.textMain,
autoSize = TextAutoSize.StepBased(minFontSize = 20.sp),
autoSize = TextAutoSize.StepBased(
minFontSize = 20.sp,
maxFontSize = CodeTheme.typography.displayMedium.fontSize
),
maxLines = 1,
)
}
Expand Down
Loading