From 955ae0383677866f2b9b3be3fef3b463b3df69d4 Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Thu, 16 Dec 2021 16:45:05 +0400
Subject: [PATCH 1/5] Site Editor: Fix template author avatar check

---
 packages/edit-site/src/components/list/added-by.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/edit-site/src/components/list/added-by.js b/packages/edit-site/src/components/list/added-by.js
index 685d93fbdfb7fb..f2910fc24e1b5c 100644
--- a/packages/edit-site/src/components/list/added-by.js
+++ b/packages/edit-site/src/components/list/added-by.js
@@ -87,7 +87,7 @@ function AddedByAuthor( { id } ) {
 				<img
 					onLoad={ () => setIsImageLoaded( true ) }
 					alt=""
-					src={ user?.avatar_urls[ 48 ] }
+					src={ user?.avatar_urls?.[ 48 ] }
 				/>
 			</div>
 			<span>{ user?.nickname }</span>

From 84642486f1b927b4f00926c127ffedad5f629af3 Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Thu, 16 Dec 2021 17:12:40 +0400
Subject: [PATCH 2/5] Fallback to icon

---
 .../edit-site/src/components/list/added-by.js | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/packages/edit-site/src/components/list/added-by.js b/packages/edit-site/src/components/list/added-by.js
index f2910fc24e1b5c..597c492829a5ad 100644
--- a/packages/edit-site/src/components/list/added-by.js
+++ b/packages/edit-site/src/components/list/added-by.js
@@ -14,7 +14,11 @@ import {
 import { store as coreStore } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
 import { useState } from '@wordpress/element';
-import { layout as themeIcon, plugins as pluginIcon } from '@wordpress/icons';
+import {
+	commentAuthorAvatar as authorIcon,
+	layout as themeIcon,
+	plugins as pluginIcon,
+} from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
 
 const TEMPLATE_POST_TYPE_NAMES = [ 'wp_template', 'wp_template_part' ];
@@ -77,18 +81,26 @@ function AddedByAuthor( { id } ) {
 	] );
 	const [ isImageLoaded, setIsImageLoaded ] = useState( false );
 
+	const hasAvatar = !! user?.avatar_urls?.[ 48 ];
+
 	return (
 		<HStack alignment="left">
 			<div
-				className={ classnames( 'edit-site-list-added-by__avatar', {
+				className={ classnames( {
+					'edit-site-list-added-by__avatar': hasAvatar,
+					'edit-site-list-added-by__icon': ! hasAvatar,
 					'is-loaded': isImageLoaded,
 				} ) }
 			>
-				<img
-					onLoad={ () => setIsImageLoaded( true ) }
-					alt=""
-					src={ user?.avatar_urls?.[ 48 ] }
-				/>
+				{ hasAvatar ? (
+					<img
+						onLoad={ () => setIsImageLoaded( true ) }
+						alt=""
+						src={ user?.avatar_urls[ 48 ] }
+					/>
+				) : (
+					<Icon icon={ authorIcon } />
+				) }
 			</div>
 			<span>{ user?.nickname }</span>
 		</HStack>

From 537e742559801664f3cf27bc3835bf6a90d8ff86 Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Sat, 18 Dec 2021 12:54:54 +0000
Subject: [PATCH 3/5] Update packages/edit-site/src/components/list/added-by.js

Co-authored-by: Kai Hao <kevin830726@gmail.com>
---
 packages/edit-site/src/components/list/added-by.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/edit-site/src/components/list/added-by.js b/packages/edit-site/src/components/list/added-by.js
index 597c492829a5ad..439b4782c75c52 100644
--- a/packages/edit-site/src/components/list/added-by.js
+++ b/packages/edit-site/src/components/list/added-by.js
@@ -81,7 +81,8 @@ function AddedByAuthor( { id } ) {
 	] );
 	const [ isImageLoaded, setIsImageLoaded ] = useState( false );
 
-	const hasAvatar = !! user?.avatar_urls?.[ 48 ];
+	const avatarURL = user?.avatar_urls?.[ 48 ];
+	const hasAvatar = !! avatarURL;
 
 	return (
 		<HStack alignment="left">

From 6a41240cc065d4ca797f49fb2f506cc13564ed4a Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Sat, 18 Dec 2021 12:54:59 +0000
Subject: [PATCH 4/5] Update packages/edit-site/src/components/list/added-by.js

Co-authored-by: Kai Hao <kevin830726@gmail.com>
---
 packages/edit-site/src/components/list/added-by.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/edit-site/src/components/list/added-by.js b/packages/edit-site/src/components/list/added-by.js
index 439b4782c75c52..9a085d9a469c33 100644
--- a/packages/edit-site/src/components/list/added-by.js
+++ b/packages/edit-site/src/components/list/added-by.js
@@ -87,9 +87,11 @@ function AddedByAuthor( { id } ) {
 	return (
 		<HStack alignment="left">
 			<div
-				className={ classnames( {
-					'edit-site-list-added-by__avatar': hasAvatar,
-					'edit-site-list-added-by__icon': ! hasAvatar,
+				className={ classnames(
+					hasAvatar 
+						? 'edit-site-list-added-by__avatar'
+						: 'edit-site-list-added-by__icon',
+				{
 					'is-loaded': isImageLoaded,
 				} ) }
 			>

From e38aa82877592d243e68229360243f02b22aca6a Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Sat, 18 Dec 2021 17:04:36 +0400
Subject: [PATCH 5/5] Use avatarURL

---
 packages/edit-site/src/components/list/added-by.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/edit-site/src/components/list/added-by.js b/packages/edit-site/src/components/list/added-by.js
index 9a085d9a469c33..4ecd817edef28e 100644
--- a/packages/edit-site/src/components/list/added-by.js
+++ b/packages/edit-site/src/components/list/added-by.js
@@ -88,18 +88,19 @@ function AddedByAuthor( { id } ) {
 		<HStack alignment="left">
 			<div
 				className={ classnames(
-					hasAvatar 
+					hasAvatar
 						? 'edit-site-list-added-by__avatar'
 						: 'edit-site-list-added-by__icon',
-				{
-					'is-loaded': isImageLoaded,
-				} ) }
+					{
+						'is-loaded': isImageLoaded,
+					}
+				) }
 			>
 				{ hasAvatar ? (
 					<img
 						onLoad={ () => setIsImageLoaded( true ) }
 						alt=""
-						src={ user?.avatar_urls[ 48 ] }
+						src={ avatarURL }
 					/>
 				) : (
 					<Icon icon={ authorIcon } />