Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions src/ROUTES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -477,15 +477,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),
Expand All @@ -496,6 +487,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,
Expand Down
12 changes: 4 additions & 8 deletions src/libs/Navigation/AppNavigator/AuthScreens.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ const loadLogOutPreviousUserPage = () => require<ReactComponentModule>('../../..
const loadConciergePage = () => require<ReactComponentModule>('../../../pages/ConciergePage').default;
const loadTrackExpensePage = () => require<ReactComponentModule>('../../../pages/TrackExpensePage').default;
const loadSubmitExpensePage = () => require<ReactComponentModule>('../../../pages/SubmitExpensePage').default;
const loadReportAvatar = () => require<ReactComponentModule>('../../../pages/ReportAvatar').default;
const loadReceiptView = () => require<ReactComponentModule>('../../../pages/TransactionReceiptPage').default;
const loadWorkspaceJoinUser = () => require<ReactComponentModule>('@pages/workspace/WorkspaceJoinUserPage').default;

Expand Down Expand Up @@ -562,7 +561,7 @@ function AuthScreens() {
listeners={modalScreenListeners}
/>
<RootStack.Screen
name={SCREENS.WORKSPACE_AVATAR}
name={SCREENS.REPORT_AVATAR}
options={attachmentModalScreenOptions}
getComponent={loadAttachmentModalScreen}
listeners={modalScreenListeners}
Expand All @@ -574,12 +573,9 @@ function AuthScreens() {
listeners={modalScreenListeners}
/>
<RootStack.Screen
name={SCREENS.REPORT_AVATAR}
options={{
headerShown: false,
presentation: Presentation.TRANSPARENT_MODAL,
}}
getComponent={loadReportAvatar}
name={SCREENS.WORKSPACE_AVATAR}
options={attachmentModalScreenOptions}
getComponent={loadAttachmentModalScreen}
listeners={modalScreenListeners}
/>
<RootStack.Screen
Expand Down
57 changes: 0 additions & 57 deletions src/pages/ReportAvatar.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/pages/media/AttachmentModalScreen/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {getDefaultGroupAvatar, getPolicyName, getReportName, getWorkspaceIcon, i
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';
Expand All @@ -15,7 +16,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),
Expand All @@ -25,21 +26,29 @@ 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,
isWorkspaceAvatar: true,
};
}, [policy, report]);

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<AttachmentModalBaseContentProps>(
() => ({
...attachment,
shouldShowNotFoundPage: !report?.reportID && !isLoadingApp,
isLoading: (!report?.reportID || !policy?.id) && !!isLoadingApp,
shouldShowNotFoundPage,
isLoading,
maybeIcon: true,
onDownloadAttachment,
}),
[attachment, isLoadingApp, policy?.id, report?.reportID],
[attachment, shouldShowNotFoundPage, isLoading, onDownloadAttachment],
);

return (
Expand Down