Merge branch 'dev' into feature/CW-2116-loader-delay

daostack · Sep 26, 2023 · be220d0 · be220d0
2 parents dece8a0 + b94ef03
commit be220d0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/pages/commonFeed/CommonFeed.tsx b/src/pages/commonFeed/CommonFeed.tsx
@@ -192,12 +192,12 @@ const CommonFeedComponent: FC<CommonFeedProps> = (props) => {
         (item) => item.itemId !== sharedFeedItemId,
       ) || [];
 
-    if (sharedFeedItem) {
-      items.push(sharedFeedItem);
-    }
     if (filteredPinnedItems.length > 0) {
       items.push(...filteredPinnedItems);
     }
+    if (sharedFeedItem) {
+      items.push(sharedFeedItem);
+    }
 
     return items;
   }, [sharedFeedItem, sharedFeedItemId, commonPinnedFeedItems]);