From 506cab6c829312c73afefdad0c0b6818612921f5 Mon Sep 17 00:00:00 2001
From: Sinclair Chen <abc.sinclair@gmail.com>
Date: Thu, 4 Aug 2022 15:19:00 -0700
Subject: [PATCH] code review: refactor

---
 web/components/feed/feed-answer-comment-group.tsx | 9 ++++-----
 web/components/groups/group-chat.tsx              | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/web/components/feed/feed-answer-comment-group.tsx b/web/components/feed/feed-answer-comment-group.tsx
index a2afe771..edaf1fe5 100644
--- a/web/components/feed/feed-answer-comment-group.tsx
+++ b/web/components/feed/feed-answer-comment-group.tsx
@@ -71,11 +71,10 @@ export function FeedAnswerCommentGroup(props: {
   const scrollAndOpenReplyInput = useEvent(
     (comment?: Comment, answer?: Answer) => {
       setReplyToUser(
-        comment ?? answer
-          ? {
-              id: comment?.userId ?? (answer as Answer).userId,
-              username: comment?.userUsername ?? (answer as Answer).username,
-            }
+        comment
+          ? { id: comment.userId, username: comment.userUsername }
+          : answer
+          ? { id: answer.userId, username: answer.username }
           : undefined
       )
       setShowReply(true)
diff --git a/web/components/groups/group-chat.tsx b/web/components/groups/group-chat.tsx
index b34cbe26..58a5e7f4 100644
--- a/web/components/groups/group-chat.tsx
+++ b/web/components/groups/group-chat.tsx
@@ -302,7 +302,7 @@ const GroupMessage = memo(function GroupMessage_(props: {
   const first = comments[0]
   const { id, userUsername, userName, userAvatarUrl, createdTime } = first
 
-  const isCreatorsComment = user && comments[0].userId === user.id
+  const isCreatorsComment = user && first.userId === user.id
   return (
     <Col
       ref={setRef}