CW-some-stream-disappear Fixed Render fewer hooks issue

daostack · Aug 5, 2024 · 0e0bde0 · 0e0bde0
1 parent a6577d8
commit 0e0bde0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git 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
@@ -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);