Refactor: change the conditions which unread message appear

boostcamp-2020 · Dec 20, 2020 · 0aabbe3 · 0aabbe3
1 parent b6ec50f
commit 0aabbe3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/frontend/src/container/ChatRoom/ChatRoom.js b/frontend/src/container/ChatRoom/ChatRoom.js
@@ -108,11 +108,12 @@ const ChatRoom = ({ width }) => {
             ...messages,
             ...hasMyReaction([message], workspaceUserInfo),
           ])
-          if (isReading.current && document.hasFocus()) {
+          if (message.userInfo._id === workspaceUserInfo._id) {
             setHasUnreadMessage(false)
             scrollTo()
-          } else if (message.userInfo._id !== workspaceUserInfo._id)
+          } else if (!isReading.current && !document.hasFocus()) {
             setHasUnreadMessage(true)
+          }
         }
 
         if (document.hidden) {
@@ -257,7 +258,6 @@ const UnreadMessage = styled.div`
   background-color: ${COLOR.STARBLUE};
   color: ${COLOR.WHITE};
   width: 170px;
-  height: 50px;
   margin-left: auto;
   margin-right: auto;
   position: sticky;

diff --git a/frontend/src/presenter/ChannelBrowserCard/ChannelBrowserCard.js b/frontend/src/presenter/ChannelBrowserCard/ChannelBrowserCard.js
@@ -40,17 +40,16 @@ function ChannelBrowserCard({
     setChannels()
     handleClose()
   }
-
   return (
     <ChannelBrowserCardStyle>
       <ContentsArea>{title}</ContentsArea>
       <ButtonArea>
         <Button
           handleClick={clickEvent}
           type={joined ? 'leave' : undefined}
-          disabled={channelType == 0 || _id === defaultChannel}
+          disabled={_id === defaultChannel || (channelType === 0 && !joined)}
           children={
-            channelType == 0
+            channelType === 0
               ? 'private'
               : _id === defaultChannel
               ? 'Default channel'