Add optional chaining and change OR operation to AND in condition (#66)

Author: HoonBaek

package-lock.json

@@ -187,21 +187,23 @@ export const getNicknamesMapFromMembers = (members = []) => {
 export const getMessageCreatedAt = (message) => format(message.createdAt, 'p');
 
 export const isSameGroup = (message, comparingMessage) => {
-  if (
-    !message
-    || !comparingMessage
-    || !message.sender
-    || !comparingMessage.sender
-    || !message.createdAt
-    || !comparingMessage.createdAt
-    || !message.sender.userId
-    || !comparingMessage.sender.userId
-  ) {
+  if (!(message
+    && comparingMessage
+    && message?.messageType !== 'admin'
+    && comparingMessage?.messageType !== 'admin'
+    && message?.sender
+    && comparingMessage?.sender
+    && message?.createdAt
+    && comparingMessage?.createdAt
+    && message?.sender?.userId
+    && comparingMessage?.sender?.userId
+  )) {
     return false;
   }
+
   return (
-    message.sendingStatus === comparingMessage.sendingStatus
-    && message.sender.userId === comparingMessage.sender.userId
+    message?.sendingStatus === comparingMessage?.sendingStatus
+    && message?.sender?.userId === comparingMessage?.sender?.userId
     && getMessageCreatedAt(message) === getMessageCreatedAt(comparingMessage)
   );
 };

src/smart-components/Conversation/utils.js

@@ -21,29 +21,28 @@ export const scrollIntoLast = (intialTry = 0): void => {
   }
 };
 
-
 export const isSameGroup = (
   message: SendbirdUIKit.EveryMessage,
   comparingMessage: SendbirdUIKit.EveryMessage,
 ): boolean => {
-  if (
-    !message
-    || !comparingMessage
-    || message.messageType === 'admin'
-    || comparingMessage.messageType === 'admin'
-    || !message.sender
-    || !comparingMessage.sender
-    || !message.createdAt
-    || !comparingMessage.createdAt
-    || !message.sender.userId
-    || !comparingMessage.sender.userId
-  ) {
+  if (!(
+    message
+    && comparingMessage
+    && message?.messageType !== 'admin'
+    && comparingMessage?.messageType !== 'admin'
+    && message?.sender
+    && comparingMessage?.sender
+    && message?.createdAt
+    && comparingMessage?.createdAt
+    && message?.sender?.userId
+    && comparingMessage?.sender?.userId
+  )) {
     return false
   }
 
   return (
-    message.sendingStatus === comparingMessage.sendingStatus
-    && message.sender.userId === comparingMessage.sender.userId
+    message?.sendingStatus === comparingMessage?.sendingStatus
+    && message?.sender?.userId === comparingMessage?.sender?.userId
     && getMessageCreatedAt(message) === getMessageCreatedAt(comparingMessage)
   );
 };
@@ -53,11 +52,11 @@ export const compareMessagesForGrouping = (
   currMessage: SendbirdUIKit.EveryMessage,
   nextMessage: SendbirdUIKit.EveryMessage,
 ): [boolean, boolean] => (
-    [
-      isSameGroup(prevMessage, currMessage),
-      isSameGroup(currMessage, nextMessage),
-    ]
-  );
+  [
+    isSameGroup(prevMessage, currMessage),
+    isSameGroup(currMessage, nextMessage),
+  ]
+);
 
 export const kFormatter = (num: number): string => {
   if (Math.abs(num) > 999999) {