From db5bf69e3eb7640b5b818862101f4331fa0b0058 Mon Sep 17 00:00:00 2001 From: Huu Le <20178761+huult@users.noreply.github.com> Date: Wed, 5 Mar 2025 13:50:32 +0700 Subject: [PATCH 1/2] Add maybeIcon to Avatar to display full size --- src/pages/settings/Profile/ProfileAvatar.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/settings/Profile/ProfileAvatar.tsx b/src/pages/settings/Profile/ProfileAvatar.tsx index 74b88f419e1d..41df9b3fd0e2 100644 --- a/src/pages/settings/Profile/ProfileAvatar.tsx +++ b/src/pages/settings/Profile/ProfileAvatar.tsx @@ -42,6 +42,7 @@ function ProfileAvatar({route}: ProfileAvatarProps) { originalFileName={personalDetail?.originalFileName ?? ''} isLoading={!!isLoading} shouldShowNotFoundPage={!avatarURL} + maybeIcon /> ); } From a3993e575a2a993b1621d2cc2e427e4f2c3f172a Mon Sep 17 00:00:00 2001 From: Huu Le <20178761+huult@users.noreply.github.com> Date: Wed, 5 Mar 2025 14:08:54 +0700 Subject: [PATCH 2/2] fix lint --- src/pages/settings/Profile/ProfileAvatar.tsx | 23 ++++++++++---------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/pages/settings/Profile/ProfileAvatar.tsx b/src/pages/settings/Profile/ProfileAvatar.tsx index 41df9b3fd0e2..bc251bd0bd94 100644 --- a/src/pages/settings/Profile/ProfileAvatar.tsx +++ b/src/pages/settings/Profile/ProfileAvatar.tsx @@ -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'; @@ -20,22 +21,22 @@ 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 ( { Navigation.goBack(); }}