Skip to content

Add maybeIcon to Avatar to display full size #57822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
techievivek merged 2 commits into from
Mar 10, 2025
Merged

Add maybeIcon to Avatar to display full size #57822

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db5bf69
Add maybeIcon to Avatar to display full size
huult Mar 5, 2025
a3993e5
fix lint
huult Mar 5, 2025
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
24 changes: 13 additions & 11 deletions src/pages/settings/Profile/ProfileAvatar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import React, {useEffect} from 'react';
import {useOnyx} from 'react-native-onyx';
import AttachmentModal from '@components/AttachmentModal';
import * as LocalePhoneNumber from '@libs/LocalePhoneNumber';
import {formatPhoneNumber} from '@libs/LocalePhoneNumber';
import Navigation from '@libs/Navigation/Navigation';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {AuthScreensParamList} from '@libs/Navigation/types';
import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
import * as UserUtils from '@libs/UserUtils';
import * as ValidationUtils from '@libs/ValidationUtils';
import * as PersonalDetails from '@userActions/PersonalDetails';
import {getDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
import {getFullSizeAvatar} from '@libs/UserUtils';
import {isValidAccountRoute} from '@libs/ValidationUtils';
import {openPublicProfilePage} from '@userActions/PersonalDetails';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type SCREENS from '@src/SCREENS';

Expand All @@ -20,28 +21,29 @@ function ProfileAvatar({route}: ProfileAvatarProps) {
const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP, {initialValue: true});
const personalDetail = personalDetails?.[route.params.accountID];
const avatarURL = personalDetail?.avatar ?? '';
const accountID = Number(route.params.accountID ?? '-1');
const accountID = Number(route.params.accountID ?? CONST.DEFAULT_NUMBER_ID);
const isLoading = personalDetailsMetadata?.[accountID]?.isLoading ?? (isLoadingApp && !Object.keys(personalDetail ?? {}).length);
const displayName = PersonalDetailsUtils.getDisplayNameOrDefault(personalDetail);
const displayName = getDisplayNameOrDefault(personalDetail);

useEffect(() => {
if (!ValidationUtils.isValidAccountRoute(Number(accountID)) ?? !!avatarURL) {
if (!isValidAccountRoute(Number(accountID)) ?? !!avatarURL) {
return;
}
PersonalDetails.openPublicProfilePage(accountID);
openPublicProfilePage(accountID);
}, [accountID, avatarURL]);

return (
<AttachmentModal
headerTitle={LocalePhoneNumber.formatPhoneNumber(displayName)}
headerTitle={formatPhoneNumber(displayName)}
defaultOpen
source={UserUtils.getFullSizeAvatar(avatarURL, accountID)}
source={getFullSizeAvatar(avatarURL, accountID)}
onModalClose={() => {
Navigation.goBack();
}}
originalFileName={personalDetail?.originalFileName ?? ''}
isLoading={!!isLoading}
shouldShowNotFoundPage={!avatarURL}
maybeIcon
/>
);
}
Expand Down