Merge pull request #439 from contentstack/collab

Collab

Author: diwakarmk7

.talismanrc

@@ -1,11 +1,13 @@
 fileignoreconfig:
-- filename: .github/workflows/secrets-scan.yml
-  ignore_detectors:
-    - filecontent
-- filename: README.md
-  checksum: 568289bbe7c088967493db246dbf29e465382648ac574c1b1236be57d5662a38
-- filename: CHANGELOG.md
-  checksum: 677807c38f5135fac7ca0377e92953fb09097150ddd3c4f68667fe0368f916ee
-- filename: src/visualBuilder/components/__test__/fieldToolbar.test.tsx
-  checksum: 3badd6a142456b6a361569e6fc546349a38ac6b366bef7fd5255d1e93220444e
-version: "1.0"
+    - filename: .github/workflows/secrets-scan.yml
+      ignore_detectors:
+          - filecontent
+    - filename: README.md
+      checksum: 568289bbe7c088967493db246dbf29e465382648ac574c1b1236be57d5662a38
+    - filename: CHANGELOG.md
+      checksum: 677807c38f5135fac7ca0377e92953fb09097150ddd3c4f68667fe0368f916ee
+    - filename: src/visualBuilder/components/__test__/fieldToolbar.test.tsx
+      checksum: 3badd6a142456b6a361569e6fc546349a38ac6b366bef7fd5255d1e93220444e
+    - filename: src/visualBuilder/components/Collab/ThreadPopup/__test__/CommentTextArea.test.tsx
+      checksum: d0ef271ee5381d9feab06bda6e7e89bd0a882fee87495627bd811c1f0a5459c7
+version: "1.0"

src/visualBuilder/components/Collab/ThreadPopup/CommentTextArea.tsx

@@ -102,12 +102,22 @@ const MentionSuggestionsList: React.FC<{
                     tabIndex={-1}
                     aria-selected={index === selectedIndex}
                 >
-                    {(user.display?.length || 0) > 20 ? (
-                        <Tooltip content={user.display || ""}>
-                            {(user.display || "").substring(0, 18) + "..."}
-                        </Tooltip>
+                    {user.display == user.email ? (
+                        user.display.length > 20 ? (
+                            <Tooltip content={user.display || ""}>
+                                {(user.display || "").substring(0, 18) + "..."}
+                            </Tooltip>
+                        ) : (
+                            user.display
+                        )
                     ) : (
-                        user.display || ""
+                        <Tooltip
+                            content={user.display + " - " + user.email || ""}
+                        >
+                            {user.display.length > 20
+                                ? (user.display || "").substring(0, 18) + "..."
+                                : user.display}
+                        </Tooltip>
                     )}
                 </li>
             ))}