From d5c50b659fb3201c8ddf78aac1df7ab76590b549 Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Tue, 23 Jan 2024 11:30:01 -0800 Subject: [PATCH 01/17] allow accessing the members page in a thread --- src/pages/ReportDetailsPage.js | 3 ++- src/pages/RoomMembersPage.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/ReportDetailsPage.js b/src/pages/ReportDetailsPage.js index ff9ed62c6a65..7cb5b12f250e 100644 --- a/src/pages/ReportDetailsPage.js +++ b/src/pages/ReportDetailsPage.js @@ -106,6 +106,7 @@ function ReportDetailsPage(props) { } // The Members page is only shown when: + // - The report is a thread in a chat report // - The report is not a user created room with participants to show i.e. DM, Group Chat, etc // - The report is a user created room and the room and the current user is a workspace member i.e. non-workspace members should not see this option. if ((!isUserCreatedPolicyRoom && participants.length) || (isUserCreatedPolicyRoom && isPolicyMember)) { @@ -116,7 +117,7 @@ function ReportDetailsPage(props) { subtitle: participants.length, isAnonymousAction: false, action: () => { - if (isUserCreatedPolicyRoom && !props.report.parentReportID) { + if (props.report.parentReportID || isUserCreatedPolicyRoom) { Navigation.navigate(ROUTES.ROOM_MEMBERS.getRoute(props.report.reportID)); } else { Navigation.navigate(ROUTES.REPORT_PARTICIPANTS.getRoute(props.report.reportID)); diff --git a/src/pages/RoomMembersPage.js b/src/pages/RoomMembersPage.js index 30ffd60aa4ac..486945b24e03 100644 --- a/src/pages/RoomMembersPage.js +++ b/src/pages/RoomMembersPage.js @@ -238,7 +238,7 @@ function RoomMembersPage(props) { testID={RoomMembersPage.displayName} > Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(props.report.reportID))} > From 545e3687617d4cdad7ceb3d0543564611b448302 Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Tue, 23 Jan 2024 13:25:51 -0800 Subject: [PATCH 02/17] restrict to chat reports --- src/pages/ReportDetailsPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ReportDetailsPage.js b/src/pages/ReportDetailsPage.js index 7cb5b12f250e..65456b17616b 100644 --- a/src/pages/ReportDetailsPage.js +++ b/src/pages/ReportDetailsPage.js @@ -117,7 +117,7 @@ function ReportDetailsPage(props) { subtitle: participants.length, isAnonymousAction: false, action: () => { - if (props.report.parentReportID || isUserCreatedPolicyRoom) { + if ((props.report.type === CONST.REPORT.TYPE.CHAT && props.report.parentReportID) || isUserCreatedPolicyRoom) { Navigation.navigate(ROUTES.ROOM_MEMBERS.getRoute(props.report.reportID)); } else { Navigation.navigate(ROUTES.REPORT_PARTICIPANTS.getRoute(props.report.reportID)); From c644fd04aa8ac28707e64003ed3049a9e9f957e9 Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Tue, 23 Jan 2024 13:31:40 -0800 Subject: [PATCH 03/17] update condition, add comment --- src/pages/RoomMembersPage.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pages/RoomMembersPage.js b/src/pages/RoomMembersPage.js index 486945b24e03..8d273c7d2fee 100644 --- a/src/pages/RoomMembersPage.js +++ b/src/pages/RoomMembersPage.js @@ -238,7 +238,12 @@ function RoomMembersPage(props) { testID={RoomMembersPage.displayName} > Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(props.report.reportID))} > From a7bfccbb7fe6c9bd5eca48fe88fddfd5d5eb80a7 Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Tue, 23 Jan 2024 14:17:11 -0800 Subject: [PATCH 04/17] style --- src/pages/RoomMembersPage.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/RoomMembersPage.js b/src/pages/RoomMembersPage.js index 8d273c7d2fee..df2634a1199e 100644 --- a/src/pages/RoomMembersPage.js +++ b/src/pages/RoomMembersPage.js @@ -243,7 +243,11 @@ function RoomMembersPage(props) { // - this report is a user-created policy room and the user is not a member of the policy // - this report is a default room (threads in default rooms are fine) // - this report is a policy expense chat (threads in policy expense chats are fine) - shouldShow={_.isEmpty(props.report) || (_.isEmpty(ReportUtils.getParentReport(props.report)) && ReportUtils.isUserCreatedPolicyRoom(props.report) && !isPolicyMember) || (_.isEmpty(ReportUtils.getParentReport(props.report)) && (ReportUtils.isDefaultRoom(props.report) || ReportUtils.isPolicyExpenseChat(props.report)))} + shouldShow={ + _.isEmpty(props.report) || + (_.isEmpty(ReportUtils.getParentReport(props.report)) && ReportUtils.isUserCreatedPolicyRoom(props.report) && !isPolicyMember) || + (_.isEmpty(ReportUtils.getParentReport(props.report)) && (ReportUtils.isDefaultRoom(props.report) || ReportUtils.isPolicyExpenseChat(props.report))) + } subtitleKey={_.isEmpty(props.report) ? undefined : 'roomMembersPage.notAuthorized'} onBackButtonPress={() => Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(props.report.reportID))} > From 67089268d0000f500bd4f70166c320addc50aca2 Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Mon, 12 Feb 2024 19:56:36 -0800 Subject: [PATCH 05/17] simplify condition --- src/pages/ReportDetailsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index 3c2ad805ea23..1a263ad537a4 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -119,7 +119,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD subtitle: participants.length, isAnonymousAction: false, action: () => { - if ((report?.type === CONST.REPORT.TYPE.CHAT && report?.parentReportID) ?? isUserCreatedPolicyRoom) { + if (isUserCreatedPolicyRoom || ReportUtils.isChatThread(report)) { Navigation.navigate(ROUTES.ROOM_MEMBERS.getRoute(report?.reportID ?? '')); } else { Navigation.navigate(ROUTES.REPORT_PARTICIPANTS.getRoute(report?.reportID ?? '')); From fe3cdf8dcd58f796b2cdc349f11e50fec2304f4a Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Fri, 23 Feb 2024 11:10:11 -0800 Subject: [PATCH 06/17] don't allow invites in Concierge reports --- src/pages/RoomMembersPage.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/RoomMembersPage.tsx b/src/pages/RoomMembersPage.tsx index 2c2b22f21299..96c32aa1f04f 100644 --- a/src/pages/RoomMembersPage.tsx +++ b/src/pages/RoomMembersPage.tsx @@ -226,7 +226,8 @@ function RoomMembersPage({report, session, policies}: RoomMembersPageProps) { isEmptyObject(report) || !isPolicyMember || (!ReportUtils.isChatThread(report) && ReportUtils.isUserCreatedPolicyRoom(report) && !isPolicyMember) || - (!ReportUtils.isChatThread(report) && (ReportUtils.isDefaultRoom(report))) + (!ReportUtils.isChatThread(report) && (ReportUtils.isDefaultRoom(report))) || + ReportUtils.isConciergeChatReport(report) } subtitleKey={isEmptyObject(report) ? undefined : 'roomMembersPage.notAuthorized'} onBackButtonPress={() => { From f37d119d460abe4bfdcc6a1338e69d89ae1638ae Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Fri, 23 Feb 2024 11:27:03 -0800 Subject: [PATCH 07/17] remove unused import --- src/pages/RoomMembersPage.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/RoomMembersPage.tsx b/src/pages/RoomMembersPage.tsx index 96c32aa1f04f..aa421925b609 100644 --- a/src/pages/RoomMembersPage.tsx +++ b/src/pages/RoomMembersPage.tsx @@ -1,5 +1,4 @@ import type {StackScreenProps} from '@react-navigation/stack'; -import isEmpty from 'lodash/isEmpty'; import React, {useCallback, useEffect, useMemo, useState} from 'react'; import {View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; @@ -226,7 +225,7 @@ function RoomMembersPage({report, session, policies}: RoomMembersPageProps) { isEmptyObject(report) || !isPolicyMember || (!ReportUtils.isChatThread(report) && ReportUtils.isUserCreatedPolicyRoom(report) && !isPolicyMember) || - (!ReportUtils.isChatThread(report) && (ReportUtils.isDefaultRoom(report))) || + (!ReportUtils.isChatThread(report) && ReportUtils.isDefaultRoom(report)) || ReportUtils.isConciergeChatReport(report) } subtitleKey={isEmptyObject(report) ? undefined : 'roomMembersPage.notAuthorized'} From 5bd9652210289be3c132c05ad724f4994e4d24e0 Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Mon, 4 Mar 2024 18:57:43 -0800 Subject: [PATCH 08/17] hide members page in Concierge DM --- src/pages/ReportDetailsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index f795f99b11f2..5b1cae2395d7 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -119,7 +119,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD // - The report is a thread in a chat report // - The report is not a user created room with participants to show i.e. DM, Group Chat, etc // - The report is a user created room and the room and the current user is a workspace member i.e. non-workspace members should not see this option. - if ((!isUserCreatedPolicyRoom && participants.length) || (isUserCreatedPolicyRoom && isPolicyMember)) { + if (((!isUserCreatedPolicyRoom && participants.length) || (isUserCreatedPolicyRoom && isPolicyMember)) && !ReportUtils.isConciergeChatReport(report)) { items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.MEMBERS, translationKey: 'common.members', From 15a94f9135cafe17ea1cfa98d9dd4cb7db6f139f Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Mon, 4 Mar 2024 19:05:35 -0800 Subject: [PATCH 09/17] allow viewing members page in Concierge DM --- src/pages/RoomMembersPage.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/RoomMembersPage.tsx b/src/pages/RoomMembersPage.tsx index b03a41f66a20..04f9db803de6 100644 --- a/src/pages/RoomMembersPage.tsx +++ b/src/pages/RoomMembersPage.tsx @@ -226,8 +226,7 @@ function RoomMembersPage({report, session, policies}: RoomMembersPageProps) { isEmptyObject(report) || !isPolicyMember || (!ReportUtils.isChatThread(report) && ReportUtils.isUserCreatedPolicyRoom(report) && !isPolicyMember) || - (!ReportUtils.isChatThread(report) && ReportUtils.isDefaultRoom(report)) || - ReportUtils.isConciergeChatReport(report) + (!ReportUtils.isChatThread(report) && ReportUtils.isDefaultRoom(report)) } subtitleKey={isEmptyObject(report) ? undefined : 'roomMembersPage.notAuthorized'} onBackButtonPress={() => { From 7d9e16cd8eb903862b27976d39df73674b50e539 Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Fri, 8 Mar 2024 12:32:07 -0800 Subject: [PATCH 10/17] enable inviting in all threads --- src/pages/RoomMembersPage.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pages/RoomMembersPage.tsx b/src/pages/RoomMembersPage.tsx index 04f9db803de6..4af3d8b8b5d1 100644 --- a/src/pages/RoomMembersPage.tsx +++ b/src/pages/RoomMembersPage.tsx @@ -224,9 +224,10 @@ function RoomMembersPage({report, session, policies}: RoomMembersPageProps) { { From c9b4140e64a6f9a2206162a96fdc96e645318ca3 Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Fri, 8 Mar 2024 12:37:07 -0800 Subject: [PATCH 11/17] fix behavior --- src/pages/ReportDetailsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index 5b1cae2395d7..4b281f8ac3fc 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -119,7 +119,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD // - The report is a thread in a chat report // - The report is not a user created room with participants to show i.e. DM, Group Chat, etc // - The report is a user created room and the room and the current user is a workspace member i.e. non-workspace members should not see this option. - if (((!isUserCreatedPolicyRoom && participants.length) || (isUserCreatedPolicyRoom && isPolicyMember)) && !ReportUtils.isConciergeChatReport(report)) { + if (((!isUserCreatedPolicyRoom && participants.length) || (isUserCreatedPolicyRoom && (isPolicyMember || ReportUtils.isChatThread(report)))) && !ReportUtils.isConciergeChatReport(report)) { items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.MEMBERS, translationKey: 'common.members', From 9c9863a918ee1992be8b460600906391e08bdb25 Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Fri, 8 Mar 2024 12:46:35 -0800 Subject: [PATCH 12/17] fix behavior --- src/pages/ReportDetailsPage.tsx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index 4b281f8ac3fc..990161ef896a 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -69,6 +69,8 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD const isChatRoom = useMemo(() => ReportUtils.isChatRoom(report), [report]); const isThread = useMemo(() => ReportUtils.isChatThread(report), [report]); const isUserCreatedPolicyRoom = useMemo(() => ReportUtils.isUserCreatedPolicyRoom(report), [report]); + const isDefaultRoom = useMemo(() => ReportUtils.isDefaultRoom(report), [report]); + const isChatThread = useMemo(() => ReportUtils.isChatThread(report), [report]); const isArchivedRoom = useMemo(() => ReportUtils.isArchivedRoom(report), [report]); const isMoneyRequestReport = useMemo(() => ReportUtils.isMoneyRequestReport(report), [report]); const canEditReportDescription = useMemo(() => ReportUtils.canEditReportDescription(report, policy), [report, policy]); @@ -119,7 +121,12 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD // - The report is a thread in a chat report // - The report is not a user created room with participants to show i.e. DM, Group Chat, etc // - The report is a user created room and the room and the current user is a workspace member i.e. non-workspace members should not see this option. - if (((!isUserCreatedPolicyRoom && participants.length) || (isUserCreatedPolicyRoom && (isPolicyMember || ReportUtils.isChatThread(report)))) && !ReportUtils.isConciergeChatReport(report)) { + + if (( + (isDefaultRoom && isChatThread && isPolicyMember) || + (!isUserCreatedPolicyRoom && participants.length) || + (isUserCreatedPolicyRoom && (isPolicyMember || isChatThread)) + ) && !ReportUtils.isConciergeChatReport(report)) { items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.MEMBERS, translationKey: 'common.members', @@ -134,7 +141,9 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD } }, }); - } else if (isUserCreatedPolicyRoom && (!participants.length || !isPolicyMember) && !report?.parentReportID) { + } else if ( + isUserCreatedPolicyRoom && (!participants.length || !isPolicyMember) || + (isDefaultRoom || ReportUtils.isPolicyExpenseChat(report)) && isChatThread && !isPolicyMember) { items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.INVITE, translationKey: 'common.invite', From d98a459d12cd2b9564b7fccaed5823231483d9a8 Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Fri, 8 Mar 2024 12:48:42 -0800 Subject: [PATCH 13/17] fix behavior for public rooms --- src/pages/ReportDetailsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index 990161ef896a..3b67ff63b004 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -125,7 +125,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD if (( (isDefaultRoom && isChatThread && isPolicyMember) || (!isUserCreatedPolicyRoom && participants.length) || - (isUserCreatedPolicyRoom && (isPolicyMember || isChatThread)) + (isUserCreatedPolicyRoom && (isPolicyMember || (isChatThread && !ReportUtils.isPublicRoom(report)))) ) && !ReportUtils.isConciergeChatReport(report)) { items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.MEMBERS, From ee6a2b581c889e1de2a46f26724d5bf4666a25df Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Fri, 8 Mar 2024 12:56:09 -0800 Subject: [PATCH 14/17] lint --- src/pages/ReportDetailsPage.tsx | 17 +++++++++-------- src/pages/RoomMembersPage.tsx | 6 +----- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index 3b67ff63b004..232a153ccfe9 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -121,12 +121,12 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD // - The report is a thread in a chat report // - The report is not a user created room with participants to show i.e. DM, Group Chat, etc // - The report is a user created room and the room and the current user is a workspace member i.e. non-workspace members should not see this option. - - if (( - (isDefaultRoom && isChatThread && isPolicyMember) || - (!isUserCreatedPolicyRoom && participants.length) || - (isUserCreatedPolicyRoom && (isPolicyMember || (isChatThread && !ReportUtils.isPublicRoom(report)))) - ) && !ReportUtils.isConciergeChatReport(report)) { + if ( + ((isDefaultRoom && isChatThread && isPolicyMember) || + (!isUserCreatedPolicyRoom && participants.length) || + (isUserCreatedPolicyRoom && (isPolicyMember || (isChatThread && !ReportUtils.isPublicRoom(report))))) && + !ReportUtils.isConciergeChatReport(report) + ) { items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.MEMBERS, translationKey: 'common.members', @@ -142,8 +142,9 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD }, }); } else if ( - isUserCreatedPolicyRoom && (!participants.length || !isPolicyMember) || - (isDefaultRoom || ReportUtils.isPolicyExpenseChat(report)) && isChatThread && !isPolicyMember) { + (isUserCreatedPolicyRoom && (!participants.length || !isPolicyMember)) || + ((isDefaultRoom || ReportUtils.isPolicyExpenseChat(report)) && isChatThread && !isPolicyMember) + ) { items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.INVITE, translationKey: 'common.invite', diff --git a/src/pages/RoomMembersPage.tsx b/src/pages/RoomMembersPage.tsx index 4af3d8b8b5d1..123108c54d89 100644 --- a/src/pages/RoomMembersPage.tsx +++ b/src/pages/RoomMembersPage.tsx @@ -223,11 +223,7 @@ function RoomMembersPage({report, session, policies}: RoomMembersPageProps) { > { From a93f1c52045ca450ed752b532f5a342498e90d96 Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Mon, 11 Mar 2024 13:27:51 -0700 Subject: [PATCH 15/17] use correct variable naming --- src/pages/ReportDetailsPage.tsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index 2f0fdeabcc36..2f7ef9c3a706 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -68,7 +68,6 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD const isPolicyMember = useMemo(() => PolicyUtils.isPolicyMember(report?.policyID ?? '', policies), [report?.policyID, policies]); const shouldUseFullTitle = useMemo(() => ReportUtils.shouldUseFullTitleToDisplay(report), [report]); const isChatRoom = useMemo(() => ReportUtils.isChatRoom(report), [report]); - const isThread = useMemo(() => ReportUtils.isChatThread(report), [report]); const isUserCreatedPolicyRoom = useMemo(() => ReportUtils.isUserCreatedPolicyRoom(report), [report]); const isDefaultRoom = useMemo(() => ReportUtils.isDefaultRoom(report), [report]); const isChatThread = useMemo(() => ReportUtils.isChatThread(report), [report]); @@ -135,7 +134,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD subtitle: participants.length, isAnonymousAction: false, action: () => { - if (isUserCreatedPolicyRoom || ReportUtils.isChatThread(report)) { + if (isUserCreatedPolicyRoom || isChatThread) { Navigation.navigate(ROUTES.ROOM_MEMBERS.getRoute(report?.reportID ?? '')); } else { Navigation.navigate(ROUTES.REPORT_PARTICIPANTS.getRoute(report?.reportID ?? '')); @@ -168,7 +167,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD }); // Prevent displaying private notes option for threads and task reports - if (!isThread && !isMoneyRequestReport && !ReportUtils.isTaskReport(report)) { + if (!isChatThread && !isMoneyRequestReport && !ReportUtils.isTaskReport(report)) { items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.PRIVATE_NOTES, translationKey: 'privateNotes.title', @@ -180,7 +179,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD } return items; - }, [isArchivedRoom, participants.length, isThread, isMoneyRequestReport, report, isGroupDMChat, isPolicyMember, isUserCreatedPolicyRoom, session, isSelfDM]); + }, [isArchivedRoom, participants.length, isChatThread, isMoneyRequestReport, report, isGroupDMChat, isPolicyMember, isUserCreatedPolicyRoom, session, isSelfDM]); const displayNamesWithTooltips = useMemo(() => { const hasMultipleParticipants = participants.length > 1; @@ -228,8 +227,8 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD fullTitle={ReportUtils.getReportName(report)} displayNamesWithTooltips={displayNamesWithTooltips} tooltipEnabled - numberOfLines={isChatRoom && !isThread ? 0 : 1} - textStyles={[styles.textHeadline, styles.textAlignCenter, isChatRoom && !isThread ? undefined : styles.pre]} + numberOfLines={isChatRoom && !isChatThread ? 0 : 1} + textStyles={[styles.textHeadline, styles.textAlignCenter, isChatRoom && !isChatThread ? undefined : styles.pre]} shouldUseFullTitle={shouldUseFullTitle} /> From 986089415317fd2adc17e241c875886c715ee832 Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Mon, 11 Mar 2024 13:28:32 -0700 Subject: [PATCH 16/17] add missing hook dependencies --- src/pages/ReportDetailsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index 2f7ef9c3a706..2c3e16f61f98 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -179,7 +179,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD } return items; - }, [isArchivedRoom, participants.length, isChatThread, isMoneyRequestReport, report, isGroupDMChat, isPolicyMember, isUserCreatedPolicyRoom, session, isSelfDM]); + }, [isArchivedRoom, participants.length, isChatThread, isMoneyRequestReport, report, isGroupDMChat, isPolicyMember, isUserCreatedPolicyRoom, session, isSelfDM, isChatThread, isDefaultRoom]); const displayNamesWithTooltips = useMemo(() => { const hasMultipleParticipants = participants.length > 1; From c4ee5d30a9e33921e745697fb96ffae4832d44ff Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Tue, 12 Mar 2024 09:58:20 -0700 Subject: [PATCH 17/17] Update ReportDetailsPage.tsx Co-authored-by: Aimane Chnaif <96077027+aimane-chnaif@users.noreply.github.com> --- src/pages/ReportDetailsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index 2c3e16f61f98..f06b40af8851 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -179,7 +179,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD } return items; - }, [isArchivedRoom, participants.length, isChatThread, isMoneyRequestReport, report, isGroupDMChat, isPolicyMember, isUserCreatedPolicyRoom, session, isSelfDM, isChatThread, isDefaultRoom]); + }, [isArchivedRoom, participants.length, isChatThread, isMoneyRequestReport, report, isGroupDMChat, isPolicyMember, isUserCreatedPolicyRoom, session, isSelfDM, isDefaultRoom]); const displayNamesWithTooltips = useMemo(() => { const hasMultipleParticipants = participants.length > 1;