Skip to content

chore(chat): merge recents and on flipcash into single grouping; filter out self #984

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 25, 2026
Merged

chore(chat): merge recents and on flipcash into single grouping; filter out self #984

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
29 changes: 16 additions & 13 deletions ...res/direct-send/src/main/kotlin/com/flipcash/app/directsend/internal/SendFlowViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import com.flipcash.app.permissions.PickedContact
import com.flipcash.app.phone.PhoneUtils
import com.flipcash.app.tokens.TokenCoordinator
import com.flipcash.features.directsend.R
import com.flipcash.services.models.chat.ChatMember
import com.flipcash.services.models.chat.ChatType
import com.flipcash.services.models.chat.MessageContent
import com.flipcash.services.user.UserManager
Expand Down Expand Up @@ -228,7 +229,11 @@ internal class SendFlowViewModel @Inject constructor(
chatFeed: List<ChatSummary>,
tokensByMint: Map<Mint, Token>,
): List<ContactListItem> = buildList {
val allContacts = contactState.contacts.values.toList()
val selfId = userManager.accountId
val selfPhone = userManager.profile?.verifiedPhoneNumber

val allContacts = contactState.contacts.values
.filter { selfPhone == null || it.e164 != selfPhone }
val filtered = if (searchString.isBlank()) {
allContacts
} else {
Expand All @@ -238,8 +243,6 @@ internal class SendFlowViewModel @Inject constructor(
}
}

val selfId = userManager.accountId

val dmChats = chatFeed.filter { it.metadata.type == ChatType.DM }
// Build a reverse lookup: e164 -> chatId string for contacts with DMs
val e164ToChatId = contactState.dmChatIds
Expand All @@ -253,7 +256,9 @@ internal class SendFlowViewModel @Inject constructor(
// Try to match this chat to a device contact
val e164 = e164ToChatId.entries
.firstOrNull { it.value == chatIdStr }?.key
val deviceContact = e164?.let { contactState.contacts[it] }
val deviceContact = e164
?.takeIf { selfPhone == null || it != selfPhone }
?.let { contactState.contacts[it] }

val contact = if (deviceContact != null) {
if (searchString.isNotBlank() &&
Expand All @@ -265,8 +270,11 @@ internal class SendFlowViewModel @Inject constructor(
deviceContact
} else {
// Non-contact DM — build contact from chat member profile
val isSelf = { member: ChatMember ->
member.userId == selfId || (selfPhone != null && member.userProfile.verifiedPhoneNumber == selfPhone)
}
val otherMember = summary.metadata.members
.firstOrNull { it.userId != selfId } ?: return@mapNotNull null
.firstOrNull { !isSelf(it) } ?: return@mapNotNull null
val phone = otherMember.userProfile.verifiedPhoneNumber
val formattedPhone = phone?.let { phoneUtils.formatNumber(it) }
val displayName = otherMember.userProfile.displayName?.takeIf { it.isNotBlank() }
Expand Down Expand Up @@ -304,19 +312,14 @@ internal class SendFlowViewModel @Inject constructor(
.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.displayName })
.map { ContactListItem.ContactRow(contact = it, isOnFlipcash = true) }

val flipcashCombined = (recentRows + flipcashRows)

val excludedE164s = recentsE164s + contactState.flipcashE164s
val other = filtered
.filter { it.e164 !in excludedE164s }
.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.displayName })

if (recentRows.isNotEmpty()) {
add(ContactListItem.Header(resources.getString(R.string.title_recents)))
addAll(recentRows)
}
if (flipcashRows.isNotEmpty()) {
add(ContactListItem.Header(resources.getString(R.string.title_flipcashContacts)))
addAll(flipcashRows)
}
addAll(flipcashCombined)
if (other.isNotEmpty()) {
add(ContactListItem.Header(resources.getString(R.string.title_nonFlipcashContacts)))
other.forEach { add(ContactListItem.ContactRow(it, isOnFlipcash = false)) }
Expand Down
17 changes: 10 additions & 7 deletions ...ared/chat/src/main/kotlin/com/flipcash/shared/chat/internal/delegates/FeedSyncDelegate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,17 @@ class FeedSyncDelegate @Inject constructor(
override val feed: Flow<List<ChatSummary>>
get() = stateHolder.state.map { state ->
val selfId = userManager.accountId
val selfPhone = userManager.profile?.verifiedPhoneNumber
val isSelf = { member: ChatMember ->
member.userId == selfId || (selfPhone != null && member.userProfile.verifiedPhoneNumber == selfPhone)
}
state.feed.mapNotNull { metadata ->
val otherMember = metadata.members.firstOrNull { it.userId != selfId }
if (otherMember != null) {
val profile = otherMember.userProfile
val hasIdentity = !profile.displayName.isNullOrBlank() ||
!profile.verifiedPhoneNumber.isNullOrBlank()
if (!hasIdentity) return@mapNotNull null
}
val otherMember = metadata.members.firstOrNull { !isSelf(it) }
?: return@mapNotNull null
val profile = otherMember.userProfile
val hasIdentity = !profile.displayName.isNullOrBlank() ||
!profile.verifiedPhoneNumber.isNullOrBlank()
if (!hasIdentity) return@mapNotNull null

val readPointer = metadata.members
.firstOrNull { it.userId == selfId }
Expand Down
Loading