Merge pull request #2081 from daostack/CW-2061-home-infinite-loader

Infinite loader when clicking the Home link inside itself#2061
daostack · Sep 18, 2023 · 63d0bfb · 63d0bfb
2 parents a44d6eb + 10993cc
commit 63d0bfb
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx b/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx
@@ -481,6 +481,10 @@ const FeedLayout: ForwardRefRenderFunction<FeedLayoutRef, FeedLayoutProps> = (
   ) => {
     const { commonId, messageId } = options;
 
+    if (chatItem?.feedItemId === feedItemId && !messageId) {
+      return;
+    }
+
     if (commonId && commonId !== outerCommon?.id) {
       history.push(
         getCommonPagePath(commonId, {