Merge pull request #4546 from mirumee/fix-null-avatar

Fix rendering user avatar when it's null
saleor · Jul 29, 2019 · cf43e0e · cf43e0e
2 parents 7b3de41 + 0a01eac
commit cf43e0e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,7 +25,7 @@ All notable, unreleased changes to this project will be documented in this file.
 - Allow selecting the number of rows displayed in dashboard's list views - #4414 by @benekex2
 - Fix generating random avatars when updating staff accounts - #4521 by @maarcingebala
 - Changed license for artwork to CC-BY 4.0
-
+- Fix rendering user avatar when it's null #4546 by @maarcingebala
 
 ## 2.8.0
 

diff --git a/saleor/static/dashboard-next/components/AppLayout/AppLayout.tsx b/saleor/static/dashboard-next/components/AppLayout/AppLayout.tsx
@@ -385,7 +385,9 @@ const AppLayout = withStyles(styles, {
                             >
                               <Chip
                                 avatar={
-                                  <Avatar alt="user" src={user.avatar.url} />
+                                  user.avatar && (
+                                    <Avatar alt="user" src={user.avatar.url} />
+                                  )
                                 }
                                 className={classes.userChip}
                                 label={