Skip to content

Commit 6ad9781

Browse files
committed
chore(fc): remove reply on deleted messages; prevent paying to chat when room closed
Signed-off-by: Brandon McAnsh <[email protected]>
1 parent b0081d8 commit 6ad9781

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/conversation/ConversationScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ private fun ConversationScreenContent(
295295
message = replyingTo.message,
296296
isDeleted = false,
297297
deletedBy = null,
298-
),
298+
)
299299
)
300300
Image(
301301
modifier = Modifier

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/conversation/ConversationViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,10 @@ class ConversationViewModel @Inject constructor(
306306
val isRoomClosedAsMember = !conversation.isOpen && !selfMember.isHost
307307

308308
when {
309+
isRoomClosedAsMember -> ChattableState.DisabledByClosedRoom
309310
isSpectator -> ChattableState.Spectator(
310311
Kin.fromQuarks(it.conversation.coverChargeQuarks ?: 0)
311312
)
312-
isRoomClosedAsMember -> ChattableState.DisabledByClosedRoom
313313
isMuted -> ChattableState.DisabledByMute
314314
else -> ChattableState.Enabled
315315
}
@@ -836,7 +836,7 @@ class ConversationViewModel @Inject constructor(
836836
},
837837
showAsChatBubble = true,
838838
enableMarkup = true,
839-
enableReply = enableReply,
839+
enableReply = enableReply && !message.isDeleted,
840840
showTimestamp = false,
841841
enableTipping = tippingEnabled,
842842
sender = Sender(

0 commit comments

Comments
 (0)