Skip to content

Commit

Permalink
apply changes from #18523
Browse files Browse the repository at this point in the history
  • Loading branch information
jasperhuangg committed May 21, 2023
1 parent de7f990 commit c52ac84
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions src/pages/home/report/ReportActionItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,15 @@ function ReportActionItem(props) {
{(hovered) => (
<View accessibilityLabel={props.translate('accessibilityHints.chatMessage')}>
{props.shouldDisplayNewMarker && <UnreadActionIndicator reportActionID={props.action.reportActionID} />}
<MiniReportActionContextMenu
reportID={props.report.reportID}
reportAction={props.action}
isArchivedRoom={ReportUtils.isArchivedRoom(props.report)}
displayAsGroup={props.displayAsGroup}
isVisible={hovered && !props.draftMessage && !hasErrors}
draftMessage={props.draftMessage}
isChronosReport={ReportUtils.chatIncludesChronos(props.report)}
/>
<View
style={StyleUtils.getReportActionItemStyle(
hovered || isWhisper || isContextMenuActive || props.draftMessage,
Expand Down Expand Up @@ -404,16 +413,6 @@ function ReportActionItem(props) {
{renderReportActionItem(hovered, isWhisper)}
</OfflineWithFeedback>
</View>
<MiniReportActionContextMenu
reportID={props.report.reportID}
reportAction={props.action}
isArchivedRoom={ReportUtils.isArchivedRoom(props.report)}
displayAsGroup={props.displayAsGroup}
isVisible={hovered && !props.draftMessage && !hasErrors}
draftMessage={props.draftMessage}
isChronosReport={ReportUtils.chatIncludesChronos(props.report)}
childReportActionID={props.action.childReportActionID}
/>
</View>
)}
</Hoverable>
Expand Down

0 comments on commit c52ac84

Please sign in to comment.