From c91d8472c95b5eb97cf96d21afb09d9b2f4f26bb Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Mon, 13 Oct 2025 01:08:46 +0100 Subject: [PATCH 1/8] feat: migrate ReportAvatar screen to AttachmentModalScreen --- src/ROUTES.ts | 18 +++--- .../Navigation/AppNavigator/AuthScreens.tsx | 16 ++--- src/pages/ReportAvatar.tsx | 64 ------------------- .../{ => report}/ReportAvatarModalContent.tsx | 16 ++++- 4 files changed, 29 insertions(+), 85 deletions(-) delete mode 100644 src/pages/ReportAvatar.tsx rename src/pages/media/AttachmentModalScreen/routes/{ => report}/ReportAvatarModalContent.tsx (78%) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index f599663ad3e2..a3365493297f 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -476,15 +476,6 @@ const ROUTES = { return getUrlWithBackToParam(`${baseRoute}${queryString}` as const, backTo); }, }, - REPORT_AVATAR: { - route: 'r/:reportID/avatar', - getRoute: (reportID: string, policyID?: string) => { - if (policyID) { - return `r/${reportID}/avatar?policyID=${policyID}` as const; - } - return `r/${reportID}/avatar` as const; - }, - }, ATTACHMENTS: { route: 'attachment', getRoute: (params?: ReportAttachmentsRouteParams) => getAttachmentModalScreenRoute('attachment', params), @@ -495,6 +486,15 @@ const ROUTES = { return getAttachmentModalScreenRoute(`r/${reportID}/attachment/add`, params); }, }, + REPORT_AVATAR: { + route: 'r/:reportID/avatar', + getRoute: (reportID: string, policyID?: string) => { + if (policyID) { + return `r/${reportID}/avatar?policyID=${policyID}` as const; + } + return `r/${reportID}/avatar` as const; + }, + }, EDIT_CURRENCY_REQUEST: { route: 'r/:threadReportID/edit/currency', getRoute: (threadReportID: string, currency: string, backTo: string) => `r/${threadReportID}/edit/currency?currency=${currency}&backTo=${backTo}` as const, diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx index 64b60bbe948a..b9ff6fb2cdc3 100644 --- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx +++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx @@ -86,7 +86,6 @@ const loadTrackExpensePage = () => require('../../../pages const loadSubmitExpensePage = () => require('../../../pages/SubmitExpensePage').default; const loadProfileAvatar = () => require('../../../pages/settings/Profile/Avatar/ProfileAvatar').default; const loadWorkspaceAvatar = () => require('../../../pages/workspace/WorkspaceAvatar').default; -const loadReportAvatar = () => require('../../../pages/ReportAvatar').default; const loadReceiptView = () => require('../../../pages/TransactionReceiptPage').default; const loadWorkspaceJoinUser = () => require('@pages/workspace/WorkspaceJoinUserPage').default; @@ -581,6 +580,12 @@ function AuthScreens() { getComponent={loadAttachmentModalScreen} listeners={modalScreenListeners} /> + - ; - -function ReportAvatar({route}: ReportAvatarProps) { - const {reportID, policyID} = route.params; - const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {canBeMissing: false}); - const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {canBeMissing: true}); - const [isLoadingApp = true] = useOnyx(ONYXKEYS.IS_LOADING_APP, {canBeMissing: true}); - - const attachment = useMemo(() => { - if (isGroupChat(report) && !isThread(report)) { - return { - source: report?.avatarUrl ? getFullSizeAvatar(report.avatarUrl, 0) : getDefaultGroupAvatar(report?.reportID), - headerTitle: getReportName(report), - isWorkspaceAvatar: false, - }; - } - if (isUserCreatedPolicyRoom(report)) { - return { - source: report?.avatarUrl ? getFullSizeAvatar(report.avatarUrl, 0) : undefined, - headerTitle: getReportName(report), - isWorkspaceAvatar: false, - }; - } - - return { - source: getFullSizeAvatar(getWorkspaceIcon(report, policy).source, 0), - headerTitle: getPolicyName({report, policy}), - // In the case of default workspace avatar, originalFileName prop takes policyID as value to get the color of the avatar - originalFileName: policy?.originalFileName ?? policy?.id ?? report?.policyID, - isWorkspaceAvatar: true, - }; - }, [report, policy]); - - return ( - { - Navigation.goBack(report?.reportID ? ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID) : undefined); - }} - isWorkspaceAvatar={attachment.isWorkspaceAvatar} - maybeIcon - originalFileName={attachment.originalFileName} - shouldShowNotFoundPage={!report?.reportID && !isLoadingApp} - isLoading={(!report?.reportID || !policy?.id) && !!isLoadingApp} - /> - ); -} - -ReportAvatar.displayName = 'ReportAvatar'; -export default ReportAvatar; diff --git a/src/pages/media/AttachmentModalScreen/routes/ReportAvatarModalContent.tsx b/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx similarity index 78% rename from src/pages/media/AttachmentModalScreen/routes/ReportAvatarModalContent.tsx rename to src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx index e2c83a2730b7..fae148b9c705 100644 --- a/src/pages/media/AttachmentModalScreen/routes/ReportAvatarModalContent.tsx +++ b/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx @@ -1,9 +1,10 @@ import React, {useMemo} from 'react'; import useOnyx from '@hooks/useOnyx'; -import {getDefaultGroupAvatar, getPolicyName, getReportName, getWorkspaceIcon, isGroupChat, isThread} from '@libs/ReportUtils'; +import {getDefaultGroupAvatar, getPolicyName, getReportName, getWorkspaceIcon, isGroupChat, isThread, isUserCreatedPolicyRoom} from '@libs/ReportUtils'; import {getFullSizeAvatar} from '@libs/UserUtils'; import type {AttachmentModalBaseContentProps} from '@pages/media/AttachmentModalScreen/AttachmentModalBaseContent/types'; import AttachmentModalContainer from '@pages/media/AttachmentModalScreen/AttachmentModalContainer'; +import useDownloadAttachment from '@pages/media/AttachmentModalScreen/routes/hooks/useDownloadAttachment'; import type {AttachmentModalScreenProps} from '@pages/media/AttachmentModalScreen/types'; import ONYXKEYS from '@src/ONYXKEYS'; import type SCREENS from '@src/SCREENS'; @@ -24,6 +25,14 @@ function ReportAvatarModalContent({navigation, route}: AttachmentModalScreenProp }; } + if (isUserCreatedPolicyRoom(report)) { + return { + source: report?.avatarUrl ? getFullSizeAvatar(report.avatarUrl, 0) : undefined, + headerTitle: getReportName(report), + isWorkspaceAvatar: false, + }; + } + return { source: getFullSizeAvatar(getWorkspaceIcon(report).source, 0), headerTitle: getPolicyName({report, policy}), @@ -33,13 +42,16 @@ function ReportAvatarModalContent({navigation, route}: AttachmentModalScreenProp }; }, [policy, report]); + const onDownloadAttachment = useDownloadAttachment(); + const contentProps = useMemo( () => ({ ...attachment, shouldShowNotFoundPage: !report?.reportID && !isLoadingApp, isLoading: (!report?.reportID || !policy?.id) && !!isLoadingApp, + onDownloadAttachment, }), - [attachment, isLoadingApp, policy?.id, report?.reportID], + [attachment, isLoadingApp, policy?.id, report?.reportID, onDownloadAttachment], ); return ( From 2ee5c1a5fd5e7991fef0da8e7914b1ab0080fad8 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Mon, 13 Oct 2025 01:18:32 +0100 Subject: [PATCH 2/8] fix: invalid import --- src/pages/media/AttachmentModalScreen/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/media/AttachmentModalScreen/index.tsx b/src/pages/media/AttachmentModalScreen/index.tsx index 749260326f9a..7e913b00f976 100644 --- a/src/pages/media/AttachmentModalScreen/index.tsx +++ b/src/pages/media/AttachmentModalScreen/index.tsx @@ -3,8 +3,8 @@ import SCREENS from '@src/SCREENS'; import AttachmentModalContext from './AttachmentModalContext'; import ProfileAvatarModalContent from './routes/ProfileAvatarModalContent'; import ReportAddAttachmentModalContent from './routes/report/ReportAddAttachmentModalContent'; +import ReportAvatarModalContent from './routes/report/ReportAvatarModalContent'; import ReportAttachmentModalContent from './routes/ReportAttachmentModalContent'; -import ReportAvatarModalContent from './routes/ReportAvatarModalContent'; import TransactionReceiptModalContent from './routes/TransactionReceiptModalContent'; import WorkspaceAvatarModalContent from './routes/WorkspaceAvatarModalContent'; import type {AttachmentModalScreenProps, AttachmentModalScreenType} from './types'; From 3625f06767aa026df6472021b90d433b09bb91b8 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Mon, 13 Oct 2025 12:00:10 +0100 Subject: [PATCH 3/8] fix: originalFileName not used for displaying file --- .../AttachmentModalBaseContent/index.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/pages/media/AttachmentModalScreen/AttachmentModalBaseContent/index.tsx b/src/pages/media/AttachmentModalScreen/AttachmentModalBaseContent/index.tsx index 7dc066948e6d..711a3d7630cc 100644 --- a/src/pages/media/AttachmentModalScreen/AttachmentModalBaseContent/index.tsx +++ b/src/pages/media/AttachmentModalScreen/AttachmentModalBaseContent/index.tsx @@ -86,7 +86,7 @@ function AttachmentModalBaseContent({ const [currentAttachmentLink, setCurrentAttachmentLink] = useState(attachmentLink); const fallbackFile = useMemo(() => (originalFileName ? {name: originalFileName} : undefined), [originalFileName]); - const [files, setFilesInternal] = useState(); + const [files, setFilesInternal] = useState(() => filesProp ?? fallbackFile); const [isMultipleFiles, setIsMultipleFiles] = useState(() => Array.isArray(files)); const fileToDisplay = useMemo(() => { if (isMultipleFiles) { @@ -106,10 +106,6 @@ function AttachmentModalBaseContent({ }, []); useEffect(() => { - if (!filesProp) { - return; - } - setFile(filesProp ?? fallbackFile); }, [filesProp, fallbackFile, setFile]); From 9e2f1eae951fbb4fd0258157b7e94f8536a03274 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Mon, 13 Oct 2025 12:00:29 +0100 Subject: [PATCH 4/8] fix: add onClose callback --- .../routes/report/ReportAvatarModalContent.tsx | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx b/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx index 6b09d542a94d..d37d322cd04d 100644 --- a/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx +++ b/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx @@ -1,5 +1,6 @@ -import React, {useMemo} from 'react'; +import React, {useCallback, useMemo} from 'react'; import useOnyx from '@hooks/useOnyx'; +import Navigation from '@libs/Navigation/Navigation'; import {getDefaultGroupAvatar, getPolicyName, getReportName, getWorkspaceIcon, isGroupChat, isThread} from '@libs/ReportUtils'; import {getFullSizeAvatar} from '@libs/UserUtils'; import type {AttachmentModalBaseContentProps} from '@pages/media/AttachmentModalScreen/AttachmentModalBaseContent/types'; @@ -7,6 +8,7 @@ import AttachmentModalContainer from '@pages/media/AttachmentModalScreen/Attachm import useDownloadAttachment from '@pages/media/AttachmentModalScreen/routes/hooks/useDownloadAttachment'; import type {AttachmentModalScreenProps} from '@pages/media/AttachmentModalScreen/types'; import ONYXKEYS from '@src/ONYXKEYS'; +import ROUTES from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; function ReportAvatarModalContent({navigation, route}: AttachmentModalScreenProps) { @@ -16,7 +18,7 @@ function ReportAvatarModalContent({navigation, route}: AttachmentModalScreenProp const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {canBeMissing: true}); const [isLoadingApp = true] = useOnyx(ONYXKEYS.IS_LOADING_APP, {canBeMissing: true}); - const attachment = useMemo(() => { + const attachment: AttachmentModalBaseContentProps = useMemo(() => { if (isGroupChat(report) && !isThread(report)) { return { source: report?.avatarUrl ? getFullSizeAvatar(report.avatarUrl, 0) : getDefaultGroupAvatar(report?.reportID), @@ -26,7 +28,7 @@ function ReportAvatarModalContent({navigation, route}: AttachmentModalScreenProp } return { - source: getFullSizeAvatar(getWorkspaceIcon(report).source, 0), + source: getFullSizeAvatar(getWorkspaceIcon(report, policy).source, 0), headerTitle: getPolicyName({report, policy}), // In the case of default workspace avatar, originalFileName prop takes policyID as value to get the color of the avatar originalFileName: policy?.originalFileName ?? policy?.id ?? report?.policyID, @@ -34,6 +36,10 @@ function ReportAvatarModalContent({navigation, route}: AttachmentModalScreenProp }; }, [policy, report]); + const handleClose = useCallback(() => { + Navigation.goBack(report?.reportID ? ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID) : undefined); + }, [report?.reportID]); + const onDownloadAttachment = useDownloadAttachment(); const contentProps = useMemo( @@ -50,6 +56,7 @@ function ReportAvatarModalContent({navigation, route}: AttachmentModalScreenProp ); } From c5c37cebc45c46567b8420efffb8dacc7c624965 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Mon, 13 Oct 2025 12:06:18 +0100 Subject: [PATCH 5/8] revert: add onClose callback --- .../routes/report/ReportAvatarModalContent.tsx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx b/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx index d37d322cd04d..2eb389b1c026 100644 --- a/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx +++ b/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx @@ -1,6 +1,5 @@ -import React, {useCallback, useMemo} from 'react'; +import React, {useMemo} from 'react'; import useOnyx from '@hooks/useOnyx'; -import Navigation from '@libs/Navigation/Navigation'; import {getDefaultGroupAvatar, getPolicyName, getReportName, getWorkspaceIcon, isGroupChat, isThread} from '@libs/ReportUtils'; import {getFullSizeAvatar} from '@libs/UserUtils'; import type {AttachmentModalBaseContentProps} from '@pages/media/AttachmentModalScreen/AttachmentModalBaseContent/types'; @@ -8,7 +7,6 @@ import AttachmentModalContainer from '@pages/media/AttachmentModalScreen/Attachm import useDownloadAttachment from '@pages/media/AttachmentModalScreen/routes/hooks/useDownloadAttachment'; import type {AttachmentModalScreenProps} from '@pages/media/AttachmentModalScreen/types'; import ONYXKEYS from '@src/ONYXKEYS'; -import ROUTES from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; function ReportAvatarModalContent({navigation, route}: AttachmentModalScreenProps) { @@ -36,10 +34,6 @@ function ReportAvatarModalContent({navigation, route}: AttachmentModalScreenProp }; }, [policy, report]); - const handleClose = useCallback(() => { - Navigation.goBack(report?.reportID ? ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID) : undefined); - }, [report?.reportID]); - const onDownloadAttachment = useDownloadAttachment(); const contentProps = useMemo( @@ -56,7 +50,6 @@ function ReportAvatarModalContent({navigation, route}: AttachmentModalScreenProp ); } From 97bb680d0b0dc1d5f061265142f028af34a6ea01 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Tue, 14 Oct 2025 09:44:43 +0100 Subject: [PATCH 6/8] fix: add modal fade out animation on web --- .../AttachmentModalScreen/AttachmentModalContainer/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/index.tsx b/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/index.tsx index 30a0991123f6..3ec85b9211bc 100644 --- a/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/index.tsx +++ b/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/index.tsx @@ -27,7 +27,8 @@ function AttachmentModalContainer({ const closeModal = useCallback(() => { Navigation.dismissModal(); - }, []); + resetAttachmentModalAndClose(); + }, [resetAttachmentModalAndClose]); useEffect(() => { onShow?.(); From 34ea41e321713825cfe7133dd51c3552e1668d4a Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Tue, 14 Oct 2025 15:44:43 +0100 Subject: [PATCH 7/8] fix: workspace default avatar background color not shown --- .../routes/report/ReportAvatarModalContent.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx b/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx index 2eb389b1c026..2edb318b65e7 100644 --- a/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx +++ b/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx @@ -41,6 +41,7 @@ function ReportAvatarModalContent({navigation, route}: AttachmentModalScreenProp ...attachment, shouldShowNotFoundPage: !report?.reportID && !isLoadingApp, isLoading: (!report?.reportID || !policy?.id) && !!isLoadingApp, + maybeIcon: true, onDownloadAttachment, }), [attachment, isLoadingApp, policy?.id, report?.reportID, onDownloadAttachment], From 9ac6444ff9c78eda35a73fd1123943c8ace28bc8 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Tue, 14 Oct 2025 15:45:01 +0100 Subject: [PATCH 8/8] refactor: extract variables --- .../routes/report/ReportAvatarModalContent.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx b/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx index 2edb318b65e7..dd8e21db0aeb 100644 --- a/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx +++ b/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx @@ -36,15 +36,19 @@ function ReportAvatarModalContent({navigation, route}: AttachmentModalScreenProp const onDownloadAttachment = useDownloadAttachment(); + // eslint-disable-next-line rulesdir/no-negated-variables + const shouldShowNotFoundPage = !report?.reportID && !isLoadingApp; + const isLoading = (!report?.reportID || !policy?.id) && !!isLoadingApp; + const contentProps = useMemo( () => ({ ...attachment, - shouldShowNotFoundPage: !report?.reportID && !isLoadingApp, - isLoading: (!report?.reportID || !policy?.id) && !!isLoadingApp, + shouldShowNotFoundPage, + isLoading, maybeIcon: true, onDownloadAttachment, }), - [attachment, isLoadingApp, policy?.id, report?.reportID, onDownloadAttachment], + [attachment, shouldShowNotFoundPage, isLoading, onDownloadAttachment], ); return (