fix(chatscope#76): rendering lastSenderName as a ReactNode

SlavaKatiukha · Nov 16, 2022 · 20d09fd · 20d09fd
1 parent 9d41285
commit 20d09fd
Showing 1 changed file with 27 additions and 17 deletions.
diff --git a/src/components/Conversation/ConversationContent.jsx b/src/components/Conversation/ConversationContent.jsx
@@ -29,23 +29,33 @@ export const ConversationContent = ({
   children,
   className,
   ...rest
-}) => (
-  <div {...rest} className={classNames(`${cName}__content`, className)}>
-    {React.Children.count(children) > 0 ? (
-      children
-    ) : (
-      <>
-        <div className={`${cName}__name`}>{name}</div>
-        <div className={`${cName}__info`}>
-          {typeof lastSenderName === "string" && (
-            <LastSenderName name={lastSenderName} />
-          )}{" "}
-          {typeof info !== "undefined" && <InfoContent info={info} />}
-        </div>
-      </>
-    )}
-  </div>
-);
+}) => {
+  const typeofLastSenderName = typeof lastSenderName;
+
+  return (
+    <div {...rest} className={classNames(`${cName}__content`, className)}>
+      {React.Children.count(children) > 0 ? (
+        children
+      ) : (
+        <>
+          <div className={`${cName}__name`}>{name}</div>
+          <div className={`${cName}__info`}>
+            {typeofLastSenderName !== "undefined" ? (
+              <>
+                {typeofLastSenderName === "string" ? (
+                  <LastSenderName name={lastSenderName} />
+                ) : (
+                  lastSenderName
+                )}{" "}
+              </>
+            ) : null}
+            {typeof info !== "undefined" && <InfoContent info={info} />}
+          </div>
+        </>
+      )}
+    </div>
+  );
+};
 
 ConversationContent.displayName = "Conversation.Content";