Merge pull request #42769 from software-mansion-labs/kicu/42750-profi…

…le-fix Fix normal Profile Page displayed for invalid accountID
Expensify · Jun 3, 2024 · e174f18 · e174f18
2 parents 79406ff + 466639f
commit e174f18
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/pages/ProfilePage.tsx b/src/pages/ProfilePage.tsx
@@ -92,7 +92,8 @@ function ProfilePage({route}: ProfilePageProps) {
     const {translate, formatPhoneNumber} = useLocalize();
     const accountID = Number(route.params?.accountID ?? 0);
     const isCurrentUser = session?.accountID === accountID;
-    const details: PersonalDetails | EmptyObject = personalDetails?.[accountID] ?? (ValidationUtils.isValidAccountRoute(accountID) ? {} : {accountID: 0});
+    const isValidAccountID = ValidationUtils.isValidAccountRoute(accountID);
+    const details: PersonalDetails | EmptyObject = personalDetails?.[accountID] ?? (isValidAccountID ? {} : {accountID: 0});
 
     const displayName = PersonalDetailsUtils.getDisplayNameOrDefault(details, undefined, undefined, isCurrentUser);
     const fallbackIcon = details?.fallbackIcon ?? '';
@@ -116,6 +117,7 @@ function ProfilePage({route}: ProfilePageProps) {
 
     const hasAvatar = Boolean(details.avatar);
     const isLoading = Boolean(personalDetailsMetadata?.[accountID]?.isLoading) || isEmptyObject(details);
+    const shouldShowBlockingView = (!isValidAccountID && !isLoading) || CONST.RESTRICTED_ACCOUNT_IDS.includes(accountID);
 
     const statusEmojiCode = details?.status?.emojiCode ?? '';
     const statusText = details?.status?.text ?? '';
@@ -139,7 +141,7 @@ function ProfilePage({route}: ProfilePageProps) {
 
     return (
         <ScreenWrapper testID={ProfilePage.displayName}>
-            <FullPageNotFoundView shouldShow={CONST.RESTRICTED_ACCOUNT_IDS.includes(accountID)}>
+            <FullPageNotFoundView shouldShow={shouldShowBlockingView}>
                 <HeaderWithBackButton
                     title={translate('common.profile')}
                     onBackButtonPress={() => Navigation.goBack(navigateBackTo)}