Merge pull request #19658 from hungvu193/fix-19443

Fix: New tagline after marking as unread have overlapping line
Expensify · May 30, 2023 · 16776ec · 16776ec
2 parents 619a529 + f449a74
commit 16776ec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/pages/home/report/ReportActionItemParentAction.js b/src/pages/home/report/ReportActionItemParentAction.js
@@ -17,6 +17,9 @@ import reportActionPropTypes from './reportActionPropTypes';
 import * as ReportActionsUtils from '../../../libs/ReportActionsUtils';
 
 const propTypes = {
+    /** Flag to show, hide the thread divider line */
+    shouldHideThreadDividerLine: PropTypes.bool,
+
     /** The id of the report */
     reportID: PropTypes.string.isRequired,
 
@@ -38,6 +41,7 @@ const propTypes = {
 const defaultProps = {
     report: {},
     parentReportActions: {},
+    shouldHideThreadDividerLine: false,
 };
 
 const ReportActionItemParentAction = (props) => {
@@ -67,7 +71,7 @@ const ReportActionItemParentAction = (props) => {
                     />
                 )}
             </View>
-            <View style={[styles.threadDividerLine]} />
+            {!props.shouldHideThreadDividerLine && <View style={[styles.threadDividerLine]} />}
         </OfflineWithFeedback>
     );
 };

diff --git a/src/pages/home/report/ReportActionsList.js b/src/pages/home/report/ReportActionsList.js
@@ -115,8 +115,11 @@ const ReportActionsList = (props) => {
             // When the new indicator should not be displayed we explicitly set it to null
             const shouldDisplayNewMarker = reportAction.reportActionID === newMarkerReportActionID;
             const shouldDisplayParentAction = reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED && ReportUtils.isThread(report);
+            const shouldHideThreadDividerLine =
+                shouldDisplayParentAction && sortedReportActions.length > 1 && sortedReportActions[sortedReportActions.length - 2].reportActionID === newMarkerReportActionID;
             return shouldDisplayParentAction ? (
                 <ReportActionItemParentAction
+                    shouldHideThreadDividerLine={shouldHideThreadDividerLine}
                     reportID={report.reportID}
                     parentReportID={`${report.parentReportID}`}
                     shouldDisplayNewMarker={shouldDisplayNewMarker}