From 7e4f4b9a87e7601b4158300e7808a1547b41b4df Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Tue, 26 Jul 2022 00:10:11 -0700
Subject: [PATCH] Clean up a bunch of crufty stuff on user comments list (#693)

---
 web/components/comments-list.tsx | 75 +++++++++++++++-----------------
 1 file changed, 36 insertions(+), 39 deletions(-)

diff --git a/web/components/comments-list.tsx b/web/components/comments-list.tsx
index ab9ed523..f8e1d7e1 100644
--- a/web/components/comments-list.tsx
+++ b/web/components/comments-list.tsx
@@ -17,58 +17,55 @@ export function UserCommentsList(props: {
   contractsById: { [id: string]: Contract }
 }) {
   const { comments, contractsById } = props
-  const commentsByContract = groupBy(comments, 'contractId')
 
-  const contractCommentPairs = Object.entries(commentsByContract)
-    .map(
-      ([contractId, comments]) => [contractsById[contractId], comments] as const
-    )
-    .filter(([contract]) => contract)
+  // we don't show comments in groups here atm, just comments on contracts
+  const contractComments = comments.filter((c) => c.contractId)
+  const commentsByContract = groupBy(contractComments, 'contractId')
 
   return (
     <Col className={'bg-white'}>
-      {contractCommentPairs.map(([contract, comments]) => (
-        <div key={contract.id} className={'border-width-1 border-b p-5'}>
-          <div className={'mb-2 text-sm text-indigo-700'}>
-            <SiteLink href={contractPath(contract)}>
+      {Object.entries(commentsByContract).map(([contractId, comments]) => {
+        const contract = contractsById[contractId]
+        return (
+          <div key={contractId} className={'border-width-1 border-b p-5'}>
+            <SiteLink
+              className={'mb-2 block text-sm text-indigo-700'}
+              href={contractPath(contract)}
+            >
               {contract.question}
             </SiteLink>
+            {comments.map((comment) => (
+              <ProfileComment
+                key={comment.id}
+                comment={comment}
+                className="relative flex items-start space-x-3 pb-6"
+              />
+            ))}
           </div>
-          {comments.map((comment) => (
-            <div key={comment.id} className={'relative pb-6'}>
-              <div className="relative flex items-start space-x-3">
-                <ProfileComment comment={comment} />
-              </div>
-            </div>
-          ))}
-        </div>
-      ))}
+        )
+      })}
     </Col>
   )
 }
 
-function ProfileComment(props: { comment: Comment }) {
-  const { comment } = props
+function ProfileComment(props: { comment: Comment; className?: string }) {
+  const { comment, className } = props
   const { text, userUsername, userName, userAvatarUrl, createdTime } = comment
   // TODO: find and attach relevant bets by comment betId at some point
   return (
-    <div>
-      <Row className={'gap-4'}>
-        <Avatar username={userUsername} avatarUrl={userAvatarUrl} />
-        <div className="min-w-0 flex-1">
-          <div>
-            <p className="mt-0.5 text-sm text-gray-500">
-              <UserLink
-                className="text-gray-500"
-                username={userUsername}
-                name={userName}
-              />{' '}
-              <RelativeTimestamp time={createdTime} />
-            </p>
-          </div>
-          <Linkify text={text} />
-        </div>
-      </Row>
-    </div>
+    <Row className={className}>
+      <Avatar username={userUsername} avatarUrl={userAvatarUrl} />
+      <div className="min-w-0 flex-1">
+        <p className="mt-0.5 text-sm text-gray-500">
+          <UserLink
+            className="text-gray-500"
+            username={userUsername}
+            name={userName}
+          />{' '}
+          <RelativeTimestamp time={createdTime} />
+        </p>
+        <Linkify text={text} />
+      </div>
+    </Row>
   )
 }