From da5acb09a55e116e1b49c09b8d13d2ef3f2430b0 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Wed, 17 May 2023 10:47:33 -0600 Subject: [PATCH 1/3] fallback on report --- src/pages/home/HeaderView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js index 47d62048b980..42562ba1c008 100644 --- a/src/pages/home/HeaderView.js +++ b/src/pages/home/HeaderView.js @@ -239,7 +239,7 @@ export default compose( canEvict: false, }, parentReport: { - key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`, + key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID || report.reportID}`, }, }), )(HeaderView); From 942b4fc6627be378470c1929a8f9534d1df492d9 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Wed, 17 May 2023 11:05:01 -0600 Subject: [PATCH 2/3] fix conditional --- src/pages/home/HeaderView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js index 42562ba1c008..8e6906f956cf 100644 --- a/src/pages/home/HeaderView.js +++ b/src/pages/home/HeaderView.js @@ -76,7 +76,7 @@ const HeaderView = (props) => { const isChatRoom = ReportUtils.isChatRoom(props.report); const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(props.report); const isTaskReport = ReportUtils.isTaskReport(props.report); - const reportHeaderData = (isTaskReport || !isThread) && !_.isEmpty(props.parentReport) ? props.parentReport : props.report; + const reportHeaderData = (isTaskReport || !isThread) && props.report.parentReportID ? props.parentReport : props.report; const title = ReportUtils.getReportName(reportHeaderData); const subtitle = ReportUtils.getChatRoomSubtitle(reportHeaderData, props.parentReport); const isConcierge = participants.length === 1 && _.contains(participants, CONST.EMAIL.CONCIERGE); @@ -239,7 +239,7 @@ export default compose( canEvict: false, }, parentReport: { - key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID || report.reportID}`, + key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`, }, }), )(HeaderView); From 4fbb188fc26c887828c8c7cdb139898c99b4cebf Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Wed, 17 May 2023 11:12:04 -0600 Subject: [PATCH 3/3] update onyx key --- src/pages/home/HeaderView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js index 8e6906f956cf..427c8a0d8003 100644 --- a/src/pages/home/HeaderView.js +++ b/src/pages/home/HeaderView.js @@ -239,7 +239,7 @@ export default compose( canEvict: false, }, parentReport: { - key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`, + key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID || report.reportID}`, }, }), )(HeaderView);