Skip to content

Commit 3387bd2

Browse files
committed
chore: reorder BottomSheetItem
1 parent 25af7e5 commit 3387bd2

File tree

1 file changed

+22
-11
lines changed
  • packages/uikit-react-native/src/components/ChannelMessageList

1 file changed

+22
-11
lines changed

packages/uikit-react-native/src/components/ChannelMessageList/index.tsx

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -393,12 +393,19 @@ const useCreateMessagePressActions = <T extends SendbirdGroupChannel | SendbirdO
393393
if (message.isUserMessage()) {
394394
sheetItems.push(menu.copy(message));
395395
if (!channel.isEphemeral) {
396-
if (channel.isGroupChannel() && sbOptions.uikit.groupChannel.channel.enableMarkAsUnread) {
397-
sheetItems.push(menu.markAsUnread(message));
398-
}
399-
if (isMyMessage(message, currentUserId) && message.sendingStatus === 'succeeded') {
400-
sheetItems.push(menu.edit(message));
401-
sheetItems.push(menu.delete(message));
396+
if (message.sendingStatus === 'succeeded') {
397+
const isMyMsg = isMyMessage(message, currentUserId);
398+
if (isMyMsg) {
399+
sheetItems.push(menu.edit(message));
400+
}
401+
402+
if (channel.isGroupChannel() && sbOptions.uikit.groupChannel.channel.enableMarkAsUnread) {
403+
sheetItems.push(menu.markAsUnread(message));
404+
}
405+
406+
if (isMyMsg) {
407+
sheetItems.push(menu.delete(message));
408+
}
402409
}
403410
if (channel.isGroupChannel()) {
404411
if (sbOptions.uikit.groupChannel.channel.replyType === 'thread' && onReplyInThreadMessage !== undefined) {
@@ -415,18 +422,22 @@ const useCreateMessagePressActions = <T extends SendbirdGroupChannel | SendbirdO
415422
sheetItems.push(menu.download(message));
416423
}
417424
if (!channel.isEphemeral) {
418-
if (isMyMessage(message, currentUserId) && message.sendingStatus === 'succeeded') {
419-
sheetItems.push(menu.delete(message));
425+
if (message.sendingStatus === 'succeeded') {
426+
if (channel.isGroupChannel() && sbOptions.uikit.groupChannel.channel.enableMarkAsUnread) {
427+
sheetItems.push(menu.markAsUnread(message));
428+
}
429+
430+
if (isMyMessage(message, currentUserId)) {
431+
sheetItems.push(menu.delete(message));
432+
}
420433
}
434+
421435
if (channel.isGroupChannel()) {
422436
if (sbOptions.uikit.groupChannel.channel.replyType === 'thread' && onReplyInThreadMessage !== undefined) {
423437
sheetItems.push(menu.replyInThread(message));
424438
} else if (sbOptions.uikit.groupChannel.channel.replyType === 'quote_reply') {
425439
sheetItems.push(menu.reply(message));
426440
}
427-
if (sbOptions.uikit.groupChannel.channel.enableMarkAsUnread) {
428-
sheetItems.push(menu.markAsUnread(message));
429-
}
430441
}
431442
}
432443
}

0 commit comments

Comments
 (0)