diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js index 710df7e30f9c..396a5289600d 100644 --- a/src/pages/home/report/ReportActionItem.js +++ b/src/pages/home/report/ReportActionItem.js @@ -98,6 +98,9 @@ const propTypes = { /** Is this the only report action on the report? */ isOnlyReportAction: PropTypes.bool, + + shouldHideThreadDividerLine: PropTypes.bool, + }; const defaultProps = { @@ -107,6 +110,8 @@ const defaultProps = { shouldShowSubscriptAvatar: false, hasOutstandingIOU: false, isOnlyReportAction: false, + shouldHideThreadDividerLine: false, + }; function ReportActionItem(props) { @@ -420,7 +425,7 @@ function ReportActionItem(props) { return ( ); } @@ -575,6 +580,8 @@ export default compose( ReportUtils.isCompletedTaskReport(prevProps.report) === ReportUtils.isCompletedTaskReport(nextProps.report) && prevProps.report.managerID === nextProps.report.managerID && prevProps.report.managerEmail === nextProps.report.managerEmail && - prevProps.isOnlyReportAction === nextProps.isOnlyReportAction, + prevProps.isOnlyReportAction === nextProps.isOnlyReportAction && + prevProps.shouldHideThreadDividerLine === nextProps.shouldHideThreadDividerLine, + ), ); diff --git a/src/pages/home/report/ReportActionsList.js b/src/pages/home/report/ReportActionsList.js index eac0975f150c..37ffc40ec69b 100644 --- a/src/pages/home/report/ReportActionsList.js +++ b/src/pages/home/report/ReportActionsList.js @@ -128,16 +128,18 @@ function ReportActionsList(props) { const shouldDisplayNewMarker = reportAction.reportActionID === newMarkerReportActionID; const shouldDisplayParentAction = reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED && ReportUtils.isChatThread(report); const shouldHideThreadDividerLine = - shouldDisplayParentAction && sortedReportActions.length > 1 && sortedReportActions[sortedReportActions.length - 2].reportActionID === newMarkerReportActionID; + sortedReportActions.length > 1 && sortedReportActions[sortedReportActions.length - 2].reportActionID === newMarkerReportActionID; + return shouldDisplayParentAction ? ( ) : (