Skip to content

fix(chat): keep the unread divider out of the gap above an unsent message #1671

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
Oct 5, 2026
Merged

fix(chat): keep the unread divider out of the gap above an unsent message #1671

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
5 changes: 5 additions & 0 deletions ...h/features/messenger/src/main/kotlin/com/flipcash/app/messenger/internal/UnreadDivider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,18 @@ internal val UNREAD_DIVIDER_LIFETIME = UnreadDividerLifetime.UntilClose
* Compares ranges rather than matching an id, so a read-through message that was deleted or never
* stored does not matter. The rows of one message share a `messageId`, so the divider never lands
* inside a message.
*
* An [older] row without a server id is a pending or failed send, stored as `-(now)` and sorted
* among the newest rows, so its id says nothing about the boundary. The gap above it never takes
* the divider; otherwise a transcript would draw a second one under the same fixed key.
*/
internal fun unreadDividerBetween(
newer: ChatListItem.ContentBubble,
older: ChatListItem.ContentBubble?,
boundary: UnreadBoundary,
): Boolean {
if (boundary !is UnreadBoundary.At || newer.isFromSelf) return false
if (older != null && older.messageId < 1) return false
val olderId = older?.messageId ?: Long.MIN_VALUE
return olderId <= boundary.readThrough && boundary.readThrough < newer.messageId
}
Expand Down
18 changes: 18 additions & 0 deletions ...ssenger/src/test/kotlin/com/flipcash/app/messenger/internal/UnreadDividerPlacementTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,24 @@ class UnreadDividerPlacementTest {
fun `own message first after pointer`() =
assertEquals(3L, dividerAbove(UnreadBoundary.At(2, 1), row(1), row(2, self = true), row(3)))

/**
* A send that is pending or failed has no server id yet: its row carries `-(now)` and sorts
* among the newest. The gap above it is not the boundary, so the transcript keeps one divider.
*/
@Test
fun `an unsent own row between unread rows draws one divider`() {
val boundary = UnreadBoundary.At(1, 2)
val unsent = row(-noon.toEpochMilliseconds(), self = true)
val newestFirst = listOf(row(3), unsent, row(2), row(1))

val above = newestFirst.indices.mapNotNull { i ->
val newer = newestFirst[i]
newer.messageId.takeIf { unreadDividerBetween(newer, newestFirst.getOrNull(i + 1), boundary) }
}

assertEquals(listOf(2L), above)
}

@Test
fun `resolving draws nothing`() = assertEquals(null, dividerAbove(UnreadBoundary.Resolving, row(1), row(2)))

Expand Down
Loading