From a9604198d8b0f69a38452f566cedf19262c711d7 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Thu, 25 Aug 2022 15:34:53 +0800
Subject: [PATCH 1/2] fix:Show the same result when switching tag feeds

---
 src/views/TagDetail/Articles/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/TagDetail/Articles/index.tsx b/src/views/TagDetail/Articles/index.tsx
index 49d57e95bb..928c18f3d2 100644
--- a/src/views/TagDetail/Articles/index.tsx
+++ b/src/views/TagDetail/Articles/index.tsx
@@ -180,7 +180,7 @@ const TagDetailArticles = ({ tagId, feedType }: TagArticlesProps) => {
     <InfiniteScroll hasNextPage={pageInfo.hasNextPage} loadMore={loadMore}>
       <List>
         {(edges || []).map(({ node, cursor }, i) => (
-          <React.Fragment key={cursor}>
+          <React.Fragment key={`${feedType}:${cursor}`}>
             <List.Item>
               <ArticleDigestFeed
                 article={node}

From 9d13ebe4848bec0a925717a960b5ef369d353970 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Fri, 26 Aug 2022 16:27:10 +0800
Subject: [PATCH 2/2] feat(notice): revert <CommentNewReplyNotice>

---
 .../CommentNewReplyNotice.tsx                 | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx b/src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx
index dca49e211a..d3f06a1cd1 100644
--- a/src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx
+++ b/src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx
@@ -28,10 +28,6 @@ const CommentNewReplyNotice = ({ notice }: { notice: NoticeType }) => {
     notice.reply?.node.__typename === 'Article' ? notice.reply.node : null
   const replyCommentCircle =
     notice.reply?.node.__typename === 'Circle' ? notice.reply.node : null
-  const replyCommentCircleDiscussion =
-    notice.reply?.type === 'circleDiscussion' ? notice.reply.type : null
-  const replyCommentCircleBroadcast =
-    notice.reply?.type === 'circleBroadcast' ? notice.reply.type : null
 
   return (
     <section className="container">
@@ -71,25 +67,20 @@ const CommentNewReplyNotice = ({ notice }: { notice: NoticeType }) => {
           )}
           {replyCommentCircle && (
             <>
-              <Translate zh_hant="在圍爐 " zh_hans="在围炉 " en="" />
+              <Translate
+                zh_hant="回覆了你在圍爐 "
+                zh_hans="回复了你在围炉 "
+                en=" replied to your response on "
+              />
               <NoticeCircleName circle={replyCommentCircle} />
-              {replyCommentCircleDiscussion && (
-                <Translate
-                  zh_hant=" 回覆你的眾聊發言"
-                  zh_hans=" 回复你的众聊发言"
-                  en=""
-                />
-              )}
-              {replyCommentCircleBroadcast && (
-                <Translate zh_hant=" 廣播中留言" zh_hans=" 广播中留言" en="" />
-              )}
+              <Translate zh_hant=" 中的發言" zh_hans=" 中的发言" en="" />
             </>
           )}
         </NoticeHead>
 
-        {/* <NoticeComment
+        <NoticeComment
           comment={isMultiActors ? notice.comment : notice.reply}
-        /> */}
+        />
 
         {isMultiActors && (
           <section className="multi-actor-avatars">