disable chat opening when item is active and shouldAllowChatAutoOpen …

…is null
daostack · Aug 29, 2023 · eb3c4c7 · eb3c4c7
1 parent 5989484
commit eb3c4c7
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/pages/common/components/DiscussionFeedCard/DiscussionFeedCard.tsx b/src/pages/common/components/DiscussionFeedCard/DiscussionFeedCard.tsx
@@ -209,12 +209,13 @@ const DiscussionFeedCard = forwardRef<FeedItemRef, DiscussionFeedCardProps>(
 
     useEffect(() => {
       if (
-        !isActive &&
+        (!isActive ||
+          shouldAllowChatAutoOpen === null ||
+          shouldAllowChatAutoOpen) &&
         isDiscussionFetched &&
         isFeedItemUserMetadataFetched &&
         item.id === feedItemIdForAutoChatOpen &&
-        !isMobileVersion &&
-        shouldAllowChatAutoOpen !== false
+        !isMobileVersion
       ) {
         handleOpenChat();
       }
@@ -225,10 +226,10 @@ const DiscussionFeedCard = forwardRef<FeedItemRef, DiscussionFeedCardProps>(
     ]);
 
     useEffect(() => {
-      if (isActive) {
+      if (isActive && shouldAllowChatAutoOpen !== null) {
         handleOpenChat();
       }
-    }, [isActive, handleOpenChat]);
+    }, [isActive, shouldAllowChatAutoOpen, handleOpenChat]);
 
     useEffect(() => {
       if (isActive && cardTitle) {