diff --git a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx index ea3828c762c0..793fbf9b1e7e 100644 --- a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx +++ b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx @@ -3,7 +3,7 @@ import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useRef, /* eslint-disable no-restricted-imports */ import type {EmitterSubscription, GestureResponderEvent, NativeTouchEvent, View} from 'react-native'; -import {Dimensions} from 'react-native'; +import {DeviceEventEmitter, Dimensions} from 'react-native'; import type {OnyxEntry} from 'react-native-onyx'; import ConfirmModal from '@components/ConfirmModal'; import PopoverWithMeasuredContent from '@components/PopoverWithMeasuredContent'; @@ -261,6 +261,8 @@ function PopoverReportActionContextMenu(_props: unknown, ref: ForwardedRef { + if (cacheUnreadMarkers.get(report.reportID) !== reportActionID) { + return; + } + + setMessageManuallyMarkedUnread(new Date().getTime()); + }); + return () => { unreadActionSubscription.remove(); readNewestActionSubscription.remove(); + deletedReportActionSubscription.remove(); }; }, [report.reportID]);