From 3c32872d4c2d66a0776873f75d2e1e1a907d55cc Mon Sep 17 00:00:00 2001 From: Hubert Sosinski Date: Tue, 29 Sep 2026 16:09:56 +0200 Subject: [PATCH 1/3] Extract ReportDetailsAvatar, Description and PromotedActions leaves --- .../ReportDetailsAvatar.tsx | 125 ++++++++++++++++ .../ReportDetailsDescription.tsx | 69 +++++++++ .../ReportDetailsPromotedActions.tsx | 57 ++++++++ src/pages/DynamicReportDetailsPage/index.tsx | 137 ++---------------- 4 files changed, 261 insertions(+), 127 deletions(-) create mode 100644 src/pages/DynamicReportDetailsPage/ReportDetailsAvatar.tsx create mode 100644 src/pages/DynamicReportDetailsPage/ReportDetailsDescription.tsx create mode 100644 src/pages/DynamicReportDetailsPage/ReportDetailsPromotedActions.tsx diff --git a/src/pages/DynamicReportDetailsPage/ReportDetailsAvatar.tsx b/src/pages/DynamicReportDetailsPage/ReportDetailsAvatar.tsx new file mode 100644 index 000000000000..b529f0d9d6be --- /dev/null +++ b/src/pages/DynamicReportDetailsPage/ReportDetailsAvatar.tsx @@ -0,0 +1,125 @@ +import UserAvatar from '@components/Avatar/UserAvatar'; +import AvatarWithImagePicker from '@components/AvatarWithImagePicker'; +import ReportHeaderAvatars from '@components/ReportHeaderAvatars'; +import RoomHeaderAvatars from '@components/RoomHeaderAvatars'; + +import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; +import useLocalize from '@hooks/useLocalize'; +import useOnyx from '@hooks/useOnyx'; +import {useAllPersonalDetails} from '@hooks/usePersonalDetails'; +import useReportIsArchived from '@hooks/useReportIsArchived'; +import useThemeStyles from '@hooks/useThemeStyles'; + +import Navigation from '@libs/Navigation/Navigation'; +import {isPolicyAdmin as isPolicyAdminUtil} from '@libs/PolicyUtils'; +import { + getIcons, + getParticipantsList, + isChatRoom as isChatRoomUtil, + isChatThread as isChatThreadUtil, + isGroupChat as isGroupChatUtil, + isPolicyExpenseChat as isPolicyExpenseChatUtil, + isThread as isThreadUtil, + isUserCreatedPolicyRoom as isUserCreatedPolicyRoomUtil, +} from '@libs/ReportUtils'; +import {getAccountIDFromAvatarID} from '@libs/UserAvatarUtils'; + +import {clearAvatarErrors, updateGroupChatAvatar} from '@userActions/Report'; + +import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; +import ROUTES from '@src/ROUTES'; +import {pendingDeleteMemberAccountIDsSelector} from '@src/selectors/ReportMetaData'; + +import React from 'react'; +import {View} from 'react-native'; + +type ReportDetailsAvatarProps = { + reportID: string; +}; + +function ReportDetailsAvatar({reportID}: ReportDetailsAvatarProps) { + const {translate, formatPhoneNumber} = useLocalize(); + const styles = useThemeStyles(); + const expensifyIcons = useMemoizedLazyExpensifyIcons(['Camera']); + const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`); + const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`); + const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID); + const [pendingDeleteMemberAccountIDs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, {selector: pendingDeleteMemberAccountIDsSelector}); + const [personalDetails] = useAllPersonalDetails(); + const currentUserPersonalDetails = useCurrentUserPersonalDetails(); + const currentUserAccountID = currentUserPersonalDetails?.accountID; + const isReportArchived = useReportIsArchived(reportID); + + if (!report?.reportID) { + return null; + } + + const isPolicyAdmin = isPolicyAdminUtil(policy); + const isPolicyExpenseChat = isPolicyExpenseChatUtil(report); + const isChatRoom = isChatRoomUtil(report); + const isUserCreatedPolicyRoom = isUserCreatedPolicyRoomUtil(report); + const isChatThread = isChatThreadUtil(report); + const isGroupChat = isGroupChatUtil(report); + const isThread = isThreadUtil(report); + const shouldOpenRoomMembersPage = isUserCreatedPolicyRoom || isChatThread || (isPolicyExpenseChat && isPolicyAdmin); + const participants = getParticipantsList(report, personalDetails, shouldOpenRoomMembersPage); + + const icons = getIcons(report, formatPhoneNumber, translate, personalDetails, null, '', -1, policy, undefined, isReportArchived, pendingDeleteMemberAccountIDs, conciergeReportID); + + if (isChatRoom && !isThread) { + return ( + + + + ); + } + if (!isGroupChat || isThread) { + return ( + + + + ); + } + + const groupChatIcon = icons.at(0); + const groupChatAvatarSource = groupChatIcon?.source; + const groupChatAvatar = groupChatAvatarSource ? ( + + ) : null; + + return ( + Navigation.navigate(ROUTES.REPORT_AVATAR.getRoute(report.reportID))} + onImageRemoved={() => { + // Calling this without a file will remove the avatar + updateGroupChatAvatar(report.reportID, report.avatarUrl); + }} + onImageSelected={(file) => updateGroupChatAvatar(report.reportID, report.avatarUrl, file)} + editIcon={expensifyIcons.Camera} + editIconStyle={styles.smallEditIconAccount} + pendingAction={report.pendingFields?.avatar ?? undefined} + errors={report.errorFields?.avatar ?? null} + errorRowStyles={styles.mt6} + onErrorClose={() => clearAvatarErrors(report.reportID)} + style={[styles.w100, styles.mb3]} + /> + ); +} + +export default ReportDetailsAvatar; diff --git a/src/pages/DynamicReportDetailsPage/ReportDetailsDescription.tsx b/src/pages/DynamicReportDetailsPage/ReportDetailsDescription.tsx new file mode 100644 index 000000000000..38a7712154c8 --- /dev/null +++ b/src/pages/DynamicReportDetailsPage/ReportDetailsDescription.tsx @@ -0,0 +1,69 @@ +import MentionReportContext from '@components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer/MentionReportContext'; +import MenuItem from '@components/MenuItem'; +import MenuItemField from '@components/MenuItem/presets/MenuItemField'; +import OfflineWithFeedback from '@components/OfflineWithFeedback'; + +import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; +import useLocalize from '@hooks/useLocalize'; +import useOnyx from '@hooks/useOnyx'; +import useReportIsArchived from '@hooks/useReportIsArchived'; + +import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute'; +import Navigation from '@libs/Navigation/Navigation'; +import {canEditReportDescription as canEditReportDescriptionUtil, getReportDescription, isChatRoom as isChatRoomUtil, isTaskReport as isTaskReportUtil} from '@libs/ReportUtils'; + +import {canModifyTask} from '@userActions/Task'; + +import ONYXKEYS from '@src/ONYXKEYS'; +import {DYNAMIC_ROUTES} from '@src/ROUTES'; + +import React from 'react'; + +type ReportDetailsDescriptionProps = { + reportID: string; +}; + +function ReportDetailsDescription({reportID}: ReportDetailsDescriptionProps) { + const {translate} = useLocalize(); + const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`); + const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`); + const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`); + const currentUserPersonalDetails = useCurrentUserPersonalDetails(); + const currentUserAccountID = currentUserPersonalDetails?.accountID; + const isParentReportArchived = useReportIsArchived(parentReport?.reportID); + + if (!report?.reportID) { + return null; + } + + const isChatRoom = isChatRoomUtil(report); + const isTaskReport = isTaskReportUtil(report); + const isTaskModifiable = canModifyTask(report, currentUserAccountID, isParentReportArchived); + const canEditReportDescription = canEditReportDescriptionUtil(report, policy); + const shouldShowReportDescription = isChatRoom && (canEditReportDescription || report.description !== '') && (isTaskReport ? isTaskModifiable : true); + + if (!shouldShowReportDescription) { + return null; + } + + const mentionReportContextValue = {currentReportID: report.reportID, exactlyMatch: true}; + + return ( + + + Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REPORT_DESCRIPTION.path))}> + + + {!!getReportDescription(report) && {getReportDescription(report)}} + + + + + + + + + ); +} + +export default ReportDetailsDescription; diff --git a/src/pages/DynamicReportDetailsPage/ReportDetailsPromotedActions.tsx b/src/pages/DynamicReportDetailsPage/ReportDetailsPromotedActions.tsx new file mode 100644 index 000000000000..8c51ae5d0f59 --- /dev/null +++ b/src/pages/DynamicReportDetailsPage/ReportDetailsPromotedActions.tsx @@ -0,0 +1,57 @@ +import type {PromotedAction} from '@components/PromotedActionsBar'; +import PromotedActionsBar, {PromotedActions} from '@components/PromotedActionsBar'; + +import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; +import useOnyx from '@hooks/useOnyx'; +import useParentReportAction from '@hooks/useParentReportAction'; +import useThemeStyles from '@hooks/useThemeStyles'; + +import {canJoinChat} from '@libs/ReportUtils'; + +import ONYXKEYS from '@src/ONYXKEYS'; + +import React from 'react'; + +type ReportDetailsPromotedActionsProps = { + reportID: string; +}; + +function ReportDetailsPromotedActions({reportID}: ReportDetailsPromotedActionsProps) { + const styles = useThemeStyles(); + const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`); + const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`); + const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`); + const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${reportID}`); + const parentReportAction = useParentReportAction(report); + const currentUserPersonalDetails = useCurrentUserPersonalDetails(); + const currentUserAccountID = currentUserPersonalDetails?.accountID; + + if (!report?.reportID) { + return null; + } + + const canJoin = canJoinChat(report, parentReportAction, policy, parentReport, !!reportNameValuePairs?.private_isArchived); + + const promotedActions = (() => { + const result: PromotedAction[] = []; + + if (canJoin) { + result.push(PromotedActions.join(report, currentUserAccountID)); + } + + result.push(PromotedActions.pin(report)); + + result.push(PromotedActions.share()); + + return result; + })(); + + return ( + + ); +} + +export default ReportDetailsPromotedActions; diff --git a/src/pages/DynamicReportDetailsPage/index.tsx b/src/pages/DynamicReportDetailsPage/index.tsx index b4c841cfa521..12e3bba5b4e9 100644 --- a/src/pages/DynamicReportDetailsPage/index.tsx +++ b/src/pages/DynamicReportDetailsPage/index.tsx @@ -1,19 +1,11 @@ -import UserAvatar from '@components/Avatar/UserAvatar'; -import AvatarWithImagePicker from '@components/AvatarWithImagePicker'; import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; -import MentionReportContext from '@components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer/MentionReportContext'; import MenuItem from '@components/MenuItem'; import MenuItemAction from '@components/MenuItem/presets/MenuItemAction'; -import MenuItemField from '@components/MenuItem/presets/MenuItemField'; import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription'; import {ModalActions} from '@components/Modal/Global/ModalContext'; import OfflineWithFeedback from '@components/OfflineWithFeedback'; import ParentNavigationSubtitle from '@components/ParentNavigationSubtitle'; -import type {PromotedAction} from '@components/PromotedActionsBar'; -import PromotedActionsBar, {PromotedActions} from '@components/PromotedActionsBar'; -import ReportHeaderAvatars from '@components/ReportHeaderAvatars'; -import RoomHeaderAvatars from '@components/RoomHeaderAvatars'; import ScreenWrapper from '@components/ScreenWrapper'; import ScrollView from '@components/ScrollView'; import {useSearchSelectionActions} from '@components/Search/SearchContext'; @@ -61,21 +53,17 @@ import {getReportName} from '@libs/ReportNameUtils'; import { canDeleteCardTransactionByLiabilityType, canDeleteTransaction, - canEditReportDescription as canEditReportDescriptionUtil, canEditReportTitle, - canJoinChat, canLeaveChat, canWriteInReport, findLastAccessedReport, getAvailableReportFields, getChatRoomSubtitle, - getIcons, getOriginalReportID, getParentNavigationSubtitle, getParticipantsAccountIDsForDisplay, getParticipantsList, getPolicyName, - getReportDescription, getReportFieldKey, getReportForHeader, isArchivedNonExpenseReport, @@ -113,7 +101,6 @@ import { } from '@libs/ReportUtils'; import StringUtils from '@libs/StringUtils'; import {getDeleteConfirmationPrompt, getDeleteExpenseTitle, getOriginalTransactionWithSplitInfo, isDemoTransaction} from '@libs/TransactionUtils'; -import {getAccountIDFromAvatarID} from '@libs/UserAvatarUtils'; import type {WithReportOrNotFoundProps} from '@pages/inbox/report/withReportOrNotFound'; import withReportOrNotFound from '@pages/inbox/report/withReportOrNotFound'; @@ -121,16 +108,7 @@ import withReportOrNotFound from '@pages/inbox/report/withReportOrNotFound'; import {getNavigationUrlOnMoneyRequestDelete} from '@userActions/IOU/DeleteMoneyRequest'; import {createDraftTransactionAndNavigateToParticipantSelector} from '@userActions/IOU/StartExpenseFlows'; import {deleteTrackExpense, getNavigationUrlAfterTrackExpenseDelete} from '@userActions/IOU/TrackExpense'; -import { - clearAvatarErrors, - clearPolicyRoomNameErrors, - getReportPrivateNote, - hasErrorInPrivateNotes, - leaveGroupChat, - leaveRoom, - setDeleteTransactionNavigateBackUrl, - updateGroupChatAvatar, -} from '@userActions/Report'; +import {clearPolicyRoomNameErrors, getReportPrivateNote, hasErrorInPrivateNotes, leaveGroupChat, leaveRoom, setDeleteTransactionNavigateBackUrl} from '@userActions/Report'; import {callFunctionIfActionIsAllowed} from '@userActions/Session'; import {canActionTask, canModifyTask, reopenTask} from '@userActions/Task'; import {deleteTask} from '@userActions/TaskDeletion'; @@ -140,7 +118,6 @@ import ONYXKEYS from '@src/ONYXKEYS'; import type {Route} from '@src/ROUTES'; import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES'; import SCREENS from '@src/SCREENS'; -import {pendingDeleteMemberAccountIDsSelector} from '@src/selectors/ReportMetaData'; import type * as OnyxTypes from '@src/types/onyx'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; @@ -157,12 +134,15 @@ import {View} from 'react-native'; import type {DynamicReportDetailsPageMenuItem} from './types'; import getReportDetailsCaseID from './getReportDetailsCaseID'; +import ReportDetailsAvatar from './ReportDetailsAvatar'; +import ReportDetailsDescription from './ReportDetailsDescription'; +import ReportDetailsPromotedActions from './ReportDetailsPromotedActions'; import {CASES} from './types'; type DynamicReportDetailsPageProps = WithReportOrNotFoundProps & PlatformStackScreenProps; function DynamicReportDetailsPage({policy, report, route, reportMetadata, reportLoadingState}: DynamicReportDetailsPageProps) { - const {translate, formatPhoneNumber} = useLocalize(); + const {translate} = useLocalize(); const {isOffline} = useNetwork(); const {isRestrictedToPreferredPolicy, preferredPolicyID} = usePreferredPolicy(); const activePolicy = useActivePolicy(); @@ -179,7 +159,6 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report 'Building', 'Exit', 'Bug', - 'Camera', 'Trashcan', 'ArrowSplit', 'Hashtag', @@ -200,7 +179,6 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID}`); const [guideAccountIDs] = useOnyx(ONYXKEYS.DERIVED.GUIDE_ACCOUNT_IDS); const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID); - const [pendingDeleteMemberAccountIDs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${report?.reportID}`, {selector: pendingDeleteMemberAccountIDsSelector}); const {reportActions} = usePaginatedReportActions(report.reportID); const [reportActionsForOriginalReportID] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`); @@ -258,8 +236,6 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report const isParentReportArchived = useReportIsArchived(parentReport?.reportID); const isTaskModifiable = canModifyTask(report, currentUserAccountID, isParentReportArchived); const isTaskActionable = canActionTask(report, parentReportAction, currentUserAccountID, parentReport, isParentReportArchived); - const canEditReportDescription = canEditReportDescriptionUtil(report, policy); - const shouldShowReportDescription = isChatRoom && (canEditReportDescription || report.description !== '') && (isTaskReport ? isTaskModifiable : true); const isExpenseReport = isMoneyRequestReport || isInvoiceReport || isMoneyRequest; const isSingleTransactionView = isMoneyRequest || isTrackExpenseReport; const isSelfDMTrackExpenseReport = isTrackExpenseReport && isSelfDMUtil(parentReport); @@ -692,81 +668,6 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report return items; })(); - const icons = getIcons(report, formatPhoneNumber, translate, personalDetails, null, '', -1, policy, undefined, isReportArchived, pendingDeleteMemberAccountIDs, conciergeReportID); - - const renderedAvatar = (() => { - if (isChatRoom && !isThread) { - return ( - - - - ); - } - if (!isGroupChat || isThread) { - return ( - - - - ); - } - - const groupChatIcon = icons.at(0); - const groupChatAvatarSource = groupChatIcon?.source; - const groupChatAvatar = groupChatAvatarSource ? ( - - ) : null; - - return ( - Navigation.navigate(ROUTES.REPORT_AVATAR.getRoute(report.reportID))} - onImageRemoved={() => { - // Calling this without a file will remove the avatar - updateGroupChatAvatar(report.reportID, report.avatarUrl); - }} - onImageSelected={(file) => updateGroupChatAvatar(report.reportID, report.avatarUrl, file)} - editIcon={expensifyIcons.Camera} - editIconStyle={styles.smallEditIconAccount} - pendingAction={report.pendingFields?.avatar ?? undefined} - errors={report.errorFields?.avatar ?? null} - errorRowStyles={styles.mt6} - onErrorClose={() => clearAvatarErrors(report.reportID)} - style={[styles.w100, styles.mb3]} - /> - ); - })(); - - const canJoin = canJoinChat(report, parentReportAction, policy, parentReport, !!reportNameValuePairs?.private_isArchived); - - const promotedActions = (() => { - const result: PromotedAction[] = []; - - if (canJoin) { - result.push(PromotedActions.join(report, currentUserAccountID)); - } - - if (report) { - result.push(PromotedActions.pin(report)); - } - - result.push(PromotedActions.share()); - - return result; - })(); - const shouldDisplayGroupWorkspaceAsPushRow = !isThread && (isGroupChat || isUserCreatedPolicyRoom || isDefaultRoom); const nameSectionGroupWorkspace = ( Navigation.goBack(navigateBackFromReportDetailsPath)} /> - {renderedAvatar} + + + {isExpenseReport && nameSectionTitleField} {isExpenseReport && shouldShowFurtherDetailsContent && nameSectionFurtherDetailsContent} {!isExpenseReport && nameSectionGroupWorkspace} - {shouldShowReportDescription && ( - - - Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REPORT_DESCRIPTION.path))}> - - - {!!getReportDescription(report) && {getReportDescription(report)}} - - - - - - - - - )} + {isFinancialReportsForBusinesses && ( <> @@ -1090,10 +976,7 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report )} - + {menuItems.map((item) => ( Date: Wed, 30 Sep 2026 15:59:55 +0200 Subject: [PATCH 2/3] fixes after review --- .../ReportDetailsPromotedActions.tsx | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/pages/DynamicReportDetailsPage/ReportDetailsPromotedActions.tsx b/src/pages/DynamicReportDetailsPage/ReportDetailsPromotedActions.tsx index 8c51ae5d0f59..0f08de1f9fdd 100644 --- a/src/pages/DynamicReportDetailsPage/ReportDetailsPromotedActions.tsx +++ b/src/pages/DynamicReportDetailsPage/ReportDetailsPromotedActions.tsx @@ -4,6 +4,7 @@ import PromotedActionsBar, {PromotedActions} from '@components/PromotedActionsBa import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useOnyx from '@hooks/useOnyx'; import useParentReportAction from '@hooks/useParentReportAction'; +import useReportIsArchived from '@hooks/useReportIsArchived'; import useThemeStyles from '@hooks/useThemeStyles'; import {canJoinChat} from '@libs/ReportUtils'; @@ -21,8 +22,8 @@ function ReportDetailsPromotedActions({reportID}: ReportDetailsPromotedActionsPr const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`); const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`); const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`); - const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${reportID}`); const parentReportAction = useParentReportAction(report); + const isReportArchived = useReportIsArchived(reportID); const currentUserPersonalDetails = useCurrentUserPersonalDetails(); const currentUserAccountID = currentUserPersonalDetails?.accountID; @@ -30,21 +31,9 @@ function ReportDetailsPromotedActions({reportID}: ReportDetailsPromotedActionsPr return null; } - const canJoin = canJoinChat(report, parentReportAction, policy, parentReport, !!reportNameValuePairs?.private_isArchived); + const canJoin = canJoinChat(report, parentReportAction, policy, parentReport, isReportArchived); - const promotedActions = (() => { - const result: PromotedAction[] = []; - - if (canJoin) { - result.push(PromotedActions.join(report, currentUserAccountID)); - } - - result.push(PromotedActions.pin(report)); - - result.push(PromotedActions.share()); - - return result; - })(); + const promotedActions: PromotedAction[] = [...(canJoin ? [PromotedActions.join(report, currentUserAccountID)] : []), PromotedActions.pin(report), PromotedActions.share()]; return ( Date: Wed, 30 Sep 2026 16:12:12 +0200 Subject: [PATCH 3/3] fixes after review --- .../ReportDetailsAvatar.tsx | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/src/pages/DynamicReportDetailsPage/ReportDetailsAvatar.tsx b/src/pages/DynamicReportDetailsPage/ReportDetailsAvatar.tsx index b529f0d9d6be..1d643d0186c6 100644 --- a/src/pages/DynamicReportDetailsPage/ReportDetailsAvatar.tsx +++ b/src/pages/DynamicReportDetailsPage/ReportDetailsAvatar.tsx @@ -31,6 +31,7 @@ import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import {pendingDeleteMemberAccountIDsSelector} from '@src/selectors/ReportMetaData'; +import type {Report} from '@src/types/onyx'; import React from 'react'; import {View} from 'react-native'; @@ -39,12 +40,16 @@ type ReportDetailsAvatarProps = { reportID: string; }; -function ReportDetailsAvatar({reportID}: ReportDetailsAvatarProps) { +type ReportDetailsAvatarContentProps = { + report: Report; +}; + +function ReportDetailsAvatarContent({report}: ReportDetailsAvatarContentProps) { + const reportID = report.reportID; const {translate, formatPhoneNumber} = useLocalize(); const styles = useThemeStyles(); const expensifyIcons = useMemoizedLazyExpensifyIcons(['Camera']); - const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`); - const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`); + const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`); const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID); const [pendingDeleteMemberAccountIDs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, {selector: pendingDeleteMemberAccountIDsSelector}); const [personalDetails] = useAllPersonalDetails(); @@ -52,10 +57,6 @@ function ReportDetailsAvatar({reportID}: ReportDetailsAvatarProps) { const currentUserAccountID = currentUserPersonalDetails?.accountID; const isReportArchived = useReportIsArchived(reportID); - if (!report?.reportID) { - return null; - } - const isPolicyAdmin = isPolicyAdminUtil(policy); const isPolicyExpenseChat = isPolicyExpenseChatUtil(report); const isChatRoom = isChatRoomUtil(report); @@ -122,4 +123,14 @@ function ReportDetailsAvatar({reportID}: ReportDetailsAvatarProps) { ); } +function ReportDetailsAvatar({reportID}: ReportDetailsAvatarProps) { + const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`); + + if (!report?.reportID) { + return null; + } + + return ; +} + export default ReportDetailsAvatar;