add more fixes after review

parasharrajat · Apr 19, 2024 · 674af05 · 674af05
1 parent d42fc2d
commit 674af05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/components/Avatar.tsx b/src/components/Avatar.tsx
@@ -87,7 +87,7 @@ function Avatar({
 
     // We pass the color styles down to the SVG for the workspace and fallback avatar.
     const source = isWorkspace ? originalSource : UserUtils.getAvatar(originalSource, accountID);
-    const useFallBackAvatar = imageError || !originalSource || !source || source === Expensicons.FallbackAvatar;
+    const useFallBackAvatar = imageError || !source || source === Expensicons.FallbackAvatar;
     const fallbackAvatar = isWorkspace ? ReportUtils.getDefaultWorkspaceAvatar(name) : fallbackIcon || Expensicons.FallbackAvatar;
     const fallbackAvatarTestID = isWorkspace ? ReportUtils.getDefaultWorkspaceAvatarTestID(name) : fallbackIconTestID || 'SvgFallbackAvatar Icon';
     const avatarSource = useFallBackAvatar ? fallbackAvatar : source;

diff --git a/src/libs/UserUtils.ts b/src/libs/UserUtils.ts
@@ -122,7 +122,7 @@ function getDefaultAvatarURL(accountID: string | number = ''): string {
 }
 
 /**
- * Given a user's avatar path, returns true if user doesn't have an avatar or if URL points to a default avatar
+ * Given a user's avatar path, returns true if URL points to a default avatar, false otherwise
  * @param avatarSource - the avatar source from user's personalDetails
  */
 function isDefaultAvatar(avatarSource?: AvatarSource): avatarSource is string | undefined {
@@ -137,11 +137,6 @@ function isDefaultAvatar(avatarSource?: AvatarSource): avatarSource is string |
         }
     }
 
-    if (!avatarSource) {
-        // If source is undefined, we should also use a default avatar
-        return true;
-    }
-
     return false;
 }