Merge branch 'main' into manalink

web/components/avatar.tsx

@@ -8,8 +8,10 @@ export function Avatar(props: {
   noLink?: boolean
   size?: number | 'xs' | 'sm'
   className?: string
+  containerClassName?: string
 }) {
-  const { username, avatarUrl, noLink, size, className } = props
+  const { username, avatarUrl, noLink, size, className, containerClassName } =
+    props
   const s = size == 'xs' ? 6 : size === 'sm' ? 8 : size || 10
 
   const onClick =
@@ -19,13 +21,17 @@ export function Avatar(props: {
           e.stopPropagation()
           Router.push(`/${username}`)
         }
-
+  return (
-  // there can be no avatar URL or username in the feed, we show a "submit comment"
+    <div
-  // item with a fake grey user circle guy even if you aren't signed in
+      className={clsx(
-  return avatarUrl ? (
+        `flex-shrink-0 rounded-full bg-white w-${s} h-${s}`,
+        containerClassName
+      )}
+    >
+      {avatarUrl ? (
         <img
           className={clsx(
-        'flex-shrink-0 rounded-full rounded-full bg-white object-cover',
+            'flex items-center justify-center rounded-full object-cover',
             `w-${s} h-${s}`,
             !noLink && 'cursor-pointer',
             className
@@ -35,12 +41,12 @@ export function Avatar(props: {
           alt={username}
         />
       ) : (
+        // TODO: After 2022-03-01, can just assume that all contracts have an avatarUrl
         <UserCircleIcon
-      className={clsx(
+          className={`w-${s} h-${s} text-gray-500`}
-        `flex-shrink-0 rounded-full bg-white w-${s} h-${s} text-gray-500`,
-        className
-      )}
           aria-hidden="true"
         />
+      )}
+    </div>
   )
 }

web/components/nav/nav-bar.tsx

@@ -60,7 +60,7 @@ export function BottomNavBar() {
         ) : user ? (
           <>
             <Avatar
-              className="mx-auto my-1"
+              containerClassName={'mx-auto my-1'}
               size="xs"
               username={user.username}
               avatarUrl={user.avatarUrl}