Merge branch 'feat/journal' into feat/Mobile-post-moment-page

thematters · Jul 31, 2024 · 64b9de5 · 64b9de5
2 parents 7f585e4 + 13b4266
commit 64b9de5
Show file tree

Hide file tree

Showing 29 changed files with 731 additions and 534 deletions.
diff --git a/lang/default.json b/lang/default.json
@@ -754,6 +754,9 @@
     "defaultMessage": "Articles",
     "description": "src/views/Follow/Tabs/index.tsx"
   },
+  "AeVndq": {
+    "defaultMessage": "mentioned you in a comment at {commentMoment}"
+  },
   "AlHYvk": {
     "defaultMessage": "{type} edited"
   },
@@ -1634,6 +1637,9 @@
     "defaultMessage": "Back",
     "description": "src/components/Forms/PaymentForm"
   },
+  "Qlzm0s": {
+    "defaultMessage": "mentioned you in a moment at"
+  },
   "QvPc1q": {
     "defaultMessage": "Upload Cover"
   },
@@ -1975,9 +1981,6 @@
   "WxhsrG": {
     "defaultMessage": "Please connect email"
   },
-  "X9a1XW": {
-    "defaultMessage": "mentioned you in a moment comment at {commentMoment}"
-  },
   "XH1s8E": {
     "defaultMessage": "Delete {commentType}",
     "description": "src/components/CircleComment/DropdownActions/DeleteComment/Dialog.tsx"
@@ -2446,9 +2449,6 @@
     "defaultMessage": "Pending",
     "description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
   },
-  "fkQOxQ": {
-    "defaultMessage": "mentioned you in moment"
-  },
   "fnv5rD": {
     "defaultMessage": "like article (current {total} likes)"
   },
@@ -2661,6 +2661,9 @@
   "kCp8A9": {
     "defaultMessage": "After resignation, you will not be able to manage tags."
   },
+  "kEDrXh": {
+    "defaultMessage": "liked your collection"
+  },
   "kHMa3H": {
     "defaultMessage": "The new password and confirmation password do not match."
   },

diff --git a/lang/en.json b/lang/en.json
@@ -754,6 +754,9 @@
     "defaultMessage": "Articles",
     "description": "src/views/Follow/Tabs/index.tsx"
   },
+  "AeVndq": {
+    "defaultMessage": "mentioned you in a comment at {commentMoment}"
+  },
   "AlHYvk": {
     "defaultMessage": "{type} edited"
   },
@@ -1634,6 +1637,9 @@
     "defaultMessage": "Back",
     "description": "src/components/Forms/PaymentForm"
   },
+  "Qlzm0s": {
+    "defaultMessage": "mentioned you in a moment at"
+  },
   "QvPc1q": {
     "defaultMessage": "Upload Cover"
   },
@@ -1975,9 +1981,6 @@
   "WxhsrG": {
     "defaultMessage": "Please connect email"
   },
-  "X9a1XW": {
-    "defaultMessage": "mentioned you in a moment comment at {commentMoment}"
-  },
   "XH1s8E": {
     "defaultMessage": "Delete {commentType}",
     "description": "src/components/CircleComment/DropdownActions/DeleteComment/Dialog.tsx"
@@ -2446,9 +2449,6 @@
     "defaultMessage": "Pending",
     "description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
   },
-  "fkQOxQ": {
-    "defaultMessage": "mentioned you in moment"
-  },
   "fnv5rD": {
     "defaultMessage": "like article (current {total} likes)"
   },
@@ -2661,6 +2661,9 @@
   "kCp8A9": {
     "defaultMessage": "After resignation, you will not be able to manage tags."
   },
+  "kEDrXh": {
+    "defaultMessage": "liked your collection"
+  },
   "kHMa3H": {
     "defaultMessage": "The new password and confirmation password do not match."
   },

diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json
@@ -754,6 +754,9 @@
     "defaultMessage": "只看文章",
     "description": "src/views/Follow/Tabs/index.tsx"
   },
+  "AeVndq": {
+    "defaultMessage": "在动态留言中提及了你 {commentMoment}"
+  },
   "AlHYvk": {
     "defaultMessage": "{type}已编辑"
   },
@@ -1634,6 +1637,9 @@
     "defaultMessage": "上一步",
     "description": "src/components/Forms/PaymentForm"
   },
+  "Qlzm0s": {
+    "defaultMessage": "在动态中提及了你"
+  },
   "QvPc1q": {
     "defaultMessage": "上传封面"
   },
@@ -1975,9 +1981,6 @@
   "WxhsrG": {
     "defaultMessage": "请先绑定邮箱"
   },
-  "X9a1XW": {
-    "defaultMessage": "在 {commentMoment} 留言中提到了你"
-  },
   "XH1s8E": {
     "defaultMessage": "刪除{commentType}",
     "description": "src/components/CircleComment/DropdownActions/DeleteComment/Dialog.tsx"
@@ -2446,9 +2449,6 @@
     "defaultMessage": "邀请中",
     "description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
   },
-  "fkQOxQ": {
-    "defaultMessage": "在动态中提及了你"
-  },
   "fnv5rD": {
     "defaultMessage": "赞赏作品（当前 {total} 次赞赏）"
   },
@@ -2661,6 +2661,9 @@
   "kCp8A9": {
     "defaultMessage": "如果辞去权限，你将无法继续管理标签。"
   },
+  "kEDrXh": {
+    "defaultMessage": "喜欢你的选集"
+  },
   "kHMa3H": {
     "defaultMessage": "密码不一致"
   },

diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json
@@ -754,6 +754,9 @@
     "defaultMessage": "只看文章",
     "description": "src/views/Follow/Tabs/index.tsx"
   },
+  "AeVndq": {
+    "defaultMessage": "在動態留言中提及了你 {commentMoment}"
+  },
   "AlHYvk": {
     "defaultMessage": "{type}已編輯"
   },
@@ -1634,6 +1637,9 @@
     "defaultMessage": "上一步",
     "description": "src/components/Forms/PaymentForm"
   },
+  "Qlzm0s": {
+    "defaultMessage": "在動態中提及了你"
+  },
   "QvPc1q": {
     "defaultMessage": "上傳封面"
   },
@@ -1975,9 +1981,6 @@
   "WxhsrG": {
     "defaultMessage": "請先綁定電子郵件"
   },
-  "X9a1XW": {
-    "defaultMessage": "在 {commentMoment} 留言中提到了你"
-  },
   "XH1s8E": {
     "defaultMessage": "刪除{commentType}",
     "description": "src/components/CircleComment/DropdownActions/DeleteComment/Dialog.tsx"
@@ -2446,9 +2449,6 @@
     "defaultMessage": "邀請中",
     "description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
   },
-  "fkQOxQ": {
-    "defaultMessage": "在動態中提及了你"
-  },
   "fnv5rD": {
     "defaultMessage": "讚賞作品（當前 {total} 次讚賞）"
   },
@@ -2661,6 +2661,9 @@
   "kCp8A9": {
     "defaultMessage": "如果辭去權限，你將無法繼續管理標籤。"
   },
+  "kEDrXh": {
+    "defaultMessage": "喜歡你的選集"
+  },
   "kHMa3H": {
     "defaultMessage": "密碼不一致"
   },

diff --git a/src/common/enums/test.ts b/src/common/enums/test.ts
@@ -117,6 +117,7 @@ export enum TEST_ID {
   NOTICE_COMMENT_MENTIONED_YOU = 'notice/comment-mentioned-you',
   NOTICE_COMMENT_PINNED = 'notice/comment-pinned',
   NOTICE_ARTICLE_NEW_COMMENT = 'notice/article-new-comment',
+  NOTICE_MOMENT_NEW_COMMENT = 'notice/moment-new-comment',
   NOTICE_COMMENT_LIKED = 'notice/comment-liked',
   NOTICE_SUBSCRIBED_ARTICLE_NEW_COMMENT = 'notice/subscribed-article-new-comment',
   NOTICE_CIRCLE_NEW_BROADCAST = 'notice/circle-new-broadcast',
@@ -137,6 +138,7 @@ export enum TEST_ID {
   NOTICE_OFFICIAL_ANNOUNCEMENT = 'notice/official-announcement',
   NOTICE_MOMENT_MENTIONED = 'notice/moment-mentioned',
   NOTICE_MOMENT_LIKED = 'notice/moment-liked',
+  NOTICE_COLLECTION_TITLE = 'notice/collection/title',
   // me
   ME_WALLET_TRANSACTIONS_ITEM = 'me/wallet/transactions/item',
   ME_WALLET_TRANSACTIONS_ITEM_AMOUNT = 'me/wallet/transactions/item/amount',

diff --git a/src/common/utils/text/index.ts b/src/common/utils/text/index.ts
@@ -1,4 +1,5 @@
 export * from './article'
+export * from './notice'
 export * from './tag'
 export * from './user'
 

diff --git a/src/common/utils/text/moment.test.ts b/src/common/utils/text/moment.test.ts