fix(ArticleDetail): fix conflict

thematters · Feb 20, 2024 · 0141df4 · 0141df4
1 parent 60fdea1
commit 0141df4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/lang/default.json b/lang/default.json
@@ -2392,6 +2392,10 @@
     "defaultMessage": "left a comment in {circleName}",
     "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
+  "zn83cE": {
+    "defaultMessage": "Preview",
+    "description": "src/components/Editor/ToggleAccess/SupportSettingDialog/Content.tsx"
+  },
   "zvNfwL": {
     "defaultMessage": "Operation too frequent, please try again later.",
     "description": "ACTION_LIMIT_EXCEEDED"

diff --git a/lang/en.json b/lang/en.json
@@ -2392,6 +2392,10 @@
     "defaultMessage": "left a comment in {circleName}",
     "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
+  "zn83cE": {
+    "defaultMessage": "Preview",
+    "description": "src/components/Editor/ToggleAccess/SupportSettingDialog/Content.tsx"
+  },
   "zvNfwL": {
     "defaultMessage": "Operation too frequent, please try again later.",
     "description": "ACTION_LIMIT_EXCEEDED"

diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json
@@ -2392,6 +2392,10 @@
     "defaultMessage": "在 {circleName} 中留言",
     "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
+  "zn83cE": {
+    "defaultMessage": "效果预览",
+    "description": "src/components/Editor/ToggleAccess/SupportSettingDialog/Content.tsx"
+  },
   "zvNfwL": {
     "defaultMessage": "操作过于频繁，请稍候重试",
     "description": "ACTION_LIMIT_EXCEEDED"

diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json
@@ -2392,6 +2392,10 @@
     "defaultMessage": "在 {circleName} 中留言",
     "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
+  "zn83cE": {
+    "defaultMessage": "效果預覽",
+    "description": "src/components/Editor/ToggleAccess/SupportSettingDialog/Content.tsx"
+  },
   "zvNfwL": {
     "defaultMessage": "操作過於頻繁，請稍候重試",
     "description": "ACTION_LIMIT_EXCEEDED"

diff --git a/src/views/ArticleDetail/Comments/CommentDetail/index.tsx b/src/views/ArticleDetail/Comments/CommentDetail/index.tsx
@@ -1,9 +1,9 @@
 import { useEffect, useState } from 'react'
 
 import {
-  CommentType,
   QueryError,
   ThreadCommentBeta,
+  ThreadCommentType,
   usePublicQuery,
 } from '~/components'
 import { CommentDetailQuery } from '~/gql/graphql'
@@ -107,7 +107,7 @@ const CommentDetail = () => {
     return null
   }
 
-  const comment = data?.node as CommentType
+  const comment = data?.node as ThreadCommentType
 
   return (
     <section>