language

YukiOnishi1129 · Apr 18, 2024 · 9ec7b8d · 9ec7b8d
1 parent 181164c
commit 9ec7b8d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 22 deletions.
diff --git a/web/client/src/features/articles/components/ArticleList.tsx b/web/client/src/features/articles/components/ArticleList.tsx
@@ -91,6 +91,10 @@ export function ArticleList({
     };
   }, [hashMore]);
 
+  useEffect(() => {
+    setArticles(initialArticles);
+  }, [initialArticles]);
+
   useEffect(() => {
     if (offset > 1) {
       loadMore(offset);

diff --git a/web/client/src/features/articles/components/ArticleListTemplate.tsx b/web/client/src/features/articles/components/ArticleListTemplate.tsx
@@ -123,28 +123,15 @@ const ArticleListContent = async ({
         />
       </div>
 
-      {languageStatus === 1 && (
-        <ArticleList
-          user={user}
-          initialArticles={res.data.articles}
-          languageStatus={languageStatus}
-          keyword={keyword}
-          platformIdList={platformIdList}
-          tab={tab}
-          fetchArticles={fetchArticlesAPI}
-        />
-      )}
-      {languageStatus === 2 && (
-        <ArticleList
-          user={user}
-          initialArticles={res.data.articles}
-          languageStatus={languageStatus}
-          keyword={keyword}
-          platformIdList={platformIdList}
-          tab={tab}
-          fetchArticles={fetchArticlesAPI}
-        />
-      )}
+      <ArticleList
+        user={user}
+        initialArticles={res.data.articles}
+        languageStatus={languageStatus}
+        keyword={keyword}
+        platformIdList={platformIdList}
+        tab={tab}
+        fetchArticles={fetchArticlesAPI}
+      />
     </>
   );
 };