Skip to content

Remove "Edit message" option from poll messages #6304

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
VelikovPetar merged 4 commits into from
Mar 30, 2026
+26 −1
Merged

Remove "Edit message" option from poll messages #6304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
191febd
Remove "Edit message" option from poll messages.
VelikovPetar Mar 27, 2026
56bdc2c
Merge branch 'v7' into bug/remove_edit_from_poll
VelikovPetar Mar 30, 2026
fe658f5
Make poll edit test cases deterministic across all modules
VelikovPetar Mar 30, 2026
272aca3
Merge branch 'v7' into bug/remove_edit_from_poll
VelikovPetar Mar 30, 2026
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
8 changes: 8 additions & 0 deletions ...tlin/io/getstream/chat/android/compose/util/extensions/MessageOptionItemVisibilityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import io.getstream.chat.android.randomAttachment
import io.getstream.chat.android.randomBoolean
import io.getstream.chat.android.randomChannelCapabilities
import io.getstream.chat.android.randomMessage
import io.getstream.chat.android.randomPoll
import io.getstream.chat.android.randomString
import io.getstream.chat.android.randomSyncStatus
import org.amshove.kluent.`should be`
Expand Down Expand Up @@ -272,6 +273,13 @@ internal class MessageOptionItemVisibilityTest {
randomChannelCapabilities(),
false,
),
Arguments.of(
MessageOptionItemVisibility(isEditMessageVisible = true),
currentUser,
randomMessage(poll = randomPoll(), command = null, sharedLocation = null),
randomChannelCapabilities(include = setOf(ChannelCapabilities.UPDATE_ANY_MESSAGE)),
false,
),
Arguments.of(
MessageOptionItemVisibility(),
currentUser.takeIf { randomBoolean() },
Expand Down
3 changes: 2 additions & 1 deletion ...ui-common/src/main/kotlin/io/getstream/chat/android/ui/common/utils/CapabilitiesHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ package io.getstream.chat.android.ui.common.utils
import io.getstream.chat.android.client.utils.attachment.isGiphy
import io.getstream.chat.android.client.utils.message.hasSharedLocation
import io.getstream.chat.android.client.utils.message.isDeleted
import io.getstream.chat.android.client.utils.message.isPoll
import io.getstream.chat.android.client.utils.message.isThreadReply
import io.getstream.chat.android.models.AttachmentType
import io.getstream.chat.android.models.Channel
Expand Down Expand Up @@ -132,7 +133,7 @@ public fun canEditMessage(
ownCapabilities: Set<String>,
): Boolean = editMessageEnabled &&
with(ownCapabilities) { ((message.isOwnMessage(currentUser) && canEditOwnMessage()) || canEditAnyMessage()) } &&
!message.isGiphyCommand() && !message.hasSharedLocation()
!message.isGiphyCommand() && !message.isPoll() && !message.hasSharedLocation()

/**
* Determines whether the given message can be deleted.
Expand Down
8 changes: 8 additions & 0 deletions ...ommon/src/test/kotlin/io/getstream/chat/android/ui/common/utils/CapabilitiesHelperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import io.getstream.chat.android.randomAttachment
import io.getstream.chat.android.randomBoolean
import io.getstream.chat.android.randomChannelCapabilities
import io.getstream.chat.android.randomMessage
import io.getstream.chat.android.randomPoll
import io.getstream.chat.android.randomString
import io.getstream.chat.android.randomSyncStatus
import org.amshove.kluent.`should be`
Expand Down Expand Up @@ -267,6 +268,13 @@ internal class CapabilitiesHelperTest {
randomChannelCapabilities(),
false,
),
Arguments.of(
true,
currentUser,
randomMessage(poll = randomPoll(), command = null, sharedLocation = null),
randomChannelCapabilities(include = setOf(ChannelCapabilities.UPDATE_ANY_MESSAGE)),
false,
),
Arguments.of(
randomBoolean(),
currentUser.takeIf { randomBoolean() },
Expand Down
8 changes: 8 additions & 0 deletions ...tstream/chat/android/ui/feature/messages/list/internal/MessageListViewExtensionsKtTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import io.getstream.chat.android.randomAttachment
import io.getstream.chat.android.randomBoolean
import io.getstream.chat.android.randomChannelCapabilities
import io.getstream.chat.android.randomMessage
import io.getstream.chat.android.randomPoll
import io.getstream.chat.android.randomString
import io.getstream.chat.android.randomSyncStatus
import io.getstream.chat.android.ui.feature.messages.list.MessageListViewStyle
Expand Down Expand Up @@ -259,6 +260,13 @@ internal class MessageListViewExtensionsKtTest {
randomChannelCapabilities(),
false,
),
Arguments.of(
randomMessageListViewStyle(editMessageEnabled = true),
currentUser,
randomMessage(poll = randomPoll(), command = null, sharedLocation = null),
randomChannelCapabilities(include = setOf(ChannelCapabilities.UPDATE_ANY_MESSAGE)),
false,
),
Arguments.of(
randomMessageListViewStyle(),
currentUser.takeIf { randomBoolean() },
Expand Down
Loading