Skip to content

fix: The green line appear immediately only after comments are added to a task #23154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MonilBhavsar merged 8 commits into from
Aug 4, 2023
Merged

fix: The green line appear immediately only after comments are added to a task #23154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
19b5bd9
fix: The green line appear immediately only after comments are added
dukenv0307 Jul 19, 2023
52df0e5
fix: conflict
dukenv0307 Jul 20, 2023
41b1164
fix: change prop
dukenv0307 Jul 27, 2023
e3b1d13
Merge branch 'main' into fix/23004
dukenv0307 Jul 28, 2023
bee9e09
fix: update shouldHideThreadDividerLine to moneyRequestView
dukenv0307 Jul 28, 2023
1cbebae
fix: remove un-used variable
dukenv0307 Jul 28, 2023
05b22d0
fix: remove redundant prop
dukenv0307 Jul 28, 2023
e3a1e97
merge main
dukenv0307 Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/pages/home/report/ReportActionItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ const propTypes = {
emojiReactions: EmojiReactionsPropTypes,
personalDetailsList: PropTypes.objectOf(personalDetailsPropType),

/** Is this the only report action on the report? */
isOnlyReportAction: PropTypes.bool,
/** Flag to show, hide the thread divider line */
shouldHideThreadDividerLine: PropTypes.bool,
};

const defaultProps = {
Expand All @@ -114,7 +114,7 @@ const defaultProps = {
personalDetailsList: {},
shouldShowSubscriptAvatar: false,
hasOutstandingIOU: false,
isOnlyReportAction: false,
shouldHideThreadDividerLine: false,
};

function ReportActionItem(props) {
Expand Down Expand Up @@ -452,23 +452,23 @@ function ReportActionItem(props) {
return (
<MoneyRequestView
report={props.report}
shouldShowHorizontalRule={!props.isOnlyReportAction}
shouldShowHorizontalRule={!props.shouldHideThreadDividerLine}
/>
);
}
if (ReportUtils.isTaskReport(props.report)) {
return (
<TaskView
report={props.report}
shouldShowHorizontalRule={!props.isOnlyReportAction}
shouldShowHorizontalRule={!props.shouldHideThreadDividerLine}

@MonilBhavsar MonilBhavsar Jul 27, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In above on L427 also, shouldShowHorizontalRule prop is passed. Should we also update that?

@dukenv0307 dukenv0307 Jul 28, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MonilBhavsar updated, please help review again.

/>
);
}
if (ReportUtils.isExpenseReport(props.report) || ReportUtils.isIOUReport(props.report)) {
return (
<MoneyReportView
report={props.report}
shouldShowHorizontalRule={!props.isOnlyReportAction}
shouldShowHorizontalRule={!props.shouldHideThreadDividerLine}
/>
);
}
Expand Down Expand Up @@ -619,6 +619,6 @@ 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.shouldHideThreadDividerLine === nextProps.shouldHideThreadDividerLine,
),
);
7 changes: 3 additions & 4 deletions src/pages/home/report/ReportActionsList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,17 +130,17 @@ function ReportActionsList(props) {
reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED &&
ReportUtils.isChatThread(report) &&
!ReportActionsUtils.isTransactionThread(ReportActionsUtils.getParentReportAction(report));
const shouldHideThreadDividerLine =
shouldDisplayParentAction && sortedReportActions.length > 1 && sortedReportActions[sortedReportActions.length - 2].reportActionID === newMarkerReportActionID;
const shouldHideThreadDividerLine = sortedReportActions.length > 1 && sortedReportActions[sortedReportActions.length - 2].reportActionID === newMarkerReportActionID;
return shouldDisplayParentAction ? (
<ReportActionItemParentAction
shouldHideThreadDividerLine={shouldHideThreadDividerLine}
shouldHideThreadDividerLine={shouldDisplayParentAction && shouldHideThreadDividerLine}
reportID={report.reportID}
parentReportID={`${report.parentReportID}`}
shouldDisplayNewMarker={shouldDisplayNewMarker}
/>
) : (
<ReportActionItem
shouldHideThreadDividerLine={shouldHideThreadDividerLine}
report={report}
action={reportAction}
displayAsGroup={ReportActionsUtils.isConsecutiveActionMadeByPreviousActor(sortedReportActions, index)}
Expand All @@ -152,7 +152,6 @@ function ReportActionsList(props) {
isMostRecentIOUReportAction={reportAction.reportActionID === mostRecentIOUReportActionID}
hasOutstandingIOU={hasOutstandingIOU}
index={index}
isOnlyReportAction={sortedReportActions.length === 1}
/>
);
},
Expand Down