Merge pull request #4087 from thematters/fix/admin-ui

fix(admin): fix copy and UI of admin actions
thematters · Dec 14, 2023 · 27fc32c · 27fc32c
2 parents bcfa4e0 + 0db296d
commit 27fc32c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/components/ArticleDigest/DropdownActions/ToggleRecommendArticle/Button.tsx b/src/components/ArticleDigest/DropdownActions/ToggleRecommendArticle/Button.tsx
@@ -56,7 +56,7 @@ const RecommendArticleButton: React.FC<RecommendArticleButtonProps> = ({
   )
 
   if (loading) {
-    return <Menu.Item icon={<IconSpinner22 size="mdS" />} />
+    return <Menu.Item icon={<IconSpinner22 size="mdS" />} text="正在加載中…" />
   }
 
   if (data?.article?.__typename !== 'Article') return null
@@ -68,11 +68,11 @@ const RecommendArticleButton: React.FC<RecommendArticleButtonProps> = ({
       : article.oss.inRecommendHottest && article.oss.inRecommendNewest
 
   const texts = {
-    icymi: ['撤銷精華', '選為精華'],
+    icymi: ['選為精華', '撤銷精華'],
     hottestAndNewest: ['撤銷移出', '移出熱門與最新'],
   }
   const icons = {
-    icymi: [IconCircleMinus20, IconNavCreate32],
+    icymi: [IconNavCreate32, IconCircleMinus20],
     hottestAndNewest: [IconReset20, IconUnPin24],
   }
   const IconComp = icons[type][+enabled]

diff --git a/src/components/ArticleDigest/DropdownActions/ToggleRecommendArticle/Dialog.tsx b/src/components/ArticleDigest/DropdownActions/ToggleRecommendArticle/Dialog.tsx
@@ -53,13 +53,13 @@ const ToggleRecommendArticleDialog = ({
     useMutation<ToggleRecommendArticleMutation>(TOGGLE_RECOMMEND_ARTICLE)
 
   const title = {
-    icymi: ['撤銷精華', '選為精華'],
+    icymi: ['選為精華', '撤銷精華'],
     hottestAndNewest: ['撤銷移出', '移出熱門與最新'],
   }
   const description = {
     icymi: [
-      `確認要将「<span class="u-highlight">${article.title}</span>」撤銷精華嗎？`,
       `確認要将「<span class="u-highlight">${article.title}</span>」選為精華嗎？`,
+      `確認要将「<span class="u-highlight">${article.title}</span>」撤銷精華嗎？`,
     ],
     hottestAndNewest: [
       `作品「<span class="u-highlight">${article.title}</span>」將可能出現在熱門和最新的文章列表中。`,

diff --git a/src/views/User/UserProfile/DropdownActions/ToggleRestrictUser/Button.tsx b/src/views/User/UserProfile/DropdownActions/ToggleRestrictUser/Button.tsx
@@ -46,7 +46,7 @@ const ToggleRestrictUserButton: React.FC<ToggleRestrictUserButtonProps> = ({
   )
 
   if (loading) {
-    return <Menu.Item icon={<IconSpinner22 size="mdS" />} />
+    return <Menu.Item icon={<IconSpinner22 size="mdS" />} text="正在加載中…" />
   }
 
   if (data?.user?.__typename !== 'User') return null