From 0e0bde068773e2693da6606b4e07e5e8c383bfdc Mon Sep 17 00:00:00 2001
From: Pavel Meyer <meyerpavel1207@gmail.com>
Date: Mon, 5 Aug 2024 15:37:52 +0300
Subject: [PATCH] CW-some-stream-disappear Fixed Render fewer hooks issue

---
 .../common/components/FeedItem/FeedItem.tsx   | 26 ++++++++++---------
 .../components/FeedLayout/FeedLayout.tsx      |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/pages/common/components/FeedItem/FeedItem.tsx b/src/pages/common/components/FeedItem/FeedItem.tsx
index 0c77addd8..56b8afca4 100644
--- a/src/pages/common/components/FeedItem/FeedItem.tsx
+++ b/src/pages/common/components/FeedItem/FeedItem.tsx
@@ -144,18 +144,6 @@ const FeedItem = forwardRef<FeedItemRef, FeedItemProps>((props, ref) => {
     onFeedItemUnfollowed,
   ]);
 
-  if (
-    shouldCheckItemVisibility &&
-    !checkIsItemVisibleForUser({
-      itemCircleVisibility: item.circleVisibility,
-      userCircleIds,
-      itemUserId: item.userId,
-      currentUserId,
-      itemDataType: item.data.type,
-    })
-  ) {
-    return null;
-  }
 
   const generalProps = useMemo(
     () => ({
@@ -218,6 +206,20 @@ const FeedItem = forwardRef<FeedItemRef, FeedItemProps>((props, ref) => {
     ],
   );
 
+
+  if (
+    shouldCheckItemVisibility &&
+    !checkIsItemVisibleForUser({
+      itemCircleVisibility: item.circleVisibility,
+      userCircleIds,
+      itemUserId: item.userId,
+      currentUserId,
+      itemDataType: item.data.type,
+    })
+  ) {
+    return null;
+  }
+
   if (item.data.type === CommonFeedType.Discussion) {
     return <DiscussionFeedCard {...generalProps} />;
   }
diff --git a/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx b/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx
index c349b456a..c57d97461 100644
--- a/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx
+++ b/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx
@@ -221,7 +221,7 @@ const FeedLayout: ForwardRefRenderFunction<FeedLayoutRef, FeedLayoutProps> = (
     fetchedCommonMember;
   const userForProfile = useUserForProfile();
   const governance = chatItem?.nestedItemData
-    ? fetchedGovernance || outerGovernance
+    ? (fetchedGovernance || outerGovernance)
     : outerGovernance || fetchedGovernance;
 
   const [splitPaneRef, setSplitPaneRef] = useState<Element | null>(null);