[CLNP-8133][Fix]Fixed a bug where the markAsUnread menu was not displayed correctly w…

src/modules/Thread/components/ThreadList/ThreadListItemContent.tsx

@@ -179,6 +179,7 @@ export default function ThreadListItemContent(props: ThreadListItemContentProps)
               message: message as SendableMessageType,
               isByMe: isByMe,
               replyType: replyType,
+              inThreadList: true,
               showEdit: showEdit,
               showRemove: showRemove,
               resendMessage: resendMessage,
@@ -306,6 +307,7 @@ export default function ThreadListItemContent(props: ThreadListItemContentProps)
               message: message as SendableMessageType,
               isByMe: isByMe,
               replyType: replyType,
+              inThreadList: true,
               showRemove: showRemove,
               resendMessage: resendMessage,
               onReplyInThread: onReplyInThread,
@@ -321,6 +323,7 @@ export default function ThreadListItemContent(props: ThreadListItemContentProps)
           message,
           userId,
           replyType,
+          inThreadList: true,
           hideMenu: () => {
             setShowMobileMenu(false);
           },

src/ui/MessageMenu/MessageMenu.tsx

@@ -52,6 +52,7 @@ export interface MessageMenuProps {
   channel: GroupChannel | OpenChannel | null;
   isByMe?: boolean;
   replyType?: ReplyType;
+  inThreadList?: boolean;
   renderTrigger?: (params: TriggerIconProps) => ReactElement;
   renderMenuItems?: (params: RenderMenuItemsParams) => ReactElement;
   disableDeleteMessage?: boolean;
@@ -71,6 +72,7 @@ export const MessageMenu = ({
   channel,
   isByMe,
   replyType,
+  inThreadList = false,
   renderTrigger = TriggerIcon,
   renderMenuItems,
 
@@ -152,7 +154,7 @@ export const MessageMenu = ({
                   {showMenuItemThread(params) && <ThreadMenuItem />}
                   {showMenuItemOpenInChannel(params) && <OpenInChannelMenuItem />}
                   {showMenuItemEdit(params) && <EditMenuItem />}
-                  {enableMarkAsUnread && showMenuItemMarkAsUnread(params) && <MarkAsUnreadMenuItem />}
+                  {enableMarkAsUnread && !inThreadList && showMenuItemMarkAsUnread(params) && <MarkAsUnreadMenuItem />}
                   {showMenuItemResend(params) && <ResendMenuItem />}
                   {showMenuItemDelete(params) && <DeleteMenuItem />}
                 </>

src/ui/MobileMenu/types.ts

@@ -19,6 +19,7 @@ export interface BaseMenuProps {
   hideMenu(): void;
   isByMe?: boolean;
   replyType?: ReplyType;
+  inThreadList?: boolean;
   disabled?: boolean;
   // This should take precedence over logic inside the component
   deleteMenuState?: DeleteMenuStates;

src/utils/menuConditions.ts

@@ -54,6 +54,6 @@ export const showMenuItemThread = ({ channel, message, replyType, onReplyInThrea
   return isReplyTypeMessageEnabled({ channel, message }) && replyType === 'THREAD' && !message?.parentMessageId && typeof onReplyInThread === 'function';
 };
 
-export const showMenuItemMarkAsUnread = ({ message, channel, replyType }: MenuConditionsParams) => {
-  return !isFailedMessage(message) && !isPendingMessage(message) && channel?.isGroupChannel?.() && replyType !== 'THREAD';
+export const showMenuItemMarkAsUnread = ({ message, channel }: MenuConditionsParams) => {
+  return !isFailedMessage(message) && !isPendingMessage(message) && channel?.isGroupChannel?.();
 };