Remove unnecessary avatar wrapper div

web/components/avatar.tsx

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

web/components/nav/nav-bar.tsx

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