CW-mention-streams

Fix redirect
daostack · Dec 29, 2024 · a5a2d32 · a5a2d32
1 parent a90937c
commit a5a2d32
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx b/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx
@@ -668,17 +668,24 @@ useEffect(() => {
       options: { commonId?: string; messageId?: string } = {}
     ) => {
       const { commonId, messageId } = options;
+
+      const queryParamsForPath = {
+        item: feedItemId,
+        message: messageId,
+      };
+
+      const isInbox = window.location.pathname === ROUTE_PATHS.INBOX;
+      if (isInbox && commonId && feedItemId) {
+        history.push(getCommonPagePath(commonId, queryParamsForPath));
+        setActiveChatItem({ feedItemId });
+        return;
+      }
 
       if (chatItem?.feedItemId === feedItemId && !messageId) {
         setActiveChatItem({ feedItemId });
         return;
       }
 
-      const queryParamsForPath = {
-        item: feedItemId,
-        message: messageId,
-      };
-
       if (commonId && commonId !== outerCommon?.id) {
         history.push(getCommonPagePath(commonId, queryParamsForPath));
         return;
@@ -699,12 +706,7 @@ useEffect(() => {
       const itemExists = allFeedItems.some((item) => item.itemId === feedItemId);
 
       if (itemExists) {
-        const isInbox = window.location.pathname === ROUTE_PATHS.INBOX;
-        if(isInbox && commonId) {
-          history.push(getCommonPagePath(commonId, queryParamsForPath));
-        } else {
-          refsByItemId.current[feedItemId]?.scrollToItem();
-        }
+        refsByItemId.current[feedItemId]?.scrollToItem();
       } else {
         onFetchNext(feedItemId);
         const paneEl = document.getElementsByClassName('Pane Pane1')[0];