From 6673bf0b18b28a498c13fba08cd7a00faa767140 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Mon, 20 Mar 2023 17:43:36 +0800
Subject: [PATCH 01/92] feat(test): update TEST_ID

---
 src/common/enums/test.ts                 |  4 ++++
 src/components/Comment/Feed/index.tsx    |  6 +++++-
 src/components/UserDigest/Mini/index.tsx | 14 ++++++++++++--
 src/components/UserProfile/index.tsx     |  7 ++++++-
 tests/helpers/poms/userProfile.ts        |  2 ++
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/common/enums/test.ts b/src/common/enums/test.ts
index 3bdb5ab350..b840be1f91 100644
--- a/src/common/enums/test.ts
+++ b/src/common/enums/test.ts
@@ -8,6 +8,8 @@ export enum TEST_ID {
   DIGEST_ARTICLE_SIDEBAR = 'digest/article/sidebar',
   DIGEST_ARTICLE_TITLE = 'digest/article/title',
   DIGEST_USER_MINI = 'digest/user/mini',
+  DIGEST_USER_MINI_DISPLAY_NAME = 'digest/user/mini/display-name',
+  DIGEST_USER_MINI_USER_NAME = 'digest/user/mini/user-name',
   DIGEST_USER_PLAIN = 'digest/user/plain',
   DIGEST_USER_RICH = 'digest/user/rich',
   DIGEST_USER_RICH_DISPLAY_NAME = 'digest/user/rich/display-name',
@@ -32,6 +34,7 @@ export enum TEST_ID {
   ARTICLE_APPRECIATION_TOTAL = 'article/appreciation/total',
   ARTICLE_TOOLBAR = 'article/toolbar',
   ARTICLE_BOOKMARK = 'article/bookmark',
+  ARTICLE_COMMENT_FEED = 'article/comment/feed',
   // payto
   PAY_TO_CURRENCY_CHOICE = 'payto/currency-choice',
   // comment
@@ -77,6 +80,7 @@ export enum TEST_ID {
   // user profile
   USER_PROFILE = 'user-profile',
   USER_PROFILE_DISPLAY_NAME = 'user-profile/display-name',
+  USER_PROFILE_USER_NAME = 'user-profile/user-name',
   USER_PROFILE_FOLLOWERS_COUNT = 'user-profile/followers/count',
   USER_PROFILE_BIO = 'user-profile/bio',
 
diff --git a/src/components/Comment/Feed/index.tsx b/src/components/Comment/Feed/index.tsx
index d4ad41428d..dfaee93f62 100644
--- a/src/components/Comment/Feed/index.tsx
+++ b/src/components/Comment/Feed/index.tsx
@@ -1,6 +1,7 @@
 import { useLazyQuery } from '@apollo/react-hooks'
 import React from 'react'
 
+import { TEST_ID } from '@/src/common/enums'
 import { AvatarSize, CommentFormType, UserDigest } from '~/components'
 import {
   FeedCommentPrivateFragment,
@@ -52,7 +53,10 @@ export const BaseCommentFeed = ({
   }
 
   return (
-    <article id={actionControls.hasLink ? nodeId : ''}>
+    <article
+      id={actionControls.hasLink ? nodeId : ''}
+      data-test-id={TEST_ID.ARTICLE_COMMENT_FEED}
+    >
       <header>
         <UserDigest.Mini
           user={author}
diff --git a/src/components/UserDigest/Mini/index.tsx b/src/components/UserDigest/Mini/index.tsx
index 1eea3c7108..8cc2978a0b 100644
--- a/src/components/UserDigest/Mini/index.tsx
+++ b/src/components/UserDigest/Mini/index.tsx
@@ -122,10 +122,20 @@ const Mini = ({
 
         <span className={nameClasses}>
           {hasDisplayName && (
-            <span className="displayname">{user.displayName}</span>
+            <span
+              className="displayname"
+              data-test-id={TEST_ID.DIGEST_USER_MINI_DISPLAY_NAME}
+            >
+              {user.displayName}
+            </span>
           )}
           {hasUserName && user.userName && (
-            <span className="username">@{user.userName}</span>
+            <span
+              className="username"
+              data-test-id={TEST_ID.DIGEST_USER_MINI_USER_NAME}
+            >
+              @{user.userName}
+            </span>
           )}
         </span>
 
diff --git a/src/components/UserProfile/index.tsx b/src/components/UserProfile/index.tsx
index eff790368f..d00b092dd6 100644
--- a/src/components/UserProfile/index.tsx
+++ b/src/components/UserProfile/index.tsx
@@ -260,7 +260,12 @@ export const UserProfile = () => {
           </section>
 
           <section className="username">
-            <span className="name">@{user.userName}</span>
+            <span
+              className="name"
+              data-test-id={TEST_ID.USER_PROFILE_USER_NAME}
+            >
+              @{user.userName}
+            </span>
             {!isMe && <FollowUserButton.State user={user} />}
           </section>
 
diff --git a/tests/helpers/poms/userProfile.ts b/tests/helpers/poms/userProfile.ts
index 8fecf11765..dec661005c 100644
--- a/tests/helpers/poms/userProfile.ts
+++ b/tests/helpers/poms/userProfile.ts
@@ -16,6 +16,7 @@ export class UserProfilePage {
 
   // profile
   displayName: Locator
+  userName: Locator
   bio: Locator
   // followButton: Locator
   // rssButton: Locator
@@ -48,6 +49,7 @@ export class UserProfilePage {
 
     // profile
     this.displayName = page.getByTestId(TEST_ID.USER_PROFILE_DISPLAY_NAME)
+    this.userName = page.getByTestId(TEST_ID.USER_PROFILE_USER_NAME)
     this.bio = page.getByTestId(TEST_ID.USER_PROFILE_BIO)
 
     // feeds

From 8959180c812e1c33884f2c082baf9e8d130081ef Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Mon, 20 Mar 2023 17:45:26 +0800
Subject: [PATCH 02/92] feat(test): add switchBetweenMultiUser

---
 tests/switchBetweenMultiUser.spec.ts | 125 +++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)
 create mode 100644 tests/switchBetweenMultiUser.spec.ts

diff --git a/tests/switchBetweenMultiUser.spec.ts b/tests/switchBetweenMultiUser.spec.ts
new file mode 100644
index 0000000000..84e607cfd0
--- /dev/null
+++ b/tests/switchBetweenMultiUser.spec.ts
@@ -0,0 +1,125 @@
+import { expect, test } from '@playwright/test'
+
+import { TEST_ID } from '~/common/enums'
+
+import {
+  ArticleDetailPage,
+  authedTest,
+  login,
+  logout,
+  pageGoto,
+  UserProfilePage,
+  users,
+} from './helpers'
+
+test.describe('Switch between multiple users', () => {
+  authedTest('Same context', async ({ alicePage: page, isMobile }) => {
+    await pageGoto(page, '/')
+    const firstArticleLink = (await page
+      .getByTestId(TEST_ID.DIGEST_ARTICLE_FEED)
+      .first()
+      .getByTestId(TEST_ID.DIGEST_ARTICLE_TITLE)
+      .getAttribute('href')) as string
+
+    expect(firstArticleLink).toBeTruthy()
+
+    await pageGoto(page, firstArticleLink)
+
+    // [Alice] Logout
+    await logout({ page })
+
+    // [Bob] Login
+    await login({
+      email: users.bob.email,
+      password: users.bob.password,
+      page,
+      target: firstArticleLink,
+    })
+
+    const articleDetail = new ArticleDetailPage(page, isMobile)
+    // [Bob] Send a comment
+    await articleDetail.sendComment()
+
+    // [Bob] Get display name and user name in first comment
+    const firstComment = await page
+      .getByTestId(TEST_ID.ARTICLE_COMMENT_FEED)
+      .first()
+    const displayName = await firstComment
+      .getByTestId(TEST_ID.DIGEST_USER_MINI_DISPLAY_NAME)
+      .first()
+      .innerText()
+    const userName = await firstComment
+      .getByTestId(TEST_ID.DIGEST_USER_MINI_USER_NAME)
+      .first()
+      .innerText()
+
+    // [Bob] Get display name and user name
+    const bobProfile = new UserProfilePage(page, isMobile)
+    await bobProfile.gotoMeProfile()
+    const profileDisplayName = await bobProfile.displayName.innerText()
+    const profileUserName = await bobProfile.userName.innerText()
+
+    expect(displayName).toBe(profileDisplayName)
+    expect(userName).toBe(profileUserName)
+  })
+
+  test('Different Context', async ({ browser, isMobile }) => {
+    const aliceContext = await browser.newContext()
+    const bobContext = await browser.newContext()
+
+    const alicePage = await aliceContext.newPage()
+    const bobPage = await bobContext.newPage()
+
+    await pageGoto(alicePage, '/')
+    const firstArticleLink = (await alicePage
+      .getByTestId(TEST_ID.DIGEST_ARTICLE_FEED)
+      .first()
+      .getByTestId(TEST_ID.DIGEST_ARTICLE_TITLE)
+      .getAttribute('href')) as string
+
+    // [Alice] login
+    await login({
+      email: users.alice.email,
+      password: users.alice.password,
+      page: alicePage,
+      target: firstArticleLink,
+    })
+
+    // [Alice] Logout
+    await logout({ page: alicePage })
+
+    // [Bob] login
+    await login({
+      email: users.bob.email,
+      password: users.bob.password,
+      page: bobPage,
+      target: firstArticleLink,
+    })
+
+    const articleDetail = new ArticleDetailPage(bobPage, isMobile)
+    // [Bob] Send a comment
+    await articleDetail.sendComment()
+
+    // [Bob] Get display name and user name in first comment
+    const firstComment = await bobPage
+      .getByTestId(TEST_ID.ARTICLE_COMMENT_FEED)
+      .first()
+    const displayName = await firstComment
+      .getByTestId(TEST_ID.DIGEST_USER_MINI_DISPLAY_NAME)
+      .first()
+      .innerText()
+    const userName = await firstComment
+      .getByTestId(TEST_ID.DIGEST_USER_MINI_USER_NAME)
+      .first()
+      .innerText()
+
+    // [Bob] Get display name and user name
+    const bobProfile = new UserProfilePage(bobPage, isMobile)
+    await bobProfile.gotoMeProfile()
+    const profileDisplayName = await bobProfile.displayName.innerText()
+    const profileUserName = await bobProfile.userName.innerText()
+
+    expect(displayName).toBe(profileDisplayName)
+    expect(userName).toBe(profileUserName)
+  })
+})

From 6bba45534766833d74298ce1253e75d573fcea69 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Mon, 20 Mar 2023 19:22:43 +0800
Subject: [PATCH 03/92] feat(test): switchBetweenMultiUser only run desktop

---
 tests/switchBetweenMultiUser.spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/switchBetweenMultiUser.spec.ts b/tests/switchBetweenMultiUser.spec.ts
index 84e607cfd0..59ac8b3e16 100644
--- a/tests/switchBetweenMultiUser.spec.ts
+++ b/tests/switchBetweenMultiUser.spec.ts
@@ -14,6 +14,7 @@ import {
 
 test.describe('Switch between multiple users', () => {
   authedTest('Same context', async ({ alicePage: page, isMobile }) => {
+    test.skip(!!isMobile, 'Desktop only!')
     await pageGoto(page, '/')
     const firstArticleLink = (await page
       .getByTestId(TEST_ID.DIGEST_ARTICLE_FEED)
@@ -64,6 +65,7 @@ test.describe('Switch between multiple users', () => {
   })
 
   test('Different Context', async ({ browser, isMobile }) => {
+    test.skip(!!isMobile, 'Desktop only!')
     const aliceContext = await browser.newContext()
     const bobContext = await browser.newContext()
 

From 134d4a7ae1c2e0d77e48775999a299b8f9169db5 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Tue, 21 Mar 2023 15:45:58 +0800
Subject: [PATCH 04/92] feat(test): update switchBetweenMultiUser

feat(test): update switchBetweenMultiUser
---
 tests/switchBetweenMultiUser.spec.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/switchBetweenMultiUser.spec.ts b/tests/switchBetweenMultiUser.spec.ts
index 59ac8b3e16..d292628e7a 100644
--- a/tests/switchBetweenMultiUser.spec.ts
+++ b/tests/switchBetweenMultiUser.spec.ts
@@ -1,5 +1,6 @@
 import { expect, test } from '@playwright/test'
 
+import { sleep } from '@/src/common/utils/time'
 import { TEST_ID } from '~/common/enums'
 
 import {
@@ -26,6 +27,7 @@ test.describe('Switch between multiple users', () => {
 
     await pageGoto(page, firstArticleLink)
 
+    await sleep(3 * 1000)
     // [Alice] Logout
     await logout({ page })
 
@@ -36,9 +38,11 @@ test.describe('Switch between multiple users', () => {
       page,
       target: firstArticleLink,
     })
+    await page.waitForLoadState('networkidle')
 
     const articleDetail = new ArticleDetailPage(page, isMobile)
     // [Bob] Send a comment
+    await sleep(3 * 1000)
     await articleDetail.sendComment()
 
     // [Bob] Get display name and user name in first comment
@@ -87,6 +91,7 @@ test.describe('Switch between multiple users', () => {
       target: firstArticleLink,
     })
 
+    await sleep(3 * 1000)
     // [Alice] Logout
     await logout({ page: alicePage })
 
@@ -97,9 +102,11 @@ test.describe('Switch between multiple users', () => {
       page: bobPage,
       target: firstArticleLink,
     })
+    await bobPage.waitForLoadState('networkidle')
 
     const articleDetail = new ArticleDetailPage(bobPage, isMobile)
     // [Bob] Send a comment
+    await sleep(3 * 1000)
     await articleDetail.sendComment()
 
     // [Bob] Get display name and user name in first comment

From 94925a0aae4d50265cda17c497d11e2c9b30f025 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:08:46 +0800
Subject: [PATCH 05/92] feat(Forms): add <EditorSearchSelectForm />

feat(test): update switchBetweenMultiUser
---
 .../Forms/EditorSearchSelectForm/index.tsx    | 176 ++++++++++++++++++
 .../Forms/EditorSearchSelectForm/styles.css   |  12 ++
 2 files changed, 188 insertions(+)
 create mode 100644 src/components/Forms/EditorSearchSelectForm/index.tsx
 create mode 100644 src/components/Forms/EditorSearchSelectForm/styles.css

diff --git a/src/components/Forms/EditorSearchSelectForm/index.tsx b/src/components/Forms/EditorSearchSelectForm/index.tsx
new file mode 100644
index 0000000000..2d496856ca
--- /dev/null
+++ b/src/components/Forms/EditorSearchSelectForm/index.tsx
@@ -0,0 +1,176 @@
+import { useEffect, useState } from 'react'
+
+import { MAX_ARTICLE_TAG_LENGTH, TextId } from '~/common/enums'
+import { Button, Dialog, IconAdd16, TextIcon, Translate } from '~/components'
+import SearchingArea, {
+  SearchType,
+  SelectNode,
+} from '~/components/SearchSelect/SearchingArea'
+import StagingArea, {
+  CustomStagingAreaProps,
+  StagingNode,
+} from '~/components/SearchSelect/StagingArea'
+import { SearchExclude, SearchFilter } from '~/gql/graphql'
+
+import styles from './styles.css'
+
+/**
+ * <EditorSearchSelectForm> is a dialog content for
+ * searching nodes (article, tag, and user),
+ * select and submit them to the component used it.
+ *
+ * It composed of three main components:
+ *
+ * - <SearchInput>: typing keyword for searching nodes.
+ *
+ * - <SearchingArea>: showing the above search results,
+ *                    click node will add it to the staging area.
+ *
+ * - <StagingArea>: managing staging nodes, selected nodes will be submitted.
+ *
+ */
+type Area = 'staging' | 'searching'
+
+export type SearchSelectNode = SelectNode
+
+export type EditorSearchSelectFormProps = {
+  title: TextId | React.ReactNode
+  hint: TextId
+  headerLeftButton?: React.ReactNode
+  headerRightButtonText?: string | React.ReactNode
+  closeDialog: () => void
+
+  nodes?: SelectNode[]
+  onSave: (nodes: SelectNode[]) => Promise<any>
+  saving?: boolean
+
+  searchType: SearchType
+  searchFilter?: SearchFilter
+  searchExclude?: SearchExclude
+
+  draggable?: boolean
+
+  createTag?: boolean
+  inviteEmail?: boolean
+
+  CustomStagingArea?: (props: CustomStagingAreaProps) => JSX.Element
+}
+
+const EditorSearchSelectForm = ({
+  title,
+  hint,
+  CustomStagingArea,
+  headerLeftButton,
+  headerRightButtonText,
+  closeDialog,
+
+  nodes,
+  onSave,
+  saving,
+
+  searchType,
+  searchFilter,
+  searchExclude,
+
+  draggable,
+
+  createTag,
+  inviteEmail,
+}: EditorSearchSelectFormProps) => {
+  const initStagingNodes =
+    nodes?.map((node) => ({ node, selected: true })) || []
+
+  // area
+  const [area, setArea] = useState<Area>('staging')
+  const inStagingArea = area === 'staging'
+  const inSearchingArea = area === 'searching'
+  const toStagingArea = () => setArea('staging')
+  const toSearchingArea = () => setArea('searching')
+
+  useEffect(() => {
+    setArea('staging')
+    setStagingNodes(initStagingNodes)
+  }, [])
+
+  // data
+  const [stagingNodes, setStagingNodes] =
+    useState<StagingNode[]>(initStagingNodes)
+  const addNodeToStaging = (node: SelectNode) => {
+    setStagingNodes([
+      ...stagingNodes.filter(({ node: n }) => n.id !== node.id),
+      { node, selected: true },
+    ])
+
+    toStagingArea()
+  }
+
+  const enableAdd = stagingNodes.length < MAX_ARTICLE_TAG_LENGTH
+
+  const onClickSave = async () => {
+    await onSave(
+      stagingNodes.filter(({ selected }) => !!selected).map(({ node }) => node)
+    )
+  }
+
+  return (
+    <>
+      <Dialog.Header
+        title={title}
+        closeDialog={closeDialog}
+        closeTextId="close"
+        leftButton={headerLeftButton}
+        rightButton={
+          <Dialog.Header.RightButton
+            onClick={onClickSave}
+            // disabled={stagingNodes.length <= 0}
+            text={headerRightButtonText || <Translate id="save" />}
+            loading={saving}
+          />
+        }
+      />
+
+      {inStagingArea && (
+        <section className="stagingHeadArea">
+          <Button onClick={toSearchingArea} disabled={!enableAdd}>
+            <TextIcon
+              icon={<IconAdd16 />}
+              color={enableAdd ? 'green' : 'grey'}
+              size="md"
+            >
+              <Translate en="Add Tag" zh_hans="添加标签" zh_hant="添加標籤" />
+            </TextIcon>
+          </Button>
+          <span className="number">（{stagingNodes.length}/3）</span>
+        </section>
+      )}
+
+      {inSearchingArea && (
+        <SearchingArea
+          inSearchingArea={inSearchingArea}
+          searchType={searchType}
+          searchFilter={searchFilter}
+          searchExclude={searchExclude}
+          toStagingArea={toStagingArea}
+          toSearchingArea={toSearchingArea}
+          addNodeToStaging={addNodeToStaging}
+          createTag={createTag}
+          inviteEmail={inviteEmail}
+          autoFocus
+        />
+      )}
+      {inStagingArea && (
+        <StagingArea
+          nodes={stagingNodes}
+          setNodes={setStagingNodes}
+          hint={hint}
+          inStagingArea={inStagingArea}
+          draggable={draggable}
+          CustomStagingArea={CustomStagingArea}
+        />
+      )}
+      <style jsx>{styles}</style>
+    </>
+  )
+}
+
+export default EditorSearchSelectForm
diff --git a/src/components/Forms/EditorSearchSelectForm/styles.css b/src/components/Forms/EditorSearchSelectForm/styles.css
new file mode 100644
index 0000000000..355581b5af
--- /dev/null
+++ b/src/components/Forms/EditorSearchSelectForm/styles.css
@@ -0,0 +1,12 @@
+.stagingHeadArea {
+  @mixin flex-center-start;
+  @mixin border-bottom-grey;
+
+  padding: var(--spacing-base);
+
+  & .number {
+    font-size: var(--font-size-md-s);
+    line-height: 1.4;
+    color: var(--color-grey);
+  }
+}

From d10787e3446241aef240f2b3a669ba22ed702342 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:10:39 +0800
Subject: [PATCH 06/92] feat(Dialogs): add <EditorSearchSelectDialog />

---
 .../EditorSearchSelectDialog/index.tsx        | 50 +++++++++++++++++++
 src/components/Dialogs/index.tsx              |  3 ++
 src/components/Editor/Sidebar/Tags/index.tsx  |  6 +--
 3 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 src/components/Dialogs/EditorSearchSelectDialog/index.tsx

diff --git a/src/components/Dialogs/EditorSearchSelectDialog/index.tsx b/src/components/Dialogs/EditorSearchSelectDialog/index.tsx
new file mode 100644
index 0000000000..a122a66632
--- /dev/null
+++ b/src/components/Dialogs/EditorSearchSelectDialog/index.tsx
@@ -0,0 +1,50 @@
+import dynamic from 'next/dynamic'
+
+import { Dialog, DialogProps, Spinner, useDialogSwitch } from '~/components'
+import { EditorSearchSelectFormProps } from '~/components/Forms/EditorSearchSelectForm'
+import { SelectNode } from '~/components/SearchSelect/SearchingArea'
+
+type EditorSearchSelectDialogProps = Omit<
+  EditorSearchSelectFormProps,
+  'closeDialog'
+> & {
+  children: ({ openDialog }: { openDialog: () => void }) => React.ReactNode
+} & Pick<DialogProps, 'size'>
+
+const DynamicEditorSearchSelectForm = dynamic(
+  () => import('~/components/Forms/EditorSearchSelectForm'),
+  { loading: Spinner }
+)
+
+const BaseSearchSelectDialog = ({
+  children,
+  size,
+  ...props
+}: EditorSearchSelectDialogProps) => {
+  const { show, openDialog, closeDialog } = useDialogSwitch(true)
+
+  return (
+    <>
+      {children({ openDialog })}
+
+      <Dialog isOpen={show} onDismiss={closeDialog} fixedHeight size={size}>
+        <DynamicEditorSearchSelectForm
+          {...props}
+          onSave={async (nodes: SelectNode[]) => {
+            await props.onSave(nodes)
+            closeDialog()
+          }}
+          closeDialog={closeDialog}
+        />
+      </Dialog>
+    </>
+  )
+}
+
+export const EditorSearchSelectDialog = (
+  props: EditorSearchSelectDialogProps
+) => (
+  <Dialog.Lazy mounted={<BaseSearchSelectDialog {...props} />}>
+    {({ openDialog }) => <>{props.children({ openDialog })}</>}
+  </Dialog.Lazy>
+)
diff --git a/src/components/Dialogs/index.tsx b/src/components/Dialogs/index.tsx
index 8dd4dae0d0..6b1172d13a 100644
--- a/src/components/Dialogs/index.tsx
+++ b/src/components/Dialogs/index.tsx
@@ -13,6 +13,9 @@ export * from './ReviseArticleDialog'
 export * from './ShareDialog'
 export * from './SupportersDialog'
 
+// Editor
+export * from './EditorSearchSelectDialog'
+
 // Tag
 export * from './RecommendTagDialog'
 export * from './TagAdoptionDialog'
diff --git a/src/components/Editor/Sidebar/Tags/index.tsx b/src/components/Editor/Sidebar/Tags/index.tsx
index c1407aef34..4287a17f26 100644
--- a/src/components/Editor/Sidebar/Tags/index.tsx
+++ b/src/components/Editor/Sidebar/Tags/index.tsx
@@ -1,7 +1,7 @@
 import { analytics } from '~/common/utils'
 import {
+  EditorSearchSelectDialog,
   IconHashTag24,
-  SearchSelectDialog,
   // SearchSelectNode,
   Tag,
 } from '~/components'
@@ -26,7 +26,7 @@ const SidebarTags = ({
   disabled,
 }: SidebarTagsProps) => {
   return (
-    <SearchSelectDialog
+    <EditorSearchSelectDialog
       size="sm"
       title="addTag"
       hint="hintAddTag"
@@ -72,7 +72,7 @@ const SidebarTags = ({
           )}
         </Box>
       )}
-    </SearchSelectDialog>
+    </EditorSearchSelectDialog>
   )
 }
 

From 15613e5ced3db722174de424eef151704505f315 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:12:54 +0800
Subject: [PATCH 07/92] feat(Editor): revise <SelectedTags />

---
 .../TagCustomStagingArea/SelectedTags/index.tsx    |  7 ++++++-
 .../TagCustomStagingArea/SelectedTags/styles.css   | 14 ++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/components/Editor/TagCustomStagingArea/SelectedTags/index.tsx b/src/components/Editor/TagCustomStagingArea/SelectedTags/index.tsx
index abe57a6b10..ace0386291 100644
--- a/src/components/Editor/TagCustomStagingArea/SelectedTags/index.tsx
+++ b/src/components/Editor/TagCustomStagingArea/SelectedTags/index.tsx
@@ -1,4 +1,4 @@
-import { Tag } from '~/components'
+import { Tag, Translate } from '~/components'
 import { SelectTag } from '~/components/SearchSelect/SearchingArea'
 import { EditorRecommendedTagsQuery } from '~/gql/graphql'
 
@@ -16,6 +16,10 @@ type SelectedTagsProps = {
 const SelectedTags: React.FC<SelectedTagsProps> = ({ tags, onRemoveTag }) => {
   return (
     <section className="selectedTags">
+      <p className="hint">
+        <Translate en="Added" zh_hans="已添加" zh_hant="已添加" />
+      </p>
+
       <ul className="tagList">
         {tags.map((tag) => (
           <li key={tag.id}>
@@ -23,6 +27,7 @@ const SelectedTags: React.FC<SelectedTagsProps> = ({ tags, onRemoveTag }) => {
               tag={tag}
               type="inline"
               hasClose
+              active
               disabled
               removeTag={() => onRemoveTag(tag)}
             />
diff --git a/src/components/Editor/TagCustomStagingArea/SelectedTags/styles.css b/src/components/Editor/TagCustomStagingArea/SelectedTags/styles.css
index ac0738b3b5..68b67e9cb0 100644
--- a/src/components/Editor/TagCustomStagingArea/SelectedTags/styles.css
+++ b/src/components/Editor/TagCustomStagingArea/SelectedTags/styles.css
@@ -1,10 +1,20 @@
-.tagList {
+.selectedTags {
   padding: 0 var(--spacing-base);
+  margin: var(--spacing-base) 0;
+}
+
+.tagList {
   margin-top: var(--spacing-base);
+  line-height: 1;
 
   & li {
     display: inline-block;
     margin-right: var(--spacing-tight);
-    margin-bottom: var(--spacing-base);
   }
 }
+
+.hint {
+  font-size: var(--font-size-sm-s);
+  line-height: 1.125rem;
+  color: var(--color-grey);
+}

From 869ea5b2f1c10541084a47d2b0f259118f998d5b Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:17:54 +0800
Subject: [PATCH 08/92] feat(Editor): Not clickable when the number of tags
 reaches the max

---
 src/common/enums/index.ts                                    | 2 ++
 .../Editor/TagCustomStagingArea/RecommendedTags/index.tsx    | 5 +++--
 src/components/Editor/TagCustomStagingArea/index.tsx         | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/common/enums/index.ts b/src/common/enums/index.ts
index 6473056949..603e282f52 100644
--- a/src/common/enums/index.ts
+++ b/src/common/enums/index.ts
@@ -50,6 +50,8 @@ export const VERIFICATION_CODE_TYPES = {
 
 export const MAX_ARTICLE_REVISION_COUNT = 4
 export const MAX_ARTICLE_REVISION_DIFF = 50
+export const MAX_ARTICLE_TAG_LENGTH = 3
+export const MAX_ARTICLE_COLLECT_LENGTH = 10
 
 export const MAX_TAG_CONTENT_LENGTH = 50
 export const MAX_TAG_DESCRIPTION_LENGTH = 200
diff --git a/src/components/Editor/TagCustomStagingArea/RecommendedTags/index.tsx b/src/components/Editor/TagCustomStagingArea/RecommendedTags/index.tsx
index ad916f5b09..53cc4581cf 100644
--- a/src/components/Editor/TagCustomStagingArea/RecommendedTags/index.tsx
+++ b/src/components/Editor/TagCustomStagingArea/RecommendedTags/index.tsx
@@ -11,11 +11,13 @@ type EditorRecommendedTagsUserTagsEdgesNode = NonNullable<
 type RecommendedTagsProps = {
   tags: EditorRecommendedTagsUserTagsEdgesNode[]
   onAddTag: (tag: SelectTag) => void
+  disabled?: boolean
 }
 
 const RecommendedTags: React.FC<RecommendedTagsProps> = ({
   tags,
   onAddTag,
+  disabled,
 }) => {
   return (
     <section className="recommendedTags">
@@ -29,9 +31,8 @@ const RecommendedTags: React.FC<RecommendedTagsProps> = ({
             <Tag
               tag={tag}
               type="inline"
-              active
               disabled
-              onClick={() => onAddTag(tag)}
+              onClick={!disabled ? () => onAddTag(tag) : undefined}
             />
           </li>
         ))}
diff --git a/src/components/Editor/TagCustomStagingArea/index.tsx b/src/components/Editor/TagCustomStagingArea/index.tsx
index 5268db9007..b9a46f1b85 100644
--- a/src/components/Editor/TagCustomStagingArea/index.tsx
+++ b/src/components/Editor/TagCustomStagingArea/index.tsx
@@ -1,6 +1,7 @@
 import _uniqBy from 'lodash/uniqBy'
 import { useContext } from 'react'
 
+import { MAX_ARTICLE_TAG_LENGTH } from '@/src/common/enums'
 import { Spinner, Translate, usePublicQuery, ViewerContext } from '~/components'
 import { SelectTag } from '~/components/SearchSelect/SearchingArea'
 import { CustomStagingAreaProps } from '~/components/SearchSelect/StagingArea'
@@ -88,11 +89,12 @@ const TagCustomStagingArea = ({
           onRemoveTag={removeTag}
         />
       )}
-      {hasRecommendedTags && <hr />}
+      {/* {hasRecommendedTags && <hr />} */}
       {hasRecommendedTags && (
         <RecommendedTags
           tags={recommendedTags as EditorRecommendedTagsUserTagsEdgesNode[]}
           onAddTag={addTag}
+          disabled={tags.length >= MAX_ARTICLE_TAG_LENGTH}
         />
       )}
     </section>

From 394eb337a6cab70dfa338a2f7007a6f0d16fe075 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:21:05 +0800
Subject: [PATCH 09/92] feat(Editor): revise copy

---
 src/common/enums/text.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/enums/text.ts b/src/common/enums/text.ts
index 5d0defee0e..4d7811ef1e 100644
--- a/src/common/enums/text.ts
+++ b/src/common/enums/text.ts
@@ -157,7 +157,7 @@ export const TEXT = {
     helpCenter: '幫助中心',
     hintAddTag:
       '通過添加標籤幫助讀者更好地找到你的作品。如果沒有合適的標籤，你可以創建新的。',
-    hintAddRecommendedTag: '下方是你近期使用過標籤，點選添加：',
+    hintAddRecommendedTag: '近期使用',
     hintAddTagNoTag: '目前尚無標籤，立即添加提高作品曝光度！',
     hintAddTagShort: '添加合適標籤，讓站內外讀者找到你的作品',
     hintAddTagNamingRestriction:
@@ -567,7 +567,7 @@ export const TEXT = {
     helpCenter: '帮助中心',
     hintAddTag:
       '通过添加标签帮助读者更好地找到你的作品。如果没有合适的标签，你可以创建新的。',
-    hintAddRecommendedTag: '下方是你近期使用过标签，点选添加：',
+    hintAddRecommendedTag: '最近使用',
     hintAddTagNoTag: '目前尚无标签，立即添加提高作品曝光度！',
     hintAddTagShort: '添加适合标签，帮助读者找到你的作品',
     hintAddTagNamingRestriction:
@@ -988,7 +988,7 @@ export const TEXT = {
     helpCenter: 'Help Center',
     hintAddTag:
       'Adding tags helps readers find your articles. Add or create new tags.',
-    hintAddRecommendedTag: 'Click to add tags you recently used :',
+    hintAddRecommendedTag: 'Recently used',
     hintAddTagNoTag:
       'Not using tags yet, add tags now to improve discoverability!',
     hintAddTagShort: 'Adding tags helps readers find your articles.',

From 8d6f2d1a8d322739f23da5d3590aae257b6b7840 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:22:34 +0800
Subject: [PATCH 10/92] feat(Editor): revise style of <RecommendedTags />

---
 .../Editor/TagCustomStagingArea/RecommendedTags/styles.css    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Editor/TagCustomStagingArea/RecommendedTags/styles.css b/src/components/Editor/TagCustomStagingArea/RecommendedTags/styles.css
index ae5005f62d..96c8bb51b6 100644
--- a/src/components/Editor/TagCustomStagingArea/RecommendedTags/styles.css
+++ b/src/components/Editor/TagCustomStagingArea/RecommendedTags/styles.css
@@ -4,7 +4,8 @@
 }
 
 .hint {
-  font-size: var(--font-size-xs);
+  font-size: var(--font-size-sm-s);
+  line-height: 1.125rem;
   color: var(--color-grey);
 }
 
@@ -15,5 +16,6 @@
     display: inline-block;
     margin-right: var(--spacing-tight);
     margin-bottom: var(--spacing-base);
+    line-height: 1.25rem;
   }
 }

From c18e7b10a1268d5306f526ad5ddde6da6e3a2b34 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:25:11 +0800
Subject: [PATCH 11/92] feat(Tag): add <IconClose16 /> & revise <Tag />

---
 public/static/icons/16px/close.svg  |  3 +++
 src/components/Icon/IconClose16.tsx |  5 +++++
 src/components/Icon/index.tsx       |  1 +
 src/components/Tag/index.tsx        | 25 +++++++------------------
 src/components/Tag/styles.css       | 21 ++++++++++-----------
 5 files changed, 26 insertions(+), 29 deletions(-)
 create mode 100644 public/static/icons/16px/close.svg
 create mode 100644 src/components/Icon/IconClose16.tsx

diff --git a/public/static/icons/16px/close.svg b/public/static/icons/16px/close.svg
new file mode 100644
index 0000000000..e7eac7fe5e
--- /dev/null
+++ b/public/static/icons/16px/close.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.06063 8L12.2656 4.795L12.9266 4.13406C13.0241 4.03656 13.0241 3.87813 12.9266 3.78063L12.2194 3.07344C12.1219 2.97594 11.9634 2.97594 11.8659 3.07344L8 6.93937L4.13406 3.07312C4.03656 2.97563 3.87812 2.97563 3.78062 3.07312L3.07312 3.78031C2.97563 3.87781 2.97563 4.03625 3.07312 4.13375L6.93937 8L3.07312 11.8659C2.97563 11.9634 2.97563 12.1219 3.07312 12.2194L3.78031 12.9266C3.87781 13.0241 4.03625 13.0241 4.13375 12.9266L8 9.06063L11.205 12.2656L11.8659 12.9266C11.9634 13.0241 12.1219 13.0241 12.2194 12.9266L12.9266 12.2194C13.0241 12.1219 13.0241 11.9634 12.9266 11.8659L9.06063 8Z" fill="currentColor"/>
+</svg>
diff --git a/src/components/Icon/IconClose16.tsx b/src/components/Icon/IconClose16.tsx
new file mode 100644
index 0000000000..7f27aa2a3a
--- /dev/null
+++ b/src/components/Icon/IconClose16.tsx
@@ -0,0 +1,5 @@
+import { ReactComponent as Icon } from '@/public/static/icons/16px/close.svg'
+
+import { withIcon } from './withIcon'
+
+export const IconClose16 = withIcon(Icon)
diff --git a/src/components/Icon/index.tsx b/src/components/Icon/index.tsx
index 67d559a2fc..a258a9825b 100644
--- a/src/components/Icon/index.tsx
+++ b/src/components/Icon/index.tsx
@@ -47,6 +47,7 @@ export * from './IconCircle24'
 export * from './IconClap16'
 export * from './IconClap24'
 export * from './IconClear16'
+export * from './IconClose16'
 export * from './IconClose32'
 export * from './IconCollapse16'
 export * from './IconCollection24'
diff --git a/src/components/Tag/index.tsx b/src/components/Tag/index.tsx
index e0520903e9..61b88198ee 100644
--- a/src/components/Tag/index.tsx
+++ b/src/components/Tag/index.tsx
@@ -3,13 +3,7 @@ import gql from 'graphql-tag'
 import Link from 'next/link'
 
 import { clampTagLength, toPath } from '~/common/utils'
-import {
-  IconClear16,
-  IconHashTag16,
-  IconProps,
-  TextIcon,
-  TextIconProps,
-} from '~/components'
+import { IconClose16, IconProps, TextIcon, TextIconProps } from '~/components'
 import { DigestTagFragment } from '~/gql/graphql'
 
 import styles from './styles.css'
@@ -113,9 +107,9 @@ export const Tag = ({
         color: active ? 'green' : 'grey',
       }
       textIconProps = {
-        size: 'sm',
-        weight: 'md',
-        spacing: 0,
+        size: 'sm-s',
+        weight: 'normal',
+        spacing: 'xxtight',
         color: active ? 'white' : 'grey-darker',
       }
       break
@@ -141,13 +135,8 @@ export const Tag = ({
 
   const Inner = () => (
     <>
-      <TextIcon
-        icon={<IconHashTag16 {...iconProps} />}
-        {...textIconProps}
-        size={textIconProps.size}
-        allowUserSelect
-      >
-        <span className="name">{tagName}</span>
+      <TextIcon {...textIconProps} size={textIconProps.size} allowUserSelect>
+        <span className="name">#&nbsp;{tagName}</span>
       </TextIcon>
 
       {hasClose && (
@@ -157,7 +146,7 @@ export const Tag = ({
             removeTag?.(tag)
           }}
         >
-          <IconClear16 color="grey" />
+          <IconClose16 color="grey" />
         </button>
       )}
 
diff --git a/src/components/Tag/styles.css b/src/components/Tag/styles.css
index a0cc418f0d..f54ec7fd1e 100644
--- a/src/components/Tag/styles.css
+++ b/src/components/Tag/styles.css
@@ -42,11 +42,17 @@
 .inline {
   display: inline-flex;
   align-items: center;
-  height: 1.5rem;
-  padding: 0 var(--spacing-tight) 0 var(--spacing-x-tight);
-  line-height: 1.5rem;
+  height: 1.25rem;
+  padding: 0 var(--spacing-x-tight) 0 var(--spacing-x-tight);
+  line-height: 1.25rem;
   background: var(--color-grey-lighter);
-  border-radius: 2rem;
+  border-radius: 1.25rem;
+
+  &.disabled {
+    & .name {
+      color: var(--color-grey);
+    }
+  }
 
   & .name {
     color: var(--color-black);
@@ -58,13 +64,6 @@
     margin-left: 3px;
   }
 
-  &:not(.disabled) {
-    &:hover,
-    &:focus {
-      background: var(--color-green-lighter);
-    }
-  }
-
   &.clickable {
     cursor: pointer;
   }

From c3184c5999c36e076887764afa947471abb599a2 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:27:25 +0800
Subject: [PATCH 12/92] feat(SearchSelect): revise <SearchingArea /> &
 <SearchInput />

---
 .../SearchingArea/SearchInput/index.tsx       | 25 +++++++++++--------
 .../SearchingArea/SearchInput/styles.css      |  5 +++-
 .../SearchSelect/SearchingArea/index.tsx      | 14 ++++++++---
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/components/SearchSelect/SearchingArea/SearchInput/index.tsx b/src/components/SearchSelect/SearchingArea/SearchInput/index.tsx
index d860b43095..f1551bd707 100644
--- a/src/components/SearchSelect/SearchingArea/SearchInput/index.tsx
+++ b/src/components/SearchSelect/SearchingArea/SearchInput/index.tsx
@@ -8,13 +8,14 @@ import styles from './styles.css'
 
 export type SearchType = 'Article' | 'Tag' | 'User' | 'Invitee'
 
-interface SearchInputProps {
+export interface SearchInputProps {
   type: SearchType
   value: string
   onChange: (value: string) => void
   onSubmit: (value: string) => void
   onFocus: () => void
   onBlur: () => void
+  autoFocus?: boolean
 }
 
 const SearchInput: React.FC<SearchInputProps> = ({
@@ -24,27 +25,28 @@ const SearchInput: React.FC<SearchInputProps> = ({
   onSubmit,
   onFocus,
   onBlur,
+  autoFocus,
 }) => {
   const fieldId = `search-input-${type}`.toLocaleLowerCase()
   const { lang } = useContext(LanguageContext)
   const textAriaLabel = translate({ id: 'search', lang })
   const textPlaceholder = {
     Article: translate({
-      zh_hant: '搜尋作品標題…',
-      zh_hans: '搜索作品标题…',
-      en: 'Search articles...',
+      zh_hant: '搜尋作品標題',
+      zh_hans: '搜索作品标题',
+      en: 'Search articles',
       lang,
     }),
     Tag: translate({
-      zh_hant: '搜尋標籤…',
-      zh_hans: '搜索标签…',
-      en: 'Search tags...',
+      zh_hant: '搜尋標籤',
+      zh_hans: '搜索标签',
+      en: 'Search tags',
       lang,
     }),
     User: translate({
-      zh_hant: '搜尋作者…',
-      zh_hans: '搜索作者…',
-      en: 'Search authors...',
+      zh_hant: '搜尋作者',
+      zh_hans: '搜索作者',
+      en: 'Search authors',
       lang,
     }),
     Invitee: translate({
@@ -72,6 +74,7 @@ const SearchInput: React.FC<SearchInputProps> = ({
           id={fieldId}
           type="search"
           name="q"
+          autoFocus={!!autoFocus}
           value={value}
           aria-label={textAriaLabel}
           placeholder={textPlaceholder[type]}
@@ -91,7 +94,7 @@ const SearchInput: React.FC<SearchInputProps> = ({
           type="submit"
           aria-label={translate({ id: 'search', lang })}
         >
-          <IconSearch16 color="grey" />
+          <IconSearch16 color="green" />
         </button>
 
         {value && (
diff --git a/src/components/SearchSelect/SearchingArea/SearchInput/styles.css b/src/components/SearchSelect/SearchingArea/SearchInput/styles.css
index 9cc858cf45..855c5c0435 100644
--- a/src/components/SearchSelect/SearchingArea/SearchInput/styles.css
+++ b/src/components/SearchSelect/SearchingArea/SearchInput/styles.css
@@ -4,6 +4,9 @@
 }
 
 form {
+  @mixin border-top-grey;
+  @mixin border-bottom-grey;
+
   position: relative;
   width: 100%;
   height: var(--search-input-height);
@@ -17,7 +20,7 @@ form {
     padding: 0 calc(var(--search-input-button-width) + var(--spacing-x-tight));
     font-size: var(--font-size-sm);
     color: var(--color-black);
-    background-color: var(--color-grey-lighter);
+    caret-color: var(--color-matters-green);
 
     &::placeholder {
       color: var(--color-grey);
diff --git a/src/components/SearchSelect/SearchingArea/index.tsx b/src/components/SearchSelect/SearchingArea/index.tsx
index 152b61e280..e0d81f8a23 100644
--- a/src/components/SearchSelect/SearchingArea/index.tsx
+++ b/src/components/SearchSelect/SearchingArea/index.tsx
@@ -30,7 +30,10 @@ import styles from '../styles.css'
 import CreateTag from './CreateTag'
 import { LIST_VIEWER_ARTICLES, SELECT_SEARCH } from './gql'
 import InviteEmail from './InviteEmail'
-import SearchInput, { SearchType as SearchInputType } from './SearchInput'
+import SearchInput, {
+  SearchInputProps,
+  SearchType as SearchInputType,
+} from './SearchInput'
 
 /**
  * This is a sub-component of search-and-select, and it will show
@@ -52,7 +55,7 @@ export type SelectUser = NonNullable<
   SelectSearchQuery['search']['edges']
 >[0]['node'] & { __typename: 'User' }
 
-interface SearchingAreaProps {
+type SearchingAreaProps = {
   searchType: SearchType
   searchFilter?: SearchFilter
   searchExclude?: SearchExclude
@@ -64,7 +67,7 @@ interface SearchingAreaProps {
 
   createTag?: boolean
   inviteEmail?: boolean
-}
+} & Pick<SearchInputProps, 'autoFocus'>
 
 type Mode = 'search' | 'list'
 
@@ -80,6 +83,7 @@ const SearchingArea: React.FC<SearchingAreaProps> = ({
 
   createTag,
   inviteEmail,
+  autoFocus,
 }) => {
   const viewer = useContext(ViewerContext)
 
@@ -267,6 +271,7 @@ const SearchingArea: React.FC<SearchingAreaProps> = ({
         onSubmit={search}
         onFocus={onSearchInputFocus}
         onBlur={onSearchInputBlur}
+        autoFocus
       />
 
       {inSearchingArea && (
@@ -274,7 +279,8 @@ const SearchingArea: React.FC<SearchingAreaProps> = ({
           {searching && <Spinner />}
 
           {/* Search */}
-          {isSearchMode &&
+          {searchKey.length > 0 &&
+            isSearchMode &&
             !searching &&
             !hasNodes &&
             !canCreateTag &&

From ac0916a443be241c69c906dd6c0b58b33e12cdc6 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Fri, 24 Mar 2023 13:43:43 +0800
Subject: [PATCH 13/92] fix(SearchSelect): fix search input tap backspace bug

---
 src/components/SearchSelect/SearchingArea/index.tsx | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/components/SearchSelect/SearchingArea/index.tsx b/src/components/SearchSelect/SearchingArea/index.tsx
index e0d81f8a23..b66205843b 100644
--- a/src/components/SearchSelect/SearchingArea/index.tsx
+++ b/src/components/SearchSelect/SearchingArea/index.tsx
@@ -182,13 +182,6 @@ const SearchingArea: React.FC<SearchingAreaProps> = ({
       toSearchingArea()
       return
     }
-
-    if (value) {
-      toSearchingArea()
-    } else {
-      toStagingArea()
-      setSearchingNodes([])
-    }
   }
   const onSearchInputFocus = () => {
     if (hasListMode) {

From 7755c1aaa5b9df9849d751cac14d1c900a640245 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Fri, 24 Mar 2023 13:50:22 +0800
Subject: [PATCH 14/92] feat(Editor): add <ArticleCustomStagingArea />

---
 .../ArticleDigest/Dropdown/index.tsx          |  3 +
 .../ConfirmDialog.tsx                         | 57 ++++++++++++++
 .../Editor/ArticleCustomStagingArea/index.tsx | 76 +++++++++++++++++++
 .../ArticleCustomStagingArea/styles.css       | 22 ++++++
 4 files changed, 158 insertions(+)
 create mode 100644 src/components/Editor/ArticleCustomStagingArea/ConfirmDialog.tsx
 create mode 100644 src/components/Editor/ArticleCustomStagingArea/index.tsx
 create mode 100644 src/components/Editor/ArticleCustomStagingArea/styles.css

diff --git a/src/components/ArticleDigest/Dropdown/index.tsx b/src/components/ArticleDigest/Dropdown/index.tsx
index 6be9a6c794..361c475d31 100644
--- a/src/components/ArticleDigest/Dropdown/index.tsx
+++ b/src/components/ArticleDigest/Dropdown/index.tsx
@@ -15,6 +15,7 @@ export type ArticleDigestDropdownProps = {
   titleTextSize?: ArticleDigestTitleTextSize
   disabled?: boolean
   extraButton?: React.ReactNode
+  lineClamp?: boolean
 } & Pick<
   CardProps,
   'spacing' | 'bgColor' | 'bgActiveColor' | 'borderRadius' | 'onClick'
@@ -47,6 +48,7 @@ export const ArticleDigestDropdown = ({
   titleTextSize,
   disabled,
   extraButton,
+  lineClamp,
 
   // Card Props
   ...cardProps
@@ -72,6 +74,7 @@ export const ArticleDigestDropdown = ({
             textSize={titleTextSize}
             disabled={cardDisabled}
             is="h3"
+            lineClamp={lineClamp}
           />
 
           <section className="extra-button">{!isBanned && extraButton}</section>
diff --git a/src/components/Editor/ArticleCustomStagingArea/ConfirmDialog.tsx b/src/components/Editor/ArticleCustomStagingArea/ConfirmDialog.tsx
new file mode 100644
index 0000000000..b0a0e56605
--- /dev/null
+++ b/src/components/Editor/ArticleCustomStagingArea/ConfirmDialog.tsx
@@ -0,0 +1,57 @@
+import { Dialog, Translate, useDialogSwitch } from '~/components'
+
+interface ConfirmDialogProps {
+  removeArticle: () => void
+  children: ({ openDialog }: { openDialog: () => void }) => React.ReactNode
+}
+
+const ConfirmDialog = ({ removeArticle, children }: ConfirmDialogProps) => {
+  const { show, openDialog, closeDialog } = useDialogSwitch(true)
+
+  return (
+    <>
+      {children({ openDialog })}
+
+      <Dialog isOpen={show} onDismiss={closeDialog} size="sm">
+        <Dialog.Header
+          title={
+            <Translate
+              en="Are you sure to delete?"
+              zh_hans="确认删除"
+              zh_hant="確認刪除"
+            />
+          }
+          closeDialog={closeDialog}
+          mode="inner"
+        />
+
+        <Dialog.Footer>
+          <Dialog.Footer.Button
+            bgColor="red"
+            onClick={() => {
+              removeArticle()
+            }}
+          >
+            <Translate id="delete" />
+          </Dialog.Footer.Button>
+
+          <Dialog.Footer.Button
+            bgColor="grey-lighter"
+            textColor="black"
+            onClick={closeDialog}
+          >
+            <Translate id="cancel" />
+          </Dialog.Footer.Button>
+        </Dialog.Footer>
+      </Dialog>
+    </>
+  )
+}
+
+const LazyConfirmDialog = (props: ConfirmDialogProps) => (
+  <Dialog.Lazy mounted={<ConfirmDialog {...props} />}>
+    {({ openDialog }) => <>{props.children({ openDialog })}</>}
+  </Dialog.Lazy>
+)
+
+export default LazyConfirmDialog
diff --git a/src/components/Editor/ArticleCustomStagingArea/index.tsx b/src/components/Editor/ArticleCustomStagingArea/index.tsx
new file mode 100644
index 0000000000..1c18a3b68f
--- /dev/null
+++ b/src/components/Editor/ArticleCustomStagingArea/index.tsx
@@ -0,0 +1,76 @@
+import {
+  ArticleDigestDropdown,
+  Button,
+  IconClose16,
+  Translate,
+} from '~/components'
+import { SelectArticle } from '~/components/SearchSelect/SearchingArea'
+import { CustomStagingAreaProps } from '~/components/SearchSelect/StagingArea'
+
+import ConfirmDialog from './ConfirmDialog'
+import styles from './styles.css'
+
+const ArticleCustomStagingArea = ({
+  nodes: articles,
+  setNodes: setArticles,
+  hint,
+}: CustomStagingAreaProps) => {
+  const removeArticle = (article: SelectArticle) => {
+    const newArticles = articles.filter((a) => a.node.id !== article.id)
+    setArticles(newArticles)
+  }
+
+  const hasArticles = articles.length > 0
+
+  if (!hasArticles) {
+    return (
+      <section className="customArticleArea">
+        <section className="hint">
+          <Translate id={hint} />
+        </section>
+
+        <style jsx>{styles}</style>
+      </section>
+    )
+  }
+
+  return (
+    <section className="customArticleArea">
+      <p className="hint">
+        <Translate en="Collected" zh_hans="已关联" zh_hant="已關聯" />
+      </p>
+
+      <ul className="nodes">
+        {articles.map(
+          ({ node }) =>
+            node.__typename === 'Article' && (
+              <li key={node.id} className="node">
+                <ArticleDigestDropdown
+                  article={node}
+                  titleTextSize="md"
+                  spacing={[0, 0]}
+                  bgColor="none"
+                  lineClamp={false}
+                  disabled
+                />
+                <ConfirmDialog
+                  removeArticle={() => {
+                    removeArticle(node as SelectArticle)
+                  }}
+                >
+                  {({ openDialog }) => (
+                    <Button onClick={openDialog}>
+                      <IconClose16 size="md-s" color="grey" />
+                    </Button>
+                  )}
+                </ConfirmDialog>
+              </li>
+            )
+        )}
+      </ul>
+      <style jsx> {styles}</style>
+    </section>
+  )
+}
+
+export default ArticleCustomStagingArea
diff --git a/src/components/Editor/ArticleCustomStagingArea/styles.css b/src/components/Editor/ArticleCustomStagingArea/styles.css
new file mode 100644
index 0000000000..d0ce88e353
--- /dev/null
+++ b/src/components/Editor/ArticleCustomStagingArea/styles.css
@@ -0,0 +1,22 @@
+.customArticleArea {
+  padding: var(--spacing-base);
+
+  & .hint {
+    padding-bottom: var(--spacing-base);
+    font-size: var(--font-size-sm-s);
+    line-height: 1.125rem;
+    color: var(--color-grey);
+  }
+
+  & .node {
+    @mixin flex-start-space-between;
+
+    & :global(section) {
+      width: calc(100% - 1.5rem);
+    }
+  }
+
+  & .node + .node {
+    margin-top: var(--spacing-loose);
+  }
+}

From 1df489f32ffdbbacce374360e6f2f52a485c04f0 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Fri, 24 Mar 2023 13:53:40 +0800
Subject: [PATCH 15/92] feat(EditorSearchSelectForm): add searchType.Article

---
 .../Forms/EditorSearchSelectForm/index.tsx    | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/components/Forms/EditorSearchSelectForm/index.tsx b/src/components/Forms/EditorSearchSelectForm/index.tsx
index 2d496856ca..7911342d37 100644
--- a/src/components/Forms/EditorSearchSelectForm/index.tsx
+++ b/src/components/Forms/EditorSearchSelectForm/index.tsx
@@ -1,6 +1,10 @@
 import { useEffect, useState } from 'react'
 
-import { MAX_ARTICLE_TAG_LENGTH, TextId } from '~/common/enums'
+import {
+  MAX_ARTICLE_COLLECT_LENGTH,
+  MAX_ARTICLE_TAG_LENGTH,
+  TextId,
+} from '~/common/enums'
 import { Button, Dialog, IconAdd16, TextIcon, Translate } from '~/components'
 import SearchingArea, {
   SearchType,
@@ -104,7 +108,12 @@ const EditorSearchSelectForm = ({
     toStagingArea()
   }
 
-  const enableAdd = stagingNodes.length < MAX_ARTICLE_TAG_LENGTH
+  const maxNodesLength =
+    searchType === 'Article'
+      ? MAX_ARTICLE_COLLECT_LENGTH
+      : MAX_ARTICLE_TAG_LENGTH
+
+  const enableAdd = stagingNodes.length < maxNodesLength
 
   const onClickSave = async () => {
     await onSave(
@@ -137,10 +146,17 @@ const EditorSearchSelectForm = ({
               color={enableAdd ? 'green' : 'grey'}
               size="md"
             >
-              <Translate en="Add Tag" zh_hans="添加标签" zh_hant="添加標籤" />
+              {searchType === 'Tag' && (
+                <Translate en="Add Tag" zh_hans="添加标签" zh_hant="添加標籤" />
+              )}
+              {searchType === 'Article' && (
+                <Translate en="Add" zh_hans="关联作品" zh_hant="關聯作品" />
+              )}
             </TextIcon>
           </Button>
-          <span className="number">（{stagingNodes.length}/3）</span>
+          <span className="number">
+            （{stagingNodes.length}/{maxNodesLength}）
+          </span>
         </section>
       )}
 

From 009c1bb3302bddc909e65c72f7538b984a1d12e2 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Fri, 24 Mar 2023 13:55:48 +0800
Subject: [PATCH 16/92] feat(Editor): revise <BottomBar>

---
 src/components/Editor/BottomBar/index.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/Editor/BottomBar/index.tsx b/src/components/Editor/BottomBar/index.tsx
index c90eb48f36..b9df5c0e70 100644
--- a/src/components/Editor/BottomBar/index.tsx
+++ b/src/components/Editor/BottomBar/index.tsx
@@ -3,6 +3,7 @@ import { useContext } from 'react'
 
 import { translate } from '~/common/utils'
 import {
+  EditorSearchSelectDialog,
   IconCollection24,
   IconHashTag24,
   IconImage24,
@@ -12,7 +13,6 @@ import {
   TextIcon,
   Translate,
 } from '~/components'
-import { SearchSelectDialog } from '~/components/Dialogs/SearchSelectDialog'
 import {
   SetCollectionProps,
   SetCoverProps,
@@ -28,6 +28,7 @@ import {
   SearchExclude,
 } from '~/gql/graphql'
 
+import ArticleCustomStagingArea from '../ArticleCustomStagingArea'
 import SetCover from '../SetCover'
 import TagCustomStagingArea from '../TagCustomStagingArea'
 import AccessDialog from './AccessDialog'
@@ -151,7 +152,7 @@ const BottomBar: React.FC<BottomBarProps> = ({
             </SetCover.Dialog>
 
             {/* Tags */}
-            <SearchSelectDialog
+            <EditorSearchSelectDialog
               title="addTag"
               hint="hintAddTag"
               searchType="Tag"
@@ -179,10 +180,10 @@ const BottomBar: React.FC<BottomBarProps> = ({
                   </TextIcon>
                 </button>
               )}
-            </SearchSelectDialog>
+            </EditorSearchSelectDialog>
 
             {/* Collection */}
-            <SearchSelectDialog
+            <EditorSearchSelectDialog
               title="collectArticle"
               hint="hintEditCollection"
               searchType="Article"
@@ -192,6 +193,7 @@ const BottomBar: React.FC<BottomBarProps> = ({
               }
               nodes={collection}
               saving={collectionSaving}
+              CustomStagingArea={ArticleCustomStagingArea}
             >
               {({ openDialog }) => (
                 <button
@@ -209,7 +211,7 @@ const BottomBar: React.FC<BottomBarProps> = ({
                   </TextIcon>
                 </button>
               )}
-            </SearchSelectDialog>
+            </EditorSearchSelectDialog>
 
             {/* Circle & License & Support Feedback & ISCN & canComment */}
             <AccessDialog {...accessProps}>

From abca95cf7dfc6c52ff4caeda7ef002699a89b044 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Fri, 24 Mar 2023 13:58:08 +0800
Subject: [PATCH 17/92] feat(SearchSelect): revise StagingArea

---
 src/components/SearchSelect/StagingArea/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/SearchSelect/StagingArea/index.tsx b/src/components/SearchSelect/StagingArea/index.tsx
index bdaa1f2d34..8dc744f570 100644
--- a/src/components/SearchSelect/StagingArea/index.tsx
+++ b/src/components/SearchSelect/StagingArea/index.tsx
@@ -69,6 +69,7 @@ const StagingArea: React.FC<StagingAreaProps> = ({
     return (
       <section className="area">
         <CustomStagingArea nodes={nodes} setNodes={setNodes} hint={hint} />
+        <style jsx>{areaStyles}</style>
       </section>
     )
   }

From 60c4bc4bf9f377758ad7dad268adfdbfae429c9e Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Fri, 24 Mar 2023 13:59:39 +0800
Subject: [PATCH 18/92] feat(Editor): revise SelectedTags list style

---
 .../Editor/TagCustomStagingArea/SelectedTags/styles.css         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Editor/TagCustomStagingArea/SelectedTags/styles.css b/src/components/Editor/TagCustomStagingArea/SelectedTags/styles.css
index 68b67e9cb0..5d4aeb2ce7 100644
--- a/src/components/Editor/TagCustomStagingArea/SelectedTags/styles.css
+++ b/src/components/Editor/TagCustomStagingArea/SelectedTags/styles.css
@@ -4,11 +4,11 @@
 }
 
 .tagList {
-  margin-top: var(--spacing-base);
   line-height: 1;
 
   & li {
     display: inline-block;
+    margin-top: var(--spacing-base);
     margin-right: var(--spacing-tight);
   }
 }

From 447a1dbb2d4ec641300e6d053cb7a9d5ee3ea5b4 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Fri, 24 Mar 2023 14:01:09 +0800
Subject: [PATCH 19/92] feat(Editor): update <Sidebar.Collection >

---
 src/components/Editor/Sidebar/Collection/index.tsx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/Editor/Sidebar/Collection/index.tsx b/src/components/Editor/Sidebar/Collection/index.tsx
index 94ae9189cc..7664052228 100644
--- a/src/components/Editor/Sidebar/Collection/index.tsx
+++ b/src/components/Editor/Sidebar/Collection/index.tsx
@@ -1,5 +1,8 @@
-import { ArticleDigestDropdown, IconCollection24 } from '~/components'
-import { SearchSelectDialog } from '~/components/Dialogs/SearchSelectDialog'
+import {
+  ArticleDigestDropdown,
+  EditorSearchSelectDialog,
+  IconCollection24,
+} from '~/components'
 import { SetCollectionProps } from '~/components/Editor'
 import { SearchSelectNode } from '~/components/Forms/SearchSelectForm'
 import {
@@ -7,6 +10,7 @@ import {
   SearchExclude,
 } from '~/gql/graphql'
 
+import ArticleCustomStagingArea from '../../ArticleCustomStagingArea'
 import Box from '../Box'
 import styles from './styles.css'
 
@@ -21,7 +25,7 @@ const SidebarCollection = ({
   disabled,
 }: SidebarCollectionProps) => {
   return (
-    <SearchSelectDialog
+    <EditorSearchSelectDialog
       title="collectArticle"
       hint="hintEditCollection"
       searchType="Article"
@@ -31,6 +35,7 @@ const SidebarCollection = ({
       }
       nodes={collection}
       saving={collectionSaving}
+      CustomStagingArea={ArticleCustomStagingArea}
     >
       {({ openDialog }) => (
         <Box
@@ -58,7 +63,7 @@ const SidebarCollection = ({
           )}
         </Box>
       )}
-    </SearchSelectDialog>
+    </EditorSearchSelectDialog>
   )
 }
 

From ed13a0b7aa647c7224268e12be1e233052699da3 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Fri, 24 Mar 2023 16:30:48 +0800
Subject: [PATCH 20/92] feat(Editor): revise ArticleCustomStagingArea style

---
 src/components/Editor/ArticleCustomStagingArea/index.tsx  | 2 +-
 src/components/Editor/ArticleCustomStagingArea/styles.css | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/Editor/ArticleCustomStagingArea/index.tsx b/src/components/Editor/ArticleCustomStagingArea/index.tsx
index 1c18a3b68f..47997792ae 100644
--- a/src/components/Editor/ArticleCustomStagingArea/index.tsx
+++ b/src/components/Editor/ArticleCustomStagingArea/index.tsx
@@ -25,7 +25,7 @@ const ArticleCustomStagingArea = ({
   if (!hasArticles) {
     return (
       <section className="customArticleArea">
-        <section className="hint">
+        <section className="hint emptyHint">
           <Translate id={hint} />
         </section>
 
diff --git a/src/components/Editor/ArticleCustomStagingArea/styles.css b/src/components/Editor/ArticleCustomStagingArea/styles.css
index d0ce88e353..517b7411b3 100644
--- a/src/components/Editor/ArticleCustomStagingArea/styles.css
+++ b/src/components/Editor/ArticleCustomStagingArea/styles.css
@@ -8,6 +8,10 @@
     color: var(--color-grey);
   }
 
+  & .emptyHint {
+    text-align: center;
+  }
+
   & .node {
     @mixin flex-start-space-between;
 

From 972439644f16660c70e5c99133b2b0abf570d636 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Fri, 24 Mar 2023 16:33:25 +0800
Subject: [PATCH 21/92] feat(EditorSearchSelectForm): revise styles and copy

---
 src/components/Forms/EditorSearchSelectForm/index.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/Forms/EditorSearchSelectForm/index.tsx b/src/components/Forms/EditorSearchSelectForm/index.tsx
index 7911342d37..97331501ee 100644
--- a/src/components/Forms/EditorSearchSelectForm/index.tsx
+++ b/src/components/Forms/EditorSearchSelectForm/index.tsx
@@ -142,12 +142,13 @@ const EditorSearchSelectForm = ({
         <section className="stagingHeadArea">
           <Button onClick={toSearchingArea} disabled={!enableAdd}>
             <TextIcon
-              icon={<IconAdd16 />}
+              icon={<IconAdd16 size="md-s" />}
               color={enableAdd ? 'green' : 'grey'}
-              size="md"
+              size="md-s"
+              spacing="xtight"
             >
               {searchType === 'Tag' && (
-                <Translate en="Add Tag" zh_hans="添加标签" zh_hant="添加標籤" />
+                <Translate en="Add tag" zh_hans="添加标签" zh_hant="添加標籤" />
               )}
               {searchType === 'Article' && (
                 <Translate en="Add" zh_hans="关联作品" zh_hant="關聯作品" />

From b5eb09a5f71cdb66b1f130e0640257ba6f4ccb36 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Mon, 27 Mar 2023 10:42:27 +0800
Subject: [PATCH 22/92] feat(Editor): the entire area of staging header is
 clickable

---
 .../Forms/EditorSearchSelectForm/index.tsx    | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/components/Forms/EditorSearchSelectForm/index.tsx b/src/components/Forms/EditorSearchSelectForm/index.tsx
index 97331501ee..e54c0f2f9a 100644
--- a/src/components/Forms/EditorSearchSelectForm/index.tsx
+++ b/src/components/Forms/EditorSearchSelectForm/index.tsx
@@ -5,7 +5,7 @@ import {
   MAX_ARTICLE_TAG_LENGTH,
   TextId,
 } from '~/common/enums'
-import { Button, Dialog, IconAdd16, TextIcon, Translate } from '~/components'
+import { Dialog, IconAdd16, TextIcon, Translate } from '~/components'
 import SearchingArea, {
   SearchType,
   SelectNode,
@@ -139,26 +139,28 @@ const EditorSearchSelectForm = ({
       />
 
       {inStagingArea && (
-        <section className="stagingHeadArea">
-          <Button onClick={toSearchingArea} disabled={!enableAdd}>
-            <TextIcon
-              icon={<IconAdd16 size="md-s" />}
-              color={enableAdd ? 'green' : 'grey'}
-              size="md-s"
-              spacing="xtight"
-            >
-              {searchType === 'Tag' && (
-                <Translate en="Add tag" zh_hans="添加标签" zh_hant="添加標籤" />
-              )}
-              {searchType === 'Article' && (
-                <Translate en="Add" zh_hans="关联作品" zh_hant="關聯作品" />
-              )}
-            </TextIcon>
-          </Button>
+        <button
+          className="stagingHeadArea"
+          onClick={toSearchingArea}
+          disabled={!enableAdd}
+        >
+          <TextIcon
+            icon={<IconAdd16 size="md-s" />}
+            color={enableAdd ? 'green' : 'grey'}
+            size="md-s"
+            spacing="xtight"
+          >
+            {searchType === 'Tag' && (
+              <Translate en="Add tag" zh_hans="添加标签" zh_hant="添加標籤" />
+            )}
+            {searchType === 'Article' && (
+              <Translate en="Add" zh_hans="关联作品" zh_hant="關聯作品" />
+            )}
+          </TextIcon>
           <span className="number">
             （{stagingNodes.length}/{maxNodesLength}）
           </span>
-        </section>
+        </button>
       )}
 
       {inSearchingArea && (

From ab25a4738ebd851c61c00cf45f820d94ce7c04a6 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Mon, 27 Mar 2023 12:45:24 +0800
Subject: [PATCH 23/92] feat(Editor): sync staging nodes

---
 .../EditorSearchSelectDialog/index.tsx        |  1 -
 .../Forms/EditorSearchSelectForm/index.tsx    | 28 +++++++++++--------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/components/Dialogs/EditorSearchSelectDialog/index.tsx b/src/components/Dialogs/EditorSearchSelectDialog/index.tsx
index a122a66632..c82ede9e6e 100644
--- a/src/components/Dialogs/EditorSearchSelectDialog/index.tsx
+++ b/src/components/Dialogs/EditorSearchSelectDialog/index.tsx
@@ -32,7 +32,6 @@ const BaseSearchSelectDialog = ({
           {...props}
           onSave={async (nodes: SelectNode[]) => {
             await props.onSave(nodes)
-            closeDialog()
           }}
           closeDialog={closeDialog}
         />
diff --git a/src/components/Forms/EditorSearchSelectForm/index.tsx b/src/components/Forms/EditorSearchSelectForm/index.tsx
index e54c0f2f9a..68dfba80da 100644
--- a/src/components/Forms/EditorSearchSelectForm/index.tsx
+++ b/src/components/Forms/EditorSearchSelectForm/index.tsx
@@ -99,15 +99,25 @@ const EditorSearchSelectForm = ({
   // data
   const [stagingNodes, setStagingNodes] =
     useState<StagingNode[]>(initStagingNodes)
-  const addNodeToStaging = (node: SelectNode) => {
+  const addNodeToStaging = async (node: SelectNode) => {
     setStagingNodes([
       ...stagingNodes.filter(({ node: n }) => n.id !== node.id),
       { node, selected: true },
     ])
-
+    await onSave([
+      ...stagingNodes
+        .filter(({ node: n }) => n.id !== node.id)
+        .map(({ node }) => node),
+      node,
+    ])
     toStagingArea()
   }
 
+  const syncStagingNodes = async (nodes: StagingNode[]) => {
+    setStagingNodes(nodes)
+    await onSave(nodes.map(({ node }) => node))
+  }
+
   const maxNodesLength =
     searchType === 'Article'
       ? MAX_ARTICLE_COLLECT_LENGTH
@@ -115,24 +125,18 @@ const EditorSearchSelectForm = ({
 
   const enableAdd = stagingNodes.length < maxNodesLength
 
-  const onClickSave = async () => {
-    await onSave(
-      stagingNodes.filter(({ selected }) => !!selected).map(({ node }) => node)
-    )
-  }
-
   return (
     <>
       <Dialog.Header
         title={title}
         closeDialog={closeDialog}
         closeTextId="close"
-        leftButton={headerLeftButton}
+        leftButton={<></>}
         rightButton={
           <Dialog.Header.RightButton
-            onClick={onClickSave}
+            onClick={closeDialog}
             // disabled={stagingNodes.length <= 0}
-            text={headerRightButtonText || <Translate id="save" />}
+            text={headerRightButtonText || <Translate id="done" />}
             loading={saving}
           />
         }
@@ -180,7 +184,7 @@ const EditorSearchSelectForm = ({
       {inStagingArea && (
         <StagingArea
           nodes={stagingNodes}
-          setNodes={setStagingNodes}
+          setNodes={syncStagingNodes}
           hint={hint}
           inStagingArea={inStagingArea}
           draggable={draggable}

From fba8ee5b6bd751f0e2ff2673dacd59c9283b6b96 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Mon, 27 Mar 2023 21:27:24 +0700
Subject: [PATCH 24/92] feat(form): disable validateOnBlur

---
 lang/default.json                                 |  8 ++++----
 lang/en.json                                      |  2 +-
 src/components/Dialogs/HelpDialog/index.tsx       | 15 ++++++++++++---
 .../SetPaymentPointerForm.tsx                     |  1 +
 src/components/Dialogs/TagDialog/Content.tsx      |  1 +
 .../ToggleAccess/SupportSettingDialog/Content.tsx |  1 +
 src/components/Forms/ChangeEmailForm/Confirm.tsx  |  1 +
 src/components/Forms/ChangeEmailForm/Request.tsx  |  1 +
 .../Forms/ChangePasswordForm/Confirm.tsx          |  1 +
 .../Forms/ChangePasswordForm/Request.tsx          |  1 +
 .../Forms/ChangeUserNameForm/Confirm.tsx          |  1 +
 src/components/Forms/CreateCircleForm/Init.tsx    |  1 +
 src/components/Forms/CreateCircleForm/Profile.tsx |  1 +
 src/components/Forms/EmailLoginForm/index.tsx     |  1 +
 src/components/Forms/EmailSignUpForm/Init.tsx     |  3 ++-
 src/components/Forms/EmailSignUpForm/Password.tsx |  1 +
 .../Forms/PaymentForm/AddCredit/index.tsx         |  1 +
 .../Forms/PaymentForm/PayTo/Confirm/index.tsx     |  1 +
 .../Forms/PaymentForm/PayTo/SetAmount/index.tsx   |  1 +
 .../Forms/PaymentForm/Payout/Confirm.tsx          |  1 +
 .../Forms/PaymentForm/ResetPassword/Confirm.tsx   |  1 +
 .../Forms/PaymentForm/ResetPassword/Request.tsx   |  1 +
 .../Forms/PaymentForm/SetPassword/index.tsx       |  1 +
 .../SubscribeCircle/PasswordPayment.tsx           |  1 +
 src/components/Forms/WalletAuthForm/Connect.tsx   |  1 +
 .../DropdownActions/EditProfileDialog/Content.tsx |  1 +
 26 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/lang/default.json b/lang/default.json
index ad3125a28d..a1501e2046 100644
--- a/lang/default.json
+++ b/lang/default.json
@@ -951,10 +951,6 @@
     "defaultMessage": "Topics",
     "description": ""
   },
-  "l5vWO8": {
-    "defaultMessage": "Your Matters display name, can be changed later",
-    "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
-  },
   "lD4FPZ": {
     "defaultMessage": "Enter Email",
     "description": ""
@@ -967,6 +963,10 @@
     "defaultMessage": "You have not invited anyone yet! Invite friends to join your circle by clicking 'invite friends'.",
     "description": "src/views/Circle/Settings/ManageInvitation/Invites/Pending/index.tsx"
   },
+  "ldNgRA": {
+    "defaultMessage": "Display name, can be changed later",
+    "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
+  },
   "lhaIoi": {
     "defaultMessage": "Enter Display Name",
     "description": ""
diff --git a/lang/en.json b/lang/en.json
index fda640be9f..6fc7ed886a 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -96,7 +96,7 @@
     "description": ""
   },
   "l5vWO8": {
-    "defaultMessage": "Your Matters display name, can be changed later",
+    "defaultMessage": "Display name, can be changed later",
     "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
   },
   "5sg7KC": {
diff --git a/src/components/Dialogs/HelpDialog/index.tsx b/src/components/Dialogs/HelpDialog/index.tsx
index 8e9ea7a741..31ff86a96c 100644
--- a/src/components/Dialogs/HelpDialog/index.tsx
+++ b/src/components/Dialogs/HelpDialog/index.tsx
@@ -23,11 +23,17 @@ const ReadTime = () => (
   <>
     <h2 className="title">
       <TextIcon icon={<IconReadTimeTotal16 size="md" />} weight="md">
-        <FormattedMessage defaultMessage="Accumulated Read Time" description="src/components/Dialogs/HelpDialog/index.tsx" />
+        <FormattedMessage
+          defaultMessage="Accumulated Read Time"
+          description="src/components/Dialogs/HelpDialog/index.tsx"
+        />
       </TextIcon>
     </h2>
     <p className="description">
-      <FormattedMessage defaultMessage="Accumulated read time indicates the total time length that registered users read." description="src/components/Dialogs/HelpDialog/index.tsx" />
+      <FormattedMessage
+        defaultMessage="Accumulated read time indicates the total time length that registered users read."
+        description="src/components/Dialogs/HelpDialog/index.tsx"
+      />
     </p>
     <style jsx>{styles}</style>
   </>
@@ -41,7 +47,10 @@ const ReadCount = () => (
       </TextIcon>
     </h2>
     <p className="description">
-      <FormattedMessage defaultMessage="Read counts indicates how many registered users read." description="src/components/Dialogs/HelpDialog/index.tsx" />
+      <FormattedMessage
+        defaultMessage="Read counts indicates how many registered users read."
+        description="src/components/Dialogs/HelpDialog/index.tsx"
+      />
     </p>
     <style jsx>{styles}</style>
   </>
diff --git a/src/components/Dialogs/PaymentPointerDialog/SetPaymentPointerForm.tsx b/src/components/Dialogs/PaymentPointerDialog/SetPaymentPointerForm.tsx
index 5e26342532..4ea0d7e25d 100644
--- a/src/components/Dialogs/PaymentPointerDialog/SetPaymentPointerForm.tsx
+++ b/src/components/Dialogs/PaymentPointerDialog/SetPaymentPointerForm.tsx
@@ -68,6 +68,7 @@ const SetPaymentPointerForm: React.FC<FormProps> = ({
     initialValues: {
       paymentPointer: defaultPaymentPointer,
     },
+    validateOnBlur: false,
     validate: ({ paymentPointer }) =>
       _pickBy({
         paymentPointer: validatePaymentPointer(paymentPointer, lang),
diff --git a/src/components/Dialogs/TagDialog/Content.tsx b/src/components/Dialogs/TagDialog/Content.tsx
index 9caf481859..06a744fba9 100644
--- a/src/components/Dialogs/TagDialog/Content.tsx
+++ b/src/components/Dialogs/TagDialog/Content.tsx
@@ -106,6 +106,7 @@ const TagDialogContent: React.FC<BaseTagDialogContentProps> = ({
       newCover: UNCHANGED_FIELD,
       newDescription: description || '',
     },
+    validateOnBlur: false,
     validate: ({ newContent }) =>
       _pickBy({
         newContent: validateTagName(newContent, lang),
diff --git a/src/components/Editor/ToggleAccess/SupportSettingDialog/Content.tsx b/src/components/Editor/ToggleAccess/SupportSettingDialog/Content.tsx
index 92c534c341..7f798c24fb 100644
--- a/src/components/Editor/ToggleAccess/SupportSettingDialog/Content.tsx
+++ b/src/components/Editor/ToggleAccess/SupportSettingDialog/Content.tsx
@@ -67,6 +67,7 @@ const SupportSettingDialogContent: React.FC<FormProps> = ({
         : '',
       replyToDonator: content?.replyToDonator ? content.replyToDonator : '',
     },
+    validateOnBlur: false,
     validate: ({ requestForDonation, replyToDonator }) =>
       _pickBy({
         requestForDonation: validateSupportWords(requestForDonation!, lang),
diff --git a/src/components/Forms/ChangeEmailForm/Confirm.tsx b/src/components/Forms/ChangeEmailForm/Confirm.tsx
index 621cddd9a5..f89efebfe1 100644
--- a/src/components/Forms/ChangeEmailForm/Confirm.tsx
+++ b/src/components/Forms/ChangeEmailForm/Confirm.tsx
@@ -74,6 +74,7 @@ const Confirm: React.FC<FormProps> = ({
       email: '',
       code: '',
     },
+    validateOnBlur: false,
     validate: ({ email, code }) =>
       _pickBy({
         email: validateEmail(email, lang, { allowPlusSign: false }),
diff --git a/src/components/Forms/ChangeEmailForm/Request.tsx b/src/components/Forms/ChangeEmailForm/Request.tsx
index 65198f9cc7..5ce743da1a 100644
--- a/src/components/Forms/ChangeEmailForm/Request.tsx
+++ b/src/components/Forms/ChangeEmailForm/Request.tsx
@@ -58,6 +58,7 @@ const Request: React.FC<FormProps> = ({
       email: defaultEmail,
       code: '',
     },
+    validateOnBlur: false,
     validate: ({ email, code }) =>
       _pickBy({
         email: validateEmail(email, lang, { allowPlusSign: true }),
diff --git a/src/components/Forms/ChangePasswordForm/Confirm.tsx b/src/components/Forms/ChangePasswordForm/Confirm.tsx
index 7833a5b8eb..ca954a2779 100644
--- a/src/components/Forms/ChangePasswordForm/Confirm.tsx
+++ b/src/components/Forms/ChangePasswordForm/Confirm.tsx
@@ -84,6 +84,7 @@ const Confirm: React.FC<FormProps> = ({
       password: '',
       comparedPassword: '',
     },
+    validateOnBlur: false,
     validate: ({ password, comparedPassword }) =>
       _pickBy({
         password: validatePassword(password, lang),
diff --git a/src/components/Forms/ChangePasswordForm/Request.tsx b/src/components/Forms/ChangePasswordForm/Request.tsx
index fc10e4dc45..07656dd7d5 100644
--- a/src/components/Forms/ChangePasswordForm/Request.tsx
+++ b/src/components/Forms/ChangePasswordForm/Request.tsx
@@ -64,6 +64,7 @@ const Request: React.FC<FormProps> = ({
     initialValues: {
       email: defaultEmail,
     },
+    validateOnBlur: false,
     validate: ({ email }) =>
       _pickBy({
         email: validateEmail(email, lang, { allowPlusSign: true }),
diff --git a/src/components/Forms/ChangeUserNameForm/Confirm.tsx b/src/components/Forms/ChangeUserNameForm/Confirm.tsx
index fdb8676910..e6f01b89a7 100644
--- a/src/components/Forms/ChangeUserNameForm/Confirm.tsx
+++ b/src/components/Forms/ChangeUserNameForm/Confirm.tsx
@@ -67,6 +67,7 @@ const Confirm: React.FC<FormProps> = ({
       userName: '',
       comparedUserName: '',
     },
+    validateOnBlur: false,
     validate: ({ userName, comparedUserName }) =>
       _pickBy({
         userName: validateUserName(userName, lang),
diff --git a/src/components/Forms/CreateCircleForm/Init.tsx b/src/components/Forms/CreateCircleForm/Init.tsx
index 0014881d6c..01eb16aacd 100644
--- a/src/components/Forms/CreateCircleForm/Init.tsx
+++ b/src/components/Forms/CreateCircleForm/Init.tsx
@@ -70,6 +70,7 @@ const Init: React.FC<FormProps> = ({
       displayName: '',
       amount: PAYMENT_MINIMAL_CIRCLE_AMOUNT.HKD,
     },
+    validateOnBlur: false,
     validate: ({ name, displayName, amount }) =>
       _pickBy({
         name: validateCircleName(name, lang),
diff --git a/src/components/Forms/CreateCircleForm/Profile.tsx b/src/components/Forms/CreateCircleForm/Profile.tsx
index dd6ab491a9..ca06e105e0 100644
--- a/src/components/Forms/CreateCircleForm/Profile.tsx
+++ b/src/components/Forms/CreateCircleForm/Profile.tsx
@@ -78,6 +78,7 @@ const Init: React.FC<FormProps> = ({ circle, type, purpose, closeDialog }) => {
       displayName: circle.displayName || '',
       description: circle.description || '',
     },
+    validateOnBlur: false,
     validate: ({ displayName, description }) =>
       _pickBy({
         displayName: !isCreate
diff --git a/src/components/Forms/EmailLoginForm/index.tsx b/src/components/Forms/EmailLoginForm/index.tsx
index 7122f4e758..8694185c88 100644
--- a/src/components/Forms/EmailLoginForm/index.tsx
+++ b/src/components/Forms/EmailLoginForm/index.tsx
@@ -101,6 +101,7 @@ export const EmailLoginForm: React.FC<FormProps> = ({
       email: '',
       password: '',
     },
+    validateOnBlur: false,
     validate: ({ email, password }) =>
       _pickBy({
         email: validateEmail(email, lang, { allowPlusSign: true }),
diff --git a/src/components/Forms/EmailSignUpForm/Init.tsx b/src/components/Forms/EmailSignUpForm/Init.tsx
index f7cfb49969..0d90cf5572 100644
--- a/src/components/Forms/EmailSignUpForm/Init.tsx
+++ b/src/components/Forms/EmailSignUpForm/Init.tsx
@@ -75,6 +75,7 @@ const Init: React.FC<FormProps> = ({
       email: '',
       tos: true,
     },
+    validateOnBlur: false,
     validate: ({ displayName, email, tos }) =>
       _pickBy({
         displayName: validateDisplayName(displayName, lang),
@@ -121,7 +122,7 @@ const Init: React.FC<FormProps> = ({
         name="displayName"
         required
         placeholder={intl.formatMessage({
-          defaultMessage: 'Your Matters display name, can be changed later',
+          defaultMessage: 'Display name, can be changed later',
           description: 'src/components/Forms/EmailSignUpForm/Init.tsx',
         })}
         value={values.displayName}
diff --git a/src/components/Forms/EmailSignUpForm/Password.tsx b/src/components/Forms/EmailSignUpForm/Password.tsx
index be96f6df1c..c6c245fa65 100644
--- a/src/components/Forms/EmailSignUpForm/Password.tsx
+++ b/src/components/Forms/EmailSignUpForm/Password.tsx
@@ -102,6 +102,7 @@ const Password: React.FC<FormProps> = ({
       password: '',
       comparedPassword: '',
     },
+    validateOnBlur: false,
     validate: ({ password, comparedPassword }) =>
       _pickBy({
         password: validatePassword(password, lang),
diff --git a/src/components/Forms/PaymentForm/AddCredit/index.tsx b/src/components/Forms/PaymentForm/AddCredit/index.tsx
index 6622d18e64..1cbb4568fe 100644
--- a/src/components/Forms/PaymentForm/AddCredit/index.tsx
+++ b/src/components/Forms/PaymentForm/AddCredit/index.tsx
@@ -122,6 +122,7 @@ const BaseAddCredit: React.FC<FormProps> = ({
     initialValues: {
       amount: defaultAmount || PAYMENT_DEFAULT_ADD_CREDIT_AMOUNT[currency],
     },
+    validateOnBlur: false,
     validate: ({ amount }) =>
       _pickBy({
         amount: validateAmount(amount, lang),
diff --git a/src/components/Forms/PaymentForm/PayTo/Confirm/index.tsx b/src/components/Forms/PaymentForm/PayTo/Confirm/index.tsx
index 377e4b7bd3..44967fb3d4 100644
--- a/src/components/Forms/PaymentForm/PayTo/Confirm/index.tsx
+++ b/src/components/Forms/PaymentForm/PayTo/Confirm/index.tsx
@@ -111,6 +111,7 @@ const Confirm: React.FC<FormProps> = ({
     initialValues: {
       password: '',
     },
+    validateOnBlur: false,
     validate: ({ password }) =>
       _pickBy({
         password: validatePaymentPassword(password, lang),
diff --git a/src/components/Forms/PaymentForm/PayTo/SetAmount/index.tsx b/src/components/Forms/PaymentForm/PayTo/SetAmount/index.tsx
index f2abb6c4f8..c6c23dc409 100644
--- a/src/components/Forms/PaymentForm/PayTo/SetAmount/index.tsx
+++ b/src/components/Forms/PaymentForm/PayTo/SetAmount/index.tsx
@@ -177,6 +177,7 @@ const SetAmount: React.FC<FormProps> = ({
       amount: AMOUNT_DEFAULT[currency],
       customAmount: 0,
     },
+    validateOnBlur: false,
     validate: ({ amount, customAmount }) =>
       _pickBy({
         amount: validateDonationAmount(customAmount || amount, balance, lang),
diff --git a/src/components/Forms/PaymentForm/Payout/Confirm.tsx b/src/components/Forms/PaymentForm/Payout/Confirm.tsx
index 095697f48f..15afcf34f9 100644
--- a/src/components/Forms/PaymentForm/Payout/Confirm.tsx
+++ b/src/components/Forms/PaymentForm/Payout/Confirm.tsx
@@ -76,6 +76,7 @@ const BaseConfirm: React.FC<FormProps> = ({
       amount: PAYMENT_MINIMAL_PAYOUT_AMOUNT.HKD,
       password: '',
     },
+    validateOnBlur: false,
     validate: ({ amount, password }) =>
       _pickBy({
         amount: validatePayoutAmount({
diff --git a/src/components/Forms/PaymentForm/ResetPassword/Confirm.tsx b/src/components/Forms/PaymentForm/ResetPassword/Confirm.tsx
index 55f4ad56a7..2b8a0195a3 100644
--- a/src/components/Forms/PaymentForm/ResetPassword/Confirm.tsx
+++ b/src/components/Forms/PaymentForm/ResetPassword/Confirm.tsx
@@ -63,6 +63,7 @@ const Confirm: React.FC<FormProps> = ({ codeId, submitCallback }) => {
       password: '',
       comparedPassword: '',
     },
+    validateOnBlur: false,
     validate: ({ password, comparedPassword }) => {
       const passwordError = validatePaymentPassword(password, lang)
       const comparedPasswordError = validateComparedPassword(
diff --git a/src/components/Forms/PaymentForm/ResetPassword/Request.tsx b/src/components/Forms/PaymentForm/ResetPassword/Request.tsx
index b0982ac747..a66c7a396d 100644
--- a/src/components/Forms/PaymentForm/ResetPassword/Request.tsx
+++ b/src/components/Forms/PaymentForm/ResetPassword/Request.tsx
@@ -56,6 +56,7 @@ const Request: React.FC<FormProps> = ({
       email: defaultEmail,
       code: '',
     },
+    validateOnBlur: false,
     validate: ({ email, code }) =>
       _pickBy({
         email: validateEmail(email, lang, { allowPlusSign: true }),
diff --git a/src/components/Forms/PaymentForm/SetPassword/index.tsx b/src/components/Forms/PaymentForm/SetPassword/index.tsx
index 0b9a110c24..50978fc651 100644
--- a/src/components/Forms/PaymentForm/SetPassword/index.tsx
+++ b/src/components/Forms/PaymentForm/SetPassword/index.tsx
@@ -69,6 +69,7 @@ const PaymentSetPasswordForm: React.FC<FormProps> = ({ submitCallback }) => {
       password: '',
       comparedPassword: '',
     },
+    validateOnBlur: false,
     validate: ({ password, comparedPassword }) => {
       const passwordError = validatePaymentPassword(password, lang)
       const comparedPasswordError = validateComparedPassword(
diff --git a/src/components/Forms/PaymentForm/SubscribeCircle/PasswordPayment.tsx b/src/components/Forms/PaymentForm/SubscribeCircle/PasswordPayment.tsx
index f1fad133a0..6c3141738f 100644
--- a/src/components/Forms/PaymentForm/SubscribeCircle/PasswordPayment.tsx
+++ b/src/components/Forms/PaymentForm/SubscribeCircle/PasswordPayment.tsx
@@ -67,6 +67,7 @@ const Confirm: React.FC<FormProps> = ({
     initialValues: {
       password: '',
     },
+    validateOnBlur: false,
     validate: ({ password }) =>
       _pickBy({
         password: validatePaymentPassword(password, lang),
diff --git a/src/components/Forms/WalletAuthForm/Connect.tsx b/src/components/Forms/WalletAuthForm/Connect.tsx
index bb5921dc93..4a1d62a060 100644
--- a/src/components/Forms/WalletAuthForm/Connect.tsx
+++ b/src/components/Forms/WalletAuthForm/Connect.tsx
@@ -164,6 +164,7 @@ const Connect: React.FC<FormProps> = ({
       email: '',
       code: '',
     },
+    validateOnBlur: false,
     validate: ({ tos, email, code }) =>
       _pickBy({
         tos: isSignUp ? validateToS(tos, lang) : undefined,
diff --git a/src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx b/src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx
index e9902ac67f..946430acba 100644
--- a/src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx
+++ b/src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx
@@ -116,6 +116,7 @@ const EditProfileDialogContent: React.FC<FormProps> = ({
       displayName: user.displayName || '',
       description: user.info.description || '',
     },
+    validateOnBlur: false,
     validate: ({ displayName, description }) =>
       _pickBy({
         displayName: validateDisplayName(displayName, lang, isAdmin),

From 84049506607d68aee24ad05b457b8cb5a61ec996 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Tue, 28 Mar 2023 15:32:31 +0800
Subject: [PATCH 25/92] feat(test): revise publishDraft

---
 tests/common/publishDraft.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/common/publishDraft.ts b/tests/common/publishDraft.ts
index b00258e19b..8b94985be1 100644
--- a/tests/common/publishDraft.ts
+++ b/tests/common/publishDraft.ts
@@ -74,7 +74,9 @@ export const publishDraft = async ({
 
   if (tags && tags.length > 0) {
     const articleTags = await articleDetail.getTags()
-    expect(articleTags.sort().join(',')).toBe(tags.sort().join(','))
+    expect(articleTags.sort().join(',')).toBe(
+      '#,'.repeat(tags.length) + tags.sort().join(',')
+    )
   }
 
   if (collectedArticleTitle) {

From 45c13a2b44eee44be5fc09f1e1c5a7a6c90d312d Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Tue, 28 Mar 2023 15:34:04 +0800
Subject: [PATCH 26/92] feat(test): revise draftDetail

---
 src/common/enums/test.ts                           |  3 +++
 .../Forms/EditorSearchSelectForm/index.tsx         |  2 ++
 tests/helpers/poms/draftDetail.ts                  | 14 ++++++++++----
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/common/enums/test.ts b/src/common/enums/test.ts
index b840be1f91..1de16df3ce 100644
--- a/src/common/enums/test.ts
+++ b/src/common/enums/test.ts
@@ -84,6 +84,9 @@ export enum TEST_ID {
   USER_PROFILE_FOLLOWERS_COUNT = 'user-profile/followers/count',
   USER_PROFILE_BIO = 'user-profile/bio',
 
+  // Editor
+  EDITOR_SEARCH_SELECT_FORM_DIALOG_ADD_BUTTON = 'editor/search-select-form/dialog/add-button',
+
   // misc
   SPINNER = 'spinner',
 }
diff --git a/src/components/Forms/EditorSearchSelectForm/index.tsx b/src/components/Forms/EditorSearchSelectForm/index.tsx
index 68dfba80da..b3c28c5dc4 100644
--- a/src/components/Forms/EditorSearchSelectForm/index.tsx
+++ b/src/components/Forms/EditorSearchSelectForm/index.tsx
@@ -3,6 +3,7 @@ import { useEffect, useState } from 'react'
 import {
   MAX_ARTICLE_COLLECT_LENGTH,
   MAX_ARTICLE_TAG_LENGTH,
+  TEST_ID,
   TextId,
 } from '~/common/enums'
 import { Dialog, IconAdd16, TextIcon, Translate } from '~/components'
@@ -147,6 +148,7 @@ const EditorSearchSelectForm = ({
           className="stagingHeadArea"
           onClick={toSearchingArea}
           disabled={!enableAdd}
+          data-test-id={TEST_ID.EDITOR_SEARCH_SELECT_FORM_DIALOG_ADD_BUTTON}
         >
           <TextIcon
             icon={<IconAdd16 size="md-s" />}
diff --git a/tests/helpers/poms/draftDetail.ts b/tests/helpers/poms/draftDetail.ts
index d1fdd985a4..032aa1043a 100644
--- a/tests/helpers/poms/draftDetail.ts
+++ b/tests/helpers/poms/draftDetail.ts
@@ -42,6 +42,7 @@ export class DraftDetailPage {
 
   // dialog
   readonly dialog: Locator
+  readonly dialogAddButton: Locator
   readonly dialogPublishNowButton: Locator
   readonly dialogPublishButton: Locator
   readonly dialogViewArticleButton: Locator
@@ -86,6 +87,9 @@ export class DraftDetailPage {
 
     // dialog
     this.dialog = this.page.getByRole('dialog')
+    this.dialogAddButton = this.page.getByTestId(
+      TEST_ID.EDITOR_SEARCH_SELECT_FORM_DIALOG_ADD_BUTTON
+    )
     this.dialogPublishNowButton = this.dialog.getByRole('button', {
       name: 'Publish Now',
     })
@@ -147,11 +151,12 @@ export class DraftDetailPage {
 
     const tags = _uniq(generateTags({ count: 3 }))
     for (const tag of tags) {
-      await this.page.getByPlaceholder('Search tags...').fill(tag)
+      await this.dialogAddButton.click()
+      await this.page.getByPlaceholder('Search tags').fill(tag)
       await this.page.getByTestId(TEST_ID.SEARCH_RESULTS_ITEM).first().click()
     }
 
-    await this.dialogSaveButton.click()
+    await this.dialogDoneButton.click()
 
     return tags
   }
@@ -217,10 +222,11 @@ export class DraftDetailPage {
 
   async setCollection() {
     await this.barCollectArticle.click()
+    await this.dialogAddButton.click()
 
     // type and search
     const searchKey = 'test'
-    await this.page.getByPlaceholder('Search articles...').fill(searchKey)
+    await this.page.getByPlaceholder('Search articles').fill(searchKey)
 
     await waitForAPIResponse({
       page: this.page,
@@ -237,7 +243,7 @@ export class DraftDetailPage {
     }
 
     // save
-    await this.dialogSaveButton.click()
+    await this.dialogDoneButton.click()
 
     return articleTitle
   }

From 5c09bc4471920ffc969b4a5e576843d0cc04eebb Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Wed, 29 Mar 2023 12:48:49 +0800
Subject: [PATCH 27/92] fix(Editor): use EditorSearchSelectForm

---
 src/components/Editor/SettingsDialog/index.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/Editor/SettingsDialog/index.tsx b/src/components/Editor/SettingsDialog/index.tsx
index 4e6fe0dbbc..ecdd4538eb 100644
--- a/src/components/Editor/SettingsDialog/index.tsx
+++ b/src/components/Editor/SettingsDialog/index.tsx
@@ -16,6 +16,7 @@ import {
   SearchExclude,
 } from '~/gql/graphql'
 
+import ArticleCustomStagingArea from '../ArticleCustomStagingArea'
 import TagCustomStagingArea from '../TagCustomStagingArea'
 import SettingsList, { SettingsListDialogButtons } from './List'
 
@@ -47,8 +48,8 @@ export type EditorSettingsDialogProps = {
   SetPublishISCNProps &
   SettingsListDialogButtons
 
-const DynamicSearchSelectForm = dynamic(
-  () => import('~/components/Forms/SearchSelectForm'),
+const DynamicEditorSearchSelectForm = dynamic(
+  () => import('~/components/Forms/EditorSearchSelectForm'),
   { loading: Spinner }
 )
 
@@ -188,7 +189,7 @@ const BaseEditorSettingsDialog = ({
         )}
 
         {isCollection && (
-          <DynamicSearchSelectForm
+          <DynamicEditorSearchSelectForm
             title="collectArticle"
             hint="hintEditCollection"
             headerLeftButton={
@@ -205,11 +206,12 @@ const BaseEditorSettingsDialog = ({
             nodes={collection}
             saving={collectionSaving}
             closeDialog={closeDialog}
+            CustomStagingArea={ArticleCustomStagingArea}
           />
         )}
 
         {isTag && (
-          <DynamicSearchSelectForm
+          <DynamicEditorSearchSelectForm
             title="addTag"
             hint="hintAddTag"
             headerLeftButton={

From 56ef01787fe8d818ac51de5e1d4daf0f2aae29a2 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Wed, 29 Mar 2023 15:51:25 +0700
Subject: [PATCH 28/92] feat(form): make <PasswordResetRedirectButton> tabIndex
 to -1

---
 src/components/Forms/EmailLoginForm/Buttons.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/Forms/EmailLoginForm/Buttons.tsx b/src/components/Forms/EmailLoginForm/Buttons.tsx
index 76f704dd78..8a49bc0f35 100644
--- a/src/components/Forms/EmailLoginForm/Buttons.tsx
+++ b/src/components/Forms/EmailLoginForm/Buttons.tsx
@@ -16,7 +16,6 @@ export const PasswordResetDialogButton = ({
     tabIndex={-1}
   >
     <TextIcon color="green" weight="md">
-      {' '}
       <FormattedMessage
         defaultMessage="Forget Password"
         description="src/components/Forms/EmailLoginForm/Buttons.tsx"
@@ -26,7 +25,7 @@ export const PasswordResetDialogButton = ({
 )
 
 export const PasswordResetRedirectButton = () => (
-  <Button spacing={['xtight', 0]} {...appendTarget(PATHS.FORGET)}>
+  <Button spacing={['xtight', 0]} {...appendTarget(PATHS.FORGET)} tabIndex={-1}>
     <TextIcon color="green" weight="md">
       <FormattedMessage
         defaultMessage="Forget Password"

From 3fd918783b2f8ee987d700f5ecad948e08a0a3a6 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Wed, 29 Mar 2023 16:26:43 +0700
Subject: [PATCH 29/92] feat(form): disable validateOnChange

---
 .../Dialogs/PaymentPointerDialog/SetPaymentPointerForm.tsx    | 1 +
 src/components/Dialogs/TagDialog/Content.tsx                  | 4 ++--
 .../Editor/ToggleAccess/SupportSettingDialog/Content.tsx      | 1 +
 src/components/Forms/ChangeEmailForm/Confirm.tsx              | 4 ++--
 src/components/Forms/ChangeEmailForm/Request.tsx              | 4 ++--
 src/components/Forms/ChangePasswordForm/Confirm.tsx           | 4 ++--
 src/components/Forms/ChangePasswordForm/Request.tsx           | 4 ++--
 src/components/Forms/ChangeUserNameForm/Confirm.tsx           | 4 ++--
 src/components/Forms/CreateCircleForm/Init.tsx                | 4 ++--
 src/components/Forms/CreateCircleForm/Profile.tsx             | 4 ++--
 src/components/Forms/EmailLoginForm/index.tsx                 | 4 ++--
 src/components/Forms/EmailSignUpForm/Init.tsx                 | 4 ++--
 src/components/Forms/EmailSignUpForm/Password.tsx             | 4 ++--
 src/components/Forms/PaymentForm/AddCredit/index.tsx          | 1 +
 src/components/Forms/PaymentForm/PayTo/Confirm/index.tsx      | 1 +
 src/components/Forms/PaymentForm/PayTo/SetAmount/index.tsx    | 1 +
 src/components/Forms/PaymentForm/Payout/Confirm.tsx           | 4 ++--
 src/components/Forms/PaymentForm/ResetPassword/Confirm.tsx    | 1 +
 src/components/Forms/PaymentForm/ResetPassword/Request.tsx    | 4 ++--
 src/components/Forms/PaymentForm/SetPassword/index.tsx        | 1 +
 .../Forms/PaymentForm/SubscribeCircle/PasswordPayment.tsx     | 1 +
 src/components/Forms/WalletAuthForm/Connect.tsx               | 1 +
 .../UserProfile/DropdownActions/EditProfileDialog/Content.tsx | 4 ++--
 23 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/src/components/Dialogs/PaymentPointerDialog/SetPaymentPointerForm.tsx b/src/components/Dialogs/PaymentPointerDialog/SetPaymentPointerForm.tsx
index 4ea0d7e25d..de3cde5514 100644
--- a/src/components/Dialogs/PaymentPointerDialog/SetPaymentPointerForm.tsx
+++ b/src/components/Dialogs/PaymentPointerDialog/SetPaymentPointerForm.tsx
@@ -69,6 +69,7 @@ const SetPaymentPointerForm: React.FC<FormProps> = ({
       paymentPointer: defaultPaymentPointer,
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ paymentPointer }) =>
       _pickBy({
         paymentPointer: validatePaymentPointer(paymentPointer, lang),
diff --git a/src/components/Dialogs/TagDialog/Content.tsx b/src/components/Dialogs/TagDialog/Content.tsx
index 06a744fba9..d23fc19bd6 100644
--- a/src/components/Dialogs/TagDialog/Content.tsx
+++ b/src/components/Dialogs/TagDialog/Content.tsx
@@ -98,7 +98,6 @@ const TagDialogContent: React.FC<BaseTagDialogContentProps> = ({
     handleChange,
     handleSubmit,
     isSubmitting,
-    isValid,
     setFieldValue,
   } = useFormik<FormValues>({
     initialValues: {
@@ -107,6 +106,7 @@ const TagDialogContent: React.FC<BaseTagDialogContentProps> = ({
       newDescription: description || '',
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ newContent }) =>
       _pickBy({
         newContent: validateTagName(newContent, lang),
@@ -229,7 +229,7 @@ const TagDialogContent: React.FC<BaseTagDialogContentProps> = ({
       text={<Translate id="confirm" />}
       type="submit"
       form={formId}
-      disabled={!isValid || isSubmitting}
+      disabled={isSubmitting}
       loading={isSubmitting}
     />
   )
diff --git a/src/components/Editor/ToggleAccess/SupportSettingDialog/Content.tsx b/src/components/Editor/ToggleAccess/SupportSettingDialog/Content.tsx
index 7f798c24fb..12e531f81b 100644
--- a/src/components/Editor/ToggleAccess/SupportSettingDialog/Content.tsx
+++ b/src/components/Editor/ToggleAccess/SupportSettingDialog/Content.tsx
@@ -68,6 +68,7 @@ const SupportSettingDialogContent: React.FC<FormProps> = ({
       replyToDonator: content?.replyToDonator ? content.replyToDonator : '',
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ requestForDonation, replyToDonator }) =>
       _pickBy({
         requestForDonation: validateSupportWords(requestForDonation!, lang),
diff --git a/src/components/Forms/ChangeEmailForm/Confirm.tsx b/src/components/Forms/ChangeEmailForm/Confirm.tsx
index f89efebfe1..1ffdef179f 100644
--- a/src/components/Forms/ChangeEmailForm/Confirm.tsx
+++ b/src/components/Forms/ChangeEmailForm/Confirm.tsx
@@ -68,13 +68,13 @@ const Confirm: React.FC<FormProps> = ({
     handleChange,
     handleSubmit,
     isSubmitting,
-    isValid,
   } = useFormik<FormValues>({
     initialValues: {
       email: '',
       code: '',
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ email, code }) =>
       _pickBy({
         email: validateEmail(email, lang, { allowPlusSign: false }),
@@ -159,7 +159,7 @@ const Confirm: React.FC<FormProps> = ({
     <Dialog.Header.RightButton
       type="submit"
       form={formId}
-      disabled={!isValid || isSubmitting}
+      disabled={isSubmitting}
       text={<Translate id="confirm" />}
       loading={isSubmitting}
     />
diff --git a/src/components/Forms/ChangeEmailForm/Request.tsx b/src/components/Forms/ChangeEmailForm/Request.tsx
index 5ce743da1a..b687b582cc 100644
--- a/src/components/Forms/ChangeEmailForm/Request.tsx
+++ b/src/components/Forms/ChangeEmailForm/Request.tsx
@@ -52,13 +52,13 @@ const Request: React.FC<FormProps> = ({
     handleChange,
     handleSubmit,
     isSubmitting,
-    isValid,
   } = useFormik<FormValues>({
     initialValues: {
       email: defaultEmail,
       code: '',
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ email, code }) =>
       _pickBy({
         email: validateEmail(email, lang, { allowPlusSign: true }),
@@ -131,7 +131,7 @@ const Request: React.FC<FormProps> = ({
     <Dialog.Header.RightButton
       type="submit"
       form={formId}
-      disabled={!isValid || isSubmitting}
+      disabled={isSubmitting}
       text={<Translate id="nextStep" />}
       loading={isSubmitting}
     />
diff --git a/src/components/Forms/ChangePasswordForm/Confirm.tsx b/src/components/Forms/ChangePasswordForm/Confirm.tsx
index ca954a2779..e28d765bd3 100644
--- a/src/components/Forms/ChangePasswordForm/Confirm.tsx
+++ b/src/components/Forms/ChangePasswordForm/Confirm.tsx
@@ -78,13 +78,13 @@ const Confirm: React.FC<FormProps> = ({
     handleChange,
     handleSubmit,
     isSubmitting,
-    isValid,
   } = useFormik<FormValues>({
     initialValues: {
       password: '',
       comparedPassword: '',
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ password, comparedPassword }) =>
       _pickBy({
         password: validatePassword(password, lang),
@@ -156,7 +156,7 @@ const Confirm: React.FC<FormProps> = ({
     <Dialog.Header.RightButton
       type="submit"
       form={formId}
-      disabled={!isValid || isSubmitting}
+      disabled={isSubmitting}
       text={<Translate id="confirm" />}
       loading={isSubmitting}
     />
diff --git a/src/components/Forms/ChangePasswordForm/Request.tsx b/src/components/Forms/ChangePasswordForm/Request.tsx
index 07656dd7d5..b824e60215 100644
--- a/src/components/Forms/ChangePasswordForm/Request.tsx
+++ b/src/components/Forms/ChangePasswordForm/Request.tsx
@@ -59,12 +59,12 @@ const Request: React.FC<FormProps> = ({
     handleChange,
     handleSubmit,
     isSubmitting,
-    isValid,
   } = useFormik<FormValues>({
     initialValues: {
       email: defaultEmail,
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ email }) =>
       _pickBy({
         email: validateEmail(email, lang, { allowPlusSign: true }),
@@ -114,7 +114,7 @@ const Request: React.FC<FormProps> = ({
     <Dialog.Header.RightButton
       type="submit"
       form={formId}
-      disabled={!isValid || isSubmitting}
+      disabled={isSubmitting}
       text={<Translate id="nextStep" />}
       loading={isSubmitting}
     />
diff --git a/src/components/Forms/ChangeUserNameForm/Confirm.tsx b/src/components/Forms/ChangeUserNameForm/Confirm.tsx
index e6f01b89a7..8f7b2ff285 100644
--- a/src/components/Forms/ChangeUserNameForm/Confirm.tsx
+++ b/src/components/Forms/ChangeUserNameForm/Confirm.tsx
@@ -61,13 +61,13 @@ const Confirm: React.FC<FormProps> = ({
     handleChange,
     handleSubmit,
     isSubmitting,
-    isValid,
   } = useFormik<FormValues>({
     initialValues: {
       userName: '',
       comparedUserName: '',
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ userName, comparedUserName }) =>
       _pickBy({
         userName: validateUserName(userName, lang),
@@ -152,7 +152,7 @@ const Confirm: React.FC<FormProps> = ({
     <Dialog.Header.RightButton
       type="submit"
       form={formId}
-      disabled={!isValid || isSubmitting}
+      disabled={isSubmitting}
       text={<Translate id="nextStep" />}
       loading={isSubmitting}
     />
diff --git a/src/components/Forms/CreateCircleForm/Init.tsx b/src/components/Forms/CreateCircleForm/Init.tsx
index 01eb16aacd..d10990a4ce 100644
--- a/src/components/Forms/CreateCircleForm/Init.tsx
+++ b/src/components/Forms/CreateCircleForm/Init.tsx
@@ -63,7 +63,6 @@ const Init: React.FC<FormProps> = ({
     handleSubmit,
     setFieldValue,
     isSubmitting,
-    isValid,
   } = useFormik<FormValues>({
     initialValues: {
       name: '',
@@ -71,6 +70,7 @@ const Init: React.FC<FormProps> = ({
       amount: PAYMENT_MINIMAL_CIRCLE_AMOUNT.HKD,
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ name, displayName, amount }) =>
       _pickBy({
         name: validateCircleName(name, lang),
@@ -211,7 +211,7 @@ const Init: React.FC<FormProps> = ({
     <Dialog.Header.RightButton
       type="submit"
       form={formId}
-      disabled={!isValid || isSubmitting}
+      disabled={isSubmitting}
       text={<FormattedMessage defaultMessage="Next Step" description="" />}
       loading={isSubmitting}
     />
diff --git a/src/components/Forms/CreateCircleForm/Profile.tsx b/src/components/Forms/CreateCircleForm/Profile.tsx
index ca06e105e0..93f363361a 100644
--- a/src/components/Forms/CreateCircleForm/Profile.tsx
+++ b/src/components/Forms/CreateCircleForm/Profile.tsx
@@ -69,7 +69,6 @@ const Init: React.FC<FormProps> = ({ circle, type, purpose, closeDialog }) => {
     handleChange,
     handleSubmit,
     isSubmitting,
-    isValid,
     setFieldValue,
   } = useFormik<FormValues>({
     initialValues: {
@@ -79,6 +78,7 @@ const Init: React.FC<FormProps> = ({ circle, type, purpose, closeDialog }) => {
       description: circle.description || '',
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ displayName, description }) =>
       _pickBy({
         displayName: !isCreate
@@ -227,7 +227,7 @@ const Init: React.FC<FormProps> = ({ circle, type, purpose, closeDialog }) => {
     <Dialog.Header.RightButton
       type="submit"
       form={formId}
-      disabled={!isValid || isSubmitting}
+      disabled={isSubmitting}
       text={<FormattedMessage defaultMessage="Done" description="" />}
       loading={isSubmitting}
     />
diff --git a/src/components/Forms/EmailLoginForm/index.tsx b/src/components/Forms/EmailLoginForm/index.tsx
index 8694185c88..410bf43734 100644
--- a/src/components/Forms/EmailLoginForm/index.tsx
+++ b/src/components/Forms/EmailLoginForm/index.tsx
@@ -94,7 +94,6 @@ export const EmailLoginForm: React.FC<FormProps> = ({
     handleBlur,
     handleChange,
     handleSubmit,
-    isValid,
     isSubmitting,
   } = useFormik<FormValues>({
     initialValues: {
@@ -102,6 +101,7 @@ export const EmailLoginForm: React.FC<FormProps> = ({
       password: '',
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ email, password }) =>
       _pickBy({
         email: validateEmail(email, lang, { allowPlusSign: true }),
@@ -213,7 +213,7 @@ export const EmailLoginForm: React.FC<FormProps> = ({
     <Dialog.Header.RightButton
       type="submit"
       form={formId}
-      disabled={!isValid || isSubmitting}
+      disabled={isSubmitting}
       text={<FormattedMessage defaultMessage="Confirm" description="" />}
       loading={isSubmitting}
     />
diff --git a/src/components/Forms/EmailSignUpForm/Init.tsx b/src/components/Forms/EmailSignUpForm/Init.tsx
index 0d90cf5572..ed05ffcc10 100644
--- a/src/components/Forms/EmailSignUpForm/Init.tsx
+++ b/src/components/Forms/EmailSignUpForm/Init.tsx
@@ -68,7 +68,6 @@ const Init: React.FC<FormProps> = ({
     handleChange,
     handleSubmit,
     isSubmitting,
-    isValid,
   } = useFormik<FormValues>({
     initialValues: {
       displayName: '',
@@ -76,6 +75,7 @@ const Init: React.FC<FormProps> = ({
       tos: true,
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ displayName, email, tos }) =>
       _pickBy({
         displayName: validateDisplayName(displayName, lang),
@@ -179,7 +179,7 @@ const Init: React.FC<FormProps> = ({
     <Dialog.Header.RightButton
       type="submit"
       form={formId}
-      disabled={!isValid || isSubmitting}
+      disabled={isSubmitting}
       text={<FormattedMessage defaultMessage="Next" description="" />}
       loading={isSubmitting}
     />
diff --git a/src/components/Forms/EmailSignUpForm/Password.tsx b/src/components/Forms/EmailSignUpForm/Password.tsx
index c6c245fa65..265ae885cb 100644
--- a/src/components/Forms/EmailSignUpForm/Password.tsx
+++ b/src/components/Forms/EmailSignUpForm/Password.tsx
@@ -96,13 +96,13 @@ const Password: React.FC<FormProps> = ({
     handleChange,
     handleSubmit,
     isSubmitting,
-    isValid,
   } = useFormik<FormValues>({
     initialValues: {
       password: '',
       comparedPassword: '',
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ password, comparedPassword }) =>
       _pickBy({
         password: validatePassword(password, lang),
@@ -206,7 +206,7 @@ const Password: React.FC<FormProps> = ({
     <Dialog.Header.RightButton
       type="submit"
       form={formId}
-      disabled={!isValid || isSubmitting}
+      disabled={isSubmitting}
       text={<FormattedMessage defaultMessage="Confirm" description="" />}
       loading={isSubmitting}
     />
diff --git a/src/components/Forms/PaymentForm/AddCredit/index.tsx b/src/components/Forms/PaymentForm/AddCredit/index.tsx
index 1cbb4568fe..406e937185 100644
--- a/src/components/Forms/PaymentForm/AddCredit/index.tsx
+++ b/src/components/Forms/PaymentForm/AddCredit/index.tsx
@@ -123,6 +123,7 @@ const BaseAddCredit: React.FC<FormProps> = ({
       amount: defaultAmount || PAYMENT_DEFAULT_ADD_CREDIT_AMOUNT[currency],
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ amount }) =>
       _pickBy({
         amount: validateAmount(amount, lang),
diff --git a/src/components/Forms/PaymentForm/PayTo/Confirm/index.tsx b/src/components/Forms/PaymentForm/PayTo/Confirm/index.tsx
index 44967fb3d4..4235381e1c 100644
--- a/src/components/Forms/PaymentForm/PayTo/Confirm/index.tsx
+++ b/src/components/Forms/PaymentForm/PayTo/Confirm/index.tsx
@@ -112,6 +112,7 @@ const Confirm: React.FC<FormProps> = ({
       password: '',
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ password }) =>
       _pickBy({
         password: validatePaymentPassword(password, lang),
diff --git a/src/components/Forms/PaymentForm/PayTo/SetAmount/index.tsx b/src/components/Forms/PaymentForm/PayTo/SetAmount/index.tsx
index c6c23dc409..3c12f67501 100644
--- a/src/components/Forms/PaymentForm/PayTo/SetAmount/index.tsx
+++ b/src/components/Forms/PaymentForm/PayTo/SetAmount/index.tsx
@@ -178,6 +178,7 @@ const SetAmount: React.FC<FormProps> = ({
       customAmount: 0,
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ amount, customAmount }) =>
       _pickBy({
         amount: validateDonationAmount(customAmount || amount, balance, lang),
diff --git a/src/components/Forms/PaymentForm/Payout/Confirm.tsx b/src/components/Forms/PaymentForm/Payout/Confirm.tsx
index 15afcf34f9..f8dfb4e9db 100644
--- a/src/components/Forms/PaymentForm/Payout/Confirm.tsx
+++ b/src/components/Forms/PaymentForm/Payout/Confirm.tsx
@@ -64,7 +64,6 @@ const BaseConfirm: React.FC<FormProps> = ({
     errors,
     handleBlur,
     handleSubmit,
-    isValid,
     isSubmitting,
     setFieldError,
     setFieldValue,
@@ -77,6 +76,7 @@ const BaseConfirm: React.FC<FormProps> = ({
       password: '',
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ amount, password }) =>
       _pickBy({
         amount: validatePayoutAmount({
@@ -238,7 +238,7 @@ const BaseConfirm: React.FC<FormProps> = ({
         <Dialog.Footer.Button
           type="submit"
           form={formId}
-          disabled={!isValid || isSubmitting}
+          disabled={isSubmitting}
           loading={isSubmitting}
         >
           <Translate id="confirm" />
diff --git a/src/components/Forms/PaymentForm/ResetPassword/Confirm.tsx b/src/components/Forms/PaymentForm/ResetPassword/Confirm.tsx
index 2b8a0195a3..460ae2ecb9 100644
--- a/src/components/Forms/PaymentForm/ResetPassword/Confirm.tsx
+++ b/src/components/Forms/PaymentForm/ResetPassword/Confirm.tsx
@@ -64,6 +64,7 @@ const Confirm: React.FC<FormProps> = ({ codeId, submitCallback }) => {
       comparedPassword: '',
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ password, comparedPassword }) => {
       const passwordError = validatePaymentPassword(password, lang)
       const comparedPasswordError = validateComparedPassword(
diff --git a/src/components/Forms/PaymentForm/ResetPassword/Request.tsx b/src/components/Forms/PaymentForm/ResetPassword/Request.tsx
index a66c7a396d..19b28fc906 100644
--- a/src/components/Forms/PaymentForm/ResetPassword/Request.tsx
+++ b/src/components/Forms/PaymentForm/ResetPassword/Request.tsx
@@ -50,13 +50,13 @@ const Request: React.FC<FormProps> = ({
     handleChange,
     handleSubmit,
     isSubmitting,
-    isValid,
   } = useFormik<FormValues>({
     initialValues: {
       email: defaultEmail,
       code: '',
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ email, code }) =>
       _pickBy({
         email: validateEmail(email, lang, { allowPlusSign: true }),
@@ -137,7 +137,7 @@ const Request: React.FC<FormProps> = ({
         <Dialog.Footer.Button
           type="submit"
           form={formId}
-          disabled={!isValid || isSubmitting}
+          disabled={isSubmitting}
           loading={isSubmitting}
         >
           <Translate id="nextStep" />
diff --git a/src/components/Forms/PaymentForm/SetPassword/index.tsx b/src/components/Forms/PaymentForm/SetPassword/index.tsx
index 50978fc651..c66d5c2c84 100644
--- a/src/components/Forms/PaymentForm/SetPassword/index.tsx
+++ b/src/components/Forms/PaymentForm/SetPassword/index.tsx
@@ -70,6 +70,7 @@ const PaymentSetPasswordForm: React.FC<FormProps> = ({ submitCallback }) => {
       comparedPassword: '',
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ password, comparedPassword }) => {
       const passwordError = validatePaymentPassword(password, lang)
       const comparedPasswordError = validateComparedPassword(
diff --git a/src/components/Forms/PaymentForm/SubscribeCircle/PasswordPayment.tsx b/src/components/Forms/PaymentForm/SubscribeCircle/PasswordPayment.tsx
index 6c3141738f..6ca95a72a2 100644
--- a/src/components/Forms/PaymentForm/SubscribeCircle/PasswordPayment.tsx
+++ b/src/components/Forms/PaymentForm/SubscribeCircle/PasswordPayment.tsx
@@ -68,6 +68,7 @@ const Confirm: React.FC<FormProps> = ({
       password: '',
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ password }) =>
       _pickBy({
         password: validatePaymentPassword(password, lang),
diff --git a/src/components/Forms/WalletAuthForm/Connect.tsx b/src/components/Forms/WalletAuthForm/Connect.tsx
index 4a1d62a060..45aca8a644 100644
--- a/src/components/Forms/WalletAuthForm/Connect.tsx
+++ b/src/components/Forms/WalletAuthForm/Connect.tsx
@@ -165,6 +165,7 @@ const Connect: React.FC<FormProps> = ({
       code: '',
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ tos, email, code }) =>
       _pickBy({
         tos: isSignUp ? validateToS(tos, lang) : undefined,
diff --git a/src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx b/src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx
index 946430acba..ccc926be6a 100644
--- a/src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx
+++ b/src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx
@@ -107,7 +107,6 @@ const EditProfileDialogContent: React.FC<FormProps> = ({
     handleChange,
     handleSubmit,
     isSubmitting,
-    isValid,
     setFieldValue,
   } = useFormik<FormValues>({
     initialValues: {
@@ -117,6 +116,7 @@ const EditProfileDialogContent: React.FC<FormProps> = ({
       description: user.info.description || '',
     },
     validateOnBlur: false,
+    validateOnChange: false,
     validate: ({ displayName, description }) =>
       _pickBy({
         displayName: validateDisplayName(displayName, lang, isAdmin),
@@ -265,7 +265,7 @@ const EditProfileDialogContent: React.FC<FormProps> = ({
     <Dialog.Header.RightButton
       type="submit"
       form={formId}
-      disabled={!isValid || isSubmitting}
+      disabled={isSubmitting}
       text={<FormattedMessage defaultMessage="Save" description="" />}
       loading={isSubmitting}
     />

From c998bf0439df25a7d89b542bac1e0364b82287ec Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Wed, 29 Mar 2023 17:05:05 +0700
Subject: [PATCH 30/92] feat(form): skip validate password for login form

---
 src/components/Forms/EmailLoginForm/index.tsx | 4 ++--
 src/components/Forms/EmailSignUpForm/Init.tsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Forms/EmailLoginForm/index.tsx b/src/components/Forms/EmailLoginForm/index.tsx
index 410bf43734..cd34f5606e 100644
--- a/src/components/Forms/EmailLoginForm/index.tsx
+++ b/src/components/Forms/EmailLoginForm/index.tsx
@@ -16,7 +16,7 @@ import {
   redirectToTarget,
   setCookies,
   validateEmail,
-  validatePassword,
+  // validatePassword,
 } from '~/common/utils'
 import {
   Dialog,
@@ -105,7 +105,7 @@ export const EmailLoginForm: React.FC<FormProps> = ({
     validate: ({ email, password }) =>
       _pickBy({
         email: validateEmail(email, lang, { allowPlusSign: true }),
-        password: validatePassword(password, lang),
+        // password: validatePassword(password, lang),
       }),
     onSubmit: async ({ email, password }, { setFieldError, setSubmitting }) => {
       try {
diff --git a/src/components/Forms/EmailSignUpForm/Init.tsx b/src/components/Forms/EmailSignUpForm/Init.tsx
index ed05ffcc10..d5586e6420 100644
--- a/src/components/Forms/EmailSignUpForm/Init.tsx
+++ b/src/components/Forms/EmailSignUpForm/Init.tsx
@@ -75,7 +75,7 @@ const Init: React.FC<FormProps> = ({
       tos: true,
     },
     validateOnBlur: false,
-    validateOnChange: false,
+    validateOnChange: true, // enable for signup form
     validate: ({ displayName, email, tos }) =>
       _pickBy({
         displayName: validateDisplayName(displayName, lang),

From f1d57d4b226dacc6901bb53b262cfe25b9017f5a Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Wed, 29 Mar 2023 17:57:56 +0700
Subject: [PATCH 31/92] fix(form): fix cannot switch to sign up on login form

---
 src/components/Form/List/Item/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Form/List/Item/index.tsx b/src/components/Form/List/Item/index.tsx
index e355664f4d..c6b70381cb 100644
--- a/src/components/Form/List/Item/index.tsx
+++ b/src/components/Form/List/Item/index.tsx
@@ -50,7 +50,7 @@ const Item: React.FC<ItemProps> = forwardRef(
       top: leftAlign === 'top',
       bold: !!bold,
     })
-    const ItemContent = () => (
+    const itemContent = (
       <section className="container">
         <section className={leftClasses}>
           <h5 className="title">{title}</h5>
@@ -90,7 +90,7 @@ const Item: React.FC<ItemProps> = forwardRef(
               spacing={cardProps.spacing || [0, 0]}
               ref={ref}
             >
-              <ItemContent />
+              {itemContent}
             </Card>
           </Media>
           <Media greaterThan="sm">
@@ -100,7 +100,7 @@ const Item: React.FC<ItemProps> = forwardRef(
               spacing={cardProps.spacing || [0, 0]}
               ref={ref}
             >
-              <ItemContent />
+              {itemContent}
             </Card>
           </Media>
         </>

From a2a2ef22d8171866f0e1419dc89e6b65de2242f7 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Wed, 29 Mar 2023 22:06:26 +0700
Subject: [PATCH 32/92] feat(tag): remove "add articles to tag" button

---
 .../AddButton/AddMyArticlesButton/index.tsx   |  24 ---
 .../AddButton/CreateDraftMenuItem/index.tsx   |  91 ----------
 .../TagDetail/Buttons/AddButton/index.tsx     | 162 ------------------
 src/views/TagDetail/Buttons/index.tsx         |   2 -
 src/views/TagDetail/index.tsx                 |   3 -
 5 files changed, 282 deletions(-)
 delete mode 100644 src/views/TagDetail/Buttons/AddButton/AddMyArticlesButton/index.tsx
 delete mode 100644 src/views/TagDetail/Buttons/AddButton/CreateDraftMenuItem/index.tsx
 delete mode 100644 src/views/TagDetail/Buttons/AddButton/index.tsx

diff --git a/src/views/TagDetail/Buttons/AddButton/AddMyArticlesButton/index.tsx b/src/views/TagDetail/Buttons/AddButton/AddMyArticlesButton/index.tsx
deleted file mode 100644
index 6a82bb7b40..0000000000
--- a/src/views/TagDetail/Buttons/AddButton/AddMyArticlesButton/index.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { FormattedMessage } from 'react-intl'
-
-import { IconHashTag16, Menu, TextIcon } from '~/components'
-
-interface AddMyArticlesButtonProps {
-  onClick: () => void
-}
-
-const AddMyArticlesButton: React.FC<AddMyArticlesButtonProps> = ({
-  onClick,
-}) => {
-  return (
-    <Menu.Item onClick={onClick}>
-      <TextIcon icon={<IconHashTag16 size="md" />} size="md" spacing="base">
-        <FormattedMessage
-          defaultMessage="Add Article"
-          description="src/views/TagDetail/Buttons/AddButton/AddMyArticlesButton/index.tsx"
-        />
-      </TextIcon>
-    </Menu.Item>
-  )
-}
-
-export default AddMyArticlesButton
diff --git a/src/views/TagDetail/Buttons/AddButton/CreateDraftMenuItem/index.tsx b/src/views/TagDetail/Buttons/AddButton/CreateDraftMenuItem/index.tsx
deleted file mode 100644
index 4dc72d9db8..0000000000
--- a/src/views/TagDetail/Buttons/AddButton/CreateDraftMenuItem/index.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import { useRouter } from 'next/router'
-import { useContext } from 'react'
-import { FormattedMessage, useIntl } from 'react-intl'
-
-import { ADD_TOAST, OPEN_LIKE_COIN_DIALOG } from '~/common/enums'
-import { analytics, toPath } from '~/common/utils'
-import {
-  IconAdd24,
-  Menu,
-  TextIcon,
-  useMutation,
-  ViewerContext,
-} from '~/components'
-import CREATE_DRAFT from '~/components/GQL/mutations/createDraft'
-import { CreateDraftMutation, TagFragmentFragment } from '~/gql/graphql'
-
-interface CreateDraftButtonProps {
-  tag: TagFragmentFragment
-}
-
-const BaseCreateDraftButton = ({ onClick }: { onClick: () => any }) => (
-  <Menu.Item onClick={onClick}>
-    <TextIcon icon={<IconAdd24 size="md" />} size="md" spacing="base">
-      <FormattedMessage
-        defaultMessage="New Article"
-        description="src/views/TagDetail/Buttons/AddButton/CreateDraftMenuItem/index.tsx"
-      />
-    </TextIcon>
-  </Menu.Item>
-)
-
-const CreateDraftButton: React.FC<CreateDraftButtonProps> = ({ tag }) => {
-  const router = useRouter()
-  const viewer = useContext(ViewerContext)
-
-  const intl = useIntl()
-  const [putDraft] = useMutation<CreateDraftMutation>(CREATE_DRAFT, {
-    variables: {
-      title: intl.formatMessage({
-        defaultMessage: 'Untitled',
-        description: '',
-      }),
-      tags: [tag.content],
-    },
-  })
-
-  const createDraft = async () => {
-    if (viewer.isInactive) {
-      window.dispatchEvent(
-        new CustomEvent(ADD_TOAST, {
-          detail: {
-            color: 'red',
-            content: (
-              <FormattedMessage
-                defaultMessage="You do not have permission to perform this operation"
-                description=""
-              />
-            ),
-          },
-        })
-      )
-      return
-    }
-
-    analytics.trackEvent('click_button', {
-      type: 'write',
-    })
-
-    const result = await putDraft()
-    const { slug, id } = result?.data?.putDraft || {}
-
-    if (slug && id) {
-      const path = toPath({ page: 'draftDetail', slug, id })
-      router.push(path.href)
-    }
-  }
-
-  if (viewer.shouldSetupLikerID) {
-    return (
-      <BaseCreateDraftButton
-        onClick={() =>
-          window.dispatchEvent(new CustomEvent(OPEN_LIKE_COIN_DIALOG, {}))
-        }
-      />
-    )
-  }
-
-  return <BaseCreateDraftButton onClick={createDraft} />
-}
-
-export default CreateDraftButton
diff --git a/src/views/TagDetail/Buttons/AddButton/index.tsx b/src/views/TagDetail/Buttons/AddButton/index.tsx
deleted file mode 100644
index cc7e225828..0000000000
--- a/src/views/TagDetail/Buttons/AddButton/index.tsx
+++ /dev/null
@@ -1,162 +0,0 @@
-import { useContext } from 'react'
-
-import { ADD_TOAST, REFETCH_TAG_DETAIL_ARTICLES } from '~/common/enums'
-import { translate } from '~/common/utils'
-import {
-  Button,
-  DropdownDialog,
-  IconPen16,
-  LanguageContext,
-  Menu,
-  TextIcon,
-  Translate,
-  useMutation,
-  ViewerContext,
-} from '~/components'
-import { SearchSelectDialog } from '~/components/Dialogs/SearchSelectDialog'
-import { SearchSelectNode } from '~/components/Forms/SearchSelectForm'
-import ADD_ARTICLES_TAGS from '~/components/GQL/mutations/addArticlesTags'
-import updateTagArticlesCount from '~/components/GQL/updates/tagArticlesCount'
-import { AddArticlesTagsMutation, TagFragmentFragment } from '~/gql/graphql'
-
-import AddMyArticlesButton from './AddMyArticlesButton'
-import CreateDraftMenuItem from './CreateDraftMenuItem'
-
-interface DropdownActionsProps {
-  tag: TagFragmentFragment
-}
-
-interface DialogProps {
-  openAddMyArticlesDialog: () => void
-}
-
-type BaseDropdownActionsProps = DropdownActionsProps & DialogProps
-
-const BaseDropdownActions = ({
-  tag,
-  openAddMyArticlesDialog,
-}: BaseDropdownActionsProps) => {
-  const Content = ({ isInDropdown }: { isInDropdown?: boolean }) => (
-    <Menu width={isInDropdown ? 'sm' : undefined}>
-      <CreateDraftMenuItem tag={tag} />
-
-      <AddMyArticlesButton onClick={openAddMyArticlesDialog} />
-    </Menu>
-  )
-
-  return (
-    <DropdownDialog
-      dropdown={{
-        content: <Content isInDropdown />,
-        placement: 'bottom-end',
-      }}
-      dialog={{
-        content: <Content />,
-        title: 'moreActions',
-      }}
-    >
-      {({ openDialog, type, ref }) => (
-        <Button
-          spacing={['xtight', 'tight']}
-          textColor="gold"
-          textActiveColor="white"
-          bgActiveColor="gold"
-          borderColor="gold"
-          onClick={openDialog}
-          aria-haspopup={type}
-          ref={ref}
-        >
-          <TextIcon icon={<IconPen16 />} weight="md" size="md-s">
-            <Translate zh_hant="投稿" zh_hans="投稿" en="Submit" />
-          </TextIcon>
-        </Button>
-      )}
-    </DropdownDialog>
-  )
-}
-
-const DropdownActions = (props: DropdownActionsProps) => {
-  const viewer = useContext(ViewerContext)
-  const { lang } = useContext(LanguageContext)
-  const { tag } = props
-
-  /**
-   * Data
-   */
-  const [add, { loading }] =
-    useMutation<AddArticlesTagsMutation>(ADD_ARTICLES_TAGS)
-  const addArticlesToTag =
-    (selected: boolean) => async (articles: SearchSelectNode[]) => {
-      const articleIds = articles.map((article) => article.id)
-
-      await add({
-        variables: { id: tag.id, articles: articleIds, selected },
-        update: (cache, { data }) => {
-          if (selected) {
-            const newCount = data?.addArticlesTags?.articles?.totalCount || 0
-            const oldCount = tag.articles.totalCount || 0
-            updateTagArticlesCount({
-              cache,
-              id: tag.id,
-              count: newCount - oldCount,
-              type: 'increment',
-            })
-          }
-        },
-      })
-
-      window.dispatchEvent(
-        new CustomEvent(ADD_TOAST, {
-          detail: {
-            color: 'green',
-            content: translate({ id: 'addedArticleTag', lang }),
-            duration: 2000,
-          },
-        })
-      )
-
-      window.dispatchEvent(
-        new CustomEvent(REFETCH_TAG_DETAIL_ARTICLES, {
-          detail: {
-            event: 'add',
-            differences: articles.length,
-          },
-        })
-      )
-    }
-
-  const forbid = () => {
-    window.dispatchEvent(
-      new CustomEvent(ADD_TOAST, {
-        detail: {
-          color: 'red',
-          content: <Translate id="FORBIDDEN_BY_STATE" />,
-        },
-      })
-    )
-    return
-  }
-
-  /**
-   * Render
-   */
-  return (
-    <SearchSelectDialog
-      title="tagAddArticle"
-      hint="hintEditCollection"
-      searchType="Article"
-      searchFilter={{ authorId: viewer.id }}
-      onSave={addArticlesToTag(false)}
-      saving={loading}
-    >
-      {({ openDialog }) => (
-        <BaseDropdownActions
-          {...props}
-          openAddMyArticlesDialog={viewer.isFrozen ? forbid : openDialog}
-        />
-      )}
-    </SearchSelectDialog>
-  )
-}
-
-export default DropdownActions
diff --git a/src/views/TagDetail/Buttons/index.tsx b/src/views/TagDetail/Buttons/index.tsx
index 7c8d964ce8..cd045c6a17 100644
--- a/src/views/TagDetail/Buttons/index.tsx
+++ b/src/views/TagDetail/Buttons/index.tsx
@@ -1,7 +1,5 @@
-import AddButton from './AddButton'
 import FollowButton from './FollowButton'
 
 export const TagDetailButtons = {
-  AddButton,
   FollowButton,
 }
diff --git a/src/views/TagDetail/index.tsx b/src/views/TagDetail/index.tsx
index a79e50304f..63dda8971e 100644
--- a/src/views/TagDetail/index.tsx
+++ b/src/views/TagDetail/index.tsx
@@ -112,8 +112,6 @@ const TagDetail = ({ tag }: { tag: TagFragmentFragment }) => {
   const isEditor = (tag?.editors || []).some((t) => t.id === viewer.id)
   const isMatty = viewer.info.email === 'hi@matters.news'
   const isMaintainer = isOwner || isEditor || isMatty
-  const isOfficial = !!tag?.isOfficial
-  const canAdd = !isOfficial || (isOfficial && isMatty)
 
   const title =
     // (tag.description ? `${makeTitle(tag.description, 80)} ` : '') +
@@ -196,7 +194,6 @@ const TagDetail = ({ tag }: { tag: TagFragmentFragment }) => {
         )}
 
         <section className="buttons">
-          {canAdd && <TagDetailButtons.AddButton tag={tag} />}
           <TagDetailButtons.FollowButton tag={tag} />
         </section>
       </section>

From e81933fadee8fab5fb155001dc1b351d1f7dc0b8 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Thu, 30 Mar 2023 12:57:35 +0700
Subject: [PATCH 33/92] feat(username): lowercase letters and strip
 non-underline chars on type user name or circle name

---
 lang/default.json                             |  8 +-
 lang/en.json                                  |  2 +-
 lang/zh-Hans.json                             |  2 +-
 lang/zh-Hant.json                             |  2 +-
 src/common/enums/text.ts                      | 19 ++--
 src/common/utils/route.ts                     |  4 +-
 src/common/utils/{text.ts => text/article.ts} | 89 ++++---------------
 src/common/utils/text/index.ts                | 22 +++++
 src/common/utils/text/tag.ts                  | 47 ++++++++++
 src/components/ArticleDigest/Card/index.tsx   |  8 +-
 src/components/Dialogs/HelpDialog/index.tsx   | 15 +++-
 src/components/Dialogs/TagDialog/Content.tsx  |  4 +-
 .../Forms/ChangeUserNameForm/Confirm.tsx      | 15 +++-
 .../Forms/CreateCircleForm/Init.tsx           |  9 +-
 .../SearchSelect/SearchingArea/index.tsx      |  8 +-
 src/components/Tag/index.tsx                  |  4 +-
 src/components/UserDigest/Plain/index.tsx     |  9 +-
 src/views/ArticleDetail/Toolbar/index.tsx     |  4 +-
 src/views/ArticleDetail/index.tsx             |  6 +-
 src/views/TagDetail/index.tsx                 | 16 ++--
 20 files changed, 157 insertions(+), 136 deletions(-)
 rename src/common/utils/{text.ts => text/article.ts} (51%)
 create mode 100644 src/common/utils/text/index.ts
 create mode 100644 src/common/utils/text/tag.ts

diff --git a/lang/default.json b/lang/default.json
index ad3125a28d..7d6ff9a47c 100644
--- a/lang/default.json
+++ b/lang/default.json
@@ -259,6 +259,10 @@
     "defaultMessage": ". Take a look at your income",
     "description": "src/components/Notice/TransactionNotice/PaymentReceivedDonationNotice.tsx"
   },
+  "CBDDR5": {
+    "defaultMessage": "Must be between 2-20 characters long. Only lowercase letters, numbers and underline are allowed.",
+    "description": ""
+  },
   "Cdkhl8": {
     "defaultMessage": "Delete {commentType}",
     "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
@@ -863,10 +867,6 @@
     "defaultMessage": "posted and replied to topics",
     "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "gMZZ9I": {
-    "defaultMessage": "Must be between 2-20 characters long. Only letters, numbers and underscores are allowed.",
-    "description": ""
-  },
   "gMZfHO": {
     "defaultMessage": "RSS Subscription",
     "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
diff --git a/lang/en.json b/lang/en.json
index fda640be9f..fcd3cd9433 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1115,7 +1115,7 @@
     "description": "src/components/Forms/CreateCircleForm/Init.tsx"
   },
   "gMZZ9I": {
-    "defaultMessage": "Must be between 2-20 characters long. Only letters, numbers and underscores are allowed.",
+    "defaultMessage": "Must be between 2-20 characters long. Only lowercase letters, numbers and underline are allowed.",
     "description": ""
   },
   "+7SAix": {
diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json
index 1ef62673d4..bc9fb68360 100644
--- a/lang/zh-Hans.json
+++ b/lang/zh-Hans.json
@@ -1115,7 +1115,7 @@
     "description": "src/components/Forms/CreateCircleForm/Init.tsx"
   },
   "gMZZ9I": {
-    "defaultMessage": "2-20 个字符，仅支持英文、数字或下划线",
+    "defaultMessage": "2-20 个字符，仅支持英文小写字母、数字或下划线",
     "description": ""
   },
   "+7SAix": {
diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json
index 569ce30535..e45ba2ce67 100644
--- a/lang/zh-Hant.json
+++ b/lang/zh-Hant.json
@@ -1115,7 +1115,7 @@
     "description": "src/components/Forms/CreateCircleForm/Init.tsx"
   },
   "gMZZ9I": {
-    "defaultMessage": "2-20 個字元，僅支持英文、數字或下劃線",
+    "defaultMessage": "2-20 個字元，僅支持英文小寫字母、數字或下劃線",
     "description": ""
   },
   "+7SAix": {
diff --git a/src/common/enums/text.ts b/src/common/enums/text.ts
index 4d7811ef1e..aee6645625 100644
--- a/src/common/enums/text.ts
+++ b/src/common/enums/text.ts
@@ -161,11 +161,11 @@ export const TEXT = {
     hintAddTagNoTag: '目前尚無標籤，立即添加提高作品曝光度！',
     hintAddTagShort: '添加合適標籤，讓站內外讀者找到你的作品',
     hintAddTagNamingRestriction:
-      '標籤名稱不允許標點符號，字間僅允許一個不連續空白，最大長度50字元',
+      '標籤名稱不允許標點符號，字間僅允許一個不連續空白，最大長度 50 字元',
     hintAddCircleInvitee: '添加站內或站外朋友加入圍爐',
     hintCircleAddArticles: '將公開作品加入圍爐，成為永久收費作品。',
     hintCircleDisplayName: '2-12 個字元',
-    hintCircleName: '2-20 個字元，僅支持英文、數字或下劃線',
+    hintCircleName: '2-20 個字元，僅支持英文小写字母、數字或下劃線',
     hintDescription: '建議 50 字以內，最長 200 字',
     hintDisplayName: '2-20 個字元',
     hintEditCollection: '關聯自己或他人的作品，幫助讀者更好地發現內容。',
@@ -173,7 +173,7 @@ export const TEXT = {
     hintPaymentPassword: '輸入六位數字交易密碼',
     hintPaymentPointer: '錢包地址以“$”開頭',
     hintTerm: '我們的用戶協議和隱私政策發生了更改，請閱讀並同意後繼續使用。',
-    hintUserName: '4-15 個字元，僅支持英文、數字或下劃線',
+    hintUserName: '4-15 個字元，僅支持英文小写字母、數字或下劃線',
     hintVerificationCode: '驗證碼有效期 20 分鐘',
     history: '足跡',
     hkd: '港幣',
@@ -571,11 +571,11 @@ export const TEXT = {
     hintAddTagNoTag: '目前尚无标签，立即添加提高作品曝光度！',
     hintAddTagShort: '添加适合标签，帮助读者找到你的作品',
     hintAddTagNamingRestriction:
-      '标签名称不允许标点符号，字间仅允许一个不连续空白，最大长度50字元',
+      '标签名称不允许标点符号，字间仅允许一个不连续空白，最大长度 50 字元',
     hintAddCircleInvitee: '添加站内或站外朋友加入围炉',
     hintCircleAddArticles: '将公开作品加入围炉，成为永久收费作品。',
     hintCircleDisplayName: '2-12 个字符',
-    hintCircleName: '2-20 个字符，仅支持英文、数字或下划线',
+    hintCircleName: '2-20 个字符，仅支持英文小写字母、数字或下划线',
     hintDescription: '建议 50 字以内，最长 200 字',
     hintDisplayName: '2-20 个字符',
     hintEditCollection: '关联自己或他人的作品，帮助读者更好地发现内容。',
@@ -583,7 +583,7 @@ export const TEXT = {
     hintPaymentPassword: '输入六位数字交易密码',
     hintPaymentPointer: '钱包地址以“$”开头',
     hintTerm: '我们的用户协议和隐私政策发生了更改，请阅读并同意后继续使用。',
-    hintUserName: '4-15 个字符，仅支持英文、数字或下划线',
+    hintUserName: '4-15 个字符，仅支持英文小写字母、数字或下划线',
     hintVerificationCode: '验证码有效期 20 分钟',
     history: '足迹',
     hkd: '港币',
@@ -999,10 +999,9 @@ export const TEXT = {
       'Add articles to Circle and keep them behind the paywall.',
     hintCircleDisplayName: 'Must be between 2-12 characters long.',
     hintCircleName:
-      'Must be between 2-20 characters long. Only letters, numbers and underscores are allowed.',
+      'Must be between 2-20 characters long. Only letters letters, numbers and underline are allowed.',
     hintDescription: 'Maximum 200 characters.',
-    hintDisplayName:
-      'Must be between 2-20 characters long. Chinese characters, letters, numbers and underscores are allowed.',
+    hintDisplayName: 'Must be between 2-20 characters long.',
     hintEditCollection:
       'Adding articles to a collection helps readers find your articles.',
     hintPassword:
@@ -1013,7 +1012,7 @@ export const TEXT = {
       'We have amended or modified our Terms and Privacy Policy. Agree and accept all Terms to continue using our Services.',
     hintUserDescription: 'Recommended within 50 words and 200 words maximum.',
     hintUserName:
-      'Must be between 4-15 characters long. Only English alphabets, numbers and underline are accepted.',
+      'Must be between 4-15 characters long. Only lowercase letters, numbers and underline are accepted.',
     hintVerificationCode: 'Code will expire after 20 minutes',
     history: 'History',
     hkd: 'HKD',
diff --git a/src/common/utils/route.ts b/src/common/utils/route.ts
index b369dd660c..ebc4b654cb 100644
--- a/src/common/utils/route.ts
+++ b/src/common/utils/route.ts
@@ -5,7 +5,7 @@ import { PATHS, ROUTES } from '~/common/enums'
 
 import { UtmParams } from './analytics'
 import { fromGlobalId } from './globalId'
-import { tagSlugify } from './text'
+import { slugifyTag } from './text'
 import { parseURL } from './url'
 
 interface ArticleArgs {
@@ -201,7 +201,7 @@ export const toPath = (
     case 'tagDetail': {
       const { id, slug, content } = args.tag
       const { id: numberId } = fromGlobalId(id as string)
-      const pathname = `/tags/${numberId}-${slug || tagSlugify(content)}`
+      const pathname = `/tags/${numberId}-${slug || slugifyTag(content)}`
       const typeStr = args.feedType ? `?type=${args.feedType}` : ''
       return {
         href: `${pathname}${typeStr}`,
diff --git a/src/common/utils/text.ts b/src/common/utils/text/article.ts
similarity index 51%
rename from src/common/utils/text.ts
rename to src/common/utils/text/article.ts
index 64749cebf2..640cc883f2 100644
--- a/src/common/utils/text.ts
+++ b/src/common/utils/text/article.ts
@@ -1,12 +1,6 @@
 import { distance } from 'fastest-levenshtein'
 
-import {
-  MAX_TAG_CONTENT_LENGTH,
-  TAG_CONTENT_CLAMP_LATIN_LETTERS_LENGTH,
-  TAG_CONTENT_CLAMP_LENGTH,
-} from '~/common/enums'
-
-import { toSizedImageURL } from './url'
+import { toSizedImageURL } from '../url'
 
 /**
  * Remove html tag and merge multiple spaces into one.
@@ -34,7 +28,7 @@ export const makeSummary = (html: string, length = 140) => {
 
     const addition =
       el.length + summary.length > length + buffer
-        ? `${el.substring(0, length - summary.length)}...`
+        ? `${el.substring(0, length - summary.length)}…`
         : el
 
     summary = summary.concat(addition)
@@ -55,20 +49,23 @@ export const trimLineBreaks = (html: string) => {
 /**
  * Simple words' length counting.
  */
-export const countWordsLength = (text: string) => {
-  return text
-    ? text.split('').reduce((count, char, index) => {
-        return count + (text.charCodeAt(index) < 256 ? 1 : 2)
-      }, 0)
-    : 0
+export const countChars = (text: string) => {
+  if (!text) {
+    return 0
+  }
+
+  return text.split('').reduce((count, char, index) => {
+    return count + (text.charCodeAt(index) < 256 ? 1 : 2)
+  }, 0)
 }
 
 /**
  * Simple substring title by words' length counting.
  */
-export const subString = (text: string, limit: number) => {
+export const normalizeArticleTitle = (text: string, limit: number) => {
   const buffer = 3
-  const length = countWordsLength(text)
+  const length = countChars(text)
+
   if (text && length > limit) {
     let sum = 0
     let lastIndex = 0
@@ -79,8 +76,10 @@ export const subString = (text: string, limit: number) => {
         break
       }
     }
-    return text.substring(0, lastIndex) + '...'
+
+    return text.substring(0, lastIndex) + '…'
   }
+
   return text
 }
 
@@ -134,59 +133,3 @@ export const optimizeEmbed = (content: string) => {
  */
 export const measureDiffs = (source: string, target: string) =>
   distance(source, target)
-
-// for Twitter and others which do not support non-English in URL
-export const stripNonEnglishUrl = (url: string) => {
-  // const frag = url.split('#', 2)?.[1] // anything after '#'
-  const hash = url.match(/(#[\x21-\x7e]+)$/)?.[1] ?? ''
-  // get the beginning portion of all printable ascii, and must ends with ASCII '\w'
-  const turl = url.match(/^[\x21-\x7e]+[A-Za-z0-9]/)?.[0]
-  return turl ? `${turl}${hash}` : url // fallback to full url
-}
-
-const nonAlphaNumUni = String.raw`[^\p{Letter}\p{Number}]+`
-const anyNonAlphaNum = new RegExp(nonAlphaNumUni, 'gu')
-
-// to simulate slugify at DB server side
-// https://github.com/thematters/matters-metabase/blob/master/sql/stale-tags-create-table-view.sql#L2-L13
-// might be able to use under more scenarios
-export const tagSlugify = (content: string) =>
-  `${content}`
-    // .toLowerCase()
-    .replace(anyNonAlphaNum, '-') // replace all non alpha-number to `-`, including spaces and punctuations
-    .replace(/(^-+|-+$)/g, '') // strip leading or trailing `-` if there's any
-
-export const stripAllPunct = (content: string) => {
-  const words = `${content}`.split(anyNonAlphaNum).filter(Boolean)
-  switch (words.length) {
-    case 0:
-      return ''
-    case 1:
-      return words[0]
-    default:
-      const [first, ...rest] = words
-      return `${first} ${rest.join('')}`
-  }
-}
-
-export const stripSpaces = (content: string | undefined | null) =>
-  content?.replaceAll(/\s+/g, ' ').trim()
-
-export const normalizeTagInput = (content: string) =>
-  stripAllPunct(content).substring(0, MAX_TAG_CONTENT_LENGTH)
-
-const allLatinLetters = new RegExp(String.raw`^[\s -~\p{Script=Latin}]+$`, 'u')
-
-export const clampTagLength = (tagContent: string) => {
-  if (allLatinLetters.test(tagContent)) {
-    if (tagContent.length > TAG_CONTENT_CLAMP_LATIN_LETTERS_LENGTH) {
-      // allow 20 chars for ASCII/latin letters only tag
-      return `${tagContent.slice(0, TAG_CONTENT_CLAMP_LATIN_LETTERS_LENGTH)}…`
-    }
-  } else {
-    if (tagContent.length > TAG_CONTENT_CLAMP_LENGTH) {
-      return `${tagContent.slice(0, TAG_CONTENT_CLAMP_LENGTH)}…`
-    }
-  }
-  return tagContent
-}
diff --git a/src/common/utils/text/index.ts b/src/common/utils/text/index.ts
new file mode 100644
index 0000000000..bc14326959
--- /dev/null
+++ b/src/common/utils/text/index.ts
@@ -0,0 +1,22 @@
+export * from './article'
+export * from './tag'
+
+// for Twitter and others which do not support non-English in URL
+export const stripNonEnglishUrl = (url: string) => {
+  // const frag = url.split('#', 2)?.[1] // anything after '#'
+  const hash = url.match(/(#[\x21-\x7e]+)$/)?.[1] ?? ''
+  // get the beginning portion of all printable ascii, and must ends with ASCII '\w'
+  const turl = url.match(/^[\x21-\x7e]+[A-Za-z0-9]/)?.[0]
+  return turl ? `${turl}${hash}` : url // fallback to full url
+}
+
+export const stripSpaces = (content: string | undefined | null) =>
+  content?.replaceAll(/\s+/g, ' ').trim()
+
+export const normalizeName = (name: string) => {
+  // convert uppercase to lowercase
+  const lower = name.toLowerCase()
+
+  // remove non-English and numbers characters except '_'
+  return lower.replace(/[^a-z0-9_]/g, '')
+}
diff --git a/src/common/utils/text/tag.ts b/src/common/utils/text/tag.ts
new file mode 100644
index 0000000000..1242d582dc
--- /dev/null
+++ b/src/common/utils/text/tag.ts
@@ -0,0 +1,47 @@
+import {
+  MAX_TAG_CONTENT_LENGTH,
+  TAG_CONTENT_CLAMP_LATIN_LETTERS_LENGTH,
+  TAG_CONTENT_CLAMP_LENGTH,
+} from '~/common/enums'
+
+const anyNonAlphaNum = new RegExp(String.raw`[^\p{Letter}\p{Number}]+`, 'gu')
+const allLatinLetters = new RegExp(String.raw`^[\s -~\p{Script=Latin}]+$`, 'u')
+
+// to simulate slugify at DB server side
+// https://github.com/thematters/matters-metabase/blob/master/sql/stale-tags-create-table-view.sql#L2-L13
+// might be able to use under more scenarios
+export const slugifyTag = (content: string) =>
+  `${content}`
+    // .toLowerCase()
+    .replace(anyNonAlphaNum, '-') // replace all non alpha-number to `-`, including spaces and punctuations
+    .replace(/(^-+|-+$)/g, '') // strip leading or trailing `-` if there's any
+
+const stripTagAllPunct = (content: string) => {
+  const words = `${content}`.split(anyNonAlphaNum).filter(Boolean)
+  switch (words.length) {
+    case 0:
+      return ''
+    case 1:
+      return words[0]
+    default:
+      const [first, ...rest] = words
+      return `${first} ${rest.join('')}`
+  }
+}
+
+export const normalizeTag = (content: string) =>
+  stripTagAllPunct(content).substring(0, MAX_TAG_CONTENT_LENGTH)
+
+export const clampTag = (tagContent: string) => {
+  if (allLatinLetters.test(tagContent)) {
+    if (tagContent.length > TAG_CONTENT_CLAMP_LATIN_LETTERS_LENGTH) {
+      // allow 20 chars for ASCII/latin letters only tag
+      return `${tagContent.slice(0, TAG_CONTENT_CLAMP_LATIN_LETTERS_LENGTH)}…`
+    }
+  } else {
+    if (tagContent.length > TAG_CONTENT_CLAMP_LENGTH) {
+      return `${tagContent.slice(0, TAG_CONTENT_CLAMP_LENGTH)}…`
+    }
+  }
+  return tagContent
+}
diff --git a/src/components/ArticleDigest/Card/index.tsx b/src/components/ArticleDigest/Card/index.tsx
index 3301f67a47..c34249fbf6 100644
--- a/src/components/ArticleDigest/Card/index.tsx
+++ b/src/components/ArticleDigest/Card/index.tsx
@@ -2,9 +2,9 @@ import classNames from 'classnames'
 
 import { TEST_ID } from '~/common/enums'
 import {
-  countWordsLength,
+  countChars,
   makeSummary,
-  subString,
+  normalizeArticleTitle,
   toPath,
 } from '~/common/utils'
 import { Card } from '~/components'
@@ -30,10 +30,10 @@ export const ArticleDigestCard = ({
   const { summary, state } = article
   const isBanned = state === 'banned'
   const cover = !isBanned ? article.cover : null
-  const title = subString(article.title, 70)
+  const title = normalizeArticleTitle(article.title, 70)
   const cleanedSummary = isBanned
     ? ''
-    : makeSummary(summary, countWordsLength(article.title) > 40 ? 50 : 70)
+    : makeSummary(summary, countChars(article.title) > 40 ? 50 : 70)
   const containerClasses = classNames({
     container: true,
     'has-cover': !!cover,
diff --git a/src/components/Dialogs/HelpDialog/index.tsx b/src/components/Dialogs/HelpDialog/index.tsx
index 8e9ea7a741..31ff86a96c 100644
--- a/src/components/Dialogs/HelpDialog/index.tsx
+++ b/src/components/Dialogs/HelpDialog/index.tsx
@@ -23,11 +23,17 @@ const ReadTime = () => (
   <>
     <h2 className="title">
       <TextIcon icon={<IconReadTimeTotal16 size="md" />} weight="md">
-        <FormattedMessage defaultMessage="Accumulated Read Time" description="src/components/Dialogs/HelpDialog/index.tsx" />
+        <FormattedMessage
+          defaultMessage="Accumulated Read Time"
+          description="src/components/Dialogs/HelpDialog/index.tsx"
+        />
       </TextIcon>
     </h2>
     <p className="description">
-      <FormattedMessage defaultMessage="Accumulated read time indicates the total time length that registered users read." description="src/components/Dialogs/HelpDialog/index.tsx" />
+      <FormattedMessage
+        defaultMessage="Accumulated read time indicates the total time length that registered users read."
+        description="src/components/Dialogs/HelpDialog/index.tsx"
+      />
     </p>
     <style jsx>{styles}</style>
   </>
@@ -41,7 +47,10 @@ const ReadCount = () => (
       </TextIcon>
     </h2>
     <p className="description">
-      <FormattedMessage defaultMessage="Read counts indicates how many registered users read." description="src/components/Dialogs/HelpDialog/index.tsx" />
+      <FormattedMessage
+        defaultMessage="Read counts indicates how many registered users read."
+        description="src/components/Dialogs/HelpDialog/index.tsx"
+      />
     </p>
     <style jsx>{styles}</style>
   </>
diff --git a/src/components/Dialogs/TagDialog/Content.tsx b/src/components/Dialogs/TagDialog/Content.tsx
index 9caf481859..b8b7ff1a8b 100644
--- a/src/components/Dialogs/TagDialog/Content.tsx
+++ b/src/components/Dialogs/TagDialog/Content.tsx
@@ -13,7 +13,7 @@ import {
   MAX_TAG_DESCRIPTION_LENGTH,
 } from '~/common/enums'
 import {
-  normalizeTagInput, // stripAllPunct, // stripPunctPrefixSuffix,
+  normalizeTag,
   parseFormSubmitErrors,
   toPath,
   translate,
@@ -189,7 +189,7 @@ const TagDialogContent: React.FC<BaseTagDialogContentProps> = ({
         error={touched.newContent && errors.newContent}
         onBlur={handleBlur}
         onChange={(e) => {
-          const newContent = normalizeTagInput(e.target.value)
+          const newContent = normalizeTag(e.target.value)
           setFieldValue('newContent', newContent)
           return newContent
         }}
diff --git a/src/components/Forms/ChangeUserNameForm/Confirm.tsx b/src/components/Forms/ChangeUserNameForm/Confirm.tsx
index fdb8676910..823ef007b2 100644
--- a/src/components/Forms/ChangeUserNameForm/Confirm.tsx
+++ b/src/components/Forms/ChangeUserNameForm/Confirm.tsx
@@ -4,6 +4,7 @@ import _pickBy from 'lodash/pickBy'
 import React, { useContext } from 'react'
 
 import {
+  normalizeName,
   parseFormSubmitErrors,
   translate,
   validateComparedUserName,
@@ -58,10 +59,10 @@ const Confirm: React.FC<FormProps> = ({
     errors,
     touched,
     handleBlur,
-    handleChange,
     handleSubmit,
     isSubmitting,
     isValid,
+    setFieldValue,
   } = useFormik<FormValues>({
     initialValues: {
       userName: '',
@@ -130,7 +131,11 @@ const Confirm: React.FC<FormProps> = ({
         value={values.userName}
         error={touched.userName && errors.userName}
         onBlur={handleBlur}
-        onChange={handleChange}
+        onChange={(e) => {
+          const userName = normalizeName(e.target.value)
+          setFieldValue('userName', userName)
+          return userName
+        }}
       />
 
       <Form.Input
@@ -141,8 +146,12 @@ const Confirm: React.FC<FormProps> = ({
         value={values.comparedUserName}
         error={touched.comparedUserName && errors.comparedUserName}
         onBlur={handleBlur}
-        onChange={handleChange}
         hint={<Translate id="hintUserName" />}
+        onChange={(e) => {
+          const userName = normalizeName(e.target.value)
+          setFieldValue('comparedUserName', userName)
+          return userName
+        }}
       />
     </Form>
   )
diff --git a/src/components/Forms/CreateCircleForm/Init.tsx b/src/components/Forms/CreateCircleForm/Init.tsx
index 0014881d6c..a40a148547 100644
--- a/src/components/Forms/CreateCircleForm/Init.tsx
+++ b/src/components/Forms/CreateCircleForm/Init.tsx
@@ -10,6 +10,7 @@ import {
 } from '~/common/enums'
 import {
   analytics,
+  normalizeName,
   parseFormSubmitErrors,
   validateCircleAmount,
   validateCircleDisplayName,
@@ -112,7 +113,7 @@ const Init: React.FC<FormProps> = ({
               'name',
               intl.formatMessage({
                 defaultMessage:
-                  'Must be between 2-20 characters long. Only letters, numbers and underscores are allowed.',
+                  'Must be between 2-20 characters long. Only lowercase letters, numbers and underline are allowed.',
                 description: '',
               })
             )
@@ -167,7 +168,11 @@ const Init: React.FC<FormProps> = ({
           value={values.name}
           error={touched.name && errors.name}
           onBlur={handleBlur}
-          onChange={handleChange}
+          onChange={(e) => {
+            const name = normalizeName(e.target.value)
+            setFieldValue('name', name)
+            return name
+          }}
         />
 
         <style jsx>{styles}</style>
diff --git a/src/components/SearchSelect/SearchingArea/index.tsx b/src/components/SearchSelect/SearchingArea/index.tsx
index b66205843b..96ee99a536 100644
--- a/src/components/SearchSelect/SearchingArea/index.tsx
+++ b/src/components/SearchSelect/SearchingArea/index.tsx
@@ -7,7 +7,7 @@ import {
   analytics,
   isValidEmail,
   mergeConnections,
-  normalizeTagInput, // stripAllPunct, // stripPunctPrefixSuffix,
+  normalizeTag, // stripTagAllPunct, // stripPunctPrefixSuffix,
 } from '~/common/utils'
 import {
   EmptySearch,
@@ -101,7 +101,7 @@ const SearchingArea: React.FC<SearchingAreaProps> = ({
   const [searchKey, setSearchKey] = useState('')
   const [debouncedSearchKey, setdebouncedSearchKey] = useState('')
   const debouncedSetSearchKey = useDebouncedCallback((sk0) => {
-    const sk = isTag ? normalizeTagInput(sk0) : sk0
+    const sk = isTag ? normalizeTag(sk0) : sk0
     setdebouncedSearchKey(sk)
     setSearchKey(sk)
   }, INPUT_DEBOUNCE)
@@ -290,9 +290,7 @@ const SearchingArea: React.FC<SearchingAreaProps> = ({
                   {canCreateTag && (
                     <li>
                       <CreateTag
-                        tag={toDigestTagPlaceholder(
-                          normalizeTagInput(searchKey)
-                        )}
+                        tag={toDigestTagPlaceholder(normalizeTag(searchKey))}
                         onClick={addNodeToStaging}
                       />
                     </li>
diff --git a/src/components/Tag/index.tsx b/src/components/Tag/index.tsx
index 61b88198ee..9c3477fe79 100644
--- a/src/components/Tag/index.tsx
+++ b/src/components/Tag/index.tsx
@@ -2,7 +2,7 @@ import classNames from 'classnames'
 import gql from 'graphql-tag'
 import Link from 'next/link'
 
-import { clampTagLength, toPath } from '~/common/utils'
+import { clampTag, toPath } from '~/common/utils'
 import { IconClose16, IconProps, TextIcon, TextIconProps } from '~/components'
 import { DigestTagFragment } from '~/gql/graphql'
 
@@ -67,7 +67,7 @@ export const Tag = ({
     disabled: !!disabled && !onClick,
   })
 
-  const tagName = canClamp ? clampTagLength(tag.content) : tag.content
+  const tagName = canClamp ? clampTag(tag.content) : tag.content
 
   const path = toPath({
     page: 'tagDetail',
diff --git a/src/components/UserDigest/Plain/index.tsx b/src/components/UserDigest/Plain/index.tsx
index 2ee29162c2..946193b6ee 100644
--- a/src/components/UserDigest/Plain/index.tsx
+++ b/src/components/UserDigest/Plain/index.tsx
@@ -1,7 +1,7 @@
 import classNames from 'classnames'
 
 import { TEST_ID } from '~/common/enums'
-import { subString, toPath } from '~/common/utils'
+import { toPath } from '~/common/utils'
 import { LinkWrapper } from '~/components'
 import { UserDigestPlainUserFragment } from '~/gql/graphql'
 
@@ -13,7 +13,6 @@ export type UserDigestPlainProps = {
 
   disabled?: boolean
   hasUnderline?: boolean
-  displayNameLimit?: number
   onClick?: () => void
 }
 
@@ -22,7 +21,6 @@ const Plain = ({
   disabled,
   onClick,
   hasUnderline,
-  displayNameLimit,
 }: UserDigestPlainProps) => {
   const path = toPath({
     page: 'userProfile',
@@ -47,10 +45,7 @@ const Plain = ({
       testId={TEST_ID.DIGEST_USER_MINI}
     >
       <section className={containerClasses}>
-        <span className={displayNameClasses}>
-          {displayNameLimit && subString(user.displayName!, displayNameLimit)}
-          {!displayNameLimit && user.displayName}
-        </span>
+        <span className={displayNameClasses}>{user.displayName}</span>
         <style jsx>{styles}</style>
       </section>
     </LinkWrapper>
diff --git a/src/views/ArticleDetail/Toolbar/index.tsx b/src/views/ArticleDetail/Toolbar/index.tsx
index 3287c5b172..c69de05295 100644
--- a/src/views/ArticleDetail/Toolbar/index.tsx
+++ b/src/views/ArticleDetail/Toolbar/index.tsx
@@ -1,7 +1,7 @@
 import gql from 'graphql-tag'
 
 import { TEST_ID } from '@/src/common/enums'
-import { stripAllPunct, toLocale, toPath } from '~/common/utils'
+import { normalizeTag, toLocale, toPath } from '~/common/utils'
 import {
   BookmarkButton,
   Media,
@@ -123,7 +123,7 @@ const Toolbar = ({
               ?.map(({ content }) => content)
               .join(' ')
               .split(/\s+/)
-              .map(stripAllPunct)}
+              .map(normalizeTag)}
           />
         </Media>
 
diff --git a/src/views/ArticleDetail/index.tsx b/src/views/ArticleDetail/index.tsx
index 0f2cec185d..0dd23be780 100644
--- a/src/views/ArticleDetail/index.tsx
+++ b/src/views/ArticleDetail/index.tsx
@@ -6,7 +6,7 @@ import { Waypoint } from 'react-waypoint'
 
 import { ADD_TOAST, DEFAULT_LOCALE, URL_QS } from '~/common/enums'
 import {
-  stripAllPunct,
+  normalizeTag,
   toGlobalId,
   toPath,
   toUserLanguage,
@@ -224,9 +224,7 @@ const BaseArticleDetail = ({
     translated && translatedSummary ? translatedSummary : article.summary
   const content =
     translated && translatedContent ? translatedContent : article.content
-  const keywords = (article.tags || []).map(({ content: c }) =>
-    stripAllPunct(c)
-  )
+  const keywords = (article.tags || []).map(({ content: c }) => normalizeTag(c))
 
   return (
     <Layout.Main aside={<RelatedArticles article={article} inSidebar />}>
diff --git a/src/views/TagDetail/index.tsx b/src/views/TagDetail/index.tsx
index a79e50304f..66a3ebae18 100644
--- a/src/views/TagDetail/index.tsx
+++ b/src/views/TagDetail/index.tsx
@@ -6,9 +6,7 @@ import IMAGE_TAG_COVER from '@/public/static/images/tag-cover.png'
 import { ERROR_CODES } from '~/common/enums'
 import {
   fromGlobalId,
-  // makeTitle,
-  // stripPunctPrefixSuffix,
-  stripAllPunct,
+  normalizeTag,
   stripSpaces,
   toGlobalId,
   toPath,
@@ -115,11 +113,9 @@ const TagDetail = ({ tag }: { tag: TagFragmentFragment }) => {
   const isOfficial = !!tag?.isOfficial
   const canAdd = !isOfficial || (isOfficial && isMatty)
 
-  const title =
-    // (tag.description ? `${makeTitle(tag.description, 80)} ` : '') +
-    '#' + stripAllPunct(tag.content)
-  const keywords = tag.content.split(/\s+/).filter(Boolean).map(stripAllPunct) // title.includes(tag.content) ??
-  const description = stripSpaces(tag.description) // || stripAllPunct(tag.content)
+  const title = '#' + normalizeTag(tag.content)
+  const keywords = tag.content.split(/\s+/).filter(Boolean).map(normalizeTag)
+  const description = stripSpaces(tag.description)
   const path = toPath({ page: 'tagDetail', tag })
 
   /**
@@ -150,7 +146,7 @@ const TagDetail = ({ tag }: { tag: TagFragmentFragment }) => {
       />
 
       <Head
-        // title={`#${stripAllPunct(tag.content)}`}
+        // title={`#${normalizeTag(tag.content)}`}
         // description={tag.description}
         title={title}
         path={path.href}
@@ -163,7 +159,7 @@ const TagDetail = ({ tag }: { tag: TagFragmentFragment }) => {
         jsonLdData={{
           '@context': 'https://schema.org',
           '@type': 'ItemList', // should follow with some recent articles under 'itemListElement'
-          name: title, // stripAllPunct(tag.content),
+          name: title,
           description,
           keywords,
           image:

From 0080855e4f13922ece156a8ba55a96931f01eaca Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Thu, 30 Mar 2023 13:45:06 +0700
Subject: [PATCH 34/92] feat(test): add test for username input normalization

---
 src/components/Layout/Header/Title/index.tsx |  2 +-
 tests/forms.spec.ts                          | 22 ++++++++++++++++++++
 tests/helpers/poms/userProfile.ts            | 15 +++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 tests/forms.spec.ts

diff --git a/src/components/Layout/Header/Title/index.tsx b/src/components/Layout/Header/Title/index.tsx
index f1a5bee750..f51f3c1b91 100644
--- a/src/components/Layout/Header/Title/index.tsx
+++ b/src/components/Layout/Header/Title/index.tsx
@@ -6,7 +6,7 @@ const LayoutHeaderTitle: React.FC<React.PropsWithChildren<TranslateProps>> = ({
   children,
   ...props
 }) => (
-  <Title type="nav" is="h1" onClick={() => jump(document.body)} role="button">
+  <Title type="nav" is="h1" onClick={() => jump(document.body)}>
     {children ? children : <Translate {...props} />}
   </Title>
 )
diff --git a/tests/forms.spec.ts b/tests/forms.spec.ts
new file mode 100644
index 0000000000..2048464d61
--- /dev/null
+++ b/tests/forms.spec.ts
@@ -0,0 +1,22 @@
+import { expect, test } from '@playwright/test'
+import _random from 'lodash/random'
+
+import { PATHS } from '~/common/enums'
+
+import { authedTest, pageGoto } from './helpers'
+
+test.describe('Change username', () => {
+  authedTest('input normalization', async ({ alicePage }) => {
+    // Go to change username page
+    await pageGoto(alicePage, PATHS.ME_SETTINGS_CHANGE_USERNAME)
+
+    // Input uppcase and non-underlined characters
+    const $userNameInput = alicePage.getByPlaceholder('Enter Matters ID', {
+      exact: true,
+    })
+    await $userNameInput.fill('UPPERcase*-_.":]}[~!?')
+
+    // Expect the input to be normalized
+    expect(await $userNameInput.inputValue()).toBe('uppercase_')
+  })
+})
diff --git a/tests/helpers/poms/userProfile.ts b/tests/helpers/poms/userProfile.ts
index dec661005c..5d7886e3e1 100644
--- a/tests/helpers/poms/userProfile.ts
+++ b/tests/helpers/poms/userProfile.ts
@@ -82,6 +82,21 @@ export class UserProfilePage {
     await expect(this.feedArticles.first()).toBeVisible()
   }
 
+  async gotoSettings() {
+    // go to homepage
+    await pageGoto(this.page, '/')
+
+    // click "My Page" button
+    await this.page.getByRole('button', { name: 'My Page' }).click()
+
+    // click "Settings" link
+    await this.page.getByRole('link', { name: 'Settings' }).click()
+    await this.page
+      .getByTestId(TEST_ID.LAYOUT_HEADER)
+      .getByRole('heading', { level: 1, name: 'Settings', exact: true })
+      .isVisible()
+  }
+
   async goto(userName: string) {
     await pageGoto(this.page, `/@${userName}`)
   }

From cd7ea47a71d8424fe87376447b36d2a18eea1847 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Thu, 30 Mar 2023 17:54:43 +0800
Subject: [PATCH 35/92] feat(Editor): revise editor search select dialog

---
 .../Editor/TagCustomStagingArea/index.tsx     |   2 +
 .../Forms/EditorSearchSelectForm/index.tsx    |  12 +-
 .../SearchingArea/EditorSearchingArea.tsx     | 354 ++++++++++++++++++
 .../SearchSelect/StagingArea/index.tsx        |   1 +
 4 files changed, 368 insertions(+), 1 deletion(-)
 create mode 100644 src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx

diff --git a/src/components/Editor/TagCustomStagingArea/index.tsx b/src/components/Editor/TagCustomStagingArea/index.tsx
index b9a46f1b85..187bca10ba 100644
--- a/src/components/Editor/TagCustomStagingArea/index.tsx
+++ b/src/components/Editor/TagCustomStagingArea/index.tsx
@@ -22,6 +22,7 @@ const TagCustomStagingArea = ({
   nodes: tags,
   setNodes: setTags,
   hint,
+  toStagingArea,
 }: CustomStagingAreaProps) => {
   const viewer = useContext(ViewerContext)
 
@@ -54,6 +55,7 @@ const TagCustomStagingArea = ({
   const addTag = (tag: SelectTag) => {
     const oldTags = tags.filter((t) => t.node.id !== tag.id)
     setTags([...oldTags, { node: tag, selected: true }])
+    toStagingArea && toStagingArea()
   }
 
   if (loading) {
diff --git a/src/components/Forms/EditorSearchSelectForm/index.tsx b/src/components/Forms/EditorSearchSelectForm/index.tsx
index b3c28c5dc4..b027e38467 100644
--- a/src/components/Forms/EditorSearchSelectForm/index.tsx
+++ b/src/components/Forms/EditorSearchSelectForm/index.tsx
@@ -10,7 +10,7 @@ import { Dialog, IconAdd16, TextIcon, Translate } from '~/components'
 import SearchingArea, {
   SearchType,
   SelectNode,
-} from '~/components/SearchSelect/SearchingArea'
+} from '~/components/SearchSelect/SearchingArea/EditorSearchingArea'
 import StagingArea, {
   CustomStagingAreaProps,
   StagingNode,
@@ -180,6 +180,16 @@ const EditorSearchSelectForm = ({
           addNodeToStaging={addNodeToStaging}
           createTag={createTag}
           inviteEmail={inviteEmail}
+          CustomStagingArea={
+            CustomStagingArea && (
+              <CustomStagingArea
+                nodes={stagingNodes}
+                setNodes={syncStagingNodes}
+                hint={hint}
+                toStagingArea={toStagingArea}
+              />
+            )
+          }
           autoFocus
         />
       )}
diff --git a/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx b/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
new file mode 100644
index 0000000000..e58f9bb93f
--- /dev/null
+++ b/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
@@ -0,0 +1,354 @@
+import { useLazyQuery } from '@apollo/react-hooks'
+import { useContext, useEffect, useState } from 'react'
+import { useDebouncedCallback } from 'use-debounce'
+
+import { INPUT_DEBOUNCE } from '~/common/enums'
+import {
+  analytics,
+  isValidEmail,
+  mergeConnections,
+  normalizeTagInput, // stripAllPunct, // stripPunctPrefixSuffix,
+} from '~/common/utils'
+import {
+  EmptySearch,
+  InfiniteScroll,
+  Spinner,
+  toDigestTagPlaceholder,
+  usePublicLazyQuery,
+  ViewerContext,
+} from '~/components'
+import { toUserDigestMiniPlaceholder } from '~/components/UserDigest/Mini'
+import {
+  ListViewerArticlesQuery,
+  SearchExclude,
+  SearchFilter,
+  SelectSearchQuery,
+} from '~/gql/graphql'
+
+import SearchSelectNode from '../SearchSelectNode'
+import styles from '../styles.css'
+import CreateTag from './CreateTag'
+import { LIST_VIEWER_ARTICLES, SELECT_SEARCH } from './gql'
+import InviteEmail from './InviteEmail'
+import SearchInput, {
+  SearchInputProps,
+  SearchType as SearchInputType,
+} from './SearchInput'
+
+/**
+ * This is a sub-component of search-and-select, and it will show
+ * search results after typing in <SearchInput>. Node will be
+ * added into the staging area when click.
+ *
+ */
+export type SearchType = SearchInputType
+export type SelectNode = NonNullable<
+  SelectSearchQuery['search']['edges']
+>[0]['node']
+export type SelectArticle = NonNullable<
+  SelectSearchQuery['search']['edges']
+>[0]['node'] & { __typename: 'Article' }
+export type SelectTag = NonNullable<
+  SelectSearchQuery['search']['edges']
+>[0]['node'] & { __typename: 'Tag' }
+export type SelectUser = NonNullable<
+  SelectSearchQuery['search']['edges']
+>[0]['node'] & { __typename: 'User' }
+
+type SearchingAreaProps = {
+  searchType: SearchType
+  searchFilter?: SearchFilter
+  searchExclude?: SearchExclude
+
+  inSearchingArea: boolean
+  toStagingArea: () => void
+  toSearchingArea: () => void
+  addNodeToStaging: (node: SelectNode) => void
+
+  createTag?: boolean
+  inviteEmail?: boolean
+
+  CustomStagingArea?: React.ReactNode
+} & Pick<SearchInputProps, 'autoFocus'>
+
+type Mode = 'search' | 'list'
+
+const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
+  searchType,
+  searchFilter,
+  searchExclude,
+
+  inSearchingArea,
+  toStagingArea,
+  toSearchingArea,
+  addNodeToStaging,
+
+  createTag,
+  inviteEmail,
+  CustomStagingArea,
+}) => {
+  const viewer = useContext(ViewerContext)
+
+  const isArticle = searchType === 'Article'
+  const isUser = searchType === 'User' || searchType === 'Invitee'
+  const isTag = searchType === 'Tag'
+  const hasListMode = viewer.id === searchFilter?.authorId && isArticle
+  const [mode, setMode] = useState<Mode>(hasListMode ? 'list' : 'search')
+  const isSearchMode = mode === 'search'
+  const isListMode = mode === 'list'
+
+  const [searching, setSearching] = useState(false)
+  const [searchingNodes, setSearchingNodes] = useState<SelectNode[]>([])
+
+  const [searchKey, setSearchKey] = useState('')
+  const [debouncedSearchKey, setdebouncedSearchKey] = useState('')
+  const debouncedSetSearchKey = useDebouncedCallback((sk0) => {
+    const sk = isTag ? normalizeTagInput(sk0) : sk0
+    setdebouncedSearchKey(sk)
+    setSearchKey(sk)
+  }, INPUT_DEBOUNCE)
+
+  // Data Fetching
+  const [lazySearch, { data, loading, fetchMore }] =
+    usePublicLazyQuery<SelectSearchQuery>(
+      SELECT_SEARCH,
+      {},
+      { publicQuery: !viewer.isAuthed }
+    )
+  const [
+    loadList,
+    { data: listData, loading: listLoading, fetchMore: fetchMoreList },
+  ] = useLazyQuery<ListViewerArticlesQuery>(LIST_VIEWER_ARTICLES)
+
+  // pagination
+  const { edges: searchEdges, pageInfo: searchPageInfo } = data?.search || {}
+  const { edges: listEdges, pageInfo: listPageInfo } =
+    listData?.viewer?.articles || {}
+
+  // load next page
+  const loadMore = async () => {
+    analytics.trackEvent('load_more', {
+      type: isArticle ? 'search_article' : isTag ? 'search_tag' : 'search_user',
+      location: searchEdges?.length || 0,
+    })
+
+    fetchMore({
+      variables: { after: searchPageInfo?.endCursor },
+      updateQuery: (previousResult, { fetchMoreResult }) =>
+        mergeConnections({
+          oldData: previousResult,
+          newData: fetchMoreResult,
+          path: 'search',
+        }),
+    })
+  }
+  const loadMoreList = async () => {
+    fetchMoreList({
+      variables: { after: listPageInfo?.endCursor },
+      updateQuery: (previousResult, { fetchMoreResult }) =>
+        mergeConnections({
+          oldData: previousResult,
+          newData: fetchMoreResult,
+          path: 'viewer.articles',
+        }),
+    })
+  }
+
+  const searchNodes = searchEdges?.map(({ node }) => node) || []
+  const searchNodeIds = searchNodes.map((n) => n.id).join(',')
+  const listNode =
+    listEdges
+      ?.map(({ node }) => node)
+      .filter((node) => node.articleState === 'active') || []
+  const listNodeIds = listNode.map((n) => n.id).join(',')
+  const search = (key: string) => {
+    const type = searchType === 'Invitee' ? 'User' : searchType
+    lazySearch({
+      variables: {
+        key,
+        type,
+        filter: searchFilter,
+        exclude: searchExclude,
+        first: 10,
+      },
+    })
+  }
+
+  // handling changes from search input
+  const onSearchInputChange = (value: string) => {
+    setSearchKey(value)
+    debouncedSetSearchKey(value)
+
+    if (hasListMode) {
+      setMode(value ? 'search' : 'list')
+      toSearchingArea()
+      return
+    }
+  }
+  const onSearchInputFocus = () => {
+    if (hasListMode) {
+      if (!searchKey) {
+        setMode('list')
+      }
+    } else if (searchingNodes.length <= 0) {
+      return
+    }
+
+    toSearchingArea()
+  }
+  const onSearchInputBlur = () => {
+    if (isSearchMode) {
+      return
+    }
+
+    // to prevent clicking node doesn't work
+    setTimeout(() => {
+      toStagingArea()
+    }, 100)
+  }
+
+  // searching
+  useEffect(() => {
+    if (debouncedSearchKey) {
+      search(debouncedSearchKey)
+    }
+  }, [debouncedSearchKey])
+
+  useEffect(() => {
+    setSearching(loading)
+    setSearchingNodes(searchNodes)
+  }, [loading, searchNodeIds])
+
+  // list
+  useEffect(() => {
+    if (!isListMode) {
+      return
+    }
+
+    // use cache or fetch
+    if (listNode.length > 0) {
+      setSearchingNodes(listNode)
+    } else {
+      loadList()
+    }
+    toSearchingArea()
+  }, [isListMode])
+
+  useEffect(() => {
+    setSearching(listLoading)
+    setSearchingNodes(listNode)
+  }, [listLoading, listNodeIds])
+
+  const hasNodes = searchNodes.length > 0
+  const haslistNode = listNode.length > 0
+  const canCreateTag =
+    isTag &&
+    searchKey &&
+    createTag &&
+    !searchNodes.some(
+      (node) => node.__typename === 'Tag' && node.content === searchKey
+    )
+  const canInviteEmail =
+    isUser &&
+    inviteEmail &&
+    searchKey &&
+    isValidEmail(searchKey.trim(), { allowPlusSign: false })
+
+  /**
+   * Render
+   */
+  return (
+    <>
+      <SearchInput
+        type={searchType}
+        value={searchKey}
+        onChange={onSearchInputChange}
+        onSubmit={search}
+        onFocus={onSearchInputFocus}
+        onBlur={onSearchInputBlur}
+        autoFocus
+      />
+
+      {inSearchingArea && (
+        <section className="area">
+          {searching && <Spinner />}
+          {searchKey.length === 0 && !!CustomStagingArea && CustomStagingArea}
+          {/* Search */}
+          {searchKey.length > 0 && (
+            <>
+              {isSearchMode &&
+                !searching &&
+                !hasNodes &&
+                !canCreateTag &&
+                !canInviteEmail && <EmptySearch />}
+
+              {isSearchMode &&
+                !searching &&
+                (hasNodes || canCreateTag || canInviteEmail) && (
+                  <InfiniteScroll
+                    hasNextPage={!!searchPageInfo?.hasNextPage}
+                    loadMore={loadMore}
+                  >
+                    <ul className="nodes">
+                      {canCreateTag && (
+                        <li>
+                          <CreateTag
+                            tag={toDigestTagPlaceholder(
+                              normalizeTagInput(searchKey)
+                            )}
+                            onClick={addNodeToStaging}
+                          />
+                        </li>
+                      )}
+                      {canInviteEmail && (
+                        <li>
+                          <InviteEmail
+                            user={toUserDigestMiniPlaceholder(searchKey.trim())}
+                            onClick={addNodeToStaging}
+                          />
+                        </li>
+                      )}
+
+                      {searchingNodes.map((node) => (
+                        <li key={node.id}>
+                          <SearchSelectNode
+                            node={node}
+                            onClick={addNodeToStaging}
+                          />
+                        </li>
+                      ))}
+                    </ul>
+                  </InfiniteScroll>
+                )}
+
+              {/* List */}
+              {isListMode && !searching && !haslistNode && <EmptySearch />}
+
+              {isListMode && !searching && haslistNode && (
+                <InfiniteScroll
+                  hasNextPage={!!listPageInfo?.hasNextPage}
+                  loadMore={loadMoreList}
+                >
+                  <ul className="nodes">
+                    {searchingNodes.map((node) => (
+                      <li key={node.id}>
+                        <SearchSelectNode
+                          node={node}
+                          onClick={addNodeToStaging}
+                        />
+                      </li>
+                    ))}
+                  </ul>
+                </InfiniteScroll>
+              )}
+            </>
+          )}
+
+          <style jsx>{styles}</style>
+        </section>
+      )}
+    </>
+  )
+}
+
+export default EditorSearchingArea
diff --git a/src/components/SearchSelect/StagingArea/index.tsx b/src/components/SearchSelect/StagingArea/index.tsx
index 8dc744f570..66aa54d0a4 100644
--- a/src/components/SearchSelect/StagingArea/index.tsx
+++ b/src/components/SearchSelect/StagingArea/index.tsx
@@ -31,6 +31,7 @@ export interface CustomStagingAreaProps {
   nodes: StagingNode[]
   setNodes: (nodes: StagingNode[]) => void
   hint: TextId
+  toStagingArea?: () => void
 }
 
 type StagingAreaProps = BaseStagingAreaProps & {

From 519d166fd778a836c7af5baa99e61fa4fe618fbe Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Thu, 30 Mar 2023 18:29:12 +0800
Subject: [PATCH 36/92] feat(Editor): adjust height of SearchInput

---
 .../SearchSelect/SearchingArea/SearchInput/styles.css           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SearchSelect/SearchingArea/SearchInput/styles.css b/src/components/SearchSelect/SearchingArea/SearchInput/styles.css
index 855c5c0435..c7a2eaa198 100644
--- a/src/components/SearchSelect/SearchingArea/SearchInput/styles.css
+++ b/src/components/SearchSelect/SearchingArea/SearchInput/styles.css
@@ -1,5 +1,5 @@
 :root {
-  --search-input-height: 3rem;
+  --search-input-height: 3.375rem;
   --search-input-button-width: 2rem;
 }
 

From 47fe9ec49ceeb55bde0e92069b7d09ae2a515469 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Fri, 31 Mar 2023 10:16:57 +0700
Subject: [PATCH 37/92] feat(announcement): revise <Announcements>

---
 src/components/Dialogs/HelpDialog/index.tsx   |  15 +-
 .../Home/Announcements/Carousel/index.tsx     |  18 +-
 .../Home/Announcements/Carousel/styles.css    |   8 +-
 .../Announcements/DropdownActions/index.tsx   | 156 ------------------
 .../Announcements/DropdownActions/styles.css  |   6 -
 src/views/Home/Announcements/index.tsx        |  30 +---
 6 files changed, 23 insertions(+), 210 deletions(-)
 delete mode 100644 src/views/Home/Announcements/DropdownActions/index.tsx
 delete mode 100644 src/views/Home/Announcements/DropdownActions/styles.css

diff --git a/src/components/Dialogs/HelpDialog/index.tsx b/src/components/Dialogs/HelpDialog/index.tsx
index 8e9ea7a741..31ff86a96c 100644
--- a/src/components/Dialogs/HelpDialog/index.tsx
+++ b/src/components/Dialogs/HelpDialog/index.tsx
@@ -23,11 +23,17 @@ const ReadTime = () => (
   <>
     <h2 className="title">
       <TextIcon icon={<IconReadTimeTotal16 size="md" />} weight="md">
-        <FormattedMessage defaultMessage="Accumulated Read Time" description="src/components/Dialogs/HelpDialog/index.tsx" />
+        <FormattedMessage
+          defaultMessage="Accumulated Read Time"
+          description="src/components/Dialogs/HelpDialog/index.tsx"
+        />
       </TextIcon>
     </h2>
     <p className="description">
-      <FormattedMessage defaultMessage="Accumulated read time indicates the total time length that registered users read." description="src/components/Dialogs/HelpDialog/index.tsx" />
+      <FormattedMessage
+        defaultMessage="Accumulated read time indicates the total time length that registered users read."
+        description="src/components/Dialogs/HelpDialog/index.tsx"
+      />
     </p>
     <style jsx>{styles}</style>
   </>
@@ -41,7 +47,10 @@ const ReadCount = () => (
       </TextIcon>
     </h2>
     <p className="description">
-      <FormattedMessage defaultMessage="Read counts indicates how many registered users read." description="src/components/Dialogs/HelpDialog/index.tsx" />
+      <FormattedMessage
+        defaultMessage="Read counts indicates how many registered users read."
+        description="src/components/Dialogs/HelpDialog/index.tsx"
+      />
     </p>
     <style jsx>{styles}</style>
   </>
diff --git a/src/views/Home/Announcements/Carousel/index.tsx b/src/views/Home/Announcements/Carousel/index.tsx
index 05fe723694..4626a59fcd 100644
--- a/src/views/Home/Announcements/Carousel/index.tsx
+++ b/src/views/Home/Announcements/Carousel/index.tsx
@@ -12,26 +12,18 @@ import {
 } from '~/components'
 import { VisibleAnnouncementsQuery } from '~/gql/graphql'
 
-import DropdownActions, { DropdownActionsProps } from '../DropdownActions'
 import Dot from './Dot'
 import styles from './styles.css'
 
 type CarouselProps = {
   items: VisibleAnnouncementsQuery['official']['announcements']
   hide: () => void
-} & DropdownActionsProps
-
-const Carousel = ({
-  type,
-  setType,
-  items,
-  hide,
-  ...controlsProps
-}: CarouselProps) => {
+}
+
+const Carousel = ({ items, hide }: CarouselProps) => {
   const { lang } = useContext(LanguageContext)
   const [dot, setDot] = useState(0)
-  // @ts-ignore
-  const [snaps, setSnaps] = useState<any[]>([])
+  const [, setSnaps] = useState<any[]>([])
   const [carousel, carouselApi] = useEmblaCarousel({
     loop: true,
     skipSnaps: false,
@@ -109,8 +101,6 @@ const Carousel = ({
     <section className="carousel">
       <header>
         <div className="left">
-          <DropdownActions type={type} setType={setType} {...controlsProps} />
-
           <section className="dots">
             {items?.map((_, index) => (
               <Dot
diff --git a/src/views/Home/Announcements/Carousel/styles.css b/src/views/Home/Announcements/Carousel/styles.css
index e3bc482cd8..17d8763de8 100644
--- a/src/views/Home/Announcements/Carousel/styles.css
+++ b/src/views/Home/Announcements/Carousel/styles.css
@@ -1,6 +1,6 @@
 :root {
   --announcement-header-height: 2rem;
-  --announcement-height: 8rem;
+  --announcement-height: 7rem;
 }
 
 .carousel {
@@ -17,7 +17,7 @@ header {
   right: var(--spacing-base);
   left: var(--spacing-base);
   z-index: 1;
-  padding: var(--spacing-base) var(--spacing-base) 0;
+  padding: var(--spacing-x-tight) var(--spacing-base) 0;
 
   & .left {
     @mixin flex-center-start;
@@ -26,7 +26,7 @@ header {
   & .dots {
     @mixin flex-center-start;
 
-    padding-left: var(--spacing-loose);
+    padding-left: var(--spacing-x-tight);
   }
 }
 
@@ -50,7 +50,7 @@ header {
     z-index: 0;
     height: var(--announcement-height);
     padding: calc(
-        var(--announcement-header-height) + var(--spacing-base) +
+        var(--announcement-header-height) + var(--spacing-x-tight) +
           var(--spacing-x-tight)
       )
       var(--spacing-base) var(--spacing-base);
diff --git a/src/views/Home/Announcements/DropdownActions/index.tsx b/src/views/Home/Announcements/DropdownActions/index.tsx
deleted file mode 100644
index d61cd7146e..0000000000
--- a/src/views/Home/Announcements/DropdownActions/index.tsx
+++ /dev/null
@@ -1,156 +0,0 @@
-import _isEmpty from 'lodash/isEmpty'
-import _pickBy from 'lodash/pickBy'
-
-import {
-  Button,
-  DropdownDialog,
-  IconAnnouncementAll24,
-  IconAnnouncementCommunity24,
-  IconAnnouncementProduct24,
-  IconAnnouncementSeminar24,
-  IconFilter12,
-  Menu,
-  TextIcon,
-  Translate,
-} from '~/components'
-
-import styles from './styles.css'
-
-type ControlsProps = {
-  hasCommunity: boolean
-  hasProduct: boolean
-  hasSeminar: boolean
-}
-
-type ContentProps = {
-  setType: (type: string) => void
-  isInDropdown?: boolean
-} & ControlsProps
-
-export type DropdownActionsProps = {
-  type: string
-  setType: (type: string) => void
-} & ControlsProps
-
-const TypeLabel = ({ type }: { type: string }) => {
-  switch (type) {
-    case 'community': {
-      return <Translate zh_hant="社區" zh_hans="社区" en="Community" />
-    }
-    case 'product': {
-      return <Translate zh_hant="產品" zh_hans="产品" en="Product" />
-    }
-    case 'seminar': {
-      return <Translate zh_hant="講座" zh_hans="讲座" en="Seminar" />
-    }
-    default: {
-      return <Translate zh_hant="全部" zh_hans="全部" en="All" />
-    }
-  }
-}
-
-const Content = ({
-  isInDropdown,
-  setType,
-  hasCommunity,
-  hasProduct,
-  hasSeminar,
-}: ContentProps) => {
-  return (
-    <Menu width={isInDropdown ? 'sm' : undefined}>
-      <Menu.Item onClick={() => setType('all')}>
-        <TextIcon
-          icon={<IconAnnouncementAll24 size="md" />}
-          size="md"
-          spacing="base"
-        >
-          <TypeLabel type="all" />
-        </TextIcon>
-      </Menu.Item>
-
-      {hasProduct && (
-        <Menu.Item onClick={() => setType('product')}>
-          <TextIcon
-            icon={<IconAnnouncementProduct24 size="md" />}
-            size="md"
-            spacing="base"
-          >
-            <TypeLabel type="product" />
-          </TextIcon>
-        </Menu.Item>
-      )}
-
-      {hasSeminar && (
-        <Menu.Item onClick={() => setType('seminar')}>
-          <TextIcon
-            icon={<IconAnnouncementSeminar24 size="md" />}
-            size="md"
-            spacing="base"
-          >
-            <TypeLabel type="seminar" />
-          </TextIcon>
-        </Menu.Item>
-      )}
-
-      {hasCommunity && (
-        <Menu.Item onClick={() => setType('community')}>
-          <TextIcon
-            icon={<IconAnnouncementCommunity24 size="md" />}
-            size="md"
-            spacing="base"
-          >
-            <TypeLabel type="community" />
-          </TextIcon>
-        </Menu.Item>
-      )}
-    </Menu>
-  )
-}
-
-const DropdownActions = ({
-  type,
-  setType,
-  ...controlsProps
-}: DropdownActionsProps) => {
-  return (
-    <DropdownDialog
-      dropdown={{
-        content: <Content setType={setType} isInDropdown {...controlsProps} />,
-        placement: 'bottom-start',
-      }}
-      dialog={{
-        content: <Content setType={setType} {...controlsProps} />,
-        title: (
-          <Translate zh_hant="公告類別" zh_hans="公告类别" en="Announcement" />
-        ),
-      }}
-    >
-      {({ openDialog, type: popupType, ref }) => (
-        <div className="btn">
-          <Button
-            bgColor="half-black"
-            size={[null, '2rem']}
-            spacing={[0, 'tight']}
-            onClick={openDialog}
-            aria-haspopup={popupType}
-            ref={ref}
-          >
-            <TextIcon
-              icon={<IconFilter12 size="xs" />}
-              color="white"
-              size="sm"
-              spacing="xxtight"
-              textPlacement="right"
-            >
-              <TypeLabel type={type} />
-            </TextIcon>
-          </Button>
-
-          <style jsx>{styles}</style>
-        </div>
-      )}
-    </DropdownDialog>
-  )
-}
-
-export default DropdownActions
diff --git a/src/views/Home/Announcements/DropdownActions/styles.css b/src/views/Home/Announcements/DropdownActions/styles.css
deleted file mode 100644
index 5ae946b942..0000000000
--- a/src/views/Home/Announcements/DropdownActions/styles.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.btn {
-  position: relative;
-  background-color: rgb(0 0 0 / 30%);
-  border: 1px solid rgb(255 255 255 / 40%);
-  border-radius: 1rem;
-}
diff --git a/src/views/Home/Announcements/index.tsx b/src/views/Home/Announcements/index.tsx
index 5c58da7e82..9d07f154c9 100644
--- a/src/views/Home/Announcements/index.tsx
+++ b/src/views/Home/Announcements/index.tsx
@@ -1,7 +1,5 @@
 import { useApolloClient, useQuery } from '@apollo/react-hooks'
 import _get from 'lodash/get'
-import _some from 'lodash/some'
-import { useState } from 'react'
 import { FormattedMessage } from 'react-intl'
 
 import { ADD_TOAST, STORAGE_KEY_ANNOUNCEMENT } from '~/common/enums'
@@ -20,44 +18,22 @@ const BaseAnnouncements = ({ hide }: BaseAnnouncementsProps) => {
     VISIBLE_ANNOUNCEMENTS,
     { variables: { input: { visible: true } } }
   )
-  const [type, setType] = useState('all')
 
   if (loading || error) {
     return null
   }
 
-  const allItems = _get(
+  const items = _get(
     data,
     'official.announcements',
     []
   ) as VisibleAnnouncementsQuery['official']['announcements']
 
-  if (!allItems || allItems.length === 0) {
+  if (!items || items.length === 0) {
     return null
   }
 
-  // check controls
-  const hasCommunity = _some(allItems, { type: 'community' })
-  const hasProduct = _some(allItems, { type: 'product' })
-  const hasSeminar = _some(allItems, { type: 'seminar' })
-
-  let items = allItems
-
-  if (type !== 'all') {
-    items = items.filter((item) => item.type === type)
-  }
-
-  return (
-    <Carousel
-      type={type}
-      setType={setType}
-      items={items}
-      hide={hide}
-      hasCommunity={hasCommunity}
-      hasProduct={hasProduct}
-      hasSeminar={hasSeminar}
-    />
-  )
+  return <Carousel items={items} hide={hide} />
 }
 
 const Announcements = () => {

From 2351bdb5340f3eba9830dec0599232ab75781aa2 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Fri, 31 Mar 2023 10:23:30 +0700
Subject: [PATCH 38/92] feat(cover): border radius <Cover>

---
 src/components/Cover/styles.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/Cover/styles.css b/src/components/Cover/styles.css
index bb7c9e3c25..0280c79fb4 100644
--- a/src/components/Cover/styles.css
+++ b/src/components/Cover/styles.css
@@ -1,5 +1,7 @@
 .cover {
   position: relative;
+  overflow: hidden;
+  border-radius: 0 0 1.25rem 1.25rem;
 
   & :global(img) {
     @mixin object-fit-cover;

From 2c06d0cff4fbd6f229bd7519492d0ffb9647fe2d Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Fri, 31 Mar 2023 11:47:07 +0700
Subject: [PATCH 39/92] feat(text): adjust typography of subtext (digests)

---
 src/common/styles/mixins.css                  | 10 ++++----
 src/common/styles/variables/typography.css    |  8 +++----
 .../Concise/FooterActions/styles.css          |  2 +-
 .../FooterActions/DonationCount/index.tsx     |  9 +++-----
 .../Feed/FooterActions/ReadTime/index.tsx     | 18 ++++++---------
 .../Feed/FooterActions/index.tsx              | 23 ++++---------------
 src/components/CircleDigest/Plain/index.tsx   |  4 ++--
 src/components/CircleDigest/Plain/styles.css  |  4 ++++
 src/components/DateTime/styles.css            |  6 ++---
 .../Interaction/LinkWrapper/styles.css        |  5 ++++
 src/components/TagDigest/Feed/index.tsx       |  4 ++--
 src/components/TagDigest/Sidebar/index.tsx    |  4 ++--
 src/views/ArticleDetail/MetaInfo/styles.css   |  6 ++---
 13 files changed, 46 insertions(+), 57 deletions(-)

diff --git a/src/common/styles/mixins.css b/src/common/styles/mixins.css
index c9fa3c2a0d..9ff04eb1f7 100644
--- a/src/common/styles/mixins.css
+++ b/src/common/styles/mixins.css
@@ -212,9 +212,9 @@
   @mixin flex-center-space-between;
 
   margin-top: var(--spacing-base);
-  font-size: var(--font-size-timestamp);
-  font-weight: var(--font-weight-timestamp);
-  line-height: var(--line-height-timestamp);
+  font-size: var(--font-size-subtext);
+  font-weight: var(--font-weight-subtext);
+  line-height: var(--line-height-subtext);
 
   & .left,
   & .right {
@@ -225,7 +225,7 @@
     color: var(--color-grey-dark);
 
     & :global(> * + *) {
-      padding-left: var(--spacing-xx-tight);
+      padding-left: var(--spacing-base);
     }
   }
 
@@ -233,7 +233,7 @@
     color: var(--color-black);
 
     & :global(> * + *) {
-      padding-left: var(--spacing-loose);
+      padding-left: var(--spacing-base);
     }
   }
 }
diff --git a/src/common/styles/variables/typography.css b/src/common/styles/variables/typography.css
index b75fbf102d..8da19b2347 100644
--- a/src/common/styles/variables/typography.css
+++ b/src/common/styles/variables/typography.css
@@ -47,10 +47,10 @@
   --line-height-feed-title: 1.3333; /* 24/18 */
   --font-weight-feed-title: var(--font-weight-medium);
 
-  /* Timestamp */
-  --font-size-timestamp: var(--font-size-xs);
-  --line-height-timestamp: 1.3333; /* 16/12 */
-  --font-weight-timestamp: var(--font-weight-normal);
+  /* Subtext: digest footer, datetime, etc. */
+  --font-size-subtext: var(--font-size-xs);
+  --line-height-subtext: 1.3333; /* 16/12 */
+  --font-weight-subtext: var(--font-weight-normal);
 
   /* Article Title */
   --font-size-article-title: var(--font-size-xl);
diff --git a/src/components/ArticleDigest/Concise/FooterActions/styles.css b/src/components/ArticleDigest/Concise/FooterActions/styles.css
index e8757d6abc..c5944b5c84 100644
--- a/src/components/ArticleDigest/Concise/FooterActions/styles.css
+++ b/src/components/ArticleDigest/Concise/FooterActions/styles.css
@@ -2,7 +2,7 @@ footer {
   @mixin feed-footer-actions;
 
   & .left {
-    padding-right: var(--spacing-base);
+    display: inline-flex;
 
     & :global(> * + *) {
       padding-left: var(--spacing-x-tight);
diff --git a/src/components/ArticleDigest/Feed/FooterActions/DonationCount/index.tsx b/src/components/ArticleDigest/Feed/FooterActions/DonationCount/index.tsx
index e447531ed7..b79b6b2121 100644
--- a/src/components/ArticleDigest/Feed/FooterActions/DonationCount/index.tsx
+++ b/src/components/ArticleDigest/Feed/FooterActions/DonationCount/index.tsx
@@ -1,28 +1,25 @@
 import { numAbbr } from '~/common/utils'
-import { IconDonate24, IconDotDivider, TextIcon } from '~/components'
+import { IconDonate24, TextIcon } from '~/components'
 import { ActionsDonationCountArticleFragment } from '~/gql/graphql'
 
 import { fragments } from './gql'
 
 interface DonationCountProps {
   article: ActionsDonationCountArticleFragment
-  hasDivider: boolean
 }
 
-const DonationCount = ({ article, hasDivider }: DonationCountProps) => {
+const DonationCount = ({ article }: DonationCountProps) => {
   if (!article.transactionsReceivedBy.totalCount) {
     return null
   }
 
   return (
     <>
-      <TextIcon icon={<IconDonate24 />} size="xs" color="grey-dark">
+      <TextIcon icon={<IconDonate24 size="xs" />} size="xs" color="grey-dark">
         {article.transactionsReceivedBy.totalCount > 0
           ? numAbbr(article.transactionsReceivedBy.totalCount)
           : undefined}
       </TextIcon>
-
-      {hasDivider && <IconDotDivider />}
     </>
   )
 }
diff --git a/src/components/ArticleDigest/Feed/FooterActions/ReadTime/index.tsx b/src/components/ArticleDigest/Feed/FooterActions/ReadTime/index.tsx
index 9bc80eb6ec..28afbf4dd7 100644
--- a/src/components/ArticleDigest/Feed/FooterActions/ReadTime/index.tsx
+++ b/src/components/ArticleDigest/Feed/FooterActions/ReadTime/index.tsx
@@ -1,20 +1,14 @@
 import { numAbbr, numRound } from '~/common/utils'
-import {
-  IconDotDivider,
-  IconReadTimeTotal16,
-  TextIcon,
-  Translate,
-} from '~/components'
+import { IconReadTimeTotal16, TextIcon, Translate } from '~/components'
 import { ActionsReadTimeArticleFragment } from '~/gql/graphql'
 
 import { fragments } from './gql'
 
 interface ResponseCountProps {
   article: ActionsReadTimeArticleFragment
-  hasDivider: boolean
 }
 
-const ReadTime = ({ article, hasDivider }: ResponseCountProps) => {
+const ReadTime = ({ article }: ResponseCountProps) => {
   if (!article.readTime) {
     return null
   }
@@ -28,13 +22,15 @@ const ReadTime = ({ article, hasDivider }: ResponseCountProps) => {
   return (
     <>
       <button type="button">
-        <TextIcon icon={<IconReadTimeTotal16 />} size="xs" color="grey-dark">
+        <TextIcon
+          icon={<IconReadTimeTotal16 size="xs" />}
+          size="xs"
+          color="grey-dark"
+        >
           {numAbbr(readHour, 1)}{' '}
           <Translate zh_hant="小時" zh_hans="小时" en="hours" />
         </TextIcon>
       </button>
-
-      {hasDivider && <IconDotDivider />}
     </>
   )
 }
diff --git a/src/components/ArticleDigest/Feed/FooterActions/index.tsx b/src/components/ArticleDigest/Feed/FooterActions/index.tsx
index fdd2ea41df..5329b33697 100644
--- a/src/components/ArticleDigest/Feed/FooterActions/index.tsx
+++ b/src/components/ArticleDigest/Feed/FooterActions/index.tsx
@@ -3,7 +3,6 @@ import {
   BookmarkButton,
   DateTime,
   IconArchive24,
-  IconDotDivider,
   IconPaywall16,
   IconPin24,
 } from '~/components'
@@ -24,36 +23,24 @@ export type FooterActionsProps = {
 
 const FooterActions = ({ article, date, ...controls }: FooterActionsProps) => {
   const hasDate = date !== false
-  const hasDonation = article.transactionsReceivedBy.totalCount > 0
 
   return (
     <footer>
       <section className="left">
-        <ReadTime article={article} hasDivider={hasDate || hasDonation} />
+        <ReadTime article={article} />
 
-        <DonationCount article={article} hasDivider={hasDate} />
+        <DonationCount article={article} />
 
         {hasDate && <DateTime date={date || article.createdAt} />}
 
-        {article.access.type === 'paywall' && (
-          <>
-            <IconDotDivider />
-            <IconPaywall16 />
-          </>
-        )}
+        {article.access.type === 'paywall' && <IconPaywall16 />}
 
         {controls.inUserArticles && article.sticky && (
-          <>
-            <IconDotDivider />
-            <IconPin24 data-test-id={TEST_ID.DIGEST_ARTICLE_FEED_FOOTER_PIN} />
-          </>
+          <IconPin24 data-test-id={TEST_ID.DIGEST_ARTICLE_FEED_FOOTER_PIN} />
         )}
 
         {controls.inUserArticles && article.articleState !== 'active' && (
-          <>
-            <IconDotDivider />
-            <IconArchive24 />
-          </>
+          <IconArchive24 />
         )}
       </section>
 
diff --git a/src/components/CircleDigest/Plain/index.tsx b/src/components/CircleDigest/Plain/index.tsx
index ad01641dda..4d3572e0d0 100644
--- a/src/components/CircleDigest/Plain/index.tsx
+++ b/src/components/CircleDigest/Plain/index.tsx
@@ -22,11 +22,11 @@ const CircleDigestPlain = ({ circle, onClick }: CircleDigestPlainProps) => {
   return (
     <LinkWrapper {...path} onClick={onClick}>
       <TextIcon
-        icon={<IconCircle16 size="sm-s" />}
+        icon={<IconCircle16 size="xs" />}
         color="green"
         spacing="xxtight"
         weight="normal"
-        size="sm-s"
+        size="xs"
       >
         <span className="name">{circle.displayName}</span>
       </TextIcon>
diff --git a/src/components/CircleDigest/Plain/styles.css b/src/components/CircleDigest/Plain/styles.css
index 90f1580134..d05a0fead6 100644
--- a/src/components/CircleDigest/Plain/styles.css
+++ b/src/components/CircleDigest/Plain/styles.css
@@ -6,4 +6,8 @@ section {
 
 .name {
   @mixin line-clamp;
+
+  /* FIXME: fix cropped descenders of letters  */
+  padding-bottom: 0.14em;
+  margin-bottom: -0.14rem;
 }
diff --git a/src/components/DateTime/styles.css b/src/components/DateTime/styles.css
index 51c987df37..1bf465ab07 100644
--- a/src/components/DateTime/styles.css
+++ b/src/components/DateTime/styles.css
@@ -1,7 +1,7 @@
 time {
-  font-size: var(--font-size-timestamp);
-  font-weight: var(--font-weight-timestamp);
-  line-height: var(--line-height-timestamp);
+  font-size: var(--font-size-subtext);
+  font-weight: var(--font-weight-subtext);
+  line-height: var(--line-height-subtext);
   color: var(--color-grey-dark);
   white-space: nowrap;
 }
diff --git a/src/components/Interaction/LinkWrapper/styles.css b/src/components/Interaction/LinkWrapper/styles.css
index 80fcd2ef89..76de84af61 100644
--- a/src/components/Interaction/LinkWrapper/styles.css
+++ b/src/components/Interaction/LinkWrapper/styles.css
@@ -1,3 +1,8 @@
+a {
+  display: inline-flex;
+  align-items: center;
+}
+
 .text-active-green {
   &:hover,
   &:focus {
diff --git a/src/components/TagDigest/Feed/index.tsx b/src/components/TagDigest/Feed/index.tsx
index f66d5a7893..786f4b5459 100644
--- a/src/components/TagDigest/Feed/index.tsx
+++ b/src/components/TagDigest/Feed/index.tsx
@@ -78,7 +78,7 @@ const Feed = ({ tag, ...cardProps }: TagDigestFeedProps) => {
 
           <section className="nums">
             <TextIcon
-              icon={<IconUser16 color="grey-dark" />}
+              icon={<IconUser16 color="grey-dark" size="xs" />}
               size="xs"
               spacing="xxtight"
               color="grey-dark"
@@ -87,7 +87,7 @@ const Feed = ({ tag, ...cardProps }: TagDigestFeedProps) => {
             </TextIcon>
 
             <TextIcon
-              icon={<IconArticle16 color="grey-dark" />}
+              icon={<IconArticle16 color="grey-dark" size="xs" />}
               size="xs"
               spacing="xxtight"
               color="grey-dark"
diff --git a/src/components/TagDigest/Sidebar/index.tsx b/src/components/TagDigest/Sidebar/index.tsx
index 180473f771..9548ec9013 100644
--- a/src/components/TagDigest/Sidebar/index.tsx
+++ b/src/components/TagDigest/Sidebar/index.tsx
@@ -78,7 +78,7 @@ const Sidebar = ({ tag, ...cardProps }: TagDigestSidebarProps) => {
 
           <section className="nums">
             <TextIcon
-              icon={<IconUser16 color="grey-dark" />}
+              icon={<IconUser16 color="grey-dark" size="xs" />}
               size="xs"
               spacing="xxtight"
               color="grey-dark"
@@ -87,7 +87,7 @@ const Sidebar = ({ tag, ...cardProps }: TagDigestSidebarProps) => {
             </TextIcon>
 
             <TextIcon
-              icon={<IconArticle16 color="grey-dark" />}
+              icon={<IconArticle16 color="grey-dark" size="xs" />}
               size="xs"
               spacing="xxtight"
               color="grey-dark"
diff --git a/src/views/ArticleDetail/MetaInfo/styles.css b/src/views/ArticleDetail/MetaInfo/styles.css
index 76954eefe8..9c3b7e822f 100644
--- a/src/views/ArticleDetail/MetaInfo/styles.css
+++ b/src/views/ArticleDetail/MetaInfo/styles.css
@@ -12,9 +12,9 @@
 
 .time {
   flex-shrink: 0;
-  font-size: var(--font-size-timestamp);
-  font-weight: var(--font-weight-timestamp);
-  line-height: var(--line-height-timestamp);
+  font-size: var(--font-size-subtext);
+  font-weight: var(--font-weight-subtext);
+  line-height: var(--line-height-subtext);
 
   & span {
     margin-right: var(--spacing-xx-tight);

From ac1a462b6920663a001574b2007f5883f0905fc9 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Fri, 31 Mar 2023 11:55:57 +0700
Subject: [PATCH 40/92] feat(tabs): darken unselected tabs

---
 src/components/Tabs/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Tabs/index.tsx b/src/components/Tabs/index.tsx
index 16766e1e13..a2247ee6c2 100644
--- a/src/components/Tabs/index.tsx
+++ b/src/components/Tabs/index.tsx
@@ -27,7 +27,7 @@ const Tab: React.FC<React.PropsWithChildren<TabProps>> = ({
       >
         <TextIcon
           size="md"
-          color={selected ? 'green' : 'grey'}
+          color={selected ? 'green' : 'grey-darker'}
           weight="semibold"
         >
           {children}

From 9ddbe0aeee858b982352e2212dd16237440ade32 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Fri, 31 Mar 2023 12:03:28 +0700
Subject: [PATCH 41/92] feat(sidebar): remove icons of View More button

---
 src/components/Buttons/ViewAll/index.tsx | 10 ++--------
 src/views/Home/Feed/Authors/index.tsx    |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/components/Buttons/ViewAll/index.tsx b/src/components/Buttons/ViewAll/index.tsx
index f7a09f1597..662f8af967 100644
--- a/src/components/Buttons/ViewAll/index.tsx
+++ b/src/components/Buttons/ViewAll/index.tsx
@@ -1,6 +1,6 @@
 import { FormattedMessage } from 'react-intl'
 
-import { Button, ButtonProps, IconArrowRight8, TextIcon } from '~/components'
+import { Button, ButtonProps, TextIcon } from '~/components'
 
 type ViewAllButtonProps = ButtonProps
 
@@ -12,13 +12,7 @@ export const ViewAllButton: React.FC<ViewAllButtonProps> = ({ ...props }) => {
       borderColor="green"
       {...props}
     >
-      <TextIcon
-        icon={<IconArrowRight8 size="xs" />}
-        color="green"
-        size="xs"
-        weight="md"
-        textPlacement="left"
-      >
+      <TextIcon color="green" size="xs" weight="md" textPlacement="left">
         <FormattedMessage defaultMessage="View All" description="" />
       </TextIcon>
     </Button>
diff --git a/src/views/Home/Feed/Authors/index.tsx b/src/views/Home/Feed/Authors/index.tsx
index cd5a393635..23af98c991 100644
--- a/src/views/Home/Feed/Authors/index.tsx
+++ b/src/views/Home/Feed/Authors/index.tsx
@@ -129,7 +129,7 @@ const Authors = () => {
           textIconProps={{ size: 'sm', weight: 'md', spacing: 'xxtight' }}
           textAlign="center"
         >
-          <FormattedMessage defaultMessage="View All" description="" />{' '}
+          <FormattedMessage defaultMessage="View All" description="" />
         </ViewMoreCard>
       </section>
 

From ebb9d22ccfbc3e4d5c372897aeb8b25a80eab7e6 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Fri, 31 Mar 2023 12:12:30 +0700
Subject: [PATCH 42/92] feat(announcement): remove close button

---
 src/common/enums/storage.ts                   |  2 -
 .../utils/resolvers/clientPreference.ts       |  1 -
 src/common/utils/types/index.ts               |  3 --
 .../GQL/queries/clientPreference.ts           |  1 -
 .../Home/Announcements/Carousel/index.tsx     | 14 +-----
 .../Home/Announcements/Carousel/styles.css    |  1 +
 src/views/Home/Announcements/index.tsx        | 45 ++-----------------
 src/views/Home/index.tsx                      | 29 +-----------
 8 files changed, 7 insertions(+), 89 deletions(-)

diff --git a/src/common/enums/storage.ts b/src/common/enums/storage.ts
index 6bb6468721..3956af7f30 100644
--- a/src/common/enums/storage.ts
+++ b/src/common/enums/storage.ts
@@ -6,6 +6,4 @@ export const STORAGE_KEY_ONBOARDING_TASKS = '__ONBOARDING_TASKS'
 
 export const STORAGE_KEY_CIRCLE_BANNER = '__CIRCLE_BANNER'
 
-export const STORAGE_KEY_ANNOUNCEMENT = '__ANNOUNCEMENT'
-
 export const STORAGE_KEY_SEARCH_HISTORY = '__SEARCH_HISTORY'
diff --git a/src/common/utils/resolvers/clientPreference.ts b/src/common/utils/resolvers/clientPreference.ts
index 2125671f41..07aa191496 100644
--- a/src/common/utils/resolvers/clientPreference.ts
+++ b/src/common/utils/resolvers/clientPreference.ts
@@ -10,7 +10,6 @@ const clientPreferenceResolver = (_: any) => {
       __typename: 'OnboardingTasks',
     },
     circleBanner: true,
-    announcement: 0,
   }
 }
 
diff --git a/src/common/utils/types/index.ts b/src/common/utils/types/index.ts
index 47e309e9f9..a3e1657d34 100644
--- a/src/common/utils/types/index.ts
+++ b/src/common/utils/types/index.ts
@@ -37,9 +37,6 @@ export default gql`
     "Whether cicle banner is shown"
     circleBanner: Boolean!
 
-    "Whether announcement is shown"
-    announcement: Int
-
     "Local language setting"
     language: Language
   }
diff --git a/src/components/GQL/queries/clientPreference.ts b/src/components/GQL/queries/clientPreference.ts
index d4e1926a4b..ccfb0a0d0d 100644
--- a/src/components/GQL/queries/clientPreference.ts
+++ b/src/components/GQL/queries/clientPreference.ts
@@ -11,7 +11,6 @@ export default gql`
         enabled
       }
       circleBanner
-      announcement
     }
   }
 `
diff --git a/src/views/Home/Announcements/Carousel/index.tsx b/src/views/Home/Announcements/Carousel/index.tsx
index 4626a59fcd..6a3d3a4392 100644
--- a/src/views/Home/Announcements/Carousel/index.tsx
+++ b/src/views/Home/Announcements/Carousel/index.tsx
@@ -1,11 +1,8 @@
 import useEmblaCarousel from 'embla-carousel-react'
 import { useCallback, useContext, useEffect, useRef, useState } from 'react'
 
-import { translate } from '~/common/utils'
 import {
-  Button,
   Card,
-  IconClose32,
   LanguageContext,
   ResponsiveImage,
   useCarousel,
@@ -17,10 +14,9 @@ import styles from './styles.css'
 
 type CarouselProps = {
   items: VisibleAnnouncementsQuery['official']['announcements']
-  hide: () => void
 }
 
-const Carousel = ({ items, hide }: CarouselProps) => {
+const Carousel = ({ items }: CarouselProps) => {
   const { lang } = useContext(LanguageContext)
   const [dot, setDot] = useState(0)
   const [, setSnaps] = useState<any[]>([])
@@ -112,14 +108,6 @@ const Carousel = ({ items, hide }: CarouselProps) => {
             ))}
           </section>
         </div>
-
-        <Button
-          spacing={[0, 0]}
-          aria-label={translate({ id: 'close', lang })}
-          onClick={hide}
-        >
-          <IconClose32 size="lg" color="white" />
-        </Button>
       </header>
 
       <section
diff --git a/src/views/Home/Announcements/Carousel/styles.css b/src/views/Home/Announcements/Carousel/styles.css
index 17d8763de8..def0d6a188 100644
--- a/src/views/Home/Announcements/Carousel/styles.css
+++ b/src/views/Home/Announcements/Carousel/styles.css
@@ -17,6 +17,7 @@ header {
   right: var(--spacing-base);
   left: var(--spacing-base);
   z-index: 1;
+  height: var(--announcement-header-height);
   padding: var(--spacing-x-tight) var(--spacing-base) 0;
 
   & .left {
diff --git a/src/views/Home/Announcements/index.tsx b/src/views/Home/Announcements/index.tsx
index 9d07f154c9..10c29129aa 100644
--- a/src/views/Home/Announcements/index.tsx
+++ b/src/views/Home/Announcements/index.tsx
@@ -1,19 +1,12 @@
-import { useApolloClient, useQuery } from '@apollo/react-hooks'
+import { useQuery } from '@apollo/react-hooks'
 import _get from 'lodash/get'
-import { FormattedMessage } from 'react-intl'
 
-import { ADD_TOAST, STORAGE_KEY_ANNOUNCEMENT } from '~/common/enums'
-import { storage } from '~/common/utils'
 import { VisibleAnnouncementsQuery } from '~/gql/graphql'
 
 import Carousel from './Carousel'
 import { VISIBLE_ANNOUNCEMENTS } from './gql'
 
-type BaseAnnouncementsProps = {
-  hide: () => void
-}
-
-const BaseAnnouncements = ({ hide }: BaseAnnouncementsProps) => {
+const Announcements = () => {
   const { data, error, loading } = useQuery<VisibleAnnouncementsQuery>(
     VISIBLE_ANNOUNCEMENTS,
     { variables: { input: { visible: true } } }
@@ -33,39 +26,7 @@ const BaseAnnouncements = ({ hide }: BaseAnnouncementsProps) => {
     return null
   }
 
-  return <Carousel items={items} hide={hide} />
-}
-
-const Announcements = () => {
-  const client = useApolloClient()
-
-  const hide = () => {
-    const now = Date.now()
-    storage.set(STORAGE_KEY_ANNOUNCEMENT, now)
-    client.writeData({
-      id: 'ClientPreference:local',
-      data: {
-        announcement: now,
-      },
-    })
-
-    window.dispatchEvent(
-      new CustomEvent(ADD_TOAST, {
-        detail: {
-          color: 'green',
-          content: (
-            <FormattedMessage
-              defaultMessage="You won't see announcements for 7 days"
-              description="src/views/Home/Announcements/index.tsx"
-            />
-          ),
-          buttonPlacement: 'center',
-        },
-      })
-    )
-  }
-
-  return <BaseAnnouncements hide={hide} />
+  return <Carousel items={items} />
 }
 
 export default Announcements
diff --git a/src/views/Home/index.tsx b/src/views/Home/index.tsx
index 46ce06c470..355443a365 100644
--- a/src/views/Home/index.tsx
+++ b/src/views/Home/index.tsx
@@ -1,35 +1,10 @@
-import { useQuery } from '@apollo/react-hooks'
-import differenceInDays from 'date-fns/differenceInDays'
-import _get from 'lodash/get'
-import _some from 'lodash/some'
-import dynamic from 'next/dynamic'
-
-import { STORAGE_KEY_ANNOUNCEMENT } from '~/common/enums'
-import { storage } from '~/common/utils'
 import { Layout, Spacer } from '~/components'
-import CLIENT_PREFERENCE from '~/components/GQL/queries/clientPreference'
-import { ClientPreferenceQuery } from '~/gql/graphql'
 
+import Announcements from './Announcements'
 import Feed from './Feed'
 import Sidebar from './Sidebar'
 
-const DynamicAnnouncements = dynamic(() => import('./Announcements'), {
-  ssr: true, // enable for first screen
-})
-
 const Home = () => {
-  // determine whether announcement should be shown or not
-  const { data } = useQuery<ClientPreferenceQuery>(CLIENT_PREFERENCE, {
-    variables: { id: 'local' },
-  })
-  const storedValue =
-    typeof window !== 'undefined' ? storage.get(STORAGE_KEY_ANNOUNCEMENT) : {}
-  const storedTime =
-    typeof storedValue === 'number'
-      ? storedValue
-      : data?.clientPreference?.announcement || 0
-  const showAnnouncement = differenceInDays(Date.now(), storedTime) > 7
-
   return (
     <Layout.Main
       aside={
@@ -41,7 +16,7 @@ const Home = () => {
     >
       <Layout.AuthHeader title="discover" />
 
-      {showAnnouncement && <DynamicAnnouncements />}
+      <Announcements />
 
       <Spacer size="xtight" />
 

From 9851158649e99a28bb8201517e4781cb74a3596e Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Fri, 31 Mar 2023 12:24:51 +0700
Subject: [PATCH 43/92] feat(sidebar): revise search bar & switch language
 button

---
 public/static/icons/16px/world.svg            |  7 ++----
 .../Buttons/LanguageSwitch/index.tsx          | 24 +++++++------------
 src/components/Buttons/ViewAll/index.tsx      |  1 +
 src/components/Dialogs/HelpDialog/index.tsx   | 15 +++++++++---
 src/components/Search/SearchBar/styles.css    |  2 --
 5 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/public/static/icons/16px/world.svg b/public/static/icons/16px/world.svg
index 5f41e19dcd..1a36e6b8a4 100644
--- a/public/static/icons/16px/world.svg
+++ b/public/static/icons/16px/world.svg
@@ -1,7 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.99988 14.4998C11.5897 14.4998 14.4998 11.5897 14.4998 7.99988C14.4998 4.41009 11.5897 1.5 7.99988 1.5C4.41009 1.5 1.5 4.41009 1.5 7.99988C1.5 11.5897 4.41009 14.4998 7.99988 14.4998Z" stroke="currentColor" stroke-miterlimit="10"/>
-<path d="M1.5 8H14.4998" stroke="currentColor" stroke-miterlimit="10"/>
-<path d="M3.08301 3.7041C3.81778 4.15627 4.80689 4.89104 8.00031 4.89104C11.1937 4.89104 12.0415 4.18453 12.8893 3.7041" stroke="currentColor" stroke-miterlimit="10"/>
-<path d="M12.974 12.1819C12.2675 11.7298 11.1936 10.9385 8.00019 10.9385C4.80677 10.9385 3.87418 11.7015 3.02637 12.1819" stroke="currentColor" stroke-miterlimit="10"/>
-<path d="M8.05668 14.4998C9.57063 14.4998 10.7979 11.5897 10.7979 7.99988C10.7979 4.41009 9.57063 1.5 8.05668 1.5C6.54273 1.5 5.31543 4.41009 5.31543 7.99988C5.31543 11.5897 6.54273 14.4998 8.05668 14.4998Z" stroke="currentColor" stroke-miterlimit="10"/>
+<path d="M2 8C2 11.3138 4.6862 14 8 14C11.3138 14 14 11.3138 14 8C14 4.6862 11.3138 2 8 2C4.6862 2 2 4.6862 2 8Z" stroke="currentColor" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.59993 2.0293C8.59993 2.0293 10.3999 4.3993 10.3999 7.9993C10.3999 11.5993 8.59993 13.9693 8.59993 13.9693M7.39993 13.9693C7.39993 13.9693 5.59993 11.5993 5.59993 7.9993C5.59993 4.3993 7.39993 2.0293 7.39993 2.0293M2.37793 10.0993H13.6219M2.37793 5.8993H13.6219" stroke="currentColor" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/components/Buttons/LanguageSwitch/index.tsx b/src/components/Buttons/LanguageSwitch/index.tsx
index f05122e771..e088c1de99 100644
--- a/src/components/Buttons/LanguageSwitch/index.tsx
+++ b/src/components/Buttons/LanguageSwitch/index.tsx
@@ -1,6 +1,5 @@
 import { useContext } from 'react'
 
-import { ReactComponent as IconArrowDown } from '@/public/static/icons/8px/arrow-down.svg'
 import { LANG_TEXT_MAP, Z_INDEX } from '~/common/enums'
 import {
   Button,
@@ -11,7 +10,6 @@ import {
   Menu,
   TextIcon,
   Translate,
-  withIcon,
 } from '~/components'
 import { UserLanguage } from '~/gql/graphql'
 
@@ -65,17 +63,17 @@ export const LanguageSwitchContent = ({
 
 type LanguageSwitchProps = {
   size?: 'sm' | 'lg'
-  bgColor?: 'grey-lighter' | 'grey-darkest'
+  bgColor?: 'grey-darkest'
 }
 
 export const LanguageSwitch: React.FC<LanguageSwitchProps> = ({
   size = 'sm',
-  bgColor = 'grey-lighter',
+  bgColor,
 }) => {
   const { lang } = useContext(LanguageContext)
 
-  const iconColor = bgColor === 'grey-lighter' ? 'grey' : 'white'
-  const textSize = size === 'sm' ? 'xs' : 'md'
+  const iconColor = bgColor === 'grey-darkest' ? 'white' : 'grey'
+  const textSize = size === 'sm' ? 'sm-s' : 'md'
 
   return (
     <DropdownDialog
@@ -100,21 +98,15 @@ export const LanguageSwitch: React.FC<LanguageSwitchProps> = ({
           size={[null, size === 'sm' ? '1.25rem' : '1.75rem']}
           spacing={[0, 'xtight']}
           bgColor={bgColor}
+          bgActiveColor={
+            bgColor === 'grey-darkest' ? undefined : 'grey-lighter'
+          }
           onClick={openDialog}
           aria-haspopup={type}
           ref={ref}
         >
           <TextIcon icon={<IconWorld16 />} size={textSize} color={iconColor}>
-            <TextIcon
-              icon={withIcon(IconArrowDown)({ size: 'xxs' })}
-              size={textSize}
-              color={iconColor}
-              weight="md"
-              spacing="xxtight"
-              textPlacement="left"
-            >
-              {LANG_TEXT_MAP[lang]}
-            </TextIcon>
+            {LANG_TEXT_MAP[lang]}
           </TextIcon>
         </Button>
       )}
diff --git a/src/components/Buttons/ViewAll/index.tsx b/src/components/Buttons/ViewAll/index.tsx
index 662f8af967..25424bd2e9 100644
--- a/src/components/Buttons/ViewAll/index.tsx
+++ b/src/components/Buttons/ViewAll/index.tsx
@@ -10,6 +10,7 @@ export const ViewAllButton: React.FC<ViewAllButtonProps> = ({ ...props }) => {
       size={[null, '1.75rem']}
       spacing={[0, 'tight']}
       borderColor="green"
+      borderWidth="sm"
       {...props}
     >
       <TextIcon color="green" size="xs" weight="md" textPlacement="left">
diff --git a/src/components/Dialogs/HelpDialog/index.tsx b/src/components/Dialogs/HelpDialog/index.tsx
index 8e9ea7a741..31ff86a96c 100644
--- a/src/components/Dialogs/HelpDialog/index.tsx
+++ b/src/components/Dialogs/HelpDialog/index.tsx
@@ -23,11 +23,17 @@ const ReadTime = () => (
   <>
     <h2 className="title">
       <TextIcon icon={<IconReadTimeTotal16 size="md" />} weight="md">
-        <FormattedMessage defaultMessage="Accumulated Read Time" description="src/components/Dialogs/HelpDialog/index.tsx" />
+        <FormattedMessage
+          defaultMessage="Accumulated Read Time"
+          description="src/components/Dialogs/HelpDialog/index.tsx"
+        />
       </TextIcon>
     </h2>
     <p className="description">
-      <FormattedMessage defaultMessage="Accumulated read time indicates the total time length that registered users read." description="src/components/Dialogs/HelpDialog/index.tsx" />
+      <FormattedMessage
+        defaultMessage="Accumulated read time indicates the total time length that registered users read."
+        description="src/components/Dialogs/HelpDialog/index.tsx"
+      />
     </p>
     <style jsx>{styles}</style>
   </>
@@ -41,7 +47,10 @@ const ReadCount = () => (
       </TextIcon>
     </h2>
     <p className="description">
-      <FormattedMessage defaultMessage="Read counts indicates how many registered users read." description="src/components/Dialogs/HelpDialog/index.tsx" />
+      <FormattedMessage
+        defaultMessage="Read counts indicates how many registered users read."
+        description="src/components/Dialogs/HelpDialog/index.tsx"
+      />
     </p>
     <style jsx>{styles}</style>
   </>
diff --git a/src/components/Search/SearchBar/styles.css b/src/components/Search/SearchBar/styles.css
index f8bc2fa106..87ae39e625 100644
--- a/src/components/Search/SearchBar/styles.css
+++ b/src/components/Search/SearchBar/styles.css
@@ -20,13 +20,11 @@ form {
     font-size: var(--font-size-sm);
     color: var(--color-black);
     text-overflow: ellipsis;
-    background-color: var(--color-grey-lighter);
     border: 1px solid var(--color-line-grey-light);
     border-radius: var(--search-bar-height);
     transition-property: border-color, background-color;
 
     &:focus {
-      background-color: var(--color-green-lighter);
       border: 1px solid var(--color-matters-green);
     }
 

From 31ae44c42355a71b7564c7abb033621279d42f59 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Fri, 31 Mar 2023 16:15:23 +0800
Subject: [PATCH 44/92] fix(SearchSelect): fix Pingyin input errors

---
 .../SearchingArea/SearchInput/index.tsx       | 118 ++++++++++--------
 1 file changed, 66 insertions(+), 52 deletions(-)

diff --git a/src/components/SearchSelect/SearchingArea/SearchInput/index.tsx b/src/components/SearchSelect/SearchingArea/SearchInput/index.tsx
index f1551bd707..8a324cfe9a 100644
--- a/src/components/SearchSelect/SearchingArea/SearchInput/index.tsx
+++ b/src/components/SearchSelect/SearchingArea/SearchInput/index.tsx
@@ -1,4 +1,5 @@
 import VisuallyHidden from '@reach/visually-hidden'
+import { Formik } from 'formik'
 import { useContext } from 'react'
 
 import { translate } from '~/common/utils'
@@ -13,8 +14,8 @@ export interface SearchInputProps {
   value: string
   onChange: (value: string) => void
   onSubmit: (value: string) => void
-  onFocus: () => void
-  onBlur: () => void
+  onFocus?: () => void
+  onBlur?: () => void
   autoFocus?: boolean
 }
 
@@ -58,59 +59,72 @@ const SearchInput: React.FC<SearchInputProps> = ({
   }
 
   return (
-    <section>
-      <form
-        onSubmit={(e) => {
-          onSubmit(value)
-          e.preventDefault()
-        }}
-        autoComplete="off"
-      >
-        <VisuallyHidden>
-          <label htmlFor={fieldId}>{textAriaLabel}</label>
-        </VisuallyHidden>
-
-        <input
-          id={fieldId}
-          type="search"
-          name="q"
-          autoFocus={!!autoFocus}
-          value={value}
-          aria-label={textAriaLabel}
-          placeholder={textPlaceholder[type]}
-          onChange={(e) => {
-            onChange(e.target.value)
-          }}
-          onFocus={() => {
-            onFocus()
-          }}
-          onBlur={() => {
-            onBlur()
-          }}
-        />
+    <Formik
+      initialValues={{ q: '' }}
+      enableReinitialize
+      onSubmit={(values) => {
+        onSubmit(values.q)
+      }}
+    >
+      {({ values, setValues, handleSubmit, handleChange }) => {
+        return (
+          <form
+            onSubmit={handleSubmit}
+            role="search"
+            autoComplete="off"
+            action=""
+          >
+            <VisuallyHidden>
+              <label htmlFor={fieldId}>{textAriaLabel}</label>
+            </VisuallyHidden>
 
-        <button
-          className="search"
-          type="submit"
-          aria-label={translate({ id: 'search', lang })}
-        >
-          <IconSearch16 color="green" />
-        </button>
+            <input
+              id={fieldId}
+              type="search"
+              name="q"
+              autoCorrect="off"
+              autoFocus={!!autoFocus}
+              value={values.q}
+              aria-label={textAriaLabel}
+              placeholder={textPlaceholder[type]}
+              onChange={(e) => {
+                handleChange(e)
+                onChange(e.target.value)
+              }}
+              onFocus={() => {
+                onFocus && onFocus()
+              }}
+              onBlur={() => {
+                onBlur && onBlur()
+              }}
+            />
 
-        {value && (
-          <button
-            className="clear"
-            type="button"
-            aria-label={translate({ id: 'clear', lang })}
-            onClick={() => onChange('')}
-          >
-            <IconClear16 color="grey" />
-          </button>
-        )}
-      </form>
+            <button
+              className="search"
+              type="submit"
+              aria-label={translate({ id: 'search', lang })}
+            >
+              <IconSearch16 color="green" />
+            </button>
 
-      <style jsx>{styles}</style>
-    </section>
+            {value && (
+              <button
+                className="clear"
+                type="button"
+                aria-label={translate({ id: 'clear', lang })}
+                onClick={() => {
+                  onChange('')
+                  setValues({ q: '' })
+                }}
+              >
+                <IconClear16 color="grey" />
+              </button>
+            )}
+            <style jsx>{styles}</style>
+          </form>
+        )
+      }}
+    </Formik>
   )
 }
 

From c1c09347c79f7d68b361e74dbc599709a16405f9 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Fri, 31 Mar 2023 16:18:46 +0800
Subject: [PATCH 45/92] feat(SearchInput): revise copy

---
 .../SearchSelect/SearchingArea/SearchInput/index.tsx        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/SearchSelect/SearchingArea/SearchInput/index.tsx b/src/components/SearchSelect/SearchingArea/SearchInput/index.tsx
index 8a324cfe9a..c1d5f59db2 100644
--- a/src/components/SearchSelect/SearchingArea/SearchInput/index.tsx
+++ b/src/components/SearchSelect/SearchingArea/SearchInput/index.tsx
@@ -33,9 +33,9 @@ const SearchInput: React.FC<SearchInputProps> = ({
   const textAriaLabel = translate({ id: 'search', lang })
   const textPlaceholder = {
     Article: translate({
-      zh_hant: '搜尋作品標題',
-      zh_hans: '搜索作品标题',
-      en: 'Search articles',
+      zh_hant: '輸入文章標題或粘貼文章鏈接',
+      zh_hans: '输入文章标题或粘贴文章链接',
+      en: 'Enter article title or paste article link',
       lang,
     }),
     Tag: translate({

From 621eed9ffceab082de9b1d7b2f762a93e60e0d93 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Fri, 31 Mar 2023 16:21:06 +0800
Subject: [PATCH 46/92] feat(Editor): remove unused code in EditorSearchingArea

---
 .../Forms/EditorSearchSelectForm/index.tsx    |   3 -
 .../SearchingArea/EditorSearchingArea.tsx     | 117 +++++-------------
 2 files changed, 34 insertions(+), 86 deletions(-)

diff --git a/src/components/Forms/EditorSearchSelectForm/index.tsx b/src/components/Forms/EditorSearchSelectForm/index.tsx
index b027e38467..6f662d0fc2 100644
--- a/src/components/Forms/EditorSearchSelectForm/index.tsx
+++ b/src/components/Forms/EditorSearchSelectForm/index.tsx
@@ -56,7 +56,6 @@ export type EditorSearchSelectFormProps = {
   draggable?: boolean
 
   createTag?: boolean
-  inviteEmail?: boolean
 
   CustomStagingArea?: (props: CustomStagingAreaProps) => JSX.Element
 }
@@ -80,7 +79,6 @@ const EditorSearchSelectForm = ({
   draggable,
 
   createTag,
-  inviteEmail,
 }: EditorSearchSelectFormProps) => {
   const initStagingNodes =
     nodes?.map((node) => ({ node, selected: true })) || []
@@ -179,7 +177,6 @@ const EditorSearchSelectForm = ({
           toSearchingArea={toSearchingArea}
           addNodeToStaging={addNodeToStaging}
           createTag={createTag}
-          inviteEmail={inviteEmail}
           CustomStagingArea={
             CustomStagingArea && (
               <CustomStagingArea
diff --git a/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx b/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
index e58f9bb93f..51d47aa415 100644
--- a/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
+++ b/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
@@ -5,7 +5,6 @@ import { useDebouncedCallback } from 'use-debounce'
 import { INPUT_DEBOUNCE } from '~/common/enums'
 import {
   analytics,
-  isValidEmail,
   mergeConnections,
   normalizeTagInput, // stripAllPunct, // stripPunctPrefixSuffix,
 } from '~/common/utils'
@@ -17,7 +16,6 @@ import {
   usePublicLazyQuery,
   ViewerContext,
 } from '~/components'
-import { toUserDigestMiniPlaceholder } from '~/components/UserDigest/Mini'
 import {
   ListViewerArticlesQuery,
   SearchExclude,
@@ -29,7 +27,6 @@ import SearchSelectNode from '../SearchSelectNode'
 import styles from '../styles.css'
 import CreateTag from './CreateTag'
 import { LIST_VIEWER_ARTICLES, SELECT_SEARCH } from './gql'
-import InviteEmail from './InviteEmail'
 import SearchInput, {
   SearchInputProps,
   SearchType as SearchInputType,
@@ -66,7 +63,6 @@ type SearchingAreaProps = {
   addNodeToStaging: (node: SelectNode) => void
 
   createTag?: boolean
-  inviteEmail?: boolean
 
   CustomStagingArea?: React.ReactNode
 } & Pick<SearchInputProps, 'autoFocus'>
@@ -84,13 +80,11 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
   addNodeToStaging,
 
   createTag,
-  inviteEmail,
   CustomStagingArea,
 }) => {
   const viewer = useContext(ViewerContext)
 
   const isArticle = searchType === 'Article'
-  const isUser = searchType === 'User' || searchType === 'Invitee'
   const isTag = searchType === 'Tag'
   const hasListMode = viewer.id === searchFilter?.authorId && isArticle
   const [mode, setMode] = useState<Mode>(hasListMode ? 'list' : 'search')
@@ -128,7 +122,7 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
   // load next page
   const loadMore = async () => {
     analytics.trackEvent('load_more', {
-      type: isArticle ? 'search_article' : isTag ? 'search_tag' : 'search_user',
+      type: isArticle ? 'search_article' : 'search_tag',
       location: searchEdges?.length || 0,
     })
 
@@ -162,7 +156,7 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
       .filter((node) => node.articleState === 'active') || []
   const listNodeIds = listNode.map((n) => n.id).join(',')
   const search = (key: string) => {
-    const type = searchType === 'Invitee' ? 'User' : searchType
+    const type = searchType
     lazySearch({
       variables: {
         key,
@@ -181,32 +175,9 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
 
     if (hasListMode) {
       setMode(value ? 'search' : 'list')
-      toSearchingArea()
       return
     }
   }
-  const onSearchInputFocus = () => {
-    if (hasListMode) {
-      if (!searchKey) {
-        setMode('list')
-      }
-    } else if (searchingNodes.length <= 0) {
-      return
-    }
-
-    toSearchingArea()
-  }
-  const onSearchInputBlur = () => {
-    if (isSearchMode) {
-      return
-    }
-
-    // to prevent clicking node doesn't work
-    setTimeout(() => {
-      toStagingArea()
-    }, 100)
-  }
-
   // searching
   useEffect(() => {
     if (debouncedSearchKey) {
@@ -231,7 +202,6 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
     } else {
       loadList()
     }
-    toSearchingArea()
   }, [isListMode])
 
   useEffect(() => {
@@ -248,11 +218,6 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
     !searchNodes.some(
       (node) => node.__typename === 'Tag' && node.content === searchKey
     )
-  const canInviteEmail =
-    isUser &&
-    inviteEmail &&
-    searchKey &&
-    isValidEmail(searchKey.trim(), { allowPlusSign: false })
 
   /**
    * Render
@@ -264,8 +229,6 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
         value={searchKey}
         onChange={onSearchInputChange}
         onSubmit={search}
-        onFocus={onSearchInputFocus}
-        onBlur={onSearchInputBlur}
         autoFocus
       />
 
@@ -276,50 +239,38 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
           {/* Search */}
           {searchKey.length > 0 && (
             <>
-              {isSearchMode &&
-                !searching &&
-                !hasNodes &&
-                !canCreateTag &&
-                !canInviteEmail && <EmptySearch />}
-
-              {isSearchMode &&
-                !searching &&
-                (hasNodes || canCreateTag || canInviteEmail) && (
-                  <InfiniteScroll
-                    hasNextPage={!!searchPageInfo?.hasNextPage}
-                    loadMore={loadMore}
-                  >
-                    <ul className="nodes">
-                      {canCreateTag && (
-                        <li>
-                          <CreateTag
-                            tag={toDigestTagPlaceholder(
-                              normalizeTagInput(searchKey)
-                            )}
-                            onClick={addNodeToStaging}
-                          />
-                        </li>
-                      )}
-                      {canInviteEmail && (
-                        <li>
-                          <InviteEmail
-                            user={toUserDigestMiniPlaceholder(searchKey.trim())}
-                            onClick={addNodeToStaging}
-                          />
-                        </li>
-                      )}
-
-                      {searchingNodes.map((node) => (
-                        <li key={node.id}>
-                          <SearchSelectNode
-                            node={node}
-                            onClick={addNodeToStaging}
-                          />
-                        </li>
-                      ))}
-                    </ul>
-                  </InfiniteScroll>
-                )}
+              {isSearchMode && !searching && !hasNodes && !canCreateTag && (
+                <EmptySearch />
+              )}
+
+              {isSearchMode && !searching && (hasNodes || canCreateTag) && (
+                <InfiniteScroll
+                  hasNextPage={!!searchPageInfo?.hasNextPage}
+                  loadMore={loadMore}
+                >
+                  <ul className="nodes">
+                    {canCreateTag && (
+                      <li>
+                        <CreateTag
+                          tag={toDigestTagPlaceholder(
+                            normalizeTagInput(searchKey)
+                          )}
+                          onClick={addNodeToStaging}
+                        />
+                      </li>
+                    )}
+
+                    {searchingNodes.map((node) => (
+                      <li key={node.id}>
+                        <SearchSelectNode
+                          node={node}
+                          onClick={addNodeToStaging}
+                        />
+                      </li>
+                    ))}
+                  </ul>
+                </InfiniteScroll>
+              )}
 
               {/* List */}
               {isListMode && !searching && !haslistNode && <EmptySearch />}

From c402d624b1f4cef0c1292a713fdf50bf44d1a229 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Fri, 31 Mar 2023 15:25:38 +0700
Subject: [PATCH 47/92] feat(nav): revise sidebar & navbar

---
 .../icons/24px/nav-following-active.svg       |   6 -
 public/static/icons/24px/nav-following.svg    |   6 -
 public/static/icons/24px/nav-home-active.svg  |   5 -
 public/static/icons/24px/nav-home.svg         |   3 -
 .../icons/24px/nav-notification-active.svg    |   5 -
 public/static/icons/24px/nav-notification.svg |   5 -
 .../static/icons/24px/nav-search-active.svg   |   4 -
 public/static/icons/24px/nav-search.svg       |   4 -
 public/static/icons/24px/nav-settings.svg     |   4 -
 public/static/icons/32px/nav-create.svg       |   3 +
 .../icons/32px/nav-following-active.svg       |   3 +
 public/static/icons/32px/nav-following.svg    |   3 +
 public/static/icons/32px/nav-home-active.svg  |   3 +
 public/static/icons/32px/nav-home.svg         |   3 +
 public/static/icons/32px/nav-me-active.svg    |   7 +
 public/static/icons/32px/nav-me.svg           |   3 +
 .../icons/32px/nav-notification-active.svg    |   3 +
 public/static/icons/32px/nav-notification.svg |   3 +
 .../static/icons/32px/nav-search-active.svg   |   3 +
 public/static/icons/32px/nav-search.svg       |   3 +
 src/components/Button/index.tsx               |   1 +
 .../Buttons/UniversalAuth/index.tsx           |  40 ++--
 src/components/Buttons/Write/index.tsx        |  73 ++++---
 src/components/Dialogs/HelpDialog/index.tsx   |  15 +-
 src/components/Empty/EmptyNotice.tsx          |   4 +-
 src/components/Empty/EmptySearch.tsx          |   4 +-
 src/components/Icon/IconLogo.tsx              |   2 +-
 src/components/Icon/IconNavCreate32.tsx       |   5 +
 src/components/Icon/IconNavFollowing24.tsx    |   5 -
 src/components/Icon/IconNavFollowing32.tsx    |   5 +
 .../Icon/IconNavFollowingActive24.tsx         |   5 -
 .../Icon/IconNavFollowingActive32.tsx         |   5 +
 src/components/Icon/IconNavHome24.tsx         |   5 -
 src/components/Icon/IconNavHome32.tsx         |   5 +
 src/components/Icon/IconNavHomeActive24.tsx   |   5 -
 src/components/Icon/IconNavHomeActive32.tsx   |   5 +
 src/components/Icon/IconNavMe32.tsx           |   5 +
 src/components/Icon/IconNavMeActive32.tsx     |   5 +
 src/components/Icon/IconNavNotification24.tsx |   5 -
 src/components/Icon/IconNavNotification32.tsx |   5 +
 .../Icon/IconNavNotificationActive24.tsx      |   5 -
 .../Icon/IconNavNotificationActive32.tsx      |   5 +
 src/components/Icon/IconNavSearch24.tsx       |   5 -
 src/components/Icon/IconNavSearch32.tsx       |   5 +
 src/components/Icon/IconNavSearchActive32.tsx |   5 +
 src/components/Icon/IconNavSettings24.tsx     |   5 -
 src/components/Icon/index.tsx                 |  19 +-
 src/components/Layout/AuthHeader/index.tsx    |  45 +---
 src/components/Layout/AuthHeader/styles.css   |   3 -
 src/components/Layout/NavBar/NavListItem.tsx  |   1 +
 src/components/Layout/NavBar/index.tsx        |  87 +++++---
 src/components/Layout/SideNav/NavListItem.tsx |   4 +-
 src/components/Layout/SideNav/index.tsx       | 195 ++++++++++--------
 src/components/Layout/SideNav/styles.css      |   2 +-
 src/components/Layout/UnreadIcon/Follow.tsx   |   8 +-
 .../Layout/UnreadIcon/Notification.tsx        |   8 +-
 src/stories/components/Button/Buttons.tsx     |   8 +-
 .../Me/Settings/AnonymousSettings/index.tsx   |   2 -
 58 files changed, 357 insertions(+), 338 deletions(-)
 delete mode 100644 public/static/icons/24px/nav-following-active.svg
 delete mode 100644 public/static/icons/24px/nav-following.svg
 delete mode 100644 public/static/icons/24px/nav-home-active.svg
 delete mode 100644 public/static/icons/24px/nav-home.svg
 delete mode 100644 public/static/icons/24px/nav-notification-active.svg
 delete mode 100644 public/static/icons/24px/nav-notification.svg
 delete mode 100644 public/static/icons/24px/nav-search-active.svg
 delete mode 100644 public/static/icons/24px/nav-search.svg
 delete mode 100644 public/static/icons/24px/nav-settings.svg
 create mode 100644 public/static/icons/32px/nav-create.svg
 create mode 100644 public/static/icons/32px/nav-following-active.svg
 create mode 100644 public/static/icons/32px/nav-following.svg
 create mode 100644 public/static/icons/32px/nav-home-active.svg
 create mode 100644 public/static/icons/32px/nav-home.svg
 create mode 100644 public/static/icons/32px/nav-me-active.svg
 create mode 100644 public/static/icons/32px/nav-me.svg
 create mode 100644 public/static/icons/32px/nav-notification-active.svg
 create mode 100644 public/static/icons/32px/nav-notification.svg
 create mode 100644 public/static/icons/32px/nav-search-active.svg
 create mode 100644 public/static/icons/32px/nav-search.svg
 create mode 100644 src/components/Icon/IconNavCreate32.tsx
 delete mode 100644 src/components/Icon/IconNavFollowing24.tsx
 create mode 100644 src/components/Icon/IconNavFollowing32.tsx
 delete mode 100644 src/components/Icon/IconNavFollowingActive24.tsx
 create mode 100644 src/components/Icon/IconNavFollowingActive32.tsx
 delete mode 100644 src/components/Icon/IconNavHome24.tsx
 create mode 100644 src/components/Icon/IconNavHome32.tsx
 delete mode 100644 src/components/Icon/IconNavHomeActive24.tsx
 create mode 100644 src/components/Icon/IconNavHomeActive32.tsx
 create mode 100644 src/components/Icon/IconNavMe32.tsx
 create mode 100644 src/components/Icon/IconNavMeActive32.tsx
 delete mode 100644 src/components/Icon/IconNavNotification24.tsx
 create mode 100644 src/components/Icon/IconNavNotification32.tsx
 delete mode 100644 src/components/Icon/IconNavNotificationActive24.tsx
 create mode 100644 src/components/Icon/IconNavNotificationActive32.tsx
 delete mode 100644 src/components/Icon/IconNavSearch24.tsx
 create mode 100644 src/components/Icon/IconNavSearch32.tsx
 create mode 100644 src/components/Icon/IconNavSearchActive32.tsx
 delete mode 100644 src/components/Icon/IconNavSettings24.tsx
 delete mode 100644 src/components/Layout/AuthHeader/styles.css

diff --git a/public/static/icons/24px/nav-following-active.svg b/public/static/icons/24px/nav-following-active.svg
deleted file mode 100644
index 02d6c216aa..0000000000
--- a/public/static/icons/24px/nav-following-active.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="24" height="24" fill="none" viewBox="0 0 24 24"  xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="2" width="15.6444" height="20" rx="1.5" fill="currentColor" stroke="currentColor" stroke-width="1.5" stroke-miterlimit="10"/>
-<path d="M18.1111 4H19.0666C19.6189 4 20.0666 4.44772 20.0666 5V19C20.0666 19.5523 19.6189 20 19.0666 20H18.1111" stroke="currentColor" stroke-width="1.5" stroke-miterlimit="10"/>
-<path d="M21.5334 6H22.5001C22.7763 6 23.0001 6.22386 23.0001 6.5V17.5C23.0001 17.7761 22.7763 18 22.5001 18H21.5334" stroke="currentColor" stroke-width="1.5" stroke-miterlimit="10"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.08889 15C8.08889 15.2761 8.31275 15.5 8.58889 15.5H9.05556C9.3317 15.5 9.55556 15.2761 9.55556 15V12.75H11.7443C12.0205 12.75 12.2443 12.5261 12.2443 12.25V11.75C12.2443 11.4739 12.0205 11.25 11.7443 11.25H9.55556V9C9.55556 8.72386 9.3317 8.5 9.05556 8.5H8.58889C8.31275 8.5 8.08889 8.72386 8.08889 9V11.25H5.8999C5.62376 11.25 5.3999 11.4739 5.3999 11.75V12.25C5.3999 12.5261 5.62376 12.75 5.8999 12.75H8.08889V15Z" fill="white"/>
-</svg>
diff --git a/public/static/icons/24px/nav-following.svg b/public/static/icons/24px/nav-following.svg
deleted file mode 100644
index 643f64e312..0000000000
--- a/public/static/icons/24px/nav-following.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="2.74219" width="15.6444" height="20" rx="1.5" stroke="#333333" stroke-width="1.5" stroke-miterlimit="10"/>
-<path d="M18.1113 4.74219H19.0669C19.6192 4.74219 20.0669 5.1899 20.0669 5.74219V19.7422C20.0669 20.2945 19.6192 20.7422 19.0669 20.7422H18.1113" stroke="#333333" stroke-width="1.5" stroke-miterlimit="10"/>
-<path d="M21.5332 6.74219H22.4999C22.776 6.74219 22.9999 6.96605 22.9999 7.24219V18.2422C22.9999 18.5183 22.776 18.7422 22.4999 18.7422H21.5332" stroke="#333333" stroke-width="1.5" stroke-miterlimit="10"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.08889 15.7422C8.08889 16.0183 8.31275 16.2422 8.58889 16.2422H9.05556C9.3317 16.2422 9.55556 16.0183 9.55556 15.7422V13.4922H11.7443C12.0205 13.4922 12.2443 13.2683 12.2443 12.9922V12.4922C12.2443 12.216 12.0205 11.9922 11.7443 11.9922H9.55556V9.74219C9.55556 9.46605 9.3317 9.24219 9.05556 9.24219H8.58889C8.31275 9.24219 8.08889 9.46605 8.08889 9.74219V11.9922H5.8999C5.62376 11.9922 5.3999 12.216 5.3999 12.4922V12.9922C5.3999 13.2683 5.62376 13.4922 5.8999 13.4922H8.08889V15.7422Z" fill="#333333"/>
-</svg>
diff --git a/public/static/icons/24px/nav-home-active.svg b/public/static/icons/24px/nav-home-active.svg
deleted file mode 100644
index 45819bb171..0000000000
--- a/public/static/icons/24px/nav-home-active.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="24" height="24" fill="none" viewBox="0 0 24 24"  xmlns="http://www.w3.org/2000/svg">
-<path d="M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23Z" fill="currentColor"/>
-<path d="M6.8669 17.8378C6.41518 18.119 5.89512 17.5937 6.18084 17.1448L10.2532 10.7468C10.3308 10.625 10.4337 10.5214 10.5551 10.4432L17.0849 6.2344C17.5356 5.94388 18.0654 6.47034 17.7777 6.92288L13.5636 13.5526C13.4832 13.6791 13.3754 13.7859 13.2482 13.8651L6.8669 17.8378Z" fill="white"/>
-<path d="M12 13C12.5523 13 13 12.5523 13 12C13 11.4477 12.5523 11 12 11C11.4477 11 11 11.4477 11 12C11 12.5523 11.4477 13 12 13Z" fill="currentColor"/>
-</svg>
diff --git a/public/static/icons/24px/nav-home.svg b/public/static/icons/24px/nav-home.svg
deleted file mode 100644
index 9f03b03337..0000000000
--- a/public/static/icons/24px/nav-home.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"  width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path d="M6.867 17.834c-.452.28-.972-.244-.686-.693l4.072-6.398a.997.997 0 01.302-.304l6.53-4.21c.45-.29.98.237.693.69l-4.214 6.63c-.08.126-.189.233-.316.312l-6.381 3.973zM12 12.996a1 1 0 100-2 1 1 0 000 2zM12 23C5.925 23 1 18.075 1 12S5.925 1 12 1s11 4.925 11 11-4.925 11-11 11zm0-1.586a9.414 9.414 0 100-18.828 9.414 9.414 0 000 18.828z" fill="currentColor" fill-rule="evenodd"/>
-</svg>
diff --git a/public/static/icons/24px/nav-notification-active.svg b/public/static/icons/24px/nav-notification-active.svg
deleted file mode 100644
index a6cc878ca2..0000000000
--- a/public/static/icons/24px/nav-notification-active.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="24" height="24" fill="none" viewBox="0 0 24 24"  xmlns="http://www.w3.org/2000/svg">
-<path d="M5.08259 9.28706C5.42376 5.72193 8.41859 3 12 3C15.5814 3 18.5763 5.72194 18.9174 9.28709L19.3684 14C19.3684 14 19.8947 19 22 19H2C4.10526 19 4.63158 14 4.63158 14L5.08259 9.28706Z" fill="currentColor" stroke="currentColor" stroke-width="1.5" stroke-miterlimit="10"/>
-<path d="M10.5 2.5C10.5 1.67157 11.1716 1 12 1C12.8284 1 13.5 1.67157 13.5 2.5V3H10.5V2.5Z" fill="currentColor"/>
-<path d="M14.5 21C14.5 22.1046 13.3807 23 12 23C10.6193 23 9.5 22.1046 9.5 21" stroke="currentColor" stroke-width="1.5" stroke-miterlimit="10"/>
-</svg>
diff --git a/public/static/icons/24px/nav-notification.svg b/public/static/icons/24px/nav-notification.svg
deleted file mode 100644
index 17a31296c8..0000000000
--- a/public/static/icons/24px/nav-notification.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="24" height="24" fill="none" viewBox="0 0 24 24"  xmlns="http://www.w3.org/2000/svg">
-<path d="M5.08259 9.28706C5.42376 5.72193 8.41859 3 12 3V3C15.5814 3 18.5763 5.72194 18.9174 9.28708L19.3684 14C19.3684 14 19.8947 19 22 19H2C4.10526 19 4.63158 14 4.63158 14L5.08259 9.28706Z" stroke="currentColor" stroke-width="1.5" stroke-miterlimit="10"/>
-<path d="M10.5 2.5C10.5 1.67157 11.1716 1 12 1C12.8284 1 13.5 1.67157 13.5 2.5V3H10.5V2.5Z" fill="currentColor"/>
-<path d="M14.5 21C14.5 22.1046 13.3807 23 12 23C10.6193 23 9.5 22.1046 9.5 21" stroke="currentColor" stroke-width="1.5" stroke-miterlimit="10"/>
-</svg>
diff --git a/public/static/icons/24px/nav-search-active.svg b/public/static/icons/24px/nav-search-active.svg
deleted file mode 100644
index 995513dcd0..0000000000
--- a/public/static/icons/24px/nav-search-active.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="24" fill="none" viewBox="0 0 24 24"  xmlns="http://www.w3.org/2000/svg">
-<path d="M10 18C14.4183 18 18 14.4183 18 10C18 5.58172 14.4183 2 10 2C5.58172 2 2 5.58172 2 10C2 14.4183 5.58172 18 10 18Z" stroke="currentColor" stroke-width="2" stroke-miterlimit="10"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19.9412 23L15 18H17.5L22.5 23L19.9412 23Z" fill="currentColor"/>
-</svg>
diff --git a/public/static/icons/24px/nav-search.svg b/public/static/icons/24px/nav-search.svg
deleted file mode 100644
index 81d36ebf4b..0000000000
--- a/public/static/icons/24px/nav-search.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="24" fill="none" viewBox="0 0 24 24"  xmlns="http://www.w3.org/2000/svg">
-<path d="M10 18C14.4183 18 18 14.4183 18 10C18 5.58172 14.4183 2 10 2C5.58172 2 2 5.58172 2 10C2 14.4183 5.58172 18 10 18Z" stroke="currentColor" stroke-width="1.5" stroke-miterlimit="10"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19.9412 23.0001L15 18.0001L17.5 18L22.5 23L19.9412 23.0001Z" fill="currentColor"/>
-</svg>
diff --git a/public/static/icons/24px/nav-settings.svg b/public/static/icons/24px/nav-settings.svg
deleted file mode 100644
index 362b7a9177..0000000000
--- a/public/static/icons/24px/nav-settings.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M22.6874 12.9991C22.6874 11.5007 23.6102 10.3208 24.9971 9.50947C24.7457 8.67529 24.4158 7.87395 24.0087 7.12119C22.4532 7.52828 21.1947 6.91978 20.1363 5.85991C19.0778 4.80289 18.7536 3.54447 19.1607 1.98751C18.4079 1.58042 17.6066 1.2476 16.7724 1.00049C15.9611 2.38604 14.4941 3.30736 12.9986 3.30736C11.5016 3.30736 10.0361 2.38604 9.22331 1.00049C8.38769 1.2476 7.58921 1.58042 6.83645 1.98751C7.24354 3.54447 6.92072 4.80289 5.85942 5.85991C4.8024 6.91978 3.54398 7.52828 1.98703 7.12119C1.57993 7.87395 1.24854 8.67529 1 9.50947C2.38555 10.3208 3.30687 11.5007 3.30687 12.9991C3.30687 14.4946 2.38555 15.9616 1 16.7743C1.24997 17.6085 1.57993 18.4084 1.98703 19.1626C3.54398 18.7555 4.8024 19.0783 5.85942 20.1368C6.91787 21.1967 7.24354 22.4551 6.83645 24.0092C7.58921 24.4163 8.38912 24.7491 9.22473 24.9991C10.0361 23.6092 11.503 22.6893 13 22.6893C14.4955 22.6893 15.9625 23.6106 16.7753 24.9991C17.6094 24.7477 18.4094 24.4163 19.1635 24.0092C18.7565 22.4551 19.0793 21.1967 20.1391 20.1368C21.1976 19.0798 22.456 18.4713 24.0115 18.8755C24.4186 18.1227 24.75 17.3243 25 16.4872C23.6102 15.6745 22.6874 14.4946 22.6874 12.9991Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.9986 16.999C10.7886 16.999 8.99805 15.2087 8.99805 13.0001C8.99805 10.7904 10.7897 8.99902 12.9986 8.99902C15.2086 8.99902 16.998 10.7915 16.998 13.0001C16.998 15.2098 15.2086 16.999 12.9986 16.999Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/public/static/icons/32px/nav-create.svg b/public/static/icons/32px/nav-create.svg
new file mode 100644
index 0000000000..35f14ed3bd
--- /dev/null
+++ b/public/static/icons/32px/nav-create.svg
@@ -0,0 +1,3 @@
+<svg width="33" height="32" viewBox="0 0 33 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.5 6H13.5C9.63401 6 6.5 9.13401 6.5 13V19C6.5 22.866 9.63401 26 13.5 26H19.5C23.366 26 26.5 22.866 26.5 19V13C26.5 9.13401 23.366 6 19.5 6ZM13.5 4C8.52944 4 4.5 8.02944 4.5 13V19C4.5 23.9706 8.52944 28 13.5 28H19.5C24.4706 28 28.5 23.9706 28.5 19V13C28.5 8.02944 24.4706 4 19.5 4H13.5ZM11.079 16C11.079 15.4477 11.5267 15 12.079 15H15.5V11.8317C15.5 11.2794 15.9477 10.8317 16.5 10.8317C17.0523 10.8317 17.5 11.2794 17.5 11.8317V15H20.9211C21.4734 15 21.9211 15.4477 21.9211 16C21.9211 16.5523 21.4734 17 20.9211 17H17.5V20.6738C17.5 21.2261 17.0523 21.6738 16.5 21.6738C15.9477 21.6738 15.5 21.2261 15.5 20.6738V17H12.079C11.5267 17 11.079 16.5523 11.079 16Z" fill="currentColor"/>
+</svg>
diff --git a/public/static/icons/32px/nav-following-active.svg b/public/static/icons/32px/nav-following-active.svg
new file mode 100644
index 0000000000..2579d3b29c
--- /dev/null
+++ b/public/static/icons/32px/nav-following-active.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 6.23242H18.75C21.37 6.23242 23.5 8.36242 23.5 10.9824V23.4824C23.5 26.1024 21.37 28.2324 18.75 28.2324H10C7.38 28.2324 5.25 26.1024 5.25 23.4824V10.9824C5.25 8.36242 7.38 6.23242 10 6.23242ZM15.38 18.2324H17.5C18.05 18.2324 18.5 17.7824 18.5 17.2324C18.5 16.6824 18.05 16.2324 17.5 16.2324H15.38V14.1124C15.38 13.5624 14.93 13.1124 14.38 13.1124C13.83 13.1124 13.38 13.5624 13.38 14.1124V16.2324H11.26C10.71 16.2324 10.26 16.6824 10.26 17.2324C10.26 17.7824 10.71 18.2324 11.26 18.2324H13.38V20.3524C13.38 20.9024 13.83 21.3524 14.38 21.3524C14.93 21.3524 15.38 20.9024 15.38 20.3524V18.2324ZM24.33 8.15247C24.9 8.39247 25.42 8.74247 25.86 9.18247C26.75 10.0725 27.25 11.2825 27.25 12.5425V21.6025C27.25 22.8625 26.75 24.0725 25.86 24.9625C25.46 25.3525 25.01 25.6725 24.51 25.9025C24.83 25.1525 25 24.3325 25 23.4725V10.9725C25 9.96247 24.76 9.00247 24.33 8.15247Z" fill="currentColor"/>
+</svg>
diff --git a/public/static/icons/32px/nav-following.svg b/public/static/icons/32px/nav-following.svg
new file mode 100644
index 0000000000..fd2de5ed67
--- /dev/null
+++ b/public/static/icons/32px/nav-following.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.25 10.9785C7.25 9.45973 8.48122 8.22852 10 8.22852H18.75C20.2688 8.22852 21.5 9.45973 21.5 10.9785V23.4785C21.5 24.9973 20.2688 26.2285 18.75 26.2285H10C8.48122 26.2285 7.25 24.9973 7.25 23.4785V10.9785ZM10 6.22852C7.37665 6.22852 5.25 8.35516 5.25 10.9785V23.4785C5.25 26.1019 7.37665 28.2285 10 28.2285H18.75C20.2928 28.2285 21.6638 27.493 22.5315 26.3534C23.7799 26.3451 24.9754 25.8456 25.8588 24.9623C26.7496 24.0715 27.25 22.8633 27.25 21.6035V12.541C27.25 11.2812 26.7496 10.0731 25.8588 9.18226C24.968 8.29146 23.7598 7.79102 22.5 7.79102C22.4284 7.79102 22.3587 7.79853 22.2914 7.81281C21.4216 6.84048 20.1573 6.22852 18.75 6.22852H10ZM23.3856 9.93751C23.4605 10.2725 23.5 10.6209 23.5 10.9785V23.4785C23.5 23.7186 23.4822 23.9545 23.4478 24.185C23.8188 24.0488 24.1597 23.8329 24.4445 23.5481C24.9603 23.0323 25.25 22.3329 25.25 21.6035V12.541C25.25 11.8117 24.9603 11.1122 24.4445 10.5965C24.1439 10.2958 23.7807 10.0719 23.3856 9.93751ZM10.25 17.2285C10.25 16.6762 10.6977 16.2285 11.25 16.2285H13.375V14.1035C13.375 13.5512 13.8227 13.1035 14.375 13.1035C14.9273 13.1035 15.375 13.5512 15.375 14.1035V16.2285H17.5C18.0523 16.2285 18.5 16.6762 18.5 17.2285C18.5 17.7808 18.0523 18.2285 17.5 18.2285H15.375V20.3535C15.375 20.9058 14.9273 21.3535 14.375 21.3535C13.8227 21.3535 13.375 20.9058 13.375 20.3535V18.2285H11.25C10.6977 18.2285 10.25 17.7808 10.25 17.2285Z" fill="currentColor"/>
+</svg>
diff --git a/public/static/icons/32px/nav-home-active.svg b/public/static/icons/32px/nav-home-active.svg
new file mode 100644
index 0000000000..f7c3e32bdf
--- /dev/null
+++ b/public/static/icons/32px/nav-home-active.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M28.8401 15.6722L18.0901 6.48219C17.5301 6.00219 16.8301 5.74219 16.1001 5.74219C15.3701 5.74219 14.6701 6.00219 14.1101 6.48219L3.35008 15.6722C2.93008 16.0322 2.88008 16.6622 3.24008 17.0822C3.60008 17.5022 4.23008 17.5522 4.65008 17.1922L6.63008 15.5022V24.5722C6.63008 25.0022 6.71008 25.4122 6.87008 25.8222C7.03008 26.2222 7.26008 26.5822 7.56008 26.8822C7.86008 27.1922 8.21008 27.4322 8.60008 27.6022C8.99008 27.7722 9.41008 27.8522 9.83008 27.8522H22.3801C22.8101 27.8522 23.2201 27.7622 23.6101 27.6022C24.0001 27.4322 24.3501 27.1922 24.6501 26.8822C24.9401 26.5722 25.1801 26.2122 25.3401 25.8122C25.5001 25.4122 25.5801 24.9922 25.5801 24.5722V15.5022L27.5601 17.1922C27.9801 17.5522 28.6101 17.5022 28.9701 17.0822C29.3301 16.6622 29.2801 16.0322 28.8601 15.6722H28.8401ZM19.5401 22.5222C19.4201 22.6522 18.2801 23.7722 16.1001 23.7722C13.9201 23.7722 12.7801 22.6522 12.6601 22.5222C12.2801 22.1222 12.2901 21.4922 12.6901 21.1122C13.0801 20.7322 13.7101 20.7422 14.0901 21.1322C14.1301 21.1722 14.7901 21.7822 16.1001 21.7822C17.4101 21.7822 18.0801 21.1622 18.1101 21.1322C18.5001 20.7522 19.1301 20.7522 19.5201 21.1322C19.9101 21.5122 19.9201 22.1322 19.5401 22.5222Z" fill="currentColor"/>
+</svg>
diff --git a/public/static/icons/32px/nav-home.svg b/public/static/icons/32px/nav-home.svg
new file mode 100644
index 0000000000..6f124ae344
--- /dev/null
+++ b/public/static/icons/32px/nav-home.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.0801 6.45273L28.8401 15.6527H28.8601C29.2801 16.0127 29.3301 16.6427 28.9701 17.0627C28.7701 17.2927 28.4901 17.4127 28.2101 17.4127C27.9801 17.4127 27.7501 17.3327 27.5601 17.1727L25.5801 15.4827V24.5527C25.5801 24.9727 25.5001 25.3927 25.3401 25.7927C25.1801 26.1927 24.9401 26.5527 24.6501 26.8627C24.3501 27.1727 24.0001 27.4127 23.6101 27.5827C23.2201 27.7427 22.8101 27.8327 22.3801 27.8327H9.83008C9.41008 27.8327 8.99008 27.7527 8.60008 27.5827C8.21008 27.4127 7.86008 27.1727 7.56008 26.8627C7.26008 26.5627 7.03008 26.2027 6.87008 25.8027C6.71008 25.3927 6.63008 24.9827 6.63008 24.5527V15.4827L4.65008 17.1727C4.23008 17.5327 3.60008 17.4827 3.24008 17.0627C2.88008 16.6427 2.93008 16.0127 3.35008 15.6527L14.1001 6.45273C15.2101 5.50273 16.9601 5.50273 18.0801 6.45273ZM23.4701 25.0527C23.5301 24.8927 23.5601 24.7227 23.5601 24.5527L23.5501 24.5427V13.7627L16.7801 7.97273C16.3801 7.64273 15.7801 7.64273 15.3901 7.97273L8.62008 13.7627V24.5427C8.62008 24.7227 8.66008 24.8927 8.72008 25.0527C8.78008 25.2127 8.88008 25.3527 8.99008 25.4727C9.11008 25.5927 9.24008 25.6827 9.38008 25.7427C9.52008 25.8027 9.70008 25.8327 9.82008 25.8327H22.3701C22.5301 25.8227 22.6701 25.8027 22.8101 25.7427C22.9601 25.6827 23.0901 25.5927 23.2001 25.4727C23.3201 25.3527 23.4101 25.2127 23.4701 25.0527ZM16.1001 21.7527C17.4201 21.7527 18.1101 21.1027 18.1101 21.1027C18.5101 20.7227 19.1401 20.7227 19.5201 21.1027C19.9001 21.4827 19.9201 22.1027 19.5401 22.4927C19.4201 22.6227 18.2701 23.7427 16.1001 23.7427C13.9301 23.7427 12.7801 22.6227 12.6601 22.4927C12.2801 22.1027 12.2901 21.4627 12.6901 21.0827C13.0801 20.7027 13.7101 20.7127 14.0901 21.1027C14.1301 21.1527 14.7801 21.7527 16.1001 21.7527Z" fill="currentColor"/>
+</svg>
diff --git a/public/static/icons/32px/nav-me-active.svg b/public/static/icons/32px/nav-me-active.svg
new file mode 100644
index 0000000000..1ae619b182
--- /dev/null
+++ b/public/static/icons/32px/nav-me-active.svg
@@ -0,0 +1,7 @@
+<svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="path-1-inside-1_11592_18201" fill="white">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.5 29.2295C23.4036 29.2295 29 23.6331 29 16.7295C29 9.82593 23.4036 4.22949 16.5 4.22949C9.59644 4.22949 4 9.82593 4 16.7295C4 23.6331 9.59644 29.2295 16.5 29.2295ZM16.5714 12.5279C16.5714 13.5141 15.7719 14.3136 14.7857 14.3136C13.7995 14.3136 13 13.5141 13 12.5279C13 11.5417 13.7995 10.7422 14.7857 10.7422C15.7719 10.7422 16.5714 11.5417 16.5714 12.5279ZM24.9047 12.5279C24.9047 13.5141 24.1052 14.3136 23.119 14.3136C22.1327 14.3136 21.3333 13.5141 21.3333 12.5279C21.3333 11.5417 22.1327 10.7422 23.119 10.7422C24.1052 10.7422 24.9047 11.5417 24.9047 12.5279Z"/>
+</mask>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.5 29.2295C23.4036 29.2295 29 23.6331 29 16.7295C29 9.82593 23.4036 4.22949 16.5 4.22949C9.59644 4.22949 4 9.82593 4 16.7295C4 23.6331 9.59644 29.2295 16.5 29.2295ZM16.5714 12.5279C16.5714 13.5141 15.7719 14.3136 14.7857 14.3136C13.7995 14.3136 13 13.5141 13 12.5279C13 11.5417 13.7995 10.7422 14.7857 10.7422C15.7719 10.7422 16.5714 11.5417 16.5714 12.5279ZM24.9047 12.5279C24.9047 13.5141 24.1052 14.3136 23.119 14.3136C22.1327 14.3136 21.3333 13.5141 21.3333 12.5279C21.3333 11.5417 22.1327 10.7422 23.119 10.7422C24.1052 10.7422 24.9047 11.5417 24.9047 12.5279Z" fill="currentColor"/>
+<path d="M27 16.7295C27 22.5285 22.299 27.2295 16.5 27.2295V31.2295C24.5081 31.2295 31 24.7376 31 16.7295H27ZM16.5 6.22949C22.299 6.22949 27 10.9305 27 16.7295H31C31 8.72136 24.5081 2.22949 16.5 2.22949V6.22949ZM6 16.7295C6 10.9305 10.701 6.22949 16.5 6.22949V2.22949C8.49187 2.22949 2 8.72136 2 16.7295H6ZM16.5 27.2295C10.701 27.2295 6 22.5285 6 16.7295H2C2 24.7376 8.49187 31.2295 16.5 31.2295V27.2295ZM14.7857 16.3136C16.8765 16.3136 18.5714 14.6187 18.5714 12.5279H14.5714C14.5714 12.4096 14.6674 12.3136 14.7857 12.3136V16.3136ZM11 12.5279C11 14.6187 12.6949 16.3136 14.7857 16.3136V12.3136C14.9041 12.3136 15 12.4096 15 12.5279H11ZM14.7857 8.74219C12.6949 8.74219 11 10.4371 11 12.5279H15C15 12.6462 14.9041 12.7422 14.7857 12.7422V8.74219ZM18.5714 12.5279C18.5714 10.4371 16.8765 8.74219 14.7857 8.74219V12.7422C14.6674 12.7422 14.5714 12.6462 14.5714 12.5279H18.5714ZM23.119 16.3136C25.2098 16.3136 26.9047 14.6187 26.9047 12.5279H22.9047C22.9047 12.4096 23.0006 12.3136 23.119 12.3136V16.3136ZM19.3333 12.5279C19.3333 14.6187 21.0282 16.3136 23.119 16.3136V12.3136C23.2373 12.3136 23.3333 12.4096 23.3333 12.5279H19.3333ZM23.119 8.74219C21.0282 8.74219 19.3333 10.4371 19.3333 12.5279H23.3333C23.3333 12.6462 23.2373 12.7422 23.119 12.7422V8.74219ZM26.9047 12.5279C26.9047 10.4371 25.2098 8.74219 23.119 8.74219V12.7422C23.0006 12.7422 22.9047 12.6462 22.9047 12.5279H26.9047Z" fill="currentColor" mask="url(#path-1-inside-1_11592_18201)"/>
+</svg>
diff --git a/public/static/icons/32px/nav-me.svg b/public/static/icons/32px/nav-me.svg
new file mode 100644
index 0000000000..c910a0b7b0
--- /dev/null
+++ b/public/static/icons/32px/nav-me.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.5 27.2295C22.299 27.2295 27 22.5285 27 16.7295C27 10.9305 22.299 6.22949 16.5 6.22949C10.701 6.22949 6 10.9305 6 16.7295C6 22.5285 10.701 27.2295 16.5 27.2295ZM16.5 29.2295C23.4036 29.2295 29 23.6331 29 16.7295C29 9.82593 23.4036 4.22949 16.5 4.22949C9.59644 4.22949 4 9.82593 4 16.7295C4 23.6331 9.59644 29.2295 16.5 29.2295ZM12.3333 16.7295C12.3333 17.7157 11.5338 18.5152 10.5476 18.5152C9.56139 18.5152 8.7619 17.7157 8.7619 16.7295C8.7619 15.7433 9.56139 14.9438 10.5476 14.9438C11.5338 14.9438 12.3333 15.7433 12.3333 16.7295ZM18.8809 18.5152C19.8672 18.5152 20.6666 17.7157 20.6666 16.7295C20.6666 15.7433 19.8672 14.9438 18.8809 14.9438C17.8947 14.9438 17.0952 15.7433 17.0952 16.7295C17.0952 17.7157 17.8947 18.5152 18.8809 18.5152Z" fill="currentColor"/>
+</svg>
diff --git a/public/static/icons/32px/nav-notification-active.svg b/public/static/icons/32px/nav-notification-active.svg
new file mode 100644
index 0000000000..12310c1810
--- /dev/null
+++ b/public/static/icons/32px/nav-notification-active.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.2488 19.2122C25.2588 20.1322 25.5688 21.0322 26.1288 21.7922L26.1588 21.7822C26.6488 22.4622 26.5888 23.2522 26.1888 23.8422C25.8088 24.4122 25.1188 24.7822 24.3488 24.7822H7.15884C6.38884 24.7822 5.69884 24.4122 5.31884 23.8422C4.91884 23.2522 4.85884 22.4522 5.34884 21.7822C5.90884 21.0322 6.21884 20.1322 6.22884 19.2122C6.22884 19.0083 6.22163 18.7538 6.21332 18.4611C6.21185 18.4093 6.21035 18.3563 6.20884 18.3022L6.20733 18.2591C6.14707 16.5434 6.04545 13.6502 6.82884 11.0422C7.31884 9.41219 8.15884 7.82219 9.60884 6.64219C11.0688 5.45219 13.0688 4.74219 15.7388 4.74219C18.4088 4.74219 20.4088 5.45219 21.8688 6.64219C23.3188 7.83219 24.1588 9.42219 24.6488 11.0422C25.4322 13.6502 25.3306 16.5434 25.2704 18.259L25.2688 18.3022C25.2673 18.3563 25.2658 18.4092 25.2644 18.461C25.2561 18.7538 25.2488 19.0082 25.2488 19.2122ZM20.4988 18.0022C20.8588 18.0022 21.2088 17.8022 21.3888 17.4622V17.4522C21.4588 17.3322 22.0088 16.2022 21.8588 14.1722C21.7188 12.1422 21.0088 11.1022 20.9288 10.9922C20.6088 10.5522 19.9988 10.4522 19.5488 10.7622C19.0988 11.0722 18.9888 11.6922 19.2888 12.1422C19.2888 12.143 19.2919 12.1484 19.2977 12.1584C19.3626 12.2722 19.767 12.9806 19.8588 14.3222C19.9588 15.7522 19.6188 16.5222 19.5988 16.5622C19.3588 17.0422 19.5488 17.6422 20.0388 17.8922C20.1888 17.9622 20.3488 18.0022 20.4988 18.0022ZM15.5489 28.2522C14.2389 28.2522 13.1789 27.8522 12.3989 27.0722C12.1489 26.8222 11.9689 26.5522 11.8089 26.2822H19.4589C18.7589 27.3322 17.5389 28.2522 15.5489 28.2522Z" fill="currentColor"/>
+</svg>
diff --git a/public/static/icons/32px/nav-notification.svg b/public/static/icons/32px/nav-notification.svg
new file mode 100644
index 0000000000..2333d8114f
--- /dev/null
+++ b/public/static/icons/32px/nav-notification.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.0001 4.77344C13.295 4.77344 11.2557 5.49407 9.75794 6.71311C8.27038 7.9238 7.41101 9.54944 6.91652 11.1975C6.11703 13.8622 6.22397 16.8221 6.28553 18.5262C6.29839 18.8821 6.30927 19.1832 6.3095 19.4155C6.2953 20.2941 6.00235 21.1515 5.46424 21.8725L5.46416 21.8724L5.45605 21.8836C4.91636 22.6279 4.98778 23.513 5.42245 24.157C5.84282 24.7798 6.58099 25.1699 7.40603 25.1699H11.3122C11.3902 25.5276 11.5213 25.957 11.7438 26.3937C12.0319 26.9592 12.4808 27.5502 13.1721 27.9965C13.8677 28.4456 14.7489 28.7095 15.8357 28.7095C18.0743 28.7095 19.3702 27.5967 20.0576 26.4557C20.3354 25.9945 20.5093 25.5394 20.6181 25.1699H24.5942C25.4193 25.1699 26.1574 24.7798 26.5778 24.157C27.0125 23.513 27.0839 22.6279 26.5442 21.8836L26.5443 21.8835L26.536 21.8725C25.9979 21.1515 25.7049 20.2941 25.6907 19.4155C25.691 19.1834 25.7018 18.8824 25.7147 18.5266L25.7147 18.5262C25.7763 16.8221 25.8832 13.8622 25.0837 11.1975C24.5892 9.54944 23.7298 7.9238 22.2423 6.71311C20.7445 5.49407 18.7052 4.77344 16.0001 4.77344ZM19.8195 23.1699C19.8107 23.1698 19.8018 23.1698 19.793 23.1699H12.2008C12.1953 23.1698 12.1899 23.1698 12.1844 23.1699H7.40603C7.21834 23.1699 7.11857 23.0887 7.08491 23.0447C7.86149 21.9939 8.29063 20.7358 8.3094 19.4373L8.3095 19.4229C8.3095 19.1078 8.29703 18.7355 8.28309 18.3192C8.22486 16.5809 8.14095 14.076 8.83216 11.7723C9.25016 10.3791 9.93337 9.14901 11.0204 8.26429C12.0972 7.3879 13.6646 6.77344 16.0001 6.77344C18.3357 6.77344 19.903 7.3879 20.9798 8.26429C22.0669 9.14901 22.7501 10.3791 23.1681 11.7723C23.8593 14.076 23.7754 16.5809 23.7171 18.3192V18.3192C23.7032 18.7355 23.6907 19.1078 23.6907 19.4229L23.6908 19.4373C23.7096 20.7358 24.1388 21.9939 24.9153 23.0447C24.8817 23.0887 24.7819 23.1699 24.5942 23.1699H19.8195ZM13.389 25.1699H18.4819C18.441 25.2541 18.3953 25.3391 18.3444 25.4236C17.9656 26.0525 17.2755 26.7095 15.8357 26.7095C15.0832 26.7095 14.5893 26.5309 14.257 26.3163C13.9204 26.099 13.6885 25.805 13.5258 25.4857C13.4723 25.3807 13.4271 25.2745 13.389 25.1699Z" fill="currentColor"/>
+</svg>
diff --git a/public/static/icons/32px/nav-search-active.svg b/public/static/icons/32px/nav-search-active.svg
new file mode 100644
index 0000000000..995584d876
--- /dev/null
+++ b/public/static/icons/32px/nav-search-active.svg
@@ -0,0 +1,3 @@
+<svg width="33" height="32" viewBox="0 0 33 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.77 25.8602L21.48 20.6102C21.48 20.6102 21.41 20.5302 21.37 20.4902C23.15 18.8002 24.26 16.4002 24.26 13.7402C24.27 8.64023 20.19 4.49023 15.13 4.49023C10.07 4.49023 6 8.64023 6 13.7402C6 18.8402 10.08 22.9902 15.13 22.9902C16.84 22.9902 18.45 22.5102 19.81 21.6802C19.84 21.7502 19.88 21.8102 19.93 21.8702L24.22 27.1202C24.57 27.5502 25.2 27.6102 25.63 27.2602C26.06 26.9102 26.12 26.2802 25.77 25.8502V25.8602ZM20.6 16.8802C20.55 16.9602 20.5 17.0302 20.46 17.0802C20.44 17.1002 20.42 17.1202 20.41 17.1402L20.39 17.1602V17.1702C20.02 17.5802 19.39 17.6102 18.98 17.2402C18.57 16.8702 18.54 16.2502 18.9 15.8402C18.9 15.8302 18.93 15.8002 18.95 15.7702C19 15.7002 19.07 15.5702 19.15 15.4002C19.3 15.0602 19.45 14.5202 19.39 13.8002C19.34 13.0702 19.11 12.5702 18.92 12.2502C18.82 12.0902 18.73 11.9802 18.67 11.9102C18.64 11.8802 18.62 11.8502 18.61 11.8402C18.2 11.4802 18.14 10.8602 18.49 10.4402C18.84 10.0202 19.47 9.96023 19.9 10.3102V10.3202L19.92 10.3402C19.92 10.3402 19.95 10.3702 19.98 10.3902C20.02 10.4302 20.08 10.4902 20.15 10.5602C20.28 10.7102 20.45 10.9202 20.62 11.1902C20.96 11.7402 21.3 12.5602 21.38 13.6402C21.46 14.7202 21.23 15.5802 20.98 16.1802C20.85 16.4802 20.72 16.7102 20.61 16.8702L20.6 16.8802Z" fill="currentColor"/>
+</svg>
diff --git a/public/static/icons/32px/nav-search.svg b/public/static/icons/32px/nav-search.svg
new file mode 100644
index 0000000000..5401290193
--- /dev/null
+++ b/public/static/icons/32px/nav-search.svg
@@ -0,0 +1,3 @@
+<svg width="33" height="32" viewBox="0 0 33 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 13.7373C8 9.71988 11.2074 6.4873 15.1343 6.4873C19.0612 6.4873 22.2686 9.71988 22.2686 13.7373C22.2686 17.7547 19.0612 20.9873 15.1343 20.9873C11.2074 20.9873 8 17.7547 8 13.7373ZM15.1343 4.4873C10.0763 4.4873 6 8.64204 6 13.7373C6 18.8326 10.0763 22.9873 15.1343 22.9873C16.8483 22.9873 18.4497 22.5102 19.8178 21.681C19.8505 21.7469 19.8911 21.8103 19.9396 21.8697L24.2253 27.1197C24.5746 27.5475 25.2045 27.6112 25.6324 27.262C26.0602 26.9127 26.1239 26.2828 25.7746 25.855L21.4889 20.605C21.4545 20.5628 21.4174 20.5242 21.378 20.4891C23.1584 18.7992 24.2686 16.3963 24.2686 13.7373C24.2686 8.64204 20.1923 4.4873 15.1343 4.4873Z" fill="currentColor"/>
+</svg>
diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx
index 9b9936a8d4..10afe6fbbc 100644
--- a/src/components/Button/index.tsx
+++ b/src/components/Button/index.tsx
@@ -12,6 +12,7 @@ export type ButtonWidth =
   | '5rem'
   | '6rem'
   | '7rem'
+  | '7.5rem'
   | '8rem'
   | '10.5rem'
   | '19.5rem'
diff --git a/src/components/Buttons/UniversalAuth/index.tsx b/src/components/Buttons/UniversalAuth/index.tsx
index 7b888cdcb6..35b5d9fb41 100644
--- a/src/components/Buttons/UniversalAuth/index.tsx
+++ b/src/components/Buttons/UniversalAuth/index.tsx
@@ -8,13 +8,11 @@ import {
 import { analytics, appendTarget } from '~/common/utils'
 import { Button, ButtonProps, Media, TextIcon, Translate } from '~/components'
 
-type UniversalAuthButtonProps = {
-  isPlain?: boolean
-} & Pick<ButtonProps, 'size'>
+type UniversalAuthButtonProps = Pick<ButtonProps, 'size'>
 
 export const UniversalAuthButton: React.FC<
   React.PropsWithChildren<UniversalAuthButtonProps>
-> = ({ children, isPlain, size }) => {
+> = ({ children, size }) => {
   const smUpProps = {
     onClick: () => {
       analytics.trackEvent('click_button', {
@@ -33,26 +31,6 @@ export const UniversalAuthButton: React.FC<
     },
   }
 
-  if (isPlain) {
-    return (
-      <>
-        <Media at="sm">
-          <Button {...smProps}>{children}</Button>
-        </Media>
-        <Media greaterThan="sm">
-          <Button aria-haspopup="dialog" {...smUpProps}>
-            {children}
-          </Button>
-        </Media>
-      </>
-    )
-  }
-
-  const buttonProps: ButtonProps = {
-    bgColor: 'green',
-    size: size || [null, '2rem'],
-    spacing: [0, 'loose'],
-  }
   const ButtonText = () => (
     <TextIcon color="white" weight="md">
       <Translate id="authEntries" />
@@ -61,13 +39,19 @@ export const UniversalAuthButton: React.FC<
 
   return (
     <>
-      <Media at="sm">
-        <Button {...buttonProps} {...smProps}>
+      <Media lessThan="lg">
+        <Button bgColor="green" spacing={['tight', 'base']} {...smProps}>
           <ButtonText />
         </Button>
       </Media>
-      <Media greaterThan="sm">
-        <Button aria-haspopup="dialog" {...buttonProps} {...smUpProps}>
+
+      <Media greaterThanOrEqual="lg">
+        <Button
+          aria-haspopup="dialog"
+          bgColor="green"
+          size={['7.5rem', '2.5rem']}
+          {...smUpProps}
+        >
           <ButtonText />
         </Button>
       </Media>
diff --git a/src/components/Buttons/Write/index.tsx b/src/components/Buttons/Write/index.tsx
index a43fdca163..99b670f9fe 100644
--- a/src/components/Buttons/Write/index.tsx
+++ b/src/components/Buttons/Write/index.tsx
@@ -10,10 +10,9 @@ import {
 import { analytics, toPath, translate } from '~/common/utils'
 import {
   Button,
-  IconPen16,
+  IconNavCreate32,
   IconSpinner16,
   LanguageContext,
-  Media,
   TextIcon,
   Translate,
   useMutation,
@@ -22,55 +21,63 @@ import CREATE_DRAFT from '~/components/GQL/mutations/createDraft'
 import { CreateDraftMutation } from '~/gql/graphql'
 
 interface Props {
+  variant: 'navbar' | 'sidenav'
   allowed: boolean
   authed?: boolean
   forbidden?: boolean
 }
 
 const BaseWriteButton = ({
+  variant,
   onClick,
   loading,
 }: {
+  variant: 'navbar' | 'sidenav'
   onClick: () => any
   loading?: boolean
 }) => {
   const { lang } = useContext(LanguageContext)
 
-  const WriteIcon = loading ? (
-    <IconSpinner16 size="sm" color="white" />
-  ) : (
-    <IconPen16 size="sm" color="white" />
-  )
+  if (variant === 'navbar') {
+    return (
+      <Button
+        bgActiveColor="grey-lighter"
+        size={['2rem', '2rem']}
+        onClick={onClick}
+        aria-label={translate({ id: 'write', lang })}
+      >
+        <IconNavCreate32 size="lg" color="black" />
+      </Button>
+    )
+  }
 
   return (
-    <>
-      <Media greaterThanOrEqual="lg">
-        <Button
-          size={['5rem', '2.25rem']}
-          bgColor="gold"
-          onClick={onClick}
-          aria-label={translate({ id: 'write', lang })}
-        >
-          <TextIcon icon={WriteIcon} weight="md" color="white">
-            <Translate id="write" />
-          </TextIcon>
-        </Button>
-      </Media>
-      <Media lessThan="lg">
-        <Button
-          size={['2rem', '2rem']}
-          bgColor="gold"
-          onClick={onClick}
-          aria-label={translate({ id: 'write', lang })}
-        >
-          <TextIcon icon={WriteIcon} weight="md" color="white" />
-        </Button>
-      </Media>
-    </>
+    <Button
+      size={[null, '2.25rem']}
+      spacing={[0, 'base']}
+      bgColor="gold"
+      onClick={onClick}
+      aria-label={translate({ id: 'write', lang })}
+    >
+      <TextIcon
+        icon={
+          loading ? (
+            <IconSpinner16 color="white" />
+          ) : (
+            <IconNavCreate32 color="white" />
+          )
+        }
+        spacing="xtight"
+        weight="md"
+        color="white"
+      >
+        <Translate id="write" />
+      </TextIcon>
+    </Button>
   )
 }
 
-export const WriteButton = ({ allowed, authed, forbidden }: Props) => {
+export const WriteButton = ({ variant, allowed, authed, forbidden }: Props) => {
   const router = useRouter()
   const { lang } = useContext(LanguageContext)
   const [putDraft, { loading }] = useMutation<CreateDraftMutation>(
@@ -83,6 +90,7 @@ export const WriteButton = ({ allowed, authed, forbidden }: Props) => {
   if (!allowed) {
     return (
       <BaseWriteButton
+        variant={variant}
         onClick={() =>
           window.dispatchEvent(new CustomEvent(OPEN_LIKE_COIN_DIALOG, {}))
         }
@@ -92,6 +100,7 @@ export const WriteButton = ({ allowed, authed, forbidden }: Props) => {
 
   return (
     <BaseWriteButton
+      variant={variant}
       onClick={async () => {
         if (!authed) {
           window.dispatchEvent(
diff --git a/src/components/Dialogs/HelpDialog/index.tsx b/src/components/Dialogs/HelpDialog/index.tsx
index 8e9ea7a741..31ff86a96c 100644
--- a/src/components/Dialogs/HelpDialog/index.tsx
+++ b/src/components/Dialogs/HelpDialog/index.tsx
@@ -23,11 +23,17 @@ const ReadTime = () => (
   <>
     <h2 className="title">
       <TextIcon icon={<IconReadTimeTotal16 size="md" />} weight="md">
-        <FormattedMessage defaultMessage="Accumulated Read Time" description="src/components/Dialogs/HelpDialog/index.tsx" />
+        <FormattedMessage
+          defaultMessage="Accumulated Read Time"
+          description="src/components/Dialogs/HelpDialog/index.tsx"
+        />
       </TextIcon>
     </h2>
     <p className="description">
-      <FormattedMessage defaultMessage="Accumulated read time indicates the total time length that registered users read." description="src/components/Dialogs/HelpDialog/index.tsx" />
+      <FormattedMessage
+        defaultMessage="Accumulated read time indicates the total time length that registered users read."
+        description="src/components/Dialogs/HelpDialog/index.tsx"
+      />
     </p>
     <style jsx>{styles}</style>
   </>
@@ -41,7 +47,10 @@ const ReadCount = () => (
       </TextIcon>
     </h2>
     <p className="description">
-      <FormattedMessage defaultMessage="Read counts indicates how many registered users read." description="src/components/Dialogs/HelpDialog/index.tsx" />
+      <FormattedMessage
+        defaultMessage="Read counts indicates how many registered users read."
+        description="src/components/Dialogs/HelpDialog/index.tsx"
+      />
     </p>
     <style jsx>{styles}</style>
   </>
diff --git a/src/components/Empty/EmptyNotice.tsx b/src/components/Empty/EmptyNotice.tsx
index ab2dd8b8f3..34fb0db216 100644
--- a/src/components/Empty/EmptyNotice.tsx
+++ b/src/components/Empty/EmptyNotice.tsx
@@ -1,8 +1,8 @@
-import { Empty, IconNavNotification24, Translate } from '~/components'
+import { Empty, IconNavNotification32, Translate } from '~/components'
 
 export const EmptyNotice = () => (
   <Empty
-    icon={<IconNavNotification24 size="xxl" />}
+    icon={<IconNavNotification32 size="xxl" />}
     description={
       <Translate
         zh_hant="還沒有通知"
diff --git a/src/components/Empty/EmptySearch.tsx b/src/components/Empty/EmptySearch.tsx
index 2e97ae6234..afd74d61d9 100644
--- a/src/components/Empty/EmptySearch.tsx
+++ b/src/components/Empty/EmptySearch.tsx
@@ -1,4 +1,4 @@
-import { Empty, IconNavSearch24, Translate } from '~/components'
+import { Empty, IconNavSearch32, Translate } from '~/components'
 
 export const EmptySearch = ({
   description,
@@ -6,7 +6,7 @@ export const EmptySearch = ({
   description?: string | React.ReactNode
 }) => (
   <Empty
-    icon={<IconNavSearch24 size="xxl" />}
+    icon={<IconNavSearch32 size="xxl" />}
     description={description || <Translate id="emptySearchResults" />}
   />
 )
diff --git a/src/components/Icon/IconLogo.tsx b/src/components/Icon/IconLogo.tsx
index 0a63ae5ab0..0377a85f20 100644
--- a/src/components/Icon/IconLogo.tsx
+++ b/src/components/Icon/IconLogo.tsx
@@ -3,5 +3,5 @@ import { ReactComponent as Icon } from '@/public/static/icons/logo.svg'
 import { withIcon } from './withIcon'
 
 export const IconLogo = withIcon((props) => (
-  <Icon style={{ width: 97, height: 20 }} {...props} />
+  <Icon style={{ width: 120, height: 24.75 }} {...props} />
 ))
diff --git a/src/components/Icon/IconNavCreate32.tsx b/src/components/Icon/IconNavCreate32.tsx
new file mode 100644
index 0000000000..5a1e77e527
--- /dev/null
+++ b/src/components/Icon/IconNavCreate32.tsx
@@ -0,0 +1,5 @@
+import { ReactComponent as Icon } from '@/public/static/icons/32px/nav-create.svg'
+
+import { withIcon } from './withIcon'
+
+export const IconNavCreate32 = withIcon(Icon)
diff --git a/src/components/Icon/IconNavFollowing24.tsx b/src/components/Icon/IconNavFollowing24.tsx
deleted file mode 100644
index 5dfb2774ed..0000000000
--- a/src/components/Icon/IconNavFollowing24.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ReactComponent as Icon } from '@/public/static/icons/24px/nav-following.svg'
-
-import { withIcon } from './withIcon'
-
-export const IconNavFollowing24 = withIcon(Icon)
diff --git a/src/components/Icon/IconNavFollowing32.tsx b/src/components/Icon/IconNavFollowing32.tsx
new file mode 100644
index 0000000000..47b1350121
--- /dev/null
+++ b/src/components/Icon/IconNavFollowing32.tsx
@@ -0,0 +1,5 @@
+import { ReactComponent as Icon } from '@/public/static/icons/32px/nav-following.svg'
+
+import { withIcon } from './withIcon'
+
+export const IconNavFollowing32 = withIcon(Icon)
diff --git a/src/components/Icon/IconNavFollowingActive24.tsx b/src/components/Icon/IconNavFollowingActive24.tsx
deleted file mode 100644
index 1db982e251..0000000000
--- a/src/components/Icon/IconNavFollowingActive24.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ReactComponent as Icon } from '@/public/static/icons/24px/nav-following-active.svg'
-
-import { withIcon } from './withIcon'
-
-export const IconNavFollowingActive24 = withIcon(Icon)
diff --git a/src/components/Icon/IconNavFollowingActive32.tsx b/src/components/Icon/IconNavFollowingActive32.tsx
new file mode 100644
index 0000000000..af54a518a5
--- /dev/null
+++ b/src/components/Icon/IconNavFollowingActive32.tsx
@@ -0,0 +1,5 @@
+import { ReactComponent as Icon } from '@/public/static/icons/32px/nav-following-active.svg'
+
+import { withIcon } from './withIcon'
+
+export const IconNavFollowingActive32 = withIcon(Icon)
diff --git a/src/components/Icon/IconNavHome24.tsx b/src/components/Icon/IconNavHome24.tsx
deleted file mode 100644
index e63f46ef34..0000000000
--- a/src/components/Icon/IconNavHome24.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ReactComponent as Icon } from '@/public/static/icons/24px/nav-home.svg'
-
-import { withIcon } from './withIcon'
-
-export const IconNavHome24 = withIcon(Icon)
diff --git a/src/components/Icon/IconNavHome32.tsx b/src/components/Icon/IconNavHome32.tsx
new file mode 100644
index 0000000000..b1b20bf1e1
--- /dev/null
+++ b/src/components/Icon/IconNavHome32.tsx
@@ -0,0 +1,5 @@
+import { ReactComponent as Icon } from '@/public/static/icons/32px/nav-home.svg'
+
+import { withIcon } from './withIcon'
+
+export const IconNavHome32 = withIcon(Icon)
diff --git a/src/components/Icon/IconNavHomeActive24.tsx b/src/components/Icon/IconNavHomeActive24.tsx
deleted file mode 100644
index d78a49d64f..0000000000
--- a/src/components/Icon/IconNavHomeActive24.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ReactComponent as Icon } from '@/public/static/icons/24px/nav-home-active.svg'
-
-import { withIcon } from './withIcon'
-
-export const IconNavHomeActive24 = withIcon(Icon)
diff --git a/src/components/Icon/IconNavHomeActive32.tsx b/src/components/Icon/IconNavHomeActive32.tsx
new file mode 100644
index 0000000000..2ec1f79710
--- /dev/null
+++ b/src/components/Icon/IconNavHomeActive32.tsx
@@ -0,0 +1,5 @@
+import { ReactComponent as Icon } from '@/public/static/icons/32px/nav-home-active.svg'
+
+import { withIcon } from './withIcon'
+
+export const IconNavHomeActive32 = withIcon(Icon)
diff --git a/src/components/Icon/IconNavMe32.tsx b/src/components/Icon/IconNavMe32.tsx
new file mode 100644
index 0000000000..5ffe7119e3
--- /dev/null
+++ b/src/components/Icon/IconNavMe32.tsx
@@ -0,0 +1,5 @@
+import { ReactComponent as Icon } from '@/public/static/icons/32px/nav-me.svg'
+
+import { withIcon } from './withIcon'
+
+export const IconNavMe32 = withIcon(Icon)
diff --git a/src/components/Icon/IconNavMeActive32.tsx b/src/components/Icon/IconNavMeActive32.tsx
new file mode 100644
index 0000000000..55d24da2e1
--- /dev/null
+++ b/src/components/Icon/IconNavMeActive32.tsx
@@ -0,0 +1,5 @@
+import { ReactComponent as Icon } from '@/public/static/icons/32px/nav-me-active.svg'
+
+import { withIcon } from './withIcon'
+
+export const IconNavMeActive32 = withIcon(Icon)
diff --git a/src/components/Icon/IconNavNotification24.tsx b/src/components/Icon/IconNavNotification24.tsx
deleted file mode 100644
index 5b0d060c15..0000000000
--- a/src/components/Icon/IconNavNotification24.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ReactComponent as Icon } from '@/public/static/icons/24px/nav-notification.svg'
-
-import { withIcon } from './withIcon'
-
-export const IconNavNotification24 = withIcon(Icon)
diff --git a/src/components/Icon/IconNavNotification32.tsx b/src/components/Icon/IconNavNotification32.tsx
new file mode 100644
index 0000000000..9e7d6bdb6c
--- /dev/null
+++ b/src/components/Icon/IconNavNotification32.tsx
@@ -0,0 +1,5 @@
+import { ReactComponent as Icon } from '@/public/static/icons/32px/nav-notification.svg'
+
+import { withIcon } from './withIcon'
+
+export const IconNavNotification32 = withIcon(Icon)
diff --git a/src/components/Icon/IconNavNotificationActive24.tsx b/src/components/Icon/IconNavNotificationActive24.tsx
deleted file mode 100644
index 2c2a3f8e5e..0000000000
--- a/src/components/Icon/IconNavNotificationActive24.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ReactComponent as Icon } from '@/public/static/icons/24px/nav-notification-active.svg'
-
-import { withIcon } from './withIcon'
-
-export const IconNavNotificationActive24 = withIcon(Icon)
diff --git a/src/components/Icon/IconNavNotificationActive32.tsx b/src/components/Icon/IconNavNotificationActive32.tsx
new file mode 100644
index 0000000000..8704263511
--- /dev/null
+++ b/src/components/Icon/IconNavNotificationActive32.tsx
@@ -0,0 +1,5 @@
+import { ReactComponent as Icon } from '@/public/static/icons/32px/nav-notification-active.svg'
+
+import { withIcon } from './withIcon'
+
+export const IconNavNotificationActive32 = withIcon(Icon)
diff --git a/src/components/Icon/IconNavSearch24.tsx b/src/components/Icon/IconNavSearch24.tsx
deleted file mode 100644
index 6b0b0ea040..0000000000
--- a/src/components/Icon/IconNavSearch24.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ReactComponent as Icon } from '@/public/static/icons/24px/nav-search.svg'
-
-import { withIcon } from './withIcon'
-
-export const IconNavSearch24 = withIcon(Icon)
diff --git a/src/components/Icon/IconNavSearch32.tsx b/src/components/Icon/IconNavSearch32.tsx
new file mode 100644
index 0000000000..9b7fab5161
--- /dev/null
+++ b/src/components/Icon/IconNavSearch32.tsx
@@ -0,0 +1,5 @@
+import { ReactComponent as Icon } from '@/public/static/icons/32px/nav-search.svg'
+
+import { withIcon } from './withIcon'
+
+export const IconNavSearch32 = withIcon(Icon)
diff --git a/src/components/Icon/IconNavSearchActive32.tsx b/src/components/Icon/IconNavSearchActive32.tsx
new file mode 100644
index 0000000000..4736aa10a6
--- /dev/null
+++ b/src/components/Icon/IconNavSearchActive32.tsx
@@ -0,0 +1,5 @@
+import { ReactComponent as Icon } from '@/public/static/icons/32px/nav-search-active.svg'
+
+import { withIcon } from './withIcon'
+
+export const IconNavSearchActive32 = withIcon(Icon)
diff --git a/src/components/Icon/IconNavSettings24.tsx b/src/components/Icon/IconNavSettings24.tsx
deleted file mode 100644
index ccc39cc5b6..0000000000
--- a/src/components/Icon/IconNavSettings24.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ReactComponent as Icon } from '@/public/static/icons/24px/nav-settings.svg'
-
-import { withIcon } from './withIcon'
-
-export const IconNavSettings24 = withIcon(Icon)
diff --git a/src/components/Icon/index.tsx b/src/components/Icon/index.tsx
index a258a9825b..5ddf1a10ef 100644
--- a/src/components/Icon/index.tsx
+++ b/src/components/Icon/index.tsx
@@ -98,14 +98,17 @@ export * from './IconMetaMask24'
 export * from './IconMore16'
 export * from './IconMore32'
 export * from './IconMute24'
-export * from './IconNavFollowing24'
-export * from './IconNavFollowingActive24'
-export * from './IconNavHome24'
-export * from './IconNavHomeActive24'
-export * from './IconNavNotification24'
-export * from './IconNavNotificationActive24'
-export * from './IconNavSearch24'
-export * from './IconNavSettings24'
+export * from './IconNavCreate32'
+export * from './IconNavFollowing32'
+export * from './IconNavFollowingActive32'
+export * from './IconNavHome32'
+export * from './IconNavHomeActive32'
+export * from './IconNavMe32'
+export * from './IconNavMeActive32'
+export * from './IconNavNotification32'
+export * from './IconNavNotificationActive32'
+export * from './IconNavSearch32'
+export * from './IconNavSearchActive32'
 export * from './IconPayout24'
 export * from './IconPaywall16'
 export * from './IconPen16'
diff --git a/src/components/Layout/AuthHeader/index.tsx b/src/components/Layout/AuthHeader/index.tsx
index dd809ad807..2a79deb53c 100644
--- a/src/components/Layout/AuthHeader/index.tsx
+++ b/src/components/Layout/AuthHeader/index.tsx
@@ -1,46 +1,12 @@
 import { useContext } from 'react'
 
 import { TextId } from '~/common/enums'
-import {
-  ConnectWalletButton,
-  IconLogo,
-  Layout,
-  Media,
-  UniversalAuthButton,
-  ViewerContext,
-} from '~/components'
-
-import styles from './styles.css'
+import { ConnectWalletButton, Layout, Media, ViewerContext } from '~/components'
 
 type HeaderProps = {
   title: TextId
 }
 
-const AnnonmousHeader: React.FC<HeaderProps> = ({ title }) => {
-  return (
-    <Layout.Header
-      right={
-        <>
-          <div>
-            <Media at="sm">
-              <section className="logo">
-                <IconLogo />
-              </section>
-            </Media>
-            <Media greaterThan="sm">
-              <Layout.Header.Title id={title} />
-            </Media>
-          </div>
-
-          <UniversalAuthButton />
-
-          <style jsx>{styles}</style>
-        </>
-      }
-    />
-  )
-}
-
 const AuthedHeader: React.FC<HeaderProps> = ({ title }) => {
   const viewer = useContext(ViewerContext)
   const showConnect = viewer.isAuthed && !viewer.info.ethAddress
@@ -52,6 +18,7 @@ const AuthedHeader: React.FC<HeaderProps> = ({ title }) => {
         right={
           <>
             <Layout.Header.Title id={title} />
+
             {showConnect && <ConnectWalletButton />}
           </>
         }
@@ -61,13 +28,7 @@ const AuthedHeader: React.FC<HeaderProps> = ({ title }) => {
 }
 
 const AuthHeader: React.FC<HeaderProps> = ({ title }) => {
-  const viewer = useContext(ViewerContext)
-
-  if (viewer.isAuthed) {
-    return <AuthedHeader title={title} />
-  }
-
-  return <AnnonmousHeader title={title} />
+  return <AuthedHeader title={title} />
 }
 
 export default AuthHeader
diff --git a/src/components/Layout/AuthHeader/styles.css b/src/components/Layout/AuthHeader/styles.css
deleted file mode 100644
index 77d0288f2d..0000000000
--- a/src/components/Layout/AuthHeader/styles.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.logo {
-  display: inline-flex;
-}
diff --git a/src/components/Layout/NavBar/NavListItem.tsx b/src/components/Layout/NavBar/NavListItem.tsx
index 5da2bee002..9a0d48dd54 100644
--- a/src/components/Layout/NavBar/NavListItem.tsx
+++ b/src/components/Layout/NavBar/NavListItem.tsx
@@ -40,6 +40,7 @@ const NavListItem = ({
         onClick={onClick}
       >
         {active ? activeIcon : icon}
+
         <VisuallyHidden>
           <span>{name}</span>
         </VisuallyHidden>
diff --git a/src/components/Layout/NavBar/index.tsx b/src/components/Layout/NavBar/index.tsx
index a83522d902..78050f349e 100644
--- a/src/components/Layout/NavBar/index.tsx
+++ b/src/components/Layout/NavBar/index.tsx
@@ -3,11 +3,12 @@ import { useContext } from 'react'
 import { PATHS, TEXT } from '~/common/enums'
 import { toPath } from '~/common/utils'
 import {
-  IconNavHome24,
-  IconNavHomeActive24,
-  IconNavSearch24,
-  IconNavSettings24,
+  IconNavHome32,
+  IconNavHomeActive32,
+  IconNavSearch32,
+  IconNavSearchActive32,
   LanguageContext,
+  UniversalAuthButton,
   useRoute,
   ViewerContext,
   WriteButton,
@@ -24,17 +25,56 @@ const NavBar = () => {
   const isInHome = isInPath('HOME')
   const isInFollow = isInPath('FOLLOW')
   const isInNotification = isInPath('ME_NOTIFICATIONS')
-  const isInSettings = isInPath('SETTINGS')
   const isInSearch = isInPath('SEARCH')
   const isInDraftDetail = isInPath('ME_DRAFT_DETAIL')
 
+  if (!viewer.isAuthed) {
+    return (
+      <section className="nav-bar" role="navigation">
+        <ul>
+          <NavListItem
+            name={TEXT[lang].discover}
+            icon={<IconNavHome32 size="lg" />}
+            activeIcon={<IconNavHomeActive32 size="lg" />}
+            active={isInHome}
+            href={PATHS.HOME}
+          />
+
+          <li role="menuitem">
+            <UniversalAuthButton />
+          </li>
+
+          <NavListItem
+            name={TEXT[lang].search}
+            icon={<IconNavSearch32 size="lg" />}
+            activeIcon={<IconNavSearchActive32 size="lg" />}
+            active={isInSearch}
+            onClick={() => {
+              const path = toPath({
+                page: 'search',
+              })
+
+              if (isInSearch) {
+                router.replace(path.href)
+              } else {
+                router.push(path.href)
+              }
+            }}
+          />
+        </ul>
+
+        <style jsx>{styles}</style>
+      </section>
+    )
+  }
+
   return (
     <section className="nav-bar" role="navigation">
       <ul>
         <NavListItem
           name={TEXT[lang].discover}
-          icon={<IconNavHome24 size="md" />}
-          activeIcon={<IconNavHomeActive24 size="md" color="green" />}
+          icon={<IconNavHome32 size="lg" />}
+          activeIcon={<IconNavHomeActive32 size="lg" />}
           active={isInHome}
           href={PATHS.HOME}
         />
@@ -50,6 +90,7 @@ const NavBar = () => {
         {!isInDraftDetail && (
           <li>
             <WriteButton
+              variant="navbar"
               allowed={!viewer.shouldSetupLikerID}
               authed={viewer.isAuthed}
               forbidden={viewer.isInactive}
@@ -59,8 +100,8 @@ const NavBar = () => {
 
         <NavListItem
           name={TEXT[lang].search}
-          icon={<IconNavSearch24 size="md" />}
-          activeIcon={<IconNavSearch24 size="md" color="green" />}
+          icon={<IconNavSearch32 size="lg" />}
+          activeIcon={<IconNavSearchActive32 size="lg" />}
           active={isInSearch}
           onClick={() => {
             const path = toPath({
@@ -75,26 +116,14 @@ const NavBar = () => {
           }}
         />
 
-        {viewer.isAuthed && (
-          <NavListItem
-            name={TEXT[lang].notifications}
-            icon={<UnreadIcon.Notification />}
-            activeIcon={<UnreadIcon.Notification active />}
-            active={isInNotification}
-            href={PATHS.ME_NOTIFICATIONS}
-            aria-label={TEXT[lang].notifications}
-          />
-        )}
-
-        {!viewer.isAuthed && (
-          <NavListItem
-            name={TEXT[lang].settings}
-            icon={<IconNavSettings24 size="md" />}
-            activeIcon={<IconNavSettings24 size="md" color="green" />}
-            active={isInSettings}
-            href={PATHS.ME_SETTINGS}
-          />
-        )}
+        <NavListItem
+          name={TEXT[lang].notifications}
+          icon={<UnreadIcon.Notification />}
+          activeIcon={<UnreadIcon.Notification active />}
+          active={isInNotification}
+          href={PATHS.ME_NOTIFICATIONS}
+          aria-label={TEXT[lang].notifications}
+        />
       </ul>
 
       <style jsx>{styles}</style>
diff --git a/src/components/Layout/SideNav/NavListItem.tsx b/src/components/Layout/SideNav/NavListItem.tsx
index e3793a15d0..4100d51ce6 100644
--- a/src/components/Layout/SideNav/NavListItem.tsx
+++ b/src/components/Layout/SideNav/NavListItem.tsx
@@ -32,7 +32,7 @@ const NavListItemButton = forwardRef(
     return (
       <Button
         bgActiveColor="grey-lighter"
-        spacing={isMdUp ? ['xtight', 'base'] : undefined}
+        spacing={isMdUp ? ['xxtight', 'xtight'] : undefined}
         size={isMdUp ? undefined : ['2rem', '2rem']}
         ref={ref}
         {...props}
@@ -43,7 +43,7 @@ const NavListItemButton = forwardRef(
           size="lg"
           weight="semibold"
           spacing="tight"
-          color={active ? 'green' : 'black'}
+          color="black"
         >
           {isMdUp && name}
         </TextIcon>
diff --git a/src/components/Layout/SideNav/index.tsx b/src/components/Layout/SideNav/index.tsx
index f75b6f3bc9..abfdab008d 100644
--- a/src/components/Layout/SideNav/index.tsx
+++ b/src/components/Layout/SideNav/index.tsx
@@ -11,23 +11,49 @@ import {
   hidePopperOnClick,
   IconLogo,
   IconLogoGraph,
-  IconNavHome24,
-  IconNavHomeActive24,
-  IconNavSearch24,
-  IconNavSettings24,
+  IconNavHome32,
+  IconNavHomeActive32,
+  IconNavMe32,
+  IconNavMeActive32,
+  IconNavSearch32,
+  IconNavSearchActive32,
   Media,
   Menu,
+  UniversalAuthButton,
   useRoute,
   ViewerContext,
   WriteButton,
 } from '~/components'
 
-import MeAvatar from '../MeAvatar'
 import NavMenu from '../NavMenu'
 import UnreadIcon from '../UnreadIcon'
 import NavListItem from './NavListItem'
 import styles from './styles.css'
 
+const Logo = () => {
+  const intl = useIntl()
+
+  return (
+    <section className="logo">
+      <Link href={PATHS.HOME} legacyBehavior>
+        <a
+          aria-label={intl.formatMessage({
+            defaultMessage: 'Discover',
+            description: '',
+          })}
+        >
+          <Media at="md">
+            <IconLogoGraph />
+          </Media>
+          <Media greaterThan="md">
+            <IconLogo />
+          </Media>
+        </a>
+      </Link>
+    </section>
+  )
+}
+
 const SideNav = () => {
   const { router, isInPath, isPathStartWith, getQuery } = useRoute()
   const viewer = useContext(ViewerContext)
@@ -39,37 +65,36 @@ const SideNav = () => {
   const isInFollow = isInPath('FOLLOW')
   const isInNotification = isInPath('ME_NOTIFICATIONS')
   const isInSearch = isInPath('SEARCH')
-  const isInSettings = isInPath('SETTINGS')
   const isInDraftDetail = isInPath('ME_DRAFT_DETAIL')
   const isInMe =
     (!isInNotification && isPathStartWith('/me')) || userName === viewerUserName
 
-  const intl = useIntl()
+  // only show auth button for anonymous
+  if (!viewer.isAuthed) {
+    return (
+      <section className="side-nav">
+        <Logo />
+
+        <ul role="menu">
+          <li role="menuitem">
+            <UniversalAuthButton />
+          </li>
+        </ul>
+
+        <style jsx>{styles}</style>
+      </section>
+    )
+  }
+
   return (
     <section className="side-nav">
-      <section className="logo">
-        <Link href={PATHS.HOME} legacyBehavior>
-          <a
-            aria-label={intl.formatMessage({
-              defaultMessage: 'Discover',
-              description: '',
-            })}
-          >
-            <Media at="md">
-              <IconLogoGraph />
-            </Media>
-            <Media greaterThan="md">
-              <IconLogo />
-            </Media>
-          </a>
-        </Link>
-      </section>
+      <Logo />
 
       <ul role="menu">
         <NavListItem
           name={<FormattedMessage defaultMessage="Discover" description="" />}
-          icon={<IconNavHome24 size="md" />}
-          activeIcon={<IconNavHomeActive24 size="md" />}
+          icon={<IconNavHome32 size="lg" />}
+          activeIcon={<IconNavHomeActive32 size="lg" />}
           active={isInHome}
           href={PATHS.HOME}
         />
@@ -87,23 +112,21 @@ const SideNav = () => {
           href={PATHS.FOLLOW}
         />
 
-        {viewer.isAuthed && (
-          <NavListItem
-            name={
-              <FormattedMessage defaultMessage="Notifications" description="" />
-            }
-            icon={<UnreadIcon.Notification />}
-            activeIcon={<UnreadIcon.Notification active />}
-            active={isInNotification}
-            href={PATHS.ME_NOTIFICATIONS}
-          />
-        )}
+        <NavListItem
+          name={
+            <FormattedMessage defaultMessage="Notifications" description="" />
+          }
+          icon={<UnreadIcon.Notification />}
+          activeIcon={<UnreadIcon.Notification active />}
+          active={isInNotification}
+          href={PATHS.ME_NOTIFICATIONS}
+        />
 
         <Media lessThan="xl">
           <NavListItem
             name={<FormattedMessage defaultMessage="Search" description="" />}
-            icon={<IconNavSearch24 size="md" />}
-            activeIcon={<IconNavSearch24 size="md" color="green" />}
+            icon={<IconNavSearch32 size="lg" />}
+            activeIcon={<IconNavSearchActive32 size="lg" />}
             active={isInSearch}
             onClick={() => {
               const path = toPath({
@@ -119,61 +142,55 @@ const SideNav = () => {
           />
         </Media>
 
-        {!viewer.isAuthed && (
+        <Dropdown
+          content={
+            <FocusLock>
+              <section className="dropdown-menu">
+                <VisuallyHidden>
+                  <button type="button">
+                    <FormattedMessage defaultMessage="Cancel" description="" />
+                  </button>
+                </VisuallyHidden>
+                <NavMenu.Top />
+                <Menu.Divider />
+                <NavMenu.Bottom />
+              </section>
+            </FocusLock>
+          }
+          placement="right-start"
+          appendTo={typeof window !== 'undefined' ? document.body : undefined}
+          offset={[-24, 24]}
+          zIndex={Z_INDEX.OVER_BOTTOM_BAR}
+          onShown={hidePopperOnClick}
+        >
           <NavListItem
-            name={<FormattedMessage defaultMessage="Settings" description="" />}
-            icon={<IconNavSettings24 size="md" />}
-            activeIcon={<IconNavSettings24 size="md" color="green" />}
-            active={isInSettings}
-            href={PATHS.ME_SETTINGS}
+            name={<FormattedMessage defaultMessage="My Page" description="" />}
+            icon={<IconNavMe32 size="lg" />}
+            activeIcon={<IconNavMeActive32 size="lg" />}
+            active={isInMe}
+            canScrollTop={false}
+            aira-haspopup="menu"
           />
-        )}
-
-        {viewer.isAuthed && (
-          <Dropdown
-            content={
-              <FocusLock>
-                <section className="dropdown-menu">
-                  <VisuallyHidden>
-                    <button type="button">
-                      <FormattedMessage
-                        defaultMessage="Cancel"
-                        description=""
-                      />
-                    </button>
-                  </VisuallyHidden>
-                  <NavMenu.Top />
-                  <Menu.Divider />
-                  <NavMenu.Bottom />
-                </section>
-              </FocusLock>
-            }
-            placement="right-start"
-            appendTo={typeof window !== 'undefined' ? document.body : undefined}
-            offset={[-24, 24]}
-            zIndex={Z_INDEX.OVER_BOTTOM_BAR}
-            onShown={hidePopperOnClick}
-          >
-            <NavListItem
-              name={
-                <FormattedMessage defaultMessage="My Page" description="" />
-              }
-              icon={<MeAvatar user={viewer} />}
-              activeIcon={<MeAvatar user={viewer} active />}
-              active={isInMe}
-              canScrollTop={false}
-              aira-haspopup="menu"
-            />
-          </Dropdown>
-        )}
+        </Dropdown>
 
         {!isInDraftDetail && (
           <li role="menuitem">
-            <WriteButton
-              allowed={!viewer.shouldSetupLikerID}
-              authed={viewer.isAuthed}
-              forbidden={viewer.isInactive}
-            />
+            <Media greaterThanOrEqual="lg">
+              <WriteButton
+                variant="sidenav"
+                allowed={!viewer.shouldSetupLikerID}
+                authed={viewer.isAuthed}
+                forbidden={viewer.isInactive}
+              />
+            </Media>
+            <Media lessThan="lg">
+              <WriteButton
+                variant="navbar"
+                allowed={!viewer.shouldSetupLikerID}
+                authed={viewer.isAuthed}
+                forbidden={viewer.isInactive}
+              />
+            </Media>
           </li>
         )}
       </ul>
diff --git a/src/components/Layout/SideNav/styles.css b/src/components/Layout/SideNav/styles.css
index 6fed440c08..febb4c8172 100644
--- a/src/components/Layout/SideNav/styles.css
+++ b/src/components/Layout/SideNav/styles.css
@@ -31,7 +31,7 @@ ul {
   }
 
   & li {
-    margin-top: var(--spacing-xx-loose);
+    margin-top: var(--spacing-x-loose);
     font-size: 0;
   }
 }
diff --git a/src/components/Layout/UnreadIcon/Follow.tsx b/src/components/Layout/UnreadIcon/Follow.tsx
index 7c4059e0cb..7865842a7d 100644
--- a/src/components/Layout/UnreadIcon/Follow.tsx
+++ b/src/components/Layout/UnreadIcon/Follow.tsx
@@ -3,8 +3,8 @@ import classNames from 'classnames'
 import { useContext, useEffect } from 'react'
 
 import {
-  IconNavFollowing24,
-  IconNavFollowingActive24,
+  IconNavFollowing32,
+  IconNavFollowingActive32,
   ViewerContext,
 } from '~/components'
 import UNREAD_FOLLOWING from '~/components/GQL/queries/unreadFollowing'
@@ -40,9 +40,9 @@ const FollowUnreadIcon: React.FC<FollowUnreadIconProps> = ({ active }) => {
   return (
     <span className={iconClasses}>
       {active ? (
-        <IconNavFollowingActive24 size="md" color="green" />
+        <IconNavFollowingActive32 size="lg" />
       ) : (
-        <IconNavFollowing24 size="md" />
+        <IconNavFollowing32 size="lg" />
       )}
 
       <style jsx>{styles}</style>
diff --git a/src/components/Layout/UnreadIcon/Notification.tsx b/src/components/Layout/UnreadIcon/Notification.tsx
index 370f465ce8..8a468db317 100644
--- a/src/components/Layout/UnreadIcon/Notification.tsx
+++ b/src/components/Layout/UnreadIcon/Notification.tsx
@@ -3,8 +3,8 @@ import classNames from 'classnames'
 import { useContext, useEffect } from 'react'
 
 import {
-  IconNavNotification24,
-  IconNavNotificationActive24,
+  IconNavNotification32,
+  IconNavNotificationActive32,
   ViewerContext,
 } from '~/components'
 import { UNREAD_NOTICE_COUNT } from '~/components/GQL/queries/notice'
@@ -40,9 +40,9 @@ const NotificationUnreadIcon: React.FC<UnreadIconProps> = ({ active }) => {
   return (
     <span className={iconClasses}>
       {active ? (
-        <IconNavNotificationActive24 size="md" color="green" />
+        <IconNavNotificationActive32 size="lg" />
       ) : (
-        <IconNavNotification24 size="md" />
+        <IconNavNotification32 size="lg" />
       )}
 
       <style jsx>{styles}</style>
diff --git a/src/stories/components/Button/Buttons.tsx b/src/stories/components/Button/Buttons.tsx
index 088b2fd722..95e5eff6e1 100644
--- a/src/stories/components/Button/Buttons.tsx
+++ b/src/stories/components/Button/Buttons.tsx
@@ -5,7 +5,7 @@ import {
   Button,
   Dialog,
   IconMore16,
-  IconNavSearch24,
+  IconNavSearch32,
   LoginButton,
   Translate,
   ViewMoreButton,
@@ -35,7 +35,7 @@ const Buttons = () => (
       </li>
 
       <li>
-        <WriteButton allowed />
+        <WriteButton variant="sidenav" allowed />
       </li>
 
       <li>
@@ -45,8 +45,8 @@ const Buttons = () => (
       <li>
         <NavListItem
           name={TEXT.zh_hant.search}
-          icon={<IconNavSearch24 size="md" />}
-          activeIcon={<IconNavSearch24 size="md" color="green" />}
+          icon={<IconNavSearch32 size="md" />}
+          activeIcon={<IconNavSearch32 size="md" color="green" />}
           active
         />
       </li>
diff --git a/src/views/Me/Settings/AnonymousSettings/index.tsx b/src/views/Me/Settings/AnonymousSettings/index.tsx
index 9d7af5ddcc..9dcfff7eac 100644
--- a/src/views/Me/Settings/AnonymousSettings/index.tsx
+++ b/src/views/Me/Settings/AnonymousSettings/index.tsx
@@ -12,8 +12,6 @@ const Settings = () => {
     <Layout.Main smBgColor="grey-lighter">
       <Head title={{ id: 'settings' }} />
 
-      <Layout.AuthHeader title="settings" />
-
       <DisplayPreferences />
       <Learn />
       <Enhance />

From c876682eb047126bf0341f8c0d8842a183591b1e Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Fri, 31 Mar 2023 16:02:42 +0700
Subject: [PATCH 48/92] feat(icon): add <IconWrite16>

---
 public/static/icons/16px/create.svg    | 1 +
 src/components/Buttons/Write/index.tsx | 3 ++-
 src/components/Icon/IconCreate16.tsx   | 5 +++++
 src/components/Icon/index.tsx          | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 public/static/icons/16px/create.svg
 create mode 100644 src/components/Icon/IconCreate16.tsx

diff --git a/public/static/icons/16px/create.svg b/public/static/icons/16px/create.svg
new file mode 100644
index 0000000000..9b1133c5aa
--- /dev/null
+++ b/public/static/icons/16px/create.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill="currentColor" fill-rule="evenodd" d="M9.688 2.375H6.312a3.938 3.938 0 0 0-3.937 3.938v3.375a3.938 3.938 0 0 0 3.938 3.937h3.375a3.938 3.938 0 0 0 3.937-3.937V6.313a3.938 3.938 0 0 0-3.938-3.938ZM6.312 1.25A5.063 5.063 0 0 0 1.25 6.313v3.375a5.063 5.063 0 0 0 5.063 5.062h3.375a5.063 5.063 0 0 0 5.062-5.062V6.313A5.063 5.063 0 0 0 9.687 1.25H6.313ZM4.952 8c0-.31.252-.562.562-.562h1.925V5.655a.563.563 0 0 1 1.125 0v1.783h1.924a.563.563 0 1 1 0 1.125H8.562v2.066a.563.563 0 0 1-1.124 0V8.563H5.513A.563.563 0 0 1 4.951 8Z"/></svg>
diff --git a/src/components/Buttons/Write/index.tsx b/src/components/Buttons/Write/index.tsx
index 99b670f9fe..184fbdb091 100644
--- a/src/components/Buttons/Write/index.tsx
+++ b/src/components/Buttons/Write/index.tsx
@@ -10,6 +10,7 @@ import {
 import { analytics, toPath, translate } from '~/common/utils'
 import {
   Button,
+  IconCreate16,
   IconNavCreate32,
   IconSpinner16,
   LanguageContext,
@@ -64,7 +65,7 @@ const BaseWriteButton = ({
           loading ? (
             <IconSpinner16 color="white" />
           ) : (
-            <IconNavCreate32 color="white" />
+            <IconCreate16 color="white" />
           )
         }
         spacing="xtight"
diff --git a/src/components/Icon/IconCreate16.tsx b/src/components/Icon/IconCreate16.tsx
new file mode 100644
index 0000000000..d69572b858
--- /dev/null
+++ b/src/components/Icon/IconCreate16.tsx
@@ -0,0 +1,5 @@
+import { ReactComponent as Icon } from '@/public/static/icons/16px/create.svg'
+
+import { withIcon } from './withIcon'
+
+export const IconCreate16 = withIcon(Icon)
diff --git a/src/components/Icon/index.tsx b/src/components/Icon/index.tsx
index 5ddf1a10ef..f0186237a9 100644
--- a/src/components/Icon/index.tsx
+++ b/src/components/Icon/index.tsx
@@ -53,6 +53,7 @@ export * from './IconCollapse16'
 export * from './IconCollection24'
 export * from './IconComment16'
 export * from './IconCopy16'
+export * from './IconCreate16'
 export * from './IconDisableComment24'
 export * from './IconDisallow16'
 export * from './IconDollarCircle16'

From 7e9f8486bc0917725a9abf91daa4cc00d2607f3e Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Thu, 6 Apr 2023 15:47:53 +0800
Subject: [PATCH 49/92] feat(SearchSelect): exact matches when pasting url in
 adding connection modal

---
 src/common/utils/url.ts                       |  8 ++
 src/components/Dialogs/HelpDialog/index.tsx   | 15 +++-
 .../SearchingArea/EditorSearchingArea.tsx     | 79 +++++++++++++++----
 .../SearchSelect/SearchingArea/gql.ts         | 11 +++
 4 files changed, 95 insertions(+), 18 deletions(-)

diff --git a/src/common/utils/url.ts b/src/common/utils/url.ts
index b3337048b2..51c5862d0e 100644
--- a/src/common/utils/url.ts
+++ b/src/common/utils/url.ts
@@ -62,3 +62,11 @@ export const toSizedImageURL = ({ url, size, ext }: ToSizedImageURLProps) => {
 
   return assetDomain + prefix + extedUrl
 }
+
+export const isUrl = (key: string) => {
+  try {
+    return Boolean(new URL(key))
+  } catch (e) {
+    return false
+  }
+}
diff --git a/src/components/Dialogs/HelpDialog/index.tsx b/src/components/Dialogs/HelpDialog/index.tsx
index 8e9ea7a741..31ff86a96c 100644
--- a/src/components/Dialogs/HelpDialog/index.tsx
+++ b/src/components/Dialogs/HelpDialog/index.tsx
@@ -23,11 +23,17 @@ const ReadTime = () => (
   <>
     <h2 className="title">
       <TextIcon icon={<IconReadTimeTotal16 size="md" />} weight="md">
-        <FormattedMessage defaultMessage="Accumulated Read Time" description="src/components/Dialogs/HelpDialog/index.tsx" />
+        <FormattedMessage
+          defaultMessage="Accumulated Read Time"
+          description="src/components/Dialogs/HelpDialog/index.tsx"
+        />
       </TextIcon>
     </h2>
     <p className="description">
-      <FormattedMessage defaultMessage="Accumulated read time indicates the total time length that registered users read." description="src/components/Dialogs/HelpDialog/index.tsx" />
+      <FormattedMessage
+        defaultMessage="Accumulated read time indicates the total time length that registered users read."
+        description="src/components/Dialogs/HelpDialog/index.tsx"
+      />
     </p>
     <style jsx>{styles}</style>
   </>
@@ -41,7 +47,10 @@ const ReadCount = () => (
       </TextIcon>
     </h2>
     <p className="description">
-      <FormattedMessage defaultMessage="Read counts indicates how many registered users read." description="src/components/Dialogs/HelpDialog/index.tsx" />
+      <FormattedMessage
+        defaultMessage="Read counts indicates how many registered users read."
+        description="src/components/Dialogs/HelpDialog/index.tsx"
+      />
     </p>
     <style jsx>{styles}</style>
   </>
diff --git a/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx b/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
index 51d47aa415..cc0851c4db 100644
--- a/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
+++ b/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
@@ -5,8 +5,10 @@ import { useDebouncedCallback } from 'use-debounce'
 import { INPUT_DEBOUNCE } from '~/common/enums'
 import {
   analytics,
+  isUrl,
   mergeConnections,
-  normalizeTagInput, // stripAllPunct, // stripPunctPrefixSuffix,
+  normalizeTagInput,
+  parseURL,
 } from '~/common/utils'
 import {
   EmptySearch,
@@ -17,6 +19,7 @@ import {
   ViewerContext,
 } from '~/components'
 import {
+  ArticleUrlQueryQuery,
   ListViewerArticlesQuery,
   SearchExclude,
   SearchFilter,
@@ -26,7 +29,7 @@ import {
 import SearchSelectNode from '../SearchSelectNode'
 import styles from '../styles.css'
 import CreateTag from './CreateTag'
-import { LIST_VIEWER_ARTICLES, SELECT_SEARCH } from './gql'
+import { ARTICLE_URL_QUERY, LIST_VIEWER_ARTICLES, SELECT_SEARCH } from './gql'
 import SearchInput, {
   SearchInputProps,
   SearchType as SearchInputType,
@@ -67,7 +70,7 @@ type SearchingAreaProps = {
   CustomStagingArea?: React.ReactNode
 } & Pick<SearchInputProps, 'autoFocus'>
 
-type Mode = 'search' | 'list'
+type Mode = 'search' | 'list' | 'article_url'
 
 const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
   searchType,
@@ -90,6 +93,7 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
   const [mode, setMode] = useState<Mode>(hasListMode ? 'list' : 'search')
   const isSearchMode = mode === 'search'
   const isListMode = mode === 'list'
+  const isArticleUrlMode = mode === 'article_url'
 
   const [searching, setSearching] = useState(false)
   const [searchingNodes, setSearchingNodes] = useState<SelectNode[]>([])
@@ -114,6 +118,15 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
     { data: listData, loading: listLoading, fetchMore: fetchMoreList },
   ] = useLazyQuery<ListViewerArticlesQuery>(LIST_VIEWER_ARTICLES)
 
+  const [
+    lazyArticleUrlQuery,
+    { data: articleUrlData, loading: articleUrlLoding },
+  ] = usePublicLazyQuery<ArticleUrlQueryQuery>(
+    ARTICLE_URL_QUERY,
+    {},
+    { publicQuery: !viewer.isAuthed }
+  )
+
   // pagination
   const { edges: searchEdges, pageInfo: searchPageInfo } = data?.search || {}
   const { edges: listEdges, pageInfo: listPageInfo } =
@@ -156,25 +169,43 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
       .filter((node) => node.articleState === 'active') || []
   const listNodeIds = listNode.map((n) => n.id).join(',')
   const search = (key: string) => {
-    const type = searchType
-    lazySearch({
-      variables: {
-        key,
-        type,
-        filter: searchFilter,
-        exclude: searchExclude,
-        first: 10,
-      },
-    })
+    // Used to match links of the format like👇
+    // https://matters.news/@az/12-来自matters的第一封信-致好朋友-zdpuAnuMKxNv6SUj7kTRzgrWRdp9q4aMMKHJ6TGtn8tp4FwX2
+    const regex = new RegExp(
+      `^https://${process.env.NEXT_PUBLIC_SITE_DOMAIN}/@\\w+/\\d+-.+-\\w+$`
+    )
+    if (searchType === 'Article' && isUrl(key) && regex.test(key)) {
+      const urlObj = parseURL(key)
+      const paths = urlObj.pathname.split('-')
+      const mediaHash = paths?.[paths?.length - 1]
+      setMode('article_url')
+      lazyArticleUrlQuery({
+        variables: {
+          mediaHash,
+        },
+      })
+    } else {
+      const type = searchType
+      lazySearch({
+        variables: {
+          key,
+          type,
+          filter: searchFilter,
+          exclude: searchExclude,
+          first: 10,
+        },
+      })
+    }
   }
 
   // handling changes from search input
   const onSearchInputChange = (value: string) => {
     setSearchKey(value)
     debouncedSetSearchKey(value)
+    setMode('search')
 
-    if (hasListMode) {
-      setMode(value ? 'search' : 'list')
+    if (hasListMode && !value) {
+      setMode('list')
       return
     }
   }
@@ -209,8 +240,14 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
     setSearchingNodes(listNode)
   }, [listLoading, listNodeIds])
 
+  // article url
+  useEffect(() => {
+    setSearching(articleUrlLoding)
+  }, [articleUrlLoding])
+
   const hasNodes = searchNodes.length > 0
   const haslistNode = listNode.length > 0
+  const hasArticle = !!articleUrlData?.article
   const canCreateTag =
     isTag &&
     searchKey &&
@@ -292,6 +329,18 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
                   </ul>
                 </InfiniteScroll>
               )}
+
+              {isArticleUrlMode && !searching && !hasArticle && <EmptySearch />}
+
+              {isArticleUrlMode &&
+                !searching &&
+                hasArticle &&
+                articleUrlData?.article?.__typename === 'Article' && (
+                  <SearchSelectNode
+                    node={articleUrlData.article}
+                    onClick={addNodeToStaging}
+                  />
+                )}
             </>
           )}
 
diff --git a/src/components/SearchSelect/SearchingArea/gql.ts b/src/components/SearchSelect/SearchingArea/gql.ts
index 4637152334..d642dac206 100644
--- a/src/components/SearchSelect/SearchingArea/gql.ts
+++ b/src/components/SearchSelect/SearchingArea/gql.ts
@@ -73,3 +73,14 @@ export const LIST_VIEWER_ARTICLES = gql`
   }
   ${ArticleDigestDropdown.fragments.article}
 `
+
+export const ARTICLE_URL_QUERY = gql`
+  query ArticleUrlQuery($mediaHash: String!) {
+    article(input: { mediaHash: $mediaHash }) {
+      ... on Article {
+        ...ArticleDigestDropdownArticle
+      }
+    }
+  }
+  ${ArticleDigestDropdown.fragments.article}
+`

From 74a9339296085c27f992fcf29ae14924d3e274ab Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Thu, 6 Apr 2023 16:23:46 +0800
Subject: [PATCH 50/92] feat(SearchSelect):  query article by id

---
 .../SearchingArea/EditorSearchingArea.tsx            | 12 +++++++-----
 src/components/SearchSelect/SearchingArea/gql.ts     |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx b/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
index cc0851c4db..bde07e6a14 100644
--- a/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
+++ b/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
@@ -9,6 +9,7 @@ import {
   mergeConnections,
   normalizeTagInput,
   parseURL,
+  toGlobalId,
 } from '~/common/utils'
 import {
   EmptySearch,
@@ -177,11 +178,12 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
     if (searchType === 'Article' && isUrl(key) && regex.test(key)) {
       const urlObj = parseURL(key)
       const paths = urlObj.pathname.split('-')
-      const mediaHash = paths?.[paths?.length - 1]
+      const subPaths = paths[0].split('/')
+      const articleId = subPaths?.[subPaths.length - 1]
       setMode('article_url')
       lazyArticleUrlQuery({
         variables: {
-          mediaHash,
+          id: toGlobalId({ type: 'Article', id: articleId }),
         },
       })
     } else {
@@ -247,7 +249,7 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
 
   const hasNodes = searchNodes.length > 0
   const haslistNode = listNode.length > 0
-  const hasArticle = !!articleUrlData?.article
+  const hasArticle = !!articleUrlData?.node
   const canCreateTag =
     isTag &&
     searchKey &&
@@ -335,9 +337,9 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
               {isArticleUrlMode &&
                 !searching &&
                 hasArticle &&
-                articleUrlData?.article?.__typename === 'Article' && (
+                articleUrlData?.node?.__typename === 'Article' && (
                   <SearchSelectNode
-                    node={articleUrlData.article}
+                    node={articleUrlData.node}
                     onClick={addNodeToStaging}
                   />
                 )}
diff --git a/src/components/SearchSelect/SearchingArea/gql.ts b/src/components/SearchSelect/SearchingArea/gql.ts
index d642dac206..9671627b8f 100644
--- a/src/components/SearchSelect/SearchingArea/gql.ts
+++ b/src/components/SearchSelect/SearchingArea/gql.ts
@@ -75,8 +75,8 @@ export const LIST_VIEWER_ARTICLES = gql`
 `
 
 export const ARTICLE_URL_QUERY = gql`
-  query ArticleUrlQuery($mediaHash: String!) {
-    article(input: { mediaHash: $mediaHash }) {
+  query ArticleUrlQuery($id: ID!) {
+    node(input: { id: $id }) {
       ... on Article {
         ...ArticleDigestDropdownArticle
       }

From 004905e511106dd9ab2fc68b0748a26661a1404b Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Tue, 4 Apr 2023 14:57:08 +0800
Subject: [PATCH 51/92] feat(EditMode): replace article.drafts with
 newestPublishDraft

---
 .../ArticleDetail/EditMode/Header/index.tsx   |  5 ++
 .../EditMode/PublishState/PendingState.tsx    | 47 ++++++++++---------
 .../EditMode/PublishState/PublishedState.tsx  | 12 ++---
 .../EditMode/PublishState/gql.ts              |  8 ++--
 .../EditMode/PublishState/index.tsx           | 45 +++++++++---------
 src/views/ArticleDetail/EditMode/gql.ts       |  7 +++
 src/views/ArticleDetail/EditMode/index.tsx    | 17 ++++---
 7 files changed, 76 insertions(+), 65 deletions(-)

diff --git a/src/views/ArticleDetail/EditMode/Header/index.tsx b/src/views/ArticleDetail/EditMode/Header/index.tsx
index eecf73b965..7955fbb865 100644
--- a/src/views/ArticleDetail/EditMode/Header/index.tsx
+++ b/src/views/ArticleDetail/EditMode/Header/index.tsx
@@ -23,6 +23,7 @@ type EditModeHeaderProps = {
   isEditDisabled: boolean
 
   onSaved: () => any
+  onPublish: () => any
 } & Omit<
   EditorSettingsDialogProps,
   | 'saving'
@@ -45,6 +46,7 @@ const EditModeHeader = ({
   isEditDisabled,
 
   onSaved,
+  onPublish,
 
   ...restProps
 }: EditModeHeaderProps) => {
@@ -75,6 +77,9 @@ const EditModeHeader = ({
           canComment: restProps.canComment,
         },
       })
+      if (isContentRevised) {
+        onPublish()
+      }
 
       if (!isContentRevised) {
         onSaved()
diff --git a/src/views/ArticleDetail/EditMode/PublishState/PendingState.tsx b/src/views/ArticleDetail/EditMode/PublishState/PendingState.tsx
index ef1cb68484..32dc6a1f5d 100644
--- a/src/views/ArticleDetail/EditMode/PublishState/PendingState.tsx
+++ b/src/views/ArticleDetail/EditMode/PublishState/PendingState.tsx
@@ -2,39 +2,44 @@ import { useQuery } from '@apollo/react-hooks'
 import { useEffect } from 'react'
 
 import { Toast, Translate } from '~/components'
-import { EditModeArticleDraftsQuery, EditModeArticleQuery } from '~/gql/graphql'
+import { EditModeArticleNewestPublishDraftQuery } from '~/gql/graphql'
 
-import EDIT_MODE_ARTICLE_DRAFTS from './gql'
+import EDIT_MODE_ARTICLE_NEWEST_PUBLISH_DRAFT from './gql'
 
 const PendingState = ({
-  draft,
+  articleMediaHash,
+  updatePublishState,
   id,
 }: {
-  draft: NonNullable<
-    NonNullable<
-      EditModeArticleQuery['article'] & { __typename: 'Article' }
-    >['drafts']
-  >[0]
+  articleMediaHash: string
+  updatePublishState: (mediaHash: string) => void
   id: string
 }) => {
-  const { startPolling, stopPolling } = useQuery<EditModeArticleDraftsQuery>(
-    EDIT_MODE_ARTICLE_DRAFTS,
-    {
-      variables: { id },
-      errorPolicy: 'none',
-      fetchPolicy: 'network-only',
-      skip: typeof window === 'undefined',
-    }
-  )
+  const { data, startPolling, stopPolling, refetch } =
+    useQuery<EditModeArticleNewestPublishDraftQuery>(
+      EDIT_MODE_ARTICLE_NEWEST_PUBLISH_DRAFT,
+      {
+        variables: { id },
+        errorPolicy: 'none',
+        fetchPolicy: 'network-only',
+        skip: typeof window === 'undefined',
+      }
+    )
 
   useEffect(() => {
     startPolling(1000 * 2)
-
-    return () => {
-      stopPolling()
-    }
+    refetch && refetch()
   }, [])
 
+  if (
+    data?.article?.__typename === 'Article' &&
+    data.article.newestPublishedDraft.publishState === 'published' &&
+    data.article.newestPublishedDraft.mediaHash !== articleMediaHash
+  ) {
+    stopPolling()
+    updatePublishState(data.article.newestPublishedDraft.mediaHash || '')
+  }
+
   return (
     <Toast.Instance
       color="green"
diff --git a/src/views/ArticleDetail/EditMode/PublishState/PublishedState.tsx b/src/views/ArticleDetail/EditMode/PublishState/PublishedState.tsx
index fbc89b0638..4790670f7a 100644
--- a/src/views/ArticleDetail/EditMode/PublishState/PublishedState.tsx
+++ b/src/views/ArticleDetail/EditMode/PublishState/PublishedState.tsx
@@ -3,8 +3,6 @@ import { useEffect } from 'react'
 
 import { toPath } from '~/common/utils'
 import { Dialog, ShareDialog, Translate } from '~/components'
-import { EditModeArticleQuery } from '~/gql/graphql'
-
 interface Props {
   article: {
     id: string
@@ -14,11 +12,7 @@ interface Props {
       userName?: string | null
     }
   }
-  draft: NonNullable<
-    NonNullable<
-      EditModeArticleQuery['article'] & { __typename: 'Article' }
-    >['drafts']
-  >[0]
+  newestMediaHash: string
 
   cancel: () => void
 }
@@ -35,12 +29,12 @@ const BasePublishedState = ({
   return null
 }
 
-const PublishedState = ({ article, draft, cancel }: Props) => {
+const PublishedState = ({ article, cancel, newestMediaHash }: Props) => {
   const router = useRouter()
 
   const path = toPath({
     page: 'articleDetail',
-    article: { ...article, mediaHash: draft.mediaHash },
+    article: { ...article, mediaHash: newestMediaHash },
   })
 
   return (
diff --git a/src/views/ArticleDetail/EditMode/PublishState/gql.ts b/src/views/ArticleDetail/EditMode/PublishState/gql.ts
index 1cf31df7d9..9c4578c047 100644
--- a/src/views/ArticleDetail/EditMode/PublishState/gql.ts
+++ b/src/views/ArticleDetail/EditMode/PublishState/gql.ts
@@ -2,8 +2,8 @@ import gql from 'graphql-tag'
 
 import { fragments as EditorFragments } from '~/components/Editor/fragments'
 
-const EDIT_MODE_ARTICLE_DRAFTS = gql`
-  query EditModeArticleDrafts($id: ID!) {
+const EDIT_MODE_ARTICLE_NEWEST_PUBLISH_DRAFT = gql`
+  query EditModeArticleNewestPublishDraft($id: ID!) {
     article: node(input: { id: $id }) {
       ... on Article {
         id
@@ -12,7 +12,7 @@ const EDIT_MODE_ARTICLE_DRAFTS = gql`
         tags {
           content
         }
-        drafts {
+        newestPublishedDraft {
           id
           mediaHash
           tags
@@ -25,4 +25,4 @@ const EDIT_MODE_ARTICLE_DRAFTS = gql`
   ${EditorFragments.draft}
 `
 
-export default EDIT_MODE_ARTICLE_DRAFTS
+export default EDIT_MODE_ARTICLE_NEWEST_PUBLISH_DRAFT
diff --git a/src/views/ArticleDetail/EditMode/PublishState/index.tsx b/src/views/ArticleDetail/EditMode/PublishState/index.tsx
index aeca35d7a3..5e234ac87c 100644
--- a/src/views/ArticleDetail/EditMode/PublishState/index.tsx
+++ b/src/views/ArticleDetail/EditMode/PublishState/index.tsx
@@ -1,4 +1,4 @@
-import { EditModeArticleQuery } from '~/gql/graphql'
+import { useState } from 'react'
 
 import PendingState from './PendingState'
 import PublishedState from './PublishedState'
@@ -14,28 +14,14 @@ interface Props {
       userName?: string | null
     }
   }
-  draft: NonNullable<
-    NonNullable<
-      EditModeArticleQuery['article'] & { __typename: 'Article' }
-    >['drafts']
-  >[0]
-
-  isSameHash: boolean
-
   cancel: () => void
 }
 
-const PublishState = ({
-  article,
-  draft,
-
-  isSameHash,
-
-  cancel,
-}: Props) => {
-  const isPending = draft.publishState === 'pending'
-  const isPublished = draft.publishState === 'published'
-  const isValidHash = typeof draft.mediaHash === 'string' && !!draft.mediaHash
+const PublishState = ({ article, cancel }: Props) => {
+  const [publishState, setPublishState] = useState('pending')
+  const isPending = publishState === 'pending'
+  const isPublished = publishState === 'published'
+  const [mediaHash, setMediaHash] = useState('')
 
   if (!isPending && !isPublished) {
     return null
@@ -43,11 +29,22 @@ const PublishState = ({
 
   return (
     <section className="container">
-      {(isPending || isPublished) && !isValidHash && (
-        <PendingState draft={draft} id={article.id} />
+      {isPending && (
+        <PendingState
+          id={article.id}
+          articleMediaHash={article.mediaHash}
+          updatePublishState={(media) => {
+            setPublishState('published')
+            setMediaHash(media)
+          }}
+        />
       )}
-      {isPublished && !isSameHash && isValidHash && (
-        <PublishedState article={article} draft={draft} cancel={cancel} />
+      {isPublished && (
+        <PublishedState
+          article={article}
+          cancel={cancel}
+          newestMediaHash={mediaHash}
+        />
       )}
 
       <style jsx>{styles}</style>
diff --git a/src/views/ArticleDetail/EditMode/gql.ts b/src/views/ArticleDetail/EditMode/gql.ts
index ce4ab8f7aa..5355f21dac 100644
--- a/src/views/ArticleDetail/EditMode/gql.ts
+++ b/src/views/ArticleDetail/EditMode/gql.ts
@@ -48,6 +48,13 @@ export const EDIT_MODE_ARTICLE = gql`
           publishState
           ...EditorDraft
         }
+        newestPublishedDraft {
+          id
+          mediaHash
+          tags
+          publishState
+          ...EditorDraft
+        }
         ...ArticleCollection
       }
     }
diff --git a/src/views/ArticleDetail/EditMode/index.tsx b/src/views/ArticleDetail/EditMode/index.tsx
index 47c242a81c..36a1216f6a 100644
--- a/src/views/ArticleDetail/EditMode/index.tsx
+++ b/src/views/ArticleDetail/EditMode/index.tsx
@@ -80,6 +80,7 @@ const Editor = dynamic(() => import('~/components/Editor/Article'), {
 
 const EditMode: React.FC<EditModeProps> = ({ article, onCancel, onSaved }) => {
   const [editData, setEditData] = useState<Record<string, any>>({})
+  const [showPublishState, setShowPublishState] = useState(false)
   const { data, loading, error } = useQuery<EditModeArticleQuery>(
     EDIT_MODE_ARTICLE,
     {
@@ -303,17 +304,19 @@ const EditMode: React.FC<EditModeProps> = ({ article, onCancel, onSaved }) => {
                   isOverRevisionLimit={isOverRevisionLimit}
                   isSameHash={isSameHash}
                   isEditDisabled={isEditDisabled}
-                  onSaved={onSaved}
+                  onSaved={() => {
+                    onSaved()
+                  }}
+                  onPublish={() => {
+                    setShowPublishState(true)
+                  }}
                 />
               }
             />
 
-            <PublishState
-              article={article}
-              draft={draft}
-              isSameHash={isSameHash}
-              cancel={onCancel}
-            />
+            {showPublishState && (
+              <PublishState article={article} cancel={onCancel} />
+            )}
 
             <Layout.Spacing>
               <Editor

From 41b8f18cd7a317bbc504abcdf693f9f2d6fffb50 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:05:49 +0800
Subject: [PATCH 52/92] feat(EditMode): stopPolling when useEffect cleanup

---
 .../ArticleDetail/EditMode/PublishState/PendingState.tsx     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/ArticleDetail/EditMode/PublishState/PendingState.tsx b/src/views/ArticleDetail/EditMode/PublishState/PendingState.tsx
index 32dc6a1f5d..623d7c011d 100644
--- a/src/views/ArticleDetail/EditMode/PublishState/PendingState.tsx
+++ b/src/views/ArticleDetail/EditMode/PublishState/PendingState.tsx
@@ -28,7 +28,12 @@ const PendingState = ({
 
   useEffect(() => {
     startPolling(1000 * 2)
+
     refetch && refetch()
+
+    return () => {
+      stopPolling()
+    }
   }, [])
 
   if (

From 47cfe8e6fbc8aba760093cf249c0f46234ba0a99 Mon Sep 17 00:00:00 2001
From: 49659410+tx0c <unknown>
Date: Wed, 29 Mar 2023 01:30:40 +0000
Subject: [PATCH 53/92] feat(ga-event): add banner_exposure events to Analytics

resolves #3311
---
 src/common/utils/analytics.ts                 | 12 ++++
 .../Analytics/BannerExposureTracker/index.tsx | 59 +++++++++++++++++++
 src/components/Analytics/index.tsx            |  1 +
 .../Home/Announcements/Carousel/index.tsx     | 30 ++++++----
 4 files changed, 90 insertions(+), 12 deletions(-)
 create mode 100644 src/components/Analytics/BannerExposureTracker/index.tsx

diff --git a/src/common/utils/analytics.ts b/src/common/utils/analytics.ts
index 3c219fdd6c..d82a329de2 100644
--- a/src/common/utils/analytics.ts
+++ b/src/common/utils/analytics.ts
@@ -32,6 +32,7 @@ type EventArgs =
   | ['view_add_credit_dialog', ViewDialogProp]
   | ['view_donation_dialog', ViewDialogProp]
   | ['view_subscribe_circle_dialog', ViewDialogProp]
+  | ['banner_exposure', BannerExposureProp]
   | ['card_exposure', CardExposureProp]
   | ['tag_exposure', TagExposureProp]
 
@@ -146,6 +147,17 @@ interface ClickFeedProp {
  * Event: Card Exposure
  */
 
+interface BannerExposureProp {
+  id: string
+  // feedType: FeedType
+  // contentType: ContentType | ActivityType
+  location: number | string
+  title: string
+  link: string
+  lang: Language
+  delay_msecs?: number
+}
+
 interface CardExposureProp {
   id: string
   feedType: FeedType
diff --git a/src/components/Analytics/BannerExposureTracker/index.tsx b/src/components/Analytics/BannerExposureTracker/index.tsx
new file mode 100644
index 0000000000..7376521bc7
--- /dev/null
+++ b/src/components/Analytics/BannerExposureTracker/index.tsx
@@ -0,0 +1,59 @@
+import { useEffect, useState } from 'react'
+import { Waypoint } from 'react-waypoint'
+
+import { analytics } from '~/common/utils'
+
+export const BannerExposureTracker = ({
+  id,
+  location,
+  // feedType,
+  // contentType,
+  title,
+  link,
+  lang,
+  horizontal = false,
+}: {
+  id: string
+  location: number | string
+  // feedType: FeedType
+  // contentType: ContentType | ActivityType
+  title: string
+  link: string
+  lang: Language
+  horizontal?: boolean
+}) => {
+  const [timerId, setTimerId] = useState<number>()
+  const [recorded, setRecorded] = useState(false)
+
+  // clean up when unmount
+  useEffect(() => () => window.clearTimeout(timerId), [timerId])
+
+  return (
+    <Waypoint
+      onEnter={() => {
+        // start timing 500ms after scroll into view
+        // only start timer if it has not been setup
+        if (!recorded) {
+          const timer = window.setTimeout(() => {
+            // analytics
+            analytics.trackEvent('banner_exposure', {
+              // feedType,
+              // contentType,
+              id,
+              location,
+              title,
+              link,
+              lang,
+              delay_msecs: window?.performance.now() ?? -1,
+            })
+            setRecorded(true)
+          }, 500)
+          setTimerId(timer)
+        }
+      }}
+      // cancel timer on leave
+      onLeave={() => window.clearTimeout(timerId)}
+      horizontal={horizontal}
+    />
+  )
+}
diff --git a/src/components/Analytics/index.tsx b/src/components/Analytics/index.tsx
index d9691283c7..145b3e9ee5 100644
--- a/src/components/Analytics/index.tsx
+++ b/src/components/Analytics/index.tsx
@@ -1,4 +1,5 @@
 export * from './AnalyticsInitilizer'
+export * from './BannerExposureTracker'
 export * from './CardExposureTracker'
 export * from './PageViewTracker'
 export * from './TagExposureTracker'
diff --git a/src/views/Home/Announcements/Carousel/index.tsx b/src/views/Home/Announcements/Carousel/index.tsx
index 05fe723694..7a20e45a69 100644
--- a/src/views/Home/Announcements/Carousel/index.tsx
+++ b/src/views/Home/Announcements/Carousel/index.tsx
@@ -3,6 +3,7 @@ import { useCallback, useContext, useEffect, useRef, useState } from 'react'
 
 import { translate } from '~/common/utils'
 import {
+  BannerExposureTracker,
   Button,
   Card,
   IconClose32,
@@ -138,7 +139,7 @@ const Carousel = ({
         onClickCapture={onCaptureClick}
       >
         <div className="container">
-          {items?.map((item) => {
+          {items?.map((item, i) => {
             if (!item.cover) {
               return null
             }
@@ -146,26 +147,31 @@ const Carousel = ({
             const translatedItem = item.translations?.find(
               (translated) => translated.language === lang
             )
-            const hasTranslaton = translatedItem != null
+
+            // const hasTranslaton = translatedItem != null
+            const title = (translatedItem?.title ?? item.title) || ''
+            const itemLink = (translatedItem?.link ?? item.link) || ''
+            const itemContent = translatedItem?.content ?? item.content
             return (
               <div key={item.id} className="slide">
-                <Card
-                  htmlHref={
-                    hasTranslaton ? translatedItem.link : item.link || ''
-                  }
-                  spacing={[0, 0]}
-                >
+                <Card htmlHref={itemLink} spacing={[0, 0]}>
                   <div className="content">
                     <ResponsiveImage
                       url={item.cover}
                       size="540w"
                       smUpSize="1080w"
                     />
-                    <h3>{hasTranslaton ? translatedItem.title : item.title}</h3>
-                    <p>
-                      {hasTranslaton ? translatedItem.content : item.content}
-                    </p>
+                    <h3>{title}</h3>
+                    <p>{itemContent}</p>
                   </div>
+                  <BannerExposureTracker
+                    id={item.id}
+                    location={i}
+                    title={title}
+                    link={itemLink}
+                    // content={itemContent}
+                    lang={lang}
+                  />
                 </Card>
               </div>
             )

From f8e6c3177c4e3cd5b76bef32d765dcb337f2101b Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Fri, 7 Apr 2023 10:01:10 +0700
Subject: [PATCH 54/92] fix: fix import

---
 .../SearchSelect/SearchingArea/EditorSearchingArea.tsx    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx b/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
index bde07e6a14..185ca106fb 100644
--- a/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
+++ b/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
@@ -7,7 +7,7 @@ import {
   analytics,
   isUrl,
   mergeConnections,
-  normalizeTagInput,
+  normalizeTag,
   parseURL,
   toGlobalId,
 } from '~/common/utils'
@@ -102,7 +102,7 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
   const [searchKey, setSearchKey] = useState('')
   const [debouncedSearchKey, setdebouncedSearchKey] = useState('')
   const debouncedSetSearchKey = useDebouncedCallback((sk0) => {
-    const sk = isTag ? normalizeTagInput(sk0) : sk0
+    const sk = isTag ? normalizeTag(sk0) : sk0
     setdebouncedSearchKey(sk)
     setSearchKey(sk)
   }, INPUT_DEBOUNCE)
@@ -291,9 +291,7 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
                     {canCreateTag && (
                       <li>
                         <CreateTag
-                          tag={toDigestTagPlaceholder(
-                            normalizeTagInput(searchKey)
-                          )}
+                          tag={toDigestTagPlaceholder(normalizeTag(searchKey))}
                           onClick={addNodeToStaging}
                         />
                       </li>

From fe5b56969a7d738b4c00e53cced02a6c08c4ef9d Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Fri, 7 Apr 2023 11:10:04 +0800
Subject: [PATCH 55/92] feat(SearchSelect): revise regex

---
 .../SearchSelect/SearchingArea/EditorSearchingArea.tsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx b/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
index 185ca106fb..01179edb6f 100644
--- a/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
+++ b/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
@@ -173,7 +173,7 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
     // Used to match links of the format like👇
     // https://matters.news/@az/12-来自matters的第一封信-致好朋友-zdpuAnuMKxNv6SUj7kTRzgrWRdp9q4aMMKHJ6TGtn8tp4FwX2
     const regex = new RegExp(
-      `^https://${process.env.NEXT_PUBLIC_SITE_DOMAIN}/@\\w+/\\d+-.+-\\w+$`
+      `^https://${process.env.NEXT_PUBLIC_SITE_DOMAIN}/@\\w+/\\d+.?$`
     )
     if (searchType === 'Article' && isUrl(key) && regex.test(key)) {
       const urlObj = parseURL(key)

From 68e784b8bc1b40fa0a171c17fac20f7e4f2f23b2 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Wed, 15 Mar 2023 14:57:56 +0700
Subject: [PATCH 56/92] fix(form): remove tabIndex=-1 from
 <PasswordResetDialogButton>

---
 src/components/Forms/EmailLoginForm/Buttons.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/Forms/EmailLoginForm/Buttons.tsx b/src/components/Forms/EmailLoginForm/Buttons.tsx
index 76f704dd78..99d95cc935 100644
--- a/src/components/Forms/EmailLoginForm/Buttons.tsx
+++ b/src/components/Forms/EmailLoginForm/Buttons.tsx
@@ -13,10 +13,8 @@ export const PasswordResetDialogButton = ({
     spacing={['xtight', 0]}
     aria-haspopup="dialog"
     onClick={gotoResetPassword}
-    tabIndex={-1}
   >
     <TextIcon color="green" weight="md">
-      {' '}
       <FormattedMessage
         defaultMessage="Forget Password"
         description="src/components/Forms/EmailLoginForm/Buttons.tsx"

From a13adced19ae249cd34c0b1e5d97b25d32104b36 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Wed, 15 Mar 2023 15:31:37 +0700
Subject: [PATCH 57/92] Revert "fix(form): remove tabIndex=-1 from
 <PasswordResetDialogButton>"

---
 src/components/Forms/EmailLoginForm/Buttons.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/Forms/EmailLoginForm/Buttons.tsx b/src/components/Forms/EmailLoginForm/Buttons.tsx
index 99d95cc935..76f704dd78 100644
--- a/src/components/Forms/EmailLoginForm/Buttons.tsx
+++ b/src/components/Forms/EmailLoginForm/Buttons.tsx
@@ -13,8 +13,10 @@ export const PasswordResetDialogButton = ({
     spacing={['xtight', 0]}
     aria-haspopup="dialog"
     onClick={gotoResetPassword}
+    tabIndex={-1}
   >
     <TextIcon color="green" weight="md">
+      {' '}
       <FormattedMessage
         defaultMessage="Forget Password"
         description="src/components/Forms/EmailLoginForm/Buttons.tsx"

From eceb76e83465c41d6a15d16d0968e1136479380f Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Wed, 29 Mar 2023 15:44:47 +0800
Subject: [PATCH 58/92] fix(Support): Fix support font size

---
 src/views/ArticleDetail/SupportWidget/Donators/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/ArticleDetail/SupportWidget/Donators/index.tsx b/src/views/ArticleDetail/SupportWidget/Donators/index.tsx
index f71ae996a6..58b4c7f6e4 100644
--- a/src/views/ArticleDetail/SupportWidget/Donators/index.tsx
+++ b/src/views/ArticleDetail/SupportWidget/Donators/index.tsx
@@ -126,6 +126,7 @@ const Donators = ({ article, showAvatarAnimation = false }: DonatorsProps) => {
                 <TextIcon
                   icon={<IconArrowRight16 size="xs" />}
                   textPlacement="left"
+                  size="xs"
                 >
                   <Translate
                     zh_hant="個人支持過本文・查看全部"

From 145efc8b8328823861328d28ac66115e511567a5 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Wed, 29 Mar 2023 17:25:40 +0800
Subject: [PATCH 59/92] fix(Expandable): remove unused hover style code

---
 src/components/Comment/Content/index.tsx |  3 ---
 src/components/Expandable/index.tsx      |  3 ---
 src/components/Expandable/styles.css     |  8 --------
 src/components/Hook/index.ts             |  1 -
 src/components/Hook/useHover.tsx         | 23 -----------------------
 src/components/Notice/NoticeComment.tsx  |  7 ++-----
 6 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 src/components/Hook/useHover.tsx

diff --git a/src/components/Comment/Content/index.tsx b/src/components/Comment/Content/index.tsx
index 6323bd2b8a..929eea7985 100644
--- a/src/components/Comment/Content/index.tsx
+++ b/src/components/Comment/Content/index.tsx
@@ -18,7 +18,6 @@ interface ContentProps {
   type: CommentFormType
   size?: 'sm' | 'md-s'
   bgColor?: 'grey-lighter' | 'white'
-  bgActiveColor?: 'grey-lighter' | 'white'
   limit?: number
   textIndent?: boolean
   isRichShow?: boolean
@@ -50,7 +49,6 @@ const Content = ({
   type,
   size,
   bgColor,
-  bgActiveColor,
   limit = 8,
   textIndent = false,
   isRichShow = true,
@@ -90,7 +88,6 @@ const Content = ({
           limit={limit}
           isRichShow={isRichShow}
           bgColor={bgColor}
-          bgActiveColor={bgActiveColor}
           textIndent={textIndent}
         >
           <section
diff --git a/src/components/Expandable/index.tsx b/src/components/Expandable/index.tsx
index 2a04e8eff5..d3724971d8 100644
--- a/src/components/Expandable/index.tsx
+++ b/src/components/Expandable/index.tsx
@@ -33,7 +33,6 @@ interface ExpandableProps {
   textIndent?: boolean
   isRichShow?: boolean
   bgColor?: 'grey-lighter' | 'white'
-  bgActiveColor?: 'grey-lighter' | 'white'
 }
 
 export const Expandable: React.FC<ExpandableProps> = ({
@@ -47,7 +46,6 @@ export const Expandable: React.FC<ExpandableProps> = ({
   textIndent = false,
   isRichShow = false,
   bgColor = 'white',
-  bgActiveColor,
 }) => {
   const [expandable, setExpandable] = useState(false)
   const [lineHeight, setLineHeight] = useState(24)
@@ -69,7 +67,6 @@ export const Expandable: React.FC<ExpandableProps> = ({
   const richWrapperClasses = classNames({
     richWrapper: true,
     [`${bgColor}`]: !!bgColor,
-    [`${bgActiveColor}-active`]: !!bgActiveColor,
   })
 
   useEffect(() => {
diff --git a/src/components/Expandable/styles.css b/src/components/Expandable/styles.css
index 04704c5e9c..7f78f4bf2b 100644
--- a/src/components/Expandable/styles.css
+++ b/src/components/Expandable/styles.css
@@ -42,14 +42,6 @@
         var(--color-grey-lighter) 100%
       );
     }
-
-    &.grey-lighter-active::after {
-      background: linear-gradient(
-        180deg,
-        rgb(247 247 247 / 0%) 0%,
-        var(--color-grey-lighter-active) 100%
-      );
-    }
   }
 }
 
diff --git a/src/components/Hook/index.ts b/src/components/Hook/index.ts
index e5e7858f20..e41c1feaf6 100644
--- a/src/components/Hook/index.ts
+++ b/src/components/Hook/index.ts
@@ -6,7 +6,6 @@ export * from './useDialogSwitch'
 export * from './useERC20'
 export * from './useEventListener'
 export * from './useFeatures'
-export * from './useHover'
 export * from './useImmersiveMode'
 export * from './useInterval'
 export * from './useNativeEventListener'
diff --git a/src/components/Hook/useHover.tsx b/src/components/Hook/useHover.tsx
deleted file mode 100644
index 17fcdd8475..0000000000
--- a/src/components/Hook/useHover.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { MutableRefObject, useEffect, useRef, useState } from 'react'
-
-export const useHover = <T,>(): [MutableRefObject<T>, boolean] => {
-  const [value, setValue] = useState(false)
-  const ref: any = useRef<T | null>(null)
-  const handleMouseOver = (): void => setValue(true)
-  const handleMouseOut = (): void => setValue(false)
-  useEffect(
-    () => {
-      const node: any = ref.current
-      if (node) {
-        node.addEventListener('mouseover', handleMouseOver)
-        node.addEventListener('mouseout', handleMouseOut)
-        return () => {
-          node.removeEventListener('mouseover', handleMouseOver)
-          node.removeEventListener('mouseout', handleMouseOut)
-        }
-      }
-    },
-    [ref.current] // Recall only if ref changes
-  )
-  return [ref, value]
-}
diff --git a/src/components/Notice/NoticeComment.tsx b/src/components/Notice/NoticeComment.tsx
index 5dcc2196b5..3a07263049 100644
--- a/src/components/Notice/NoticeComment.tsx
+++ b/src/components/Notice/NoticeComment.tsx
@@ -2,7 +2,7 @@ import gql from 'graphql-tag'
 
 import { TEST_ID } from '~/common/enums'
 import { toPath } from '~/common/utils'
-import { Card, useHover } from '~/components'
+import { Card } from '~/components'
 import CommentContent from '~/components/Comment/Content'
 import { NoticeCommentFragment } from '~/gql/graphql'
 
@@ -51,8 +51,6 @@ const NoticeComment = ({
   const circle =
     comment?.node.__typename === 'Circle' ? comment.node : undefined
 
-  const [hoverRef, isHovered] = useHover<HTMLDivElement>()
-
   if (!comment) {
     return null
   }
@@ -68,7 +66,7 @@ const NoticeComment = ({
       : {}
 
   return (
-    <section className="sub-content" ref={hoverRef}>
+    <section className="sub-content">
       <Card
         {...path}
         bgColor="grey-lighter"
@@ -81,7 +79,6 @@ const NoticeComment = ({
           type="article"
           size="sm"
           bgColor="grey-lighter"
-          bgActiveColor={isHovered ? 'grey-lighter' : undefined}
         />
       </Card>
 

From 2b30fb5097114384926a5d66caf257c2a5fbc211 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Thu, 30 Mar 2023 11:09:02 +0800
Subject: [PATCH 60/92] feat(Notice): Remove payout notice codes

---
 .../TransactionNotice/PaymentPayoutNotice.tsx | 64 -------------------
 .../Notice/TransactionNotice/index.tsx        |  5 --
 2 files changed, 69 deletions(-)
 delete mode 100644 src/components/Notice/TransactionNotice/PaymentPayoutNotice.tsx

diff --git a/src/components/Notice/TransactionNotice/PaymentPayoutNotice.tsx b/src/components/Notice/TransactionNotice/PaymentPayoutNotice.tsx
deleted file mode 100644
index 92a943f625..0000000000
--- a/src/components/Notice/TransactionNotice/PaymentPayoutNotice.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import gql from 'graphql-tag'
-import { FormattedMessage } from 'react-intl'
-
-import { TEST_ID } from '~/common/enums'
-import { PaymentPayoutNoticeFragment } from '~/gql/graphql'
-
-import NoticeDate from '../NoticeDate'
-import NoticeTypeIcon from '../NoticeTypeIcon'
-import styles from '../styles.css'
-
-const PaymentPayoutNotice = ({
-  notice,
-}: {
-  notice: PaymentPayoutNoticeFragment
-}) => {
-  const tx = notice.tx
-
-  return (
-    <section className="container" data-test-id={TEST_ID.PAYMENT_PAYOUT}>
-      <section className="avatar-wrap">
-        <NoticeTypeIcon type="volume" />
-      </section>
-
-      <section className="content-wrap">
-        <p>
-          <FormattedMessage
-            defaultMessage="Your"
-            description="src/components/Notice/TransactionNotice/PaymentPayoutNotice.tsx"
-          />
-          {tx && (
-            <span className="highlight">
-              {tx.amount} {tx.currency}
-            </span>
-          )}
-          <FormattedMessage
-            defaultMessage="withdrawal process has started. Please refer to your bank for payout status."
-            description="src/components/Notice/TransactionNotice/PaymentPayoutNotice.tsx"
-          />
-        </p>
-
-        <NoticeDate notice={notice} />
-      </section>
-
-      <style jsx>{styles}</style>
-    </section>
-  )
-}
-
-PaymentPayoutNotice.fragments = {
-  notice: gql`
-    fragment PaymentPayoutNotice on TransactionNotice {
-      id
-      ...NoticeDate
-      tx: target {
-        id
-        amount
-        currency
-      }
-    }
-    ${NoticeDate.fragments.notice}
-  `,
-}
-
-export default PaymentPayoutNotice
diff --git a/src/components/Notice/TransactionNotice/index.tsx b/src/components/Notice/TransactionNotice/index.tsx
index 435ac2fb03..5c7f189862 100644
--- a/src/components/Notice/TransactionNotice/index.tsx
+++ b/src/components/Notice/TransactionNotice/index.tsx
@@ -2,7 +2,6 @@ import gql from 'graphql-tag'
 
 import { TransactionNoticeFragment } from '~/gql/graphql'
 
-import PaymentPayoutNotice from './PaymentPayoutNotice'
 import PaymentReceivedDonationNotice from './PaymentReceivedDonationNotice'
 
 const TransactionNotice = ({
@@ -11,8 +10,6 @@ const TransactionNotice = ({
   notice: TransactionNoticeFragment
 }) => {
   switch (notice.txNoticeType) {
-    case 'PaymentPayout':
-      return <PaymentPayoutNotice notice={notice} />
     case 'PaymentReceivedDonation':
       return <PaymentReceivedDonationNotice notice={notice} />
     default:
@@ -27,10 +24,8 @@ TransactionNotice.fragments = {
       unread
       __typename
       txNoticeType: type
-      ...PaymentPayoutNotice
       ...PaymentReceivedDonationNotice
     }
-    ${PaymentPayoutNotice.fragments.notice}
     ${PaymentReceivedDonationNotice.fragments.notice}
   `,
 }

From fe16d5c68e5230613c679e276d6549dff6fd3bc6 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Thu, 30 Mar 2023 15:40:51 +0800
Subject: [PATCH 61/92] fix(lang): format

---
 lang/default.json | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/lang/default.json b/lang/default.json
index 7d6ff9a47c..f22804c21a 100644
--- a/lang/default.json
+++ b/lang/default.json
@@ -771,10 +771,6 @@
     "defaultMessage": "Unblock",
     "description": "src/components/BlockUser/Button/index.tsx"
   },
-  "bVZDVx": {
-    "defaultMessage": "withdrawal process has started. Please refer to your bank for payout status.",
-    "description": "src/components/Notice/TransactionNotice/PaymentPayoutNotice.tsx"
-  },
   "beLe/F": {
     "defaultMessage": "Broadcast",
     "description": ""
@@ -1242,10 +1238,6 @@
     "defaultMessage": "discussion and mentioned you",
     "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
   },
-  "z4NaU2": {
-    "defaultMessage": "Your",
-    "description": "src/components/Notice/TransactionNotice/PaymentPayoutNotice.tsx"
-  },
   "zKOr2x": {
     "defaultMessage": "Conversion Rate of Followers",
     "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"

From bb892f4a42df55019a5b85fb5d1622f4c7697f99 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Thu, 30 Mar 2023 15:48:48 +0800
Subject: [PATCH 62/92] feat(Expandable): revise rich text expand ui

---
 src/common/enums/text.ts                 |  2 +-
 src/components/Comment/Content/index.tsx |  2 +-
 src/components/Comment/Feed/index.tsx    | 10 +++++--
 src/components/Expandable/index.tsx      | 35 +++++++++++-----------
 src/components/Expandable/styles.css     | 37 +++++++++++++++++++++++-
 5 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/src/common/enums/text.ts b/src/common/enums/text.ts
index aee6645625..1c365f6c50 100644
--- a/src/common/enums/text.ts
+++ b/src/common/enums/text.ts
@@ -955,7 +955,7 @@ export const TEXT = {
     enterUserNameAgain: 'Enter Matters ID again',
     enterVerificationCode: 'Enter verification code',
     ENTITY_NOT_FOUND: 'Entity not found',
-    expand: 'Expand',
+    expand: 'More',
     extend: 'Collect',
     collectArticle: 'Collect Article',
     failureChange: 'Failed to edit, please try again.',
diff --git a/src/components/Comment/Content/index.tsx b/src/components/Comment/Content/index.tsx
index 929eea7985..1540e24bb8 100644
--- a/src/components/Comment/Content/index.tsx
+++ b/src/components/Comment/Content/index.tsx
@@ -49,7 +49,7 @@ const Content = ({
   type,
   size,
   bgColor,
-  limit = 8,
+  limit = 10,
   textIndent = false,
   isRichShow = true,
 }: ContentProps) => {
diff --git a/src/components/Comment/Feed/index.tsx b/src/components/Comment/Feed/index.tsx
index dfaee93f62..787620c96f 100644
--- a/src/components/Comment/Feed/index.tsx
+++ b/src/components/Comment/Feed/index.tsx
@@ -2,7 +2,7 @@ import { useLazyQuery } from '@apollo/react-hooks'
 import React from 'react'
 
 import { TEST_ID } from '@/src/common/enums'
-import { AvatarSize, CommentFormType, UserDigest } from '~/components'
+import { AvatarSize, CommentFormType, Media, UserDigest } from '~/components'
 import {
   FeedCommentPrivateFragment,
   FeedCommentPublicFragment,
@@ -87,7 +87,13 @@ export const BaseCommentFeed = ({
       )}
 
       <section className="content-container">
-        <Content comment={comment} type={type} size="md-s" />
+        <Media at="sm">
+          <Content comment={comment} type={type} size="md-s" limit={13} />
+        </Media>
+        <Media greaterThan="sm">
+          <Content comment={comment} type={type} size="md-s" limit={10} />
+        </Media>
+
         <FooterActions
           comment={comment}
           type={type}
diff --git a/src/components/Expandable/index.tsx b/src/components/Expandable/index.tsx
index d3724971d8..7273a669ec 100644
--- a/src/components/Expandable/index.tsx
+++ b/src/components/Expandable/index.tsx
@@ -69,6 +69,11 @@ export const Expandable: React.FC<ExpandableProps> = ({
     [`${bgColor}`]: !!bgColor,
   })
 
+  const richShowMoreButtonClasses = classNames({
+    richShowMoreButton: true,
+    [`${bgColor}`]: !!bgColor,
+  })
+
   useEffect(() => {
     setExpandable(false)
     setExpand(true)
@@ -98,7 +103,7 @@ export const Expandable: React.FC<ExpandableProps> = ({
       <div ref={node}>
         {(!expandable || (expandable && expand)) && <div>{children}</div>}
       </div>
-      {expandable && expand && (
+      {expandable && expand && !isRichShow && (
         <section className="collapseWrapper">
           <Button
             spacing={['xxtight', 'xtight']}
@@ -108,14 +113,14 @@ export const Expandable: React.FC<ExpandableProps> = ({
               setExpand(!expand)
             }}
           >
-            <TextIcon icon={<IconArrowUp16 />}>
+            <TextIcon icon={<IconArrowUp16 />} textPlacement="left">
               <Translate zh_hans="收起" zh_hant="收合" en="collapse" />
             </TextIcon>
           </Button>
         </section>
       )}
       {expandable && !expand && (
-        <p>
+        <p className="unexpandWrapper">
           {!isRichShow && (
             <TextTruncate
               line={limit}
@@ -159,20 +164,16 @@ export const Expandable: React.FC<ExpandableProps> = ({
               >
                 {children}
               </div>
-              <section className="collapseWrapper">
-                <Button
-                  spacing={['xxtight', 'xtight']}
-                  bgColor="grey-lighter"
-                  textColor="grey"
-                  onClick={() => {
-                    setExpand(!expand)
-                  }}
-                >
-                  <TextIcon icon={<IconArrowDown16 />}>
-                    <Translate id="expand" />
-                  </TextIcon>
-                </Button>
-              </section>
+              <button
+                className={richShowMoreButtonClasses}
+                onClick={() => {
+                  setExpand(!expand)
+                }}
+              >
+                <TextIcon icon={<IconArrowDown16 />}>
+                  <Translate id="expand" />
+                </TextIcon>
+              </button>
             </>
           )}
         </p>
diff --git a/src/components/Expandable/styles.css b/src/components/Expandable/styles.css
index 7f78f4bf2b..8b584c77a8 100644
--- a/src/components/Expandable/styles.css
+++ b/src/components/Expandable/styles.css
@@ -13,6 +13,41 @@
     margin-top: var(--spacing-x-tight);
   }
 
+  & .unexpandWrapper {
+    position: relative;
+
+    & .richShowMoreButton {
+      @mixin flex-start-center;
+
+      position: absolute;
+      bottom: 0;
+      align-items: flex-end;
+      width: 100%;
+      height: 7.5rem;
+      color: var(--color-grey);
+
+      &:hover {
+        color: var(--color-grey-darker);
+      }
+
+      &.white {
+        background: linear-gradient(
+          180deg,
+          rgb(255 255 255 / 0%) 0%,
+          var(--color-white) 100%
+        );
+      }
+
+      &.grey-lighter {
+        background: linear-gradient(
+          180deg,
+          rgb(247 247 247 / 0%) 0%,
+          var(--color-grey-lighter) 100%
+        );
+      }
+    }
+  }
+
   & .richWrapper {
     overflow-y: hidden;
     overflow-y: clip;
@@ -20,7 +55,7 @@
     &::after {
       position: absolute;
       right: 0;
-      bottom: 2rem;
+      bottom: 0;
       left: 0;
       height: 80%;
       pointer-events: none;

From 22e4e9be28adf020faca834f8fe27c799d98991e Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Mon, 3 Apr 2023 16:04:03 +0800
Subject: [PATCH 63/92] feat(Comment): adjust default limit line

---
 src/components/Comment/Feed/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Comment/Feed/index.tsx b/src/components/Comment/Feed/index.tsx
index 787620c96f..e1696b4fca 100644
--- a/src/components/Comment/Feed/index.tsx
+++ b/src/components/Comment/Feed/index.tsx
@@ -88,10 +88,10 @@ export const BaseCommentFeed = ({
 
       <section className="content-container">
         <Media at="sm">
-          <Content comment={comment} type={type} size="md-s" limit={13} />
+          <Content comment={comment} type={type} size="md-s" limit={17} />
         </Media>
         <Media greaterThan="sm">
-          <Content comment={comment} type={type} size="md-s" limit={10} />
+          <Content comment={comment} type={type} size="md-s" limit={13} />
         </Media>
 
         <FooterActions

From e3849429ce674cc9dcf57531af9ec40f134d7335 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Tue, 4 Apr 2023 16:06:11 +0800
Subject: [PATCH 64/92] feat(NoticeComment): Don't change the background color
 when hover

---
 src/components/Notice/NoticeComment.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Notice/NoticeComment.tsx b/src/components/Notice/NoticeComment.tsx
index 3a07263049..c1f21f7381 100644
--- a/src/components/Notice/NoticeComment.tsx
+++ b/src/components/Notice/NoticeComment.tsx
@@ -70,6 +70,7 @@ const NoticeComment = ({
       <Card
         {...path}
         bgColor="grey-lighter"
+        bgActiveColor="grey-lighter"
         spacing={['xtight', 'base']}
         borderRadius="xtight"
         testId={TEST_ID.DIGEST_COMMENT_NOTICE}

From acfb08c95742444590e472ced491385b17d82aa9 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Tue, 4 Apr 2023 16:07:32 +0800
Subject: [PATCH 65/92] feat(UserComments): Don't change the background color
 when hover

---
 src/views/User/Comments/UserComments.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/User/Comments/UserComments.tsx b/src/views/User/Comments/UserComments.tsx
index db2780549c..08979ad31f 100644
--- a/src/views/User/Comments/UserComments.tsx
+++ b/src/views/User/Comments/UserComments.tsx
@@ -212,6 +212,7 @@ const BaseUserComments = ({ user }: UserIdUserQuery) => {
                 <List.Item key={comment.id}>
                   <Card
                     spacing={['tight', 'base']}
+                    bgColor="none"
                     {...toPath({
                       page: 'commentDetail',
                       comment,

From 78757e7b0ec7cea8a7768371edb07850def5bbdd Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Mon, 10 Apr 2023 16:38:05 +0700
Subject: [PATCH 66/92] fix: fix cropped descender of letters;

---
 src/components/Tag/styles.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/Tag/styles.css b/src/components/Tag/styles.css
index f54ec7fd1e..1dddf0338a 100644
--- a/src/components/Tag/styles.css
+++ b/src/components/Tag/styles.css
@@ -5,6 +5,9 @@
 .tag .name {
   @mixin line-clamp;
 
+  /* FIXME: fix cropped descenders of letters  */
+  padding-bottom: 0.14em;
+  margin-bottom: -0.14rem;
   line-height: inherit;
 }
 

From 3ae081d4d906fa230cbd722dea82997bfe1ee69d Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Mon, 10 Apr 2023 18:51:43 +0700
Subject: [PATCH 67/92] fix: submit form on pin input complete

---
 src/common/utils/validator.ts                                 | 4 +++-
 src/components/Forms/PaymentForm/PayTo/Confirm/index.tsx      | 3 +--
 src/components/Forms/PaymentForm/ResetPassword/Confirm.tsx    | 2 --
 src/components/Forms/PaymentForm/SetPassword/index.tsx        | 2 --
 .../Forms/PaymentForm/SubscribeCircle/PasswordPayment.tsx     | 3 +--
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/common/utils/validator.ts b/src/common/utils/validator.ts
index 65f2328218..ba912658f6 100644
--- a/src/common/utils/validator.ts
+++ b/src/common/utils/validator.ts
@@ -1,5 +1,7 @@
 import isEmail from 'validator/lib/isEmail'
 
+import { PAYMENT_PASSSWORD_LENGTH } from '../enums'
+
 /**
  * Validate email address.
  */
@@ -37,7 +39,7 @@ export const isValidPassword = (password: string): boolean => {
  * Validate payment pass word. It only accepts digital.
  */
 export const isValidPaymentPassword = (password: string): boolean => {
-  if (!password || password.length !== 6) {
+  if (!password || password.length !== PAYMENT_PASSSWORD_LENGTH) {
     return false
   }
 
diff --git a/src/components/Forms/PaymentForm/PayTo/Confirm/index.tsx b/src/components/Forms/PaymentForm/PayTo/Confirm/index.tsx
index 4235381e1c..694b180af3 100644
--- a/src/components/Forms/PaymentForm/PayTo/Confirm/index.tsx
+++ b/src/components/Forms/PaymentForm/PayTo/Confirm/index.tsx
@@ -101,7 +101,6 @@ const Confirm: React.FC<FormProps> = ({
   const {
     errors,
     handleSubmit,
-    isValid,
     isSubmitting,
     setFieldValue,
     setTouched,
@@ -171,7 +170,7 @@ const Confirm: React.FC<FormProps> = ({
   )
 
   useEffect(() => {
-    if (isValid && values.password.length === PAYMENT_PASSSWORD_LENGTH) {
+    if (values.password.length === PAYMENT_PASSSWORD_LENGTH) {
       handleSubmit()
     }
   }, [values.password])
diff --git a/src/components/Forms/PaymentForm/ResetPassword/Confirm.tsx b/src/components/Forms/PaymentForm/ResetPassword/Confirm.tsx
index 460ae2ecb9..4b00e682e5 100644
--- a/src/components/Forms/PaymentForm/ResetPassword/Confirm.tsx
+++ b/src/components/Forms/PaymentForm/ResetPassword/Confirm.tsx
@@ -57,7 +57,6 @@ const Confirm: React.FC<FormProps> = ({ codeId, submitCallback }) => {
     setTouched,
     handleSubmit,
     isSubmitting,
-    isValid,
   } = useFormik<FormValues>({
     initialValues: {
       password: '',
@@ -141,7 +140,6 @@ const Confirm: React.FC<FormProps> = ({ codeId, submitCallback }) => {
   useEffect(() => {
     // submit on validate
     if (
-      isValid &&
       values.password.length === PAYMENT_PASSSWORD_LENGTH &&
       values.comparedPassword.length === PAYMENT_PASSSWORD_LENGTH
     ) {
diff --git a/src/components/Forms/PaymentForm/SetPassword/index.tsx b/src/components/Forms/PaymentForm/SetPassword/index.tsx
index c66d5c2c84..10be54fada 100644
--- a/src/components/Forms/PaymentForm/SetPassword/index.tsx
+++ b/src/components/Forms/PaymentForm/SetPassword/index.tsx
@@ -61,7 +61,6 @@ const PaymentSetPasswordForm: React.FC<FormProps> = ({ submitCallback }) => {
     isSubmitting,
     handleSubmit,
     setFieldValue,
-    isValid,
     touched,
     setTouched,
   } = useFormik<FormValues>({
@@ -145,7 +144,6 @@ const PaymentSetPasswordForm: React.FC<FormProps> = ({ submitCallback }) => {
   useEffect(() => {
     // submit on validate
     if (
-      isValid &&
       values.password.length === PAYMENT_PASSSWORD_LENGTH &&
       values.comparedPassword.length === PAYMENT_PASSSWORD_LENGTH
     ) {
diff --git a/src/components/Forms/PaymentForm/SubscribeCircle/PasswordPayment.tsx b/src/components/Forms/PaymentForm/SubscribeCircle/PasswordPayment.tsx
index 6ca95a72a2..8dce25b9d9 100644
--- a/src/components/Forms/PaymentForm/SubscribeCircle/PasswordPayment.tsx
+++ b/src/components/Forms/PaymentForm/SubscribeCircle/PasswordPayment.tsx
@@ -57,7 +57,6 @@ const Confirm: React.FC<FormProps> = ({
   const {
     errors,
     handleSubmit,
-    isValid,
     isSubmitting,
     setFieldValue,
     setTouched,
@@ -107,7 +106,7 @@ const Confirm: React.FC<FormProps> = ({
   )
 
   useEffect(() => {
-    if (isValid && values.password.length === PAYMENT_PASSSWORD_LENGTH) {
+    if (values.password.length === PAYMENT_PASSSWORD_LENGTH) {
       handleSubmit()
     }
   }, [values.password])

From c600a8af1799946900a54352a8c8eae7953201e9 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Thu, 16 Mar 2023 16:16:32 +0800
Subject: [PATCH 68/92] feat(test): add mutateArticle test

---
 tests/mutateArticle.spec.ts | 236 ++++++++++++++++++++++++++++++++++++
 1 file changed, 236 insertions(+)
 create mode 100644 tests/mutateArticle.spec.ts

diff --git a/tests/mutateArticle.spec.ts b/tests/mutateArticle.spec.ts
new file mode 100644
index 0000000000..f325f8d5ef
--- /dev/null
+++ b/tests/mutateArticle.spec.ts
@@ -0,0 +1,236 @@
+import { expect, test } from '@playwright/test'
+import _random from 'lodash/random'
+
+import { sleep } from '@/src/common/utils/time'
+import { TEST_ID } from '~/common/enums'
+import { stripSpaces } from '~/common/utils/text'
+
+import { publishDraft } from './common'
+import {
+  ArticleDetailPage,
+  authedTest,
+  DraftDetailPage,
+  NotificationsPage,
+  pageGoto,
+  UserProfilePage,
+  waitForAPIResponse,
+} from './helpers'
+
+test.describe.only('Mutate article', () => {
+  authedTest(
+    "Alice' article is appreciation by Bob, and received notification",
+    async ({ alicePage, bobPage, isMobile, request }) => {
+      // [Alice] create and publish new article
+      await publishDraft({ page: alicePage, isMobile })
+
+      // const mediaHashState = await request.post(
+      //   'https://server-develop.matters.news/graphql',
+      //   {
+      //     data: {
+      //       variables: {},
+      //       query:
+      //         '{\n  node(input: {id: "QXJ0aWNsZTo5MDI2"}) {\n    ... on Article {\n      id\n      mediaHash\n    }\n  }\n}\n',
+      //     },
+      //   }
+      // )
+      // console.log({ mediaHashState })
+      // console.log(await mediaHashState.json())
+
+      // [Alice] Get new article link
+      const aliceArticleLink = alicePage.url()
+
+      // [Bob] Go to Alice's article page
+      await pageGoto(bobPage, aliceArticleLink)
+
+      const bobArticleDetail = new ArticleDetailPage(bobPage, isMobile)
+
+      while (true) {
+        const appreciationButtonState =
+          await bobArticleDetail.toolbarAppreciationButton.getAttribute(
+            'disabled'
+          )
+        if (appreciationButtonState === null) break
+        await sleep(5 * 1000)
+        await bobPage.reload()
+        await bobPage.waitForLoadState('networkidle')
+      }
+
+      const title = await bobArticleDetail.getTitle()
+
+      const amount = _random(1, 5, false)
+
+      // [Bob] appreciation
+      await bobArticleDetail.sendAppreciation(amount)
+
+      // [Alice] Go to notifications page
+      const aliceNotifications = new NotificationsPage(alicePage)
+      await aliceNotifications.goto()
+
+      // [Alice] Expect it has "liked your article" notice
+      const noticeReceiveArtileTitle = await alicePage
+        .getByTestId(TEST_ID.ARTICLE_NEW_APPRECIATION)
+        .first()
+        .getByTestId(TEST_ID.DIGEST_ARTICLE_TITLE)
+        .first()
+        .innerText({
+          // FIXME: notifications page is slow to fetch data since it's no-cache
+          timeout: 15e3,
+        })
+      expect(stripSpaces(noticeReceiveArtileTitle)).toBe(stripSpaces(title))
+
+      // [Alice] Check Appreciation count
+      await alicePage
+        .getByTestId(TEST_ID.ARTICLE_NEW_APPRECIATION)
+        .first()
+        .getByTestId(TEST_ID.DIGEST_ARTICLE_TITLE)
+        .first()
+        .click()
+      const aliceAppreciationAmount = await alicePage
+        .getByTestId(TEST_ID.ARTICLE_APPRECIATION_TOTAL)
+        .innerText()
+      expect(aliceAppreciationAmount).toBe(amount.toString())
+    }
+  )
+
+  authedTest(
+    "Alice' article is bookmarked by Bob",
+    async ({ alicePage, bobPage, isMobile }) => {
+      // [Alice] Go to profile page
+      const aliceProfile = new UserProfilePage(alicePage, isMobile)
+      await aliceProfile.gotoMeProfile()
+
+      // [Alice] Get first article
+      const aliceArticleLink = (await aliceProfile.feedArticles
+        .first()
+        .getByTestId(TEST_ID.DIGEST_ARTICLE_TITLE)
+        .getAttribute('href')) as string
+      expect(aliceArticleLink).toBeTruthy()
+
+      // [Bob] Go to Alice's article page
+      await pageGoto(bobPage, aliceArticleLink)
+      const aliceArticleDetail = new ArticleDetailPage(bobPage, isMobile)
+
+      const firstLabel =
+        await aliceArticleDetail.toolbarBookmarkButton.getAttribute(
+          'aria-label'
+        )
+      // [Bob] bookmark
+      await aliceArticleDetail.sendBookmark()
+      const secondLabel =
+        await aliceArticleDetail.toolbarBookmarkButton.getAttribute(
+          'aria-label'
+        )
+
+      expect(firstLabel !== secondLabel).toBeTruthy()
+    }
+  )
+
+  authedTest(
+    "Alice' article is forked by Bob",
+    async ({ alicePage, bobPage, isMobile }) => {
+      // [Alice] Go to profile page
+      const aliceProfile = new UserProfilePage(alicePage, isMobile)
+      await aliceProfile.gotoMeProfile()
+
+      // [Alice] Get first article
+      const aliceArticleLink = (await aliceProfile.feedArticles
+        .first()
+        .getByTestId(TEST_ID.DIGEST_ARTICLE_TITLE)
+        .getAttribute('href')) as string
+      expect(aliceArticleLink).toBeTruthy()
+
+      // [Bob] Go to Alice's article page
+      await pageGoto(bobPage, aliceArticleLink)
+      const aliceArticleDetail = new ArticleDetailPage(bobPage, isMobile)
+      const aliceTitle = await aliceArticleDetail.getTitle()
+
+      await aliceArticleDetail.forkArticle()
+
+      // [Bob] create and publish article
+      const draftDetail = new DraftDetailPage(bobPage, isMobile)
+      // Required: Fill title and content
+      const title = await draftDetail.fillTitle()
+      const content = await draftDetail.fillContent()
+      await draftDetail.publish()
+
+      // Goto published article page
+      // Promise.all prevents a race condition between clicking and waiting.
+      await Promise.all([
+        bobPage.waitForNavigation(),
+        draftDetail.dialogViewArticleButton.click(),
+      ])
+
+      const bobArticleDetail = new ArticleDetailPage(bobPage, isMobile)
+      const bobTitle = await bobArticleDetail.getTitle()
+      expect(stripSpaces(bobTitle)).toBe(stripSpaces(title))
+
+      const bobContent = await bobArticleDetail.content.innerText()
+      expect(stripSpaces(bobContent)).toBe(stripSpaces(content))
+
+      const firstCollectionArticleTitle =
+        await bobArticleDetail.getFirstCollectionArticleTitle()
+      expect(stripSpaces(firstCollectionArticleTitle)).toBe(
+        stripSpaces(aliceTitle)
+      )
+    }
+  )
+
+  authedTest('Pin and unpin article', async ({ alicePage, isMobile }) => {
+    // [Alice] Go to profile page
+    const aliceProfile = new UserProfilePage(alicePage, isMobile)
+    await aliceProfile.gotoMeProfile()
+
+    // [Alice] Get first article
+    const aliceArticles = await aliceProfile.feedArticles.all()
+    const secondArticle = await aliceArticles[1].first()
+    await expect(secondArticle).toBeVisible()
+    const secondArticleTitle = await secondArticle
+      .getByTestId(TEST_ID.DIGEST_ARTICLE_TITLE)
+      .innerText()
+
+    await secondArticle.getByRole('button', { name: 'More Actions' }).click()
+    const pinButton = await alicePage
+      .getByRole('menuitem', { name: 'Article pinned' })
+      .locator('section')
+    await Promise.all([
+      waitForAPIResponse({
+        page: alicePage,
+        path: 'data.editArticle.sticky',
+        isOK: (data) => data === true,
+      }),
+      pinButton.click(),
+    ])
+
+    const firstArticle = await aliceProfile.feedArticles.first()
+    const firstArticleTitle = await firstArticle
+      .getByTestId(TEST_ID.DIGEST_ARTICLE_TITLE)
+      .innerText()
+    expect(stripSpaces(firstArticleTitle)).toBe(stripSpaces(secondArticleTitle))
+    const footerPin = firstArticle.getByTestId(
+      TEST_ID.DIGEST_ARTICLE_FEED_FOOTER_PIN
+    )
+    await expect(footerPin).toBeVisible()
+
+    // unpin
+    await firstArticle.getByRole('button', { name: 'More Actions' }).click()
+    const unpinButton = await alicePage
+      .getByRole('menuitem', { name: 'Unpin' })
+      .locator('section')
+    await Promise.all([
+      waitForAPIResponse({
+        page: alicePage,
+        path: 'data.editArticle.sticky',
+        isOK: (data) => data === false,
+      }),
+      unpinButton.click(),
+    ])
+    const firstArticleAfterUnpin = await aliceProfile.feedArticles.first()
+    const firstArticleTitleAfterUnpin = await firstArticleAfterUnpin
+      .getByTestId(TEST_ID.DIGEST_ARTICLE_TITLE)
+      .innerText()
+    expect(
+      stripSpaces(firstArticleTitle) !==
+        stripSpaces(firstArticleTitleAfterUnpin)
+    ).toBeTruthy()
+  })
+})

From 93ea26000172920f03e69b2fe6db365a7a54dcf6 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Fri, 17 Mar 2023 11:36:51 +0800
Subject: [PATCH 69/92] feat(test): add revise article test

---
 tests/common/publishDraft.ts        |  6 +++++
 tests/helpers/poms/articleDetail.ts |  9 +++++++
 tests/helpers/poms/draftDetail.ts   | 24 ++++++++++++++++++
 tests/mutateArticle.spec.ts         | 38 +++++++++++++++++------------
 4 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/tests/common/publishDraft.ts b/tests/common/publishDraft.ts
index 8b94985be1..df94edc1b3 100644
--- a/tests/common/publishDraft.ts
+++ b/tests/common/publishDraft.ts
@@ -98,4 +98,10 @@ export const publishDraft = async ({
     const articleLicense = await articleDetail.getLicense()
     expect(stripSpaces(articleLicense)).toBe(stripSpaces(license))
   }
+
+  return {
+    title,
+    summary,
+    content,
+  }
 }
diff --git a/tests/helpers/poms/articleDetail.ts b/tests/helpers/poms/articleDetail.ts
index 033389979a..b456f95f02 100644
--- a/tests/helpers/poms/articleDetail.ts
+++ b/tests/helpers/poms/articleDetail.ts
@@ -41,6 +41,7 @@ export class ArticleDetailPage {
   readonly toolbarViewSupportersButton: Locator
   readonly toolbarIPFSButton: Locator
   readonly toolbarCollectButton: Locator
+  readonly toolbarEditButton: Locator
 
   // dialog
   readonly dialog: Locator
@@ -99,6 +100,9 @@ export class ArticleDetailPage {
     this.toolbarCollectButton = this.page.getByRole('menuitem', {
       name: 'Collect Article',
     })
+    this.toolbarEditButton = this.page.getByRole('menuitem', {
+      name: 'Edit',
+    })
 
     // dialog
     this.dialog = this.page.getByRole('dialog')
@@ -186,6 +190,11 @@ export class ArticleDetailPage {
     await this.toolbarCollectButton.click()
   }
 
+  async editArticle() {
+    await this.toolbarMoreButton.click()
+    await this.toolbarEditButton.click()
+  }
+
   async supportHKD(password: string, amount: number) {
     // Open support dialog
     await this.supportButton.click()
diff --git a/tests/helpers/poms/draftDetail.ts b/tests/helpers/poms/draftDetail.ts
index 032aa1043a..6a7bc69251 100644
--- a/tests/helpers/poms/draftDetail.ts
+++ b/tests/helpers/poms/draftDetail.ts
@@ -49,6 +49,12 @@ export class DraftDetailPage {
   readonly dialogSaveButton: Locator
   readonly dialogDoneButton: Locator
 
+  // reediting
+  readonly dialogEditButton: Locator
+  readonly nextButton: Locator
+  readonly dialogSaveRevisions: Locator
+  readonly dialogViewRepublishedArticle: Locator
+
   constructor(page: Page, isMobile?: boolean) {
     this.page = page
     this.isMobile = isMobile
@@ -105,6 +111,16 @@ export class DraftDetailPage {
     this.dialogDoneButton = this.dialog.getByRole('button', {
       name: 'Done',
     })
+
+    // reediting
+    this.dialogEditButton = this.dialog.getByRole('button', { name: 'Edit' })
+    this.nextButton = this.page.getByRole('button', { name: 'Next' })
+    this.dialogSaveRevisions = this.dialog.getByRole('button', {
+      name: 'Save Revisions',
+    })
+    this.dialogViewRepublishedArticle = this.dialog.getByRole('button', {
+      name: 'View republished article',
+    })
   }
 
   async createDraft() {
@@ -324,4 +340,12 @@ export class DraftDetailPage {
     await this.dialogPublishButton.click()
     await expect(this.dialogViewArticleButton).toBeVisible()
   }
+
+  async rePublish() {
+    await this.nextButton.click()
+    await this.dialogPublishButton.click()
+    await this.dialogPublishButton.click()
+    await this.page.waitForLoadState('networkidle')
+    await expect(this.dialogViewRepublishedArticle).toBeVisible()
+  }
 }
diff --git a/tests/mutateArticle.spec.ts b/tests/mutateArticle.spec.ts
index f325f8d5ef..2e912dcecf 100644
--- a/tests/mutateArticle.spec.ts
+++ b/tests/mutateArticle.spec.ts
@@ -16,26 +16,13 @@ import {
   waitForAPIResponse,
 } from './helpers'
 
-test.describe.only('Mutate article', () => {
+test.describe('Mutate article', () => {
   authedTest(
     "Alice' article is appreciation by Bob, and received notification",
     async ({ alicePage, bobPage, isMobile, request }) => {
       // [Alice] create and publish new article
       await publishDraft({ page: alicePage, isMobile })
 
-      // const mediaHashState = await request.post(
-      //   'https://server-develop.matters.news/graphql',
-      //   {
-      //     data: {
-      //       variables: {},
-      //       query:
-      //         '{\n  node(input: {id: "QXJ0aWNsZTo5MDI2"}) {\n    ... on Article {\n      id\n      mediaHash\n    }\n  }\n}\n',
-      //     },
-      //   }
-      // )
-      // console.log({ mediaHashState })
-      // console.log(await mediaHashState.json())
-
       // [Alice] Get new article link
       const aliceArticleLink = alicePage.url()
 
@@ -190,7 +177,7 @@ test.describe.only('Mutate article', () => {
 
     await secondArticle.getByRole('button', { name: 'More Actions' }).click()
     const pinButton = await alicePage
-      .getByRole('menuitem', { name: 'Article pinned' })
+      .getByRole('menuitem', { name: 'Pin article' })
       .locator('section')
     await Promise.all([
       waitForAPIResponse({
@@ -233,4 +220,25 @@ test.describe.only('Mutate article', () => {
         stripSpaces(firstArticleTitleAfterUnpin)
     ).toBeTruthy()
   })
+
+  authedTest('revise article', async ({ alicePage, isMobile }) => {
+    // [Alice] create and publish new article
+    const article = await publishDraft({ page: alicePage, isMobile })
+
+    const aliceArticleDetail = new ArticleDetailPage(alicePage, isMobile)
+    // revise article
+    aliceArticleDetail.editArticle()
+
+    const draftDetail = new DraftDetailPage(alicePage, isMobile)
+    await draftDetail.dialogEditButton.click()
+    const newContent = 'revise article ' + article.content
+    await draftDetail.contentInput.fill(newContent)
+    await draftDetail.rePublish()
+
+    // Goto republished article page
+    await draftDetail.dialogViewRepublishedArticle.click()
+    await alicePage.waitForLoadState('networkidle')
+    const articleContent = await aliceArticleDetail.content.innerText()
+    expect(stripSpaces(articleContent)).toBe(stripSpaces(newContent))
+  })
 })

From 979c30cd0c9ebb77e81c34a12f555a4db42b2434 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Tue, 4 Apr 2023 13:52:08 +0800
Subject: [PATCH 70/92] feat(test): update placeholder

---
 tests/helpers/poms/draftDetail.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/helpers/poms/draftDetail.ts b/tests/helpers/poms/draftDetail.ts
index 6a7bc69251..9e3863b3aa 100644
--- a/tests/helpers/poms/draftDetail.ts
+++ b/tests/helpers/poms/draftDetail.ts
@@ -242,7 +242,9 @@ export class DraftDetailPage {
 
     // type and search
     const searchKey = 'test'
-    await this.page.getByPlaceholder('Search articles').fill(searchKey)
+    await this.page
+      .getByPlaceholder('Enter article title or paste article link')
+      .fill(searchKey)
 
     await waitForAPIResponse({
       page: this.page,

From 973604122efddc3c2c504d1c73f826d38888c945 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Thu, 6 Apr 2023 21:10:11 +0800
Subject: [PATCH 71/92] fix(test): fix firefox timeout bug

---
 tests/mutateArticle.spec.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/mutateArticle.spec.ts b/tests/mutateArticle.spec.ts
index 2e912dcecf..e14b7b09b3 100644
--- a/tests/mutateArticle.spec.ts
+++ b/tests/mutateArticle.spec.ts
@@ -227,10 +227,11 @@ test.describe('Mutate article', () => {
 
     const aliceArticleDetail = new ArticleDetailPage(alicePage, isMobile)
     // revise article
-    aliceArticleDetail.editArticle()
+    await aliceArticleDetail.editArticle()
 
     const draftDetail = new DraftDetailPage(alicePage, isMobile)
     await draftDetail.dialogEditButton.click()
+    await sleep(3 * 1000)
     const newContent = 'revise article ' + article.content
     await draftDetail.contentInput.fill(newContent)
     await draftDetail.rePublish()

From d30c4565d51bc26852ba1a0815ad30c0a1bc8657 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Tue, 11 Apr 2023 21:56:02 +0700
Subject: [PATCH 72/92] fix(i18n): fix translation on CommentPinnedNotice

---
 lang/default.json                                     | 11 ++++-------
 lang/en.json                                          |  4 ++++
 lang/zh-Hans.json                                     |  4 ++++
 lang/zh-Hant.json                                     |  4 ++++
 .../Notice/CommentNotice/CommentPinnedNotice.tsx      |  5 ++++-
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/lang/default.json b/lang/default.json
index 81973e34de..be0b4600d3 100644
--- a/lang/default.json
+++ b/lang/default.json
@@ -79,6 +79,10 @@
     "defaultMessage": "Likes",
     "description": ""
   },
+  "2uRduT": {
+    "defaultMessage": "comment",
+    "description": "src/components/Notice/CommentNotice/CommentPinnedNotice.tsx"
+  },
   "2uwwz+": {
     "defaultMessage": "Accumulated read time indicates the total time length that registered users read.",
     "description": "src/components/Dialogs/HelpDialog/index.tsx"
@@ -163,10 +167,6 @@
     "defaultMessage": "Term of Services",
     "description": ""
   },
-  "6gOpfl": {
-    "defaultMessage": "You won't see announcements for 7 days",
-    "description": "src/views/Home/Announcements/index.tsx"
-  },
   "77tYPg": {
     "defaultMessage": "After deletion, the {commentType} will be removed immediately",
     "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
@@ -1007,9 +1007,6 @@
     "defaultMessage": "Logged in successfully",
     "description": ""
   },
-  "ntjlWR": {
-    "defaultMessage": "comment"
-  },
   "o2Na0B": {
     "defaultMessage": "Back to All",
     "description": ""
diff --git a/lang/en.json b/lang/en.json
index f799a1dac1..8bcebe2173 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -607,6 +607,10 @@
     "defaultMessage": "Likes",
     "description": ""
   },
+  "2uRduT": {
+    "defaultMessage": "",
+    "description": "src/components/Notice/CommentNotice/CommentPinnedNotice.tsx"
+  },
   "MkwOFW": {
     "defaultMessage": "Read History",
     "description": ""
diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json
index bc9fb68360..360d711866 100644
--- a/lang/zh-Hans.json
+++ b/lang/zh-Hans.json
@@ -651,6 +651,10 @@
     "defaultMessage": "我的赞赏",
     "description": ""
   },
+  "2uRduT": {
+    "defaultMessage": " 的评论",
+    "description": "src/components/Notice/CommentNotice/CommentPinnedNotice.tsx"
+  },
   "MkwOFW": {
     "defaultMessage": "浏览记录",
     "description": ""
diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json
index e45ba2ce67..2650ea5f7a 100644
--- a/lang/zh-Hant.json
+++ b/lang/zh-Hant.json
@@ -643,6 +643,10 @@
     "defaultMessage": "我的讚賞",
     "description": ""
   },
+  "2uRduT": {
+    "defaultMessage": " 的評論",
+    "description": "src/components/Notice/CommentNotice/CommentPinnedNotice.tsx"
+  },
   "MkwOFW": {
     "defaultMessage": "瀏覽紀錄",
     "description": ""
diff --git a/src/components/Notice/CommentNotice/CommentPinnedNotice.tsx b/src/components/Notice/CommentNotice/CommentPinnedNotice.tsx
index 44be73eac8..d13e47f0fd 100644
--- a/src/components/Notice/CommentNotice/CommentPinnedNotice.tsx
+++ b/src/components/Notice/CommentNotice/CommentPinnedNotice.tsx
@@ -41,7 +41,10 @@ const CommentPinnedNotice = ({
             description="src/components/Notice/CommentNotice/CommentPinnedNotice.tsx"
           />
           {commentArticle && <NoticeArticleTitle article={commentArticle} />}
-          <FormattedMessage defaultMessage="comment" />
+          <FormattedMessage
+            defaultMessage="comment"
+            description="src/components/Notice/CommentNotice/CommentPinnedNotice.tsx"
+          />
         </NoticeHead>
 
         <NoticeComment comment={notice.comment} />

From 9d1bc50648e64382203eb3a616ffabd375485027 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Tue, 11 Apr 2023 22:05:22 +0700
Subject: [PATCH 73/92] fix(style): fix comment labels

---
 src/components/Comment/DonatorLabel/styles.css | 3 ++-
 src/components/Comment/PinnedLabel/styles.css  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/Comment/DonatorLabel/styles.css b/src/components/Comment/DonatorLabel/styles.css
index 702fa43ff4..1e90527bed 100644
--- a/src/components/Comment/DonatorLabel/styles.css
+++ b/src/components/Comment/DonatorLabel/styles.css
@@ -1,5 +1,6 @@
 .label {
-  display: inline-block;
+  @mixin inline-flex-center-all;
+
   padding: var(--spacing-xx-tight) var(--spacing-x-tight);
   font-size: var(--font-size-xs);
   line-height: 1;
diff --git a/src/components/Comment/PinnedLabel/styles.css b/src/components/Comment/PinnedLabel/styles.css
index f1f930e677..d648e0e7bb 100644
--- a/src/components/Comment/PinnedLabel/styles.css
+++ b/src/components/Comment/PinnedLabel/styles.css
@@ -1,5 +1,6 @@
 .label {
-  display: inline-block;
+  @mixin inline-flex-center-all;
+
   padding: var(--spacing-xx-tight) var(--spacing-x-tight);
   font-size: var(--font-size-xs);
   line-height: 1;

From 1d9e401104cdd8b32d9269e0b1df3a0ca29e3942 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Tue, 11 Apr 2023 22:31:03 +0700
Subject: [PATCH 74/92] fix(style): fix subtexts vertical align

---
 .stylelintrc.json                                             | 1 +
 src/common/styles/variables/typography.css                    | 4 ++--
 src/components/CircleDigest/Plain/styles.css                  | 4 ++--
 src/components/Tag/styles.css                                 | 4 ++--
 .../Analytics/ContentAnalytics/ContentDigest/styles.css       | 2 +-
 src/views/Follow/Feed/FollowingFeedHead/styles.css            | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.stylelintrc.json b/.stylelintrc.json
index 7eb20a01a1..c1e031e765 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -6,6 +6,7 @@
   ],
   "plugins": ["stylelint-prettier"],
   "rules": {
+    "number-max-precision": 7,
     "at-rule-no-unknown": null,
     "no-descending-specificity": null,
     "prettier/prettier": true,
diff --git a/src/common/styles/variables/typography.css b/src/common/styles/variables/typography.css
index 8da19b2347..cb1bf964e4 100644
--- a/src/common/styles/variables/typography.css
+++ b/src/common/styles/variables/typography.css
@@ -44,12 +44,12 @@
 
   /* Feed Title */
   --font-size-feed-title: var(--font-size-xm);
-  --line-height-feed-title: 1.3333; /* 24/18 */
+  --line-height-feed-title: 1.3333333; /* 24/18 */
   --font-weight-feed-title: var(--font-weight-medium);
 
   /* Subtext: digest footer, datetime, etc. */
   --font-size-subtext: var(--font-size-xs);
-  --line-height-subtext: 1.3333; /* 16/12 */
+  --line-height-subtext: 1.3333333; /* 16/12 */
   --font-weight-subtext: var(--font-weight-normal);
 
   /* Article Title */
diff --git a/src/components/CircleDigest/Plain/styles.css b/src/components/CircleDigest/Plain/styles.css
index d05a0fead6..2c2de38d52 100644
--- a/src/components/CircleDigest/Plain/styles.css
+++ b/src/components/CircleDigest/Plain/styles.css
@@ -8,6 +8,6 @@ section {
   @mixin line-clamp;
 
   /* FIXME: fix cropped descenders of letters  */
-  padding-bottom: 0.14em;
-  margin-bottom: -0.14rem;
+  padding-bottom: 0.12em;
+  margin-bottom: -0.12rem;
 }
diff --git a/src/components/Tag/styles.css b/src/components/Tag/styles.css
index 1dddf0338a..53d0f7e532 100644
--- a/src/components/Tag/styles.css
+++ b/src/components/Tag/styles.css
@@ -6,8 +6,8 @@
   @mixin line-clamp;
 
   /* FIXME: fix cropped descenders of letters  */
-  padding-bottom: 0.14em;
-  margin-bottom: -0.14rem;
+  padding-bottom: 0.12em;
+  margin-bottom: -0.12rem;
   line-height: inherit;
 }
 
diff --git a/src/views/Circle/Analytics/ContentAnalytics/ContentDigest/styles.css b/src/views/Circle/Analytics/ContentAnalytics/ContentDigest/styles.css
index 4d5087a4f5..daa90b5f33 100644
--- a/src/views/Circle/Analytics/ContentAnalytics/ContentDigest/styles.css
+++ b/src/views/Circle/Analytics/ContentAnalytics/ContentDigest/styles.css
@@ -13,7 +13,7 @@
   padding-right: var(--spacing-tight);
   font-size: var(--font-size-xm);
   font-weight: var(--font-weight-semibold);
-  line-height: 1.3333;
+  line-height: 1.3333333;
   color: var(--color-analytics-red);
 }
 
diff --git a/src/views/Follow/Feed/FollowingFeedHead/styles.css b/src/views/Follow/Feed/FollowingFeedHead/styles.css
index 25f55bfe23..28a4b1109d 100644
--- a/src/views/Follow/Feed/FollowingFeedHead/styles.css
+++ b/src/views/Follow/Feed/FollowingFeedHead/styles.css
@@ -4,7 +4,7 @@
   & h4 {
     @mixin flex-center-start;
 
-    font-size: var(--font-size-sm-s);
+    font-size: var(--font-size-xs);
     font-weight: var(--font-weight-normal);
     line-height: 1rem;
     color: var(--color-grey);

From e86fc724aee6d1a7d42a73a8f658e5126a742c1f Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Tue, 11 Apr 2023 23:40:57 +0700
Subject: [PATCH 75/92] feat(test): add test for payment password input

---
 tests/helpers/poms/articleDetail.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/helpers/poms/articleDetail.ts b/tests/helpers/poms/articleDetail.ts
index b456f95f02..51f8f4dc54 100644
--- a/tests/helpers/poms/articleDetail.ts
+++ b/tests/helpers/poms/articleDetail.ts
@@ -232,7 +232,15 @@ export class ArticleDetailPage {
     // click next step
     await this.dialog.getByRole('button', { name: 'Next' }).click()
 
-    // fill payment password
+    // fill incorrect payment password
+    await this.dialog.locator('#field-password-1').fill(password[0])
+    await this.dialog.locator('#field-password-2').fill(password[0])
+    await this.dialog.locator('#field-password-3').fill(password[0])
+    await this.dialog.locator('#field-password-4').fill(password[0])
+    await this.dialog.locator('#field-password-5').fill(password[0])
+    await this.dialog.locator('#field-password-6').fill(password[0])
+
+    // fill correct payment password
     await this.dialog.locator('#field-password-1').fill(password[0])
     await this.dialog.locator('#field-password-2').fill(password[1])
     await this.dialog.locator('#field-password-3').fill(password[2])

From dddc90cff96234737abe6d885483ed5559996fc8 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Wed, 12 Apr 2023 12:32:16 +0700
Subject: [PATCH 76/92] fix(icon): revise nav icons

---
 public/static/icons/32px/nav-following.svg           | 2 +-
 public/static/icons/32px/nav-home-active.svg         | 4 ++--
 public/static/icons/32px/nav-home.svg                | 2 +-
 public/static/icons/32px/nav-me-active.svg           | 6 +-----
 public/static/icons/32px/nav-me.svg                  | 2 +-
 public/static/icons/32px/nav-notification-active.svg | 2 +-
 public/static/icons/32px/nav-notification.svg        | 2 +-
 public/static/icons/32px/nav-search-active.svg       | 2 +-
 public/static/icons/32px/nav-search.svg              | 2 +-
 9 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/public/static/icons/32px/nav-following.svg b/public/static/icons/32px/nav-following.svg
index fd2de5ed67..226b1d2bb6 100644
--- a/public/static/icons/32px/nav-following.svg
+++ b/public/static/icons/32px/nav-following.svg
@@ -1,3 +1,3 @@
 <svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.25 10.9785C7.25 9.45973 8.48122 8.22852 10 8.22852H18.75C20.2688 8.22852 21.5 9.45973 21.5 10.9785V23.4785C21.5 24.9973 20.2688 26.2285 18.75 26.2285H10C8.48122 26.2285 7.25 24.9973 7.25 23.4785V10.9785ZM10 6.22852C7.37665 6.22852 5.25 8.35516 5.25 10.9785V23.4785C5.25 26.1019 7.37665 28.2285 10 28.2285H18.75C20.2928 28.2285 21.6638 27.493 22.5315 26.3534C23.7799 26.3451 24.9754 25.8456 25.8588 24.9623C26.7496 24.0715 27.25 22.8633 27.25 21.6035V12.541C27.25 11.2812 26.7496 10.0731 25.8588 9.18226C24.968 8.29146 23.7598 7.79102 22.5 7.79102C22.4284 7.79102 22.3587 7.79853 22.2914 7.81281C21.4216 6.84048 20.1573 6.22852 18.75 6.22852H10ZM23.3856 9.93751C23.4605 10.2725 23.5 10.6209 23.5 10.9785V23.4785C23.5 23.7186 23.4822 23.9545 23.4478 24.185C23.8188 24.0488 24.1597 23.8329 24.4445 23.5481C24.9603 23.0323 25.25 22.3329 25.25 21.6035V12.541C25.25 11.8117 24.9603 11.1122 24.4445 10.5965C24.1439 10.2958 23.7807 10.0719 23.3856 9.93751ZM10.25 17.2285C10.25 16.6762 10.6977 16.2285 11.25 16.2285H13.375V14.1035C13.375 13.5512 13.8227 13.1035 14.375 13.1035C14.9273 13.1035 15.375 13.5512 15.375 14.1035V16.2285H17.5C18.0523 16.2285 18.5 16.6762 18.5 17.2285C18.5 17.7808 18.0523 18.2285 17.5 18.2285H15.375V20.3535C15.375 20.9058 14.9273 21.3535 14.375 21.3535C13.8227 21.3535 13.375 20.9058 13.375 20.3535V18.2285H11.25C10.6977 18.2285 10.25 17.7808 10.25 17.2285Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.27265 10.6822C7.27265 9.20947 8.46655 8.01557 9.93931 8.01557H18.4242C19.8969 8.01557 21.0908 9.20947 21.0908 10.6822V22.8034C21.0908 24.2762 19.8969 25.4701 18.4242 25.4701H9.93931C8.46655 25.4701 7.27265 24.2762 7.27265 22.8034V10.6822ZM9.93931 6.07617C7.39546 6.07617 5.33325 8.13838 5.33325 10.6822V22.8034C5.33325 25.3473 7.39546 27.4095 9.93931 27.4095H18.4242C19.9202 27.4095 21.2497 26.6962 22.0911 25.5912C23.3017 25.5832 24.4609 25.0988 25.3175 24.2422C26.1813 23.3784 26.6666 22.2069 26.6666 20.9853V12.1974C26.6666 10.9758 26.1813 9.80421 25.3175 8.9404C24.4537 8.0766 23.2821 7.59132 22.0605 7.59132C21.9911 7.59132 21.9235 7.59861 21.8582 7.61246C21.0148 6.6696 19.7888 6.07617 18.4242 6.07617H9.93931ZM22.9193 9.67277C22.9919 9.99764 23.0302 10.3355 23.0302 10.6822V22.8034C23.0302 23.0362 23.0129 23.265 22.9796 23.4885C23.3394 23.3564 23.6699 23.1471 23.9461 22.8709C24.4462 22.3708 24.7272 21.6925 24.7272 20.9853V12.1974C24.7272 11.4901 24.4462 10.8119 23.9461 10.3118C23.6546 10.0202 23.3024 9.8031 22.9193 9.67277ZM10.1817 16.7428C10.1817 16.2073 10.6159 15.7731 11.1514 15.7731H13.212V13.7125C13.212 13.177 13.6462 12.7428 14.1817 12.7428C14.7173 12.7428 15.1514 13.177 15.1514 13.7125V15.7731H17.212C17.7476 15.7731 18.1817 16.2073 18.1817 16.7428C18.1817 17.2784 17.7476 17.7125 17.212 17.7125H15.1514V19.7731C15.1514 20.3087 14.7173 20.7428 14.1817 20.7428C13.6462 20.7428 13.212 20.3087 13.212 19.7731V17.7125H11.1514C10.6159 17.7125 10.1817 17.2784 10.1817 16.7428Z" fill="currentColor"/>
 </svg>
diff --git a/public/static/icons/32px/nav-home-active.svg b/public/static/icons/32px/nav-home-active.svg
index f7c3e32bdf..d68e1d0300 100644
--- a/public/static/icons/32px/nav-home-active.svg
+++ b/public/static/icons/32px/nav-home-active.svg
@@ -1,3 +1,3 @@
-<svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M28.8401 15.6722L18.0901 6.48219C17.5301 6.00219 16.8301 5.74219 16.1001 5.74219C15.3701 5.74219 14.6701 6.00219 14.1101 6.48219L3.35008 15.6722C2.93008 16.0322 2.88008 16.6622 3.24008 17.0822C3.60008 17.5022 4.23008 17.5522 4.65008 17.1922L6.63008 15.5022V24.5722C6.63008 25.0022 6.71008 25.4122 6.87008 25.8222C7.03008 26.2222 7.26008 26.5822 7.56008 26.8822C7.86008 27.1922 8.21008 27.4322 8.60008 27.6022C8.99008 27.7722 9.41008 27.8522 9.83008 27.8522H22.3801C22.8101 27.8522 23.2201 27.7622 23.6101 27.6022C24.0001 27.4322 24.3501 27.1922 24.6501 26.8822C24.9401 26.5722 25.1801 26.2122 25.3401 25.8122C25.5001 25.4122 25.5801 24.9922 25.5801 24.5722V15.5022L27.5601 17.1922C27.9801 17.5522 28.6101 17.5022 28.9701 17.0822C29.3301 16.6622 29.2801 16.0322 28.8601 15.6722H28.8401ZM19.5401 22.5222C19.4201 22.6522 18.2801 23.7722 16.1001 23.7722C13.9201 23.7722 12.7801 22.6522 12.6601 22.5222C12.2801 22.1222 12.2901 21.4922 12.6901 21.1122C13.0801 20.7322 13.7101 20.7422 14.0901 21.1322C14.1301 21.1722 14.7901 21.7822 16.1001 21.7822C17.4101 21.7822 18.0801 21.1622 18.1101 21.1322C18.5001 20.7522 19.1301 20.7522 19.5201 21.1322C19.9101 21.5122 19.9201 22.1322 19.5401 22.5222Z" fill="currentColor"/>
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M28.9564 14.9152L18.0196 6.04799C17.4498 5.58485 16.7377 5.33398 15.995 5.33398C15.2523 5.33398 14.5401 5.58485 13.9704 6.04799L3.02341 14.9152C2.59611 15.2625 2.54524 15.8704 2.9115 16.2756C3.27776 16.6809 3.91871 16.7291 4.346 16.3818L6.36042 14.7511V23.5025C6.36042 23.9174 6.44181 24.313 6.60459 24.7086C6.76737 25.0946 7.00136 25.4419 7.30658 25.7314C7.61179 26.0305 7.96787 26.2621 8.36465 26.4261C8.76143 26.5901 9.18873 26.6673 9.61603 26.6673H22.3841C22.8216 26.6673 23.2387 26.5805 23.6355 26.4261C24.0323 26.2621 24.3884 26.0305 24.6936 25.7314C24.9886 25.4323 25.2328 25.0849 25.3956 24.699C25.5584 24.313 25.6397 23.9078 25.6397 23.5025V14.7511L27.6542 16.3818C28.0815 16.7291 28.7224 16.6809 29.0887 16.2756C29.4549 15.8704 29.4041 15.2625 28.9768 14.9152H28.9564ZM19.4948 21.5245C19.3727 21.65 18.2129 22.7306 15.995 22.7306C13.7771 22.7306 12.6173 21.65 12.4952 21.5245C12.1086 21.1386 12.1188 20.5307 12.5257 20.1641C12.9225 19.7974 13.5635 19.8071 13.9501 20.1834C13.9908 20.222 14.6622 20.8105 15.995 20.8105C17.3278 20.8105 18.0094 20.2123 18.0399 20.1834C18.4367 19.8167 19.0777 19.8167 19.4744 20.1834C19.8712 20.55 19.8814 21.1482 19.4948 21.5245Z" fill="currentColor"/>
 </svg>
diff --git a/public/static/icons/32px/nav-home.svg b/public/static/icons/32px/nav-home.svg
index 6f124ae344..1686a8e6d4 100644
--- a/public/static/icons/32px/nav-home.svg
+++ b/public/static/icons/32px/nav-home.svg
@@ -1,3 +1,3 @@
 <svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M18.0801 6.45273L28.8401 15.6527H28.8601C29.2801 16.0127 29.3301 16.6427 28.9701 17.0627C28.7701 17.2927 28.4901 17.4127 28.2101 17.4127C27.9801 17.4127 27.7501 17.3327 27.5601 17.1727L25.5801 15.4827V24.5527C25.5801 24.9727 25.5001 25.3927 25.3401 25.7927C25.1801 26.1927 24.9401 26.5527 24.6501 26.8627C24.3501 27.1727 24.0001 27.4127 23.6101 27.5827C23.2201 27.7427 22.8101 27.8327 22.3801 27.8327H9.83008C9.41008 27.8327 8.99008 27.7527 8.60008 27.5827C8.21008 27.4127 7.86008 27.1727 7.56008 26.8627C7.26008 26.5627 7.03008 26.2027 6.87008 25.8027C6.71008 25.3927 6.63008 24.9827 6.63008 24.5527V15.4827L4.65008 17.1727C4.23008 17.5327 3.60008 17.4827 3.24008 17.0627C2.88008 16.6427 2.93008 16.0127 3.35008 15.6527L14.1001 6.45273C15.2101 5.50273 16.9601 5.50273 18.0801 6.45273ZM23.4701 25.0527C23.5301 24.8927 23.5601 24.7227 23.5601 24.5527L23.5501 24.5427V13.7627L16.7801 7.97273C16.3801 7.64273 15.7801 7.64273 15.3901 7.97273L8.62008 13.7627V24.5427C8.62008 24.7227 8.66008 24.8927 8.72008 25.0527C8.78008 25.2127 8.88008 25.3527 8.99008 25.4727C9.11008 25.5927 9.24008 25.6827 9.38008 25.7427C9.52008 25.8027 9.70008 25.8327 9.82008 25.8327H22.3701C22.5301 25.8227 22.6701 25.8027 22.8101 25.7427C22.9601 25.6827 23.0901 25.5927 23.2001 25.4727C23.3201 25.3527 23.4101 25.2127 23.4701 25.0527ZM16.1001 21.7527C17.4201 21.7527 18.1101 21.1027 18.1101 21.1027C18.5101 20.7227 19.1401 20.7227 19.5201 21.1027C19.9001 21.4827 19.9201 22.1027 19.5401 22.4927C19.4201 22.6227 18.2701 23.7427 16.1001 23.7427C13.9301 23.7427 12.7801 22.6227 12.6601 22.4927C12.2801 22.1027 12.2901 21.4627 12.6901 21.0827C13.0801 20.7027 13.7101 20.7127 14.0901 21.1027C14.1301 21.1527 14.7801 21.7527 16.1001 21.7527Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.0094 6.76419L28.9564 15.648H28.9767C29.404 15.9957 29.4549 16.604 29.0887 17.0096C28.8852 17.2317 28.6003 17.3476 28.3155 17.3476C28.0815 17.3476 27.8475 17.2703 27.6542 17.1158L25.6397 15.4839V24.2422C25.6397 24.6478 25.5584 25.0534 25.3956 25.4396C25.2328 25.8259 24.9886 26.1735 24.6936 26.4728C24.3884 26.7722 24.0323 27.0039 23.6355 27.1681C23.2387 27.3226 22.8216 27.4095 22.3841 27.4095H9.61603C9.18873 27.4095 8.76143 27.3323 8.36465 27.1681C7.96787 27.0039 7.61179 26.7722 7.30658 26.4728C7.00136 26.1831 6.76737 25.8355 6.60459 25.4493C6.44181 25.0534 6.36041 24.6574 6.36041 24.2422V15.4839L4.346 17.1158C3.91871 17.4634 3.27776 17.4152 2.9115 17.0096C2.54524 16.604 2.59611 15.9957 3.02341 15.648L13.9602 6.76419C15.0895 5.84683 16.8699 5.84683 18.0094 6.76419ZM23.4931 24.725C23.5541 24.5705 23.5846 24.4064 23.5846 24.2422L23.5745 24.2326V13.823L16.6868 8.23196C16.2799 7.9133 15.6694 7.9133 15.2727 8.23196L8.385 13.823V24.2326C8.385 24.4064 8.42569 24.5705 8.48674 24.725C8.54778 24.8795 8.64952 25.0147 8.76143 25.1306C8.88351 25.2465 9.01577 25.3334 9.15821 25.3913C9.30064 25.4493 9.48377 25.4782 9.60585 25.4782H22.374C22.5367 25.4686 22.6792 25.4493 22.8216 25.3913C22.9742 25.3334 23.1065 25.2465 23.2184 25.1306C23.3405 25.0147 23.432 24.8795 23.4931 24.725ZM15.995 21.5384C17.3379 21.5384 18.0399 20.9108 18.0399 20.9108C18.4469 20.5438 19.0878 20.5438 19.4744 20.9108C19.861 21.2777 19.8814 21.8764 19.4948 22.253C19.3727 22.3785 18.2027 23.46 15.995 23.46C13.7873 23.46 12.6173 22.3785 12.4952 22.253C12.1086 21.8764 12.1188 21.2584 12.5257 20.8915C12.9225 20.5245 13.5635 20.5342 13.9501 20.9108C13.9908 20.959 14.6521 21.5384 15.995 21.5384Z" fill="currentColor"/>
 </svg>
diff --git a/public/static/icons/32px/nav-me-active.svg b/public/static/icons/32px/nav-me-active.svg
index 1ae619b182..753d5ac022 100644
--- a/public/static/icons/32px/nav-me-active.svg
+++ b/public/static/icons/32px/nav-me-active.svg
@@ -1,7 +1,3 @@
 <svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
-<mask id="path-1-inside-1_11592_18201" fill="white">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16.5 29.2295C23.4036 29.2295 29 23.6331 29 16.7295C29 9.82593 23.4036 4.22949 16.5 4.22949C9.59644 4.22949 4 9.82593 4 16.7295C4 23.6331 9.59644 29.2295 16.5 29.2295ZM16.5714 12.5279C16.5714 13.5141 15.7719 14.3136 14.7857 14.3136C13.7995 14.3136 13 13.5141 13 12.5279C13 11.5417 13.7995 10.7422 14.7857 10.7422C15.7719 10.7422 16.5714 11.5417 16.5714 12.5279ZM24.9047 12.5279C24.9047 13.5141 24.1052 14.3136 23.119 14.3136C22.1327 14.3136 21.3333 13.5141 21.3333 12.5279C21.3333 11.5417 22.1327 10.7422 23.119 10.7422C24.1052 10.7422 24.9047 11.5417 24.9047 12.5279Z"/>
-</mask>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16.5 29.2295C23.4036 29.2295 29 23.6331 29 16.7295C29 9.82593 23.4036 4.22949 16.5 4.22949C9.59644 4.22949 4 9.82593 4 16.7295C4 23.6331 9.59644 29.2295 16.5 29.2295ZM16.5714 12.5279C16.5714 13.5141 15.7719 14.3136 14.7857 14.3136C13.7995 14.3136 13 13.5141 13 12.5279C13 11.5417 13.7995 10.7422 14.7857 10.7422C15.7719 10.7422 16.5714 11.5417 16.5714 12.5279ZM24.9047 12.5279C24.9047 13.5141 24.1052 14.3136 23.119 14.3136C22.1327 14.3136 21.3333 13.5141 21.3333 12.5279C21.3333 11.5417 22.1327 10.7422 23.119 10.7422C24.1052 10.7422 24.9047 11.5417 24.9047 12.5279Z" fill="currentColor"/>
-<path d="M27 16.7295C27 22.5285 22.299 27.2295 16.5 27.2295V31.2295C24.5081 31.2295 31 24.7376 31 16.7295H27ZM16.5 6.22949C22.299 6.22949 27 10.9305 27 16.7295H31C31 8.72136 24.5081 2.22949 16.5 2.22949V6.22949ZM6 16.7295C6 10.9305 10.701 6.22949 16.5 6.22949V2.22949C8.49187 2.22949 2 8.72136 2 16.7295H6ZM16.5 27.2295C10.701 27.2295 6 22.5285 6 16.7295H2C2 24.7376 8.49187 31.2295 16.5 31.2295V27.2295ZM14.7857 16.3136C16.8765 16.3136 18.5714 14.6187 18.5714 12.5279H14.5714C14.5714 12.4096 14.6674 12.3136 14.7857 12.3136V16.3136ZM11 12.5279C11 14.6187 12.6949 16.3136 14.7857 16.3136V12.3136C14.9041 12.3136 15 12.4096 15 12.5279H11ZM14.7857 8.74219C12.6949 8.74219 11 10.4371 11 12.5279H15C15 12.6462 14.9041 12.7422 14.7857 12.7422V8.74219ZM18.5714 12.5279C18.5714 10.4371 16.8765 8.74219 14.7857 8.74219V12.7422C14.6674 12.7422 14.5714 12.6462 14.5714 12.5279H18.5714ZM23.119 16.3136C25.2098 16.3136 26.9047 14.6187 26.9047 12.5279H22.9047C22.9047 12.4096 23.0006 12.3136 23.119 12.3136V16.3136ZM19.3333 12.5279C19.3333 14.6187 21.0282 16.3136 23.119 16.3136V12.3136C23.2373 12.3136 23.3333 12.4096 23.3333 12.5279H19.3333ZM23.119 8.74219C21.0282 8.74219 19.3333 10.4371 19.3333 12.5279H23.3333C23.3333 12.6462 23.2373 12.7422 23.119 12.7422V8.74219ZM26.9047 12.5279C26.9047 10.4371 25.2098 8.74219 23.119 8.74219V12.7422C23.0006 12.7422 22.9047 12.6462 22.9047 12.5279H26.9047Z" fill="currentColor" mask="url(#path-1-inside-1_11592_18201)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 28.7422C22.624 28.7422 28 23.3662 28 16.7422C28 10.1182 22.624 4.74219 16 4.74219C9.376 4.74219 4 10.1182 4 16.7422C4 23.3662 9.376 28.7422 16 28.7422ZM16.0672 12.7102C16.0672 13.6606 15.2992 14.4286 14.3488 14.4286C13.3984 14.4286 12.6304 13.6606 12.6304 12.7102C12.6304 11.7598 13.3984 10.9918 14.3488 10.9918C15.2992 10.9918 16.0672 11.7598 16.0672 12.7102ZM24.064 12.7102C24.064 13.6606 23.296 14.4286 22.3456 14.4286C21.3952 14.4286 20.6272 13.6606 20.6272 12.7102C20.6272 11.7598 21.3952 10.9918 22.3456 10.9918C23.296 10.9918 24.064 11.7598 24.064 12.7102Z" fill="currentColor"/>
 </svg>
diff --git a/public/static/icons/32px/nav-me.svg b/public/static/icons/32px/nav-me.svg
index c910a0b7b0..e4dabe24b4 100644
--- a/public/static/icons/32px/nav-me.svg
+++ b/public/static/icons/32px/nav-me.svg
@@ -1,3 +1,3 @@
 <svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16.5 27.2295C22.299 27.2295 27 22.5285 27 16.7295C27 10.9305 22.299 6.22949 16.5 6.22949C10.701 6.22949 6 10.9305 6 16.7295C6 22.5285 10.701 27.2295 16.5 27.2295ZM16.5 29.2295C23.4036 29.2295 29 23.6331 29 16.7295C29 9.82593 23.4036 4.22949 16.5 4.22949C9.59644 4.22949 4 9.82593 4 16.7295C4 23.6331 9.59644 29.2295 16.5 29.2295ZM12.3333 16.7295C12.3333 17.7157 11.5338 18.5152 10.5476 18.5152C9.56139 18.5152 8.7619 17.7157 8.7619 16.7295C8.7619 15.7433 9.56139 14.9438 10.5476 14.9438C11.5338 14.9438 12.3333 15.7433 12.3333 16.7295ZM18.8809 18.5152C19.8672 18.5152 20.6666 17.7157 20.6666 16.7295C20.6666 15.7433 19.8672 14.9438 18.8809 14.9438C17.8947 14.9438 17.0952 15.7433 17.0952 16.7295C17.0952 17.7157 17.8947 18.5152 18.8809 18.5152Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 26.7422C21.5228 26.7422 26 22.265 26 16.7422C26 11.2193 21.5228 6.74219 16 6.74219C10.4772 6.74219 6 11.2193 6 16.7422C6 22.265 10.4772 26.7422 16 26.7422ZM16 28.7422C22.6274 28.7422 28 23.3696 28 16.7422C28 10.1148 22.6274 4.74219 16 4.74219C9.37258 4.74219 4 10.1148 4 16.7422C4 23.3696 9.37258 28.7422 16 28.7422ZM12 16.7422C12 17.689 11.2325 18.4565 10.2857 18.4565C9.33892 18.4565 8.57141 17.689 8.57141 16.7422C8.57141 15.7954 9.33892 15.0279 10.2857 15.0279C11.2325 15.0279 12 15.7954 12 16.7422ZM18.2857 18.4565C19.2325 18.4565 20 17.689 20 16.7422C20 15.7954 19.2325 15.0279 18.2857 15.0279C17.3389 15.0279 16.5714 15.7954 16.5714 16.7422C16.5714 17.689 17.3389 18.4565 18.2857 18.4565Z" fill="currentColor"/>
 </svg>
diff --git a/public/static/icons/32px/nav-notification-active.svg b/public/static/icons/32px/nav-notification-active.svg
index 12310c1810..9384157727 100644
--- a/public/static/icons/32px/nav-notification-active.svg
+++ b/public/static/icons/32px/nav-notification-active.svg
@@ -1,3 +1,3 @@
 <svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.2488 19.2122C25.2588 20.1322 25.5688 21.0322 26.1288 21.7922L26.1588 21.7822C26.6488 22.4622 26.5888 23.2522 26.1888 23.8422C25.8088 24.4122 25.1188 24.7822 24.3488 24.7822H7.15884C6.38884 24.7822 5.69884 24.4122 5.31884 23.8422C4.91884 23.2522 4.85884 22.4522 5.34884 21.7822C5.90884 21.0322 6.21884 20.1322 6.22884 19.2122C6.22884 19.0083 6.22163 18.7538 6.21332 18.4611C6.21185 18.4093 6.21035 18.3563 6.20884 18.3022L6.20733 18.2591C6.14707 16.5434 6.04545 13.6502 6.82884 11.0422C7.31884 9.41219 8.15884 7.82219 9.60884 6.64219C11.0688 5.45219 13.0688 4.74219 15.7388 4.74219C18.4088 4.74219 20.4088 5.45219 21.8688 6.64219C23.3188 7.83219 24.1588 9.42219 24.6488 11.0422C25.4322 13.6502 25.3306 16.5434 25.2704 18.259L25.2688 18.3022C25.2673 18.3563 25.2658 18.4092 25.2644 18.461C25.2561 18.7538 25.2488 19.0082 25.2488 19.2122ZM20.4988 18.0022C20.8588 18.0022 21.2088 17.8022 21.3888 17.4622V17.4522C21.4588 17.3322 22.0088 16.2022 21.8588 14.1722C21.7188 12.1422 21.0088 11.1022 20.9288 10.9922C20.6088 10.5522 19.9988 10.4522 19.5488 10.7622C19.0988 11.0722 18.9888 11.6922 19.2888 12.1422C19.2888 12.143 19.2919 12.1484 19.2977 12.1584C19.3626 12.2722 19.767 12.9806 19.8588 14.3222C19.9588 15.7522 19.6188 16.5222 19.5988 16.5622C19.3588 17.0422 19.5488 17.6422 20.0388 17.8922C20.1888 17.9622 20.3488 18.0022 20.4988 18.0022ZM15.5489 28.2522C14.2389 28.2522 13.1789 27.8522 12.3989 27.0722C12.1489 26.8222 11.9689 26.5522 11.8089 26.2822H19.4589C18.7589 27.3322 17.5389 28.2522 15.5489 28.2522Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.4179 19.5138C25.4279 20.4529 25.7353 21.3717 26.2908 22.1475L26.3206 22.1373C26.8066 22.8315 26.7471 23.6379 26.3503 24.2402C25.9734 24.8221 25.289 25.1998 24.5252 25.1998H7.4746C6.71084 25.1998 6.02643 24.8221 5.64951 24.2402C5.25275 23.6379 5.19324 22.8213 5.67927 22.1373C6.23473 21.3717 6.54222 20.4529 6.55213 19.5138C6.55213 19.3056 6.54497 19.0459 6.53674 18.7471C6.53528 18.6942 6.53379 18.6401 6.5323 18.5848L6.53079 18.5408C6.47102 16.7893 6.37022 13.8359 7.14727 11.1735C7.6333 9.50951 8.46649 7.88638 9.90473 6.68178C11.3529 5.46698 13.3367 4.74219 15.985 4.74219C18.6334 4.74219 20.6172 5.46698 22.0653 6.68178C23.5036 7.89658 24.3368 9.51972 24.8228 11.1735C25.5999 13.8359 25.4991 16.7893 25.4393 18.5408L25.4378 18.5848C25.4363 18.6399 25.4348 18.6939 25.4333 18.7467C25.4251 19.0457 25.4179 19.3055 25.4179 19.5138ZM20.7064 18.2785C21.0635 18.2785 21.4107 18.0744 21.5892 17.7273V17.7171C21.6587 17.5946 22.2042 16.441 22.0554 14.3687C21.9166 12.2964 21.2123 11.2347 21.133 11.1224C20.8156 10.6733 20.2105 10.5712 19.7642 10.8876C19.3178 11.2041 19.2087 11.837 19.5063 12.2964C19.5063 12.2972 19.5093 12.3028 19.515 12.313C19.5794 12.4292 19.9805 13.1522 20.0716 14.5218C20.1708 15.9816 19.8336 16.7677 19.8137 16.8085C19.5757 17.2985 19.7641 17.911 20.2502 18.1662C20.399 18.2377 20.5577 18.2785 20.7064 18.2785ZM15.7967 28.7422C14.4973 28.7422 13.4459 28.3339 12.6722 27.5376C12.4242 27.2824 12.2457 27.0068 12.087 26.7311H19.675C18.9807 27.803 17.7705 28.7422 15.7967 28.7422Z" fill="currentColor"/>
 </svg>
diff --git a/public/static/icons/32px/nav-notification.svg b/public/static/icons/32px/nav-notification.svg
index 2333d8114f..c1d782ee8c 100644
--- a/public/static/icons/32px/nav-notification.svg
+++ b/public/static/icons/32px/nav-notification.svg
@@ -1,3 +1,3 @@
 <svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16.0001 4.77344C13.295 4.77344 11.2557 5.49407 9.75794 6.71311C8.27038 7.9238 7.41101 9.54944 6.91652 11.1975C6.11703 13.8622 6.22397 16.8221 6.28553 18.5262C6.29839 18.8821 6.30927 19.1832 6.3095 19.4155C6.2953 20.2941 6.00235 21.1515 5.46424 21.8725L5.46416 21.8724L5.45605 21.8836C4.91636 22.6279 4.98778 23.513 5.42245 24.157C5.84282 24.7798 6.58099 25.1699 7.40603 25.1699H11.3122C11.3902 25.5276 11.5213 25.957 11.7438 26.3937C12.0319 26.9592 12.4808 27.5502 13.1721 27.9965C13.8677 28.4456 14.7489 28.7095 15.8357 28.7095C18.0743 28.7095 19.3702 27.5967 20.0576 26.4557C20.3354 25.9945 20.5093 25.5394 20.6181 25.1699H24.5942C25.4193 25.1699 26.1574 24.7798 26.5778 24.157C27.0125 23.513 27.0839 22.6279 26.5442 21.8836L26.5443 21.8835L26.536 21.8725C25.9979 21.1515 25.7049 20.2941 25.6907 19.4155C25.691 19.1834 25.7018 18.8824 25.7147 18.5266L25.7147 18.5262C25.7763 16.8221 25.8832 13.8622 25.0837 11.1975C24.5892 9.54944 23.7298 7.9238 22.2423 6.71311C20.7445 5.49407 18.7052 4.77344 16.0001 4.77344ZM19.8195 23.1699C19.8107 23.1698 19.8018 23.1698 19.793 23.1699H12.2008C12.1953 23.1698 12.1899 23.1698 12.1844 23.1699H7.40603C7.21834 23.1699 7.11857 23.0887 7.08491 23.0447C7.86149 21.9939 8.29063 20.7358 8.3094 19.4373L8.3095 19.4229C8.3095 19.1078 8.29703 18.7355 8.28309 18.3192C8.22486 16.5809 8.14095 14.076 8.83216 11.7723C9.25016 10.3791 9.93337 9.14901 11.0204 8.26429C12.0972 7.3879 13.6646 6.77344 16.0001 6.77344C18.3357 6.77344 19.903 7.3879 20.9798 8.26429C22.0669 9.14901 22.7501 10.3791 23.1681 11.7723C23.8593 14.076 23.7754 16.5809 23.7171 18.3192V18.3192C23.7032 18.7355 23.6907 19.1078 23.6907 19.4229L23.6908 19.4373C23.7096 20.7358 24.1388 21.9939 24.9153 23.0447C24.8817 23.0887 24.7819 23.1699 24.5942 23.1699H19.8195ZM13.389 25.1699H18.4819C18.441 25.2541 18.3953 25.3391 18.3444 25.4236C17.9656 26.0525 17.2755 26.7095 15.8357 26.7095C15.0832 26.7095 14.5893 26.5309 14.257 26.3163C13.9204 26.099 13.6885 25.805 13.5258 25.4857C13.4723 25.3807 13.4271 25.2745 13.389 25.1699Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.9999 4.74219C13.3591 4.74219 11.3683 5.46475 9.90612 6.68704C8.45392 7.90097 7.61498 9.53095 7.13224 11.1835C6.35175 13.8552 6.45615 16.8231 6.51625 18.5317C6.5288 18.8886 6.53942 19.1905 6.53965 19.4233C6.52579 20.3043 6.2398 21.164 5.71447 21.8869L5.7144 21.8868L5.70648 21.8981C5.17963 22.6444 5.24935 23.5318 5.67369 24.1775C6.08406 24.8021 6.80469 25.1931 7.61012 25.1931H11.4234C11.4995 25.5518 11.6275 25.9824 11.8447 26.4202C12.1261 26.9873 12.5643 27.5798 13.2392 28.0274C13.9182 28.4777 14.7784 28.7422 15.8394 28.7422C18.0248 28.7422 19.2899 27.6264 19.9609 26.4824C20.2321 26.02 20.402 25.5636 20.5082 25.1931H24.3897C25.1952 25.1931 25.9158 24.8021 26.3262 24.1775C26.7505 23.5318 26.8202 22.6444 26.2934 21.8981L26.2934 21.898L26.2854 21.8869C25.76 21.164 25.474 20.3043 25.4602 19.4234C25.4604 19.1906 25.471 18.8887 25.4836 18.532L25.4836 18.5317V18.5317C25.5437 16.823 25.6481 13.8552 24.8676 11.1835C24.3848 9.53095 23.5459 7.90097 22.0937 6.68704C20.6315 5.46475 18.6407 4.74219 15.9999 4.74219ZM19.725 23.1878C19.7187 23.1877 19.7124 23.1877 19.7062 23.1878H7.61012C7.42688 23.1878 7.32949 23.1064 7.29662 23.0622C8.05474 22.0086 8.47368 20.7472 8.49201 19.4452L8.49211 19.4308C8.49211 19.1148 8.47993 18.7415 8.46632 18.3241C8.40948 16.5812 8.32756 14.0696 9.00234 11.7597C9.41041 10.3628 10.0774 9.12946 11.1386 8.24237C12.1898 7.36364 13.7199 6.74753 15.9999 6.74753C18.2799 6.74753 19.81 7.36364 20.8612 8.24237C21.9224 9.12946 22.5894 10.3628 22.9975 11.7597C23.6723 14.0696 23.5903 16.5812 23.5335 18.3241C23.5199 18.7415 23.5077 19.1148 23.5077 19.4308L23.5078 19.4452C23.5261 20.7472 23.9451 22.0086 24.7032 23.0622C24.6704 23.1064 24.573 23.1878 24.3897 23.1878H19.725ZM18.4228 25.1931C18.3828 25.2776 18.3382 25.3629 18.2885 25.4476C17.9186 26.0781 17.245 26.7369 15.8394 26.7369C15.1048 26.7369 14.6226 26.5578 14.2982 26.3427C13.9696 26.1248 13.7432 25.83 13.5844 25.5098C13.5322 25.4045 13.4881 25.298 13.4509 25.1931H18.4228Z" fill="currentColor"/>
 </svg>
diff --git a/public/static/icons/32px/nav-search-active.svg b/public/static/icons/32px/nav-search-active.svg
index 995584d876..46e7e48ee8 100644
--- a/public/static/icons/32px/nav-search-active.svg
+++ b/public/static/icons/32px/nav-search-active.svg
@@ -1,3 +1,3 @@
 <svg width="33" height="32" viewBox="0 0 33 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.77 25.8602L21.48 20.6102C21.48 20.6102 21.41 20.5302 21.37 20.4902C23.15 18.8002 24.26 16.4002 24.26 13.7402C24.27 8.64023 20.19 4.49023 15.13 4.49023C10.07 4.49023 6 8.64023 6 13.7402C6 18.8402 10.08 22.9902 15.13 22.9902C16.84 22.9902 18.45 22.5102 19.81 21.6802C19.84 21.7502 19.88 21.8102 19.93 21.8702L24.22 27.1202C24.57 27.5502 25.2 27.6102 25.63 27.2602C26.06 26.9102 26.12 26.2802 25.77 25.8502V25.8602ZM20.6 16.8802C20.55 16.9602 20.5 17.0302 20.46 17.0802C20.44 17.1002 20.42 17.1202 20.41 17.1402L20.39 17.1602V17.1702C20.02 17.5802 19.39 17.6102 18.98 17.2402C18.57 16.8702 18.54 16.2502 18.9 15.8402C18.9 15.8302 18.93 15.8002 18.95 15.7702C19 15.7002 19.07 15.5702 19.15 15.4002C19.3 15.0602 19.45 14.5202 19.39 13.8002C19.34 13.0702 19.11 12.5702 18.92 12.2502C18.82 12.0902 18.73 11.9802 18.67 11.9102C18.64 11.8802 18.62 11.8502 18.61 11.8402C18.2 11.4802 18.14 10.8602 18.49 10.4402C18.84 10.0202 19.47 9.96023 19.9 10.3102V10.3202L19.92 10.3402C19.92 10.3402 19.95 10.3702 19.98 10.3902C20.02 10.4302 20.08 10.4902 20.15 10.5602C20.28 10.7102 20.45 10.9202 20.62 11.1902C20.96 11.7402 21.3 12.5602 21.38 13.6402C21.46 14.7202 21.23 15.5802 20.98 16.1802C20.85 16.4802 20.72 16.7102 20.61 16.8702L20.6 16.8802Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.6742 26.3018L22.0976 20.8228C22.0976 20.8228 22.0229 20.7394 21.9803 20.6976C23.8792 18.9339 25.0633 16.4293 25.0633 13.6533C25.074 8.33094 20.7214 4 15.3234 4C9.92529 4 5.58337 8.33094 5.58337 13.6533C5.58337 18.9757 9.93596 23.3066 15.3234 23.3066C17.1476 23.3066 18.8652 22.8057 20.316 21.9395C20.348 22.0126 20.3907 22.0752 20.444 22.1378L25.0207 27.6167C25.394 28.0654 26.0661 28.1281 26.5249 27.7628C26.9836 27.3975 27.0476 26.7401 26.6742 26.2913V26.3018ZM21.1588 16.9302C21.1055 17.0137 21.0521 17.0868 21.0095 17.1389C20.9881 17.1598 20.9668 17.1807 20.9561 17.2016L20.9348 17.2224V17.2329C20.5401 17.6607 19.868 17.692 19.4306 17.3059C18.9932 16.9198 18.9612 16.2727 19.3452 15.8449C19.3452 15.8344 19.3772 15.8031 19.3986 15.7718C19.4519 15.6988 19.5266 15.5631 19.6119 15.3857C19.772 15.0309 19.932 14.4673 19.868 13.7159C19.8146 12.9541 19.5693 12.4323 19.3666 12.0983C19.2599 11.9314 19.1639 11.8166 19.0999 11.7435C19.0679 11.7122 19.0465 11.6809 19.0359 11.6705C18.5985 11.2948 18.5345 10.6477 18.9078 10.2094C19.2812 9.77111 19.9533 9.7085 20.412 10.0738V10.0842L20.4334 10.1051C20.4334 10.1051 20.4654 10.1364 20.4974 10.1572C20.5401 10.199 20.6041 10.2616 20.6787 10.3347C20.8174 10.4912 20.9988 10.7104 21.1801 10.9921C21.5429 11.5661 21.9056 12.4219 21.9909 13.5489C22.0763 14.676 21.8309 15.5735 21.5642 16.1997C21.4255 16.5128 21.2868 16.7528 21.1695 16.9198L21.1588 16.9302Z" fill="currentColor"/>
 </svg>
diff --git a/public/static/icons/32px/nav-search.svg b/public/static/icons/32px/nav-search.svg
index 5401290193..51451f7efd 100644
--- a/public/static/icons/32px/nav-search.svg
+++ b/public/static/icons/32px/nav-search.svg
@@ -1,3 +1,3 @@
 <svg width="33" height="32" viewBox="0 0 33 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 13.7373C8 9.71988 11.2074 6.4873 15.1343 6.4873C19.0612 6.4873 22.2686 9.71988 22.2686 13.7373C22.2686 17.7547 19.0612 20.9873 15.1343 20.9873C11.2074 20.9873 8 17.7547 8 13.7373ZM15.1343 4.4873C10.0763 4.4873 6 8.64204 6 13.7373C6 18.8326 10.0763 22.9873 15.1343 22.9873C16.8483 22.9873 18.4497 22.5102 19.8178 21.681C19.8505 21.7469 19.8911 21.8103 19.9396 21.8697L24.2253 27.1197C24.5746 27.5475 25.2045 27.6112 25.6324 27.262C26.0602 26.9127 26.1239 26.2828 25.7746 25.855L21.4889 20.605C21.4545 20.5628 21.4174 20.5242 21.378 20.4891C23.1584 18.7992 24.2686 16.3963 24.2686 13.7373C24.2686 8.64204 20.1923 4.4873 15.1343 4.4873Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.71671 13.6521C7.71671 9.46006 11.1379 6.08695 15.3266 6.08695C19.5153 6.08695 22.9365 9.46006 22.9365 13.6521C22.9365 17.8442 19.5153 21.2173 15.3266 21.2173C11.1379 21.2173 7.71671 17.8442 7.71671 13.6521ZM15.3266 4C9.93141 4 5.58337 8.33536 5.58337 13.6521C5.58337 18.9689 9.93141 23.3043 15.3266 23.3043C17.1549 23.3043 18.863 22.8064 20.3223 21.9412C20.3572 22.0101 20.4005 22.0762 20.4523 22.1382L25.0237 27.6165C25.3962 28.0629 26.0682 28.1294 26.5245 27.7649C26.9809 27.4005 27.0488 26.7432 26.6763 26.2967L22.1049 20.8185C22.0681 20.7745 22.0285 20.7342 21.9865 20.6976C23.8857 18.9342 25.0698 16.4268 25.0698 13.6521C25.0698 8.33536 20.7218 4 15.3266 4Z" fill="currentColor"/>
 </svg>

From be5108d93fcd7c4d8e38788a8decadc90c5813f8 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Wed, 12 Apr 2023 12:51:44 +0700
Subject: [PATCH 77/92] fix(nav): show search & home buttons on tablet

---
 lang/zh-Hant.json                       |  2 +-
 src/components/Cover/styles.css         |  3 ++-
 src/components/Layout/SideNav/index.tsx | 30 +++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json
index 2650ea5f7a..a000082a9c 100644
--- a/lang/zh-Hant.json
+++ b/lang/zh-Hant.json
@@ -684,7 +684,7 @@
     "description": ""
   },
   "xmcVZ0": {
-    "defaultMessage": "搜索",
+    "defaultMessage": "搜尋",
     "description": ""
   },
   "47FYwb": {
diff --git a/src/components/Cover/styles.css b/src/components/Cover/styles.css
index 0280c79fb4..0c2fb53174 100644
--- a/src/components/Cover/styles.css
+++ b/src/components/Cover/styles.css
@@ -1,7 +1,8 @@
 .cover {
   position: relative;
   overflow: hidden;
-  border-radius: 0 0 1.25rem 1.25rem;
+
+  /* border-radius: 0 0 1.25rem 1.25rem; */
 
   & :global(img) {
     @mixin object-fit-cover;
diff --git a/src/components/Layout/SideNav/index.tsx b/src/components/Layout/SideNav/index.tsx
index abfdab008d..9b20f6e7e7 100644
--- a/src/components/Layout/SideNav/index.tsx
+++ b/src/components/Layout/SideNav/index.tsx
@@ -76,6 +76,36 @@ const SideNav = () => {
         <Logo />
 
         <ul role="menu">
+          <Media lessThan="xl">
+            <NavListItem
+              name={
+                <FormattedMessage defaultMessage="Discover" description="" />
+              }
+              icon={<IconNavHome32 size="lg" />}
+              activeIcon={<IconNavHomeActive32 size="lg" />}
+              active={isInHome}
+              href={PATHS.HOME}
+            />
+
+            <NavListItem
+              name={<FormattedMessage defaultMessage="Search" description="" />}
+              icon={<IconNavSearch32 size="lg" />}
+              activeIcon={<IconNavSearchActive32 size="lg" />}
+              active={isInSearch}
+              onClick={() => {
+                const path = toPath({
+                  page: 'search',
+                })
+
+                if (isInSearch) {
+                  router.replace(path.href)
+                } else {
+                  router.push(path.href)
+                }
+              }}
+            />
+          </Media>
+
           <li role="menuitem">
             <UniversalAuthButton />
           </li>

From fb72ab5173d22f698fe12572878d141eb08a1fb9 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Wed, 12 Apr 2023 16:55:58 +0800
Subject: [PATCH 78/92] fix(Search): fix Searchbar background color

---
 src/components/Search/SearchBar/styles.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Search/SearchBar/styles.css b/src/components/Search/SearchBar/styles.css
index 87ae39e625..999a2727ea 100644
--- a/src/components/Search/SearchBar/styles.css
+++ b/src/components/Search/SearchBar/styles.css
@@ -20,6 +20,7 @@ form {
     font-size: var(--font-size-sm);
     color: var(--color-black);
     text-overflow: ellipsis;
+    background: white;
     border: 1px solid var(--color-line-grey-light);
     border-radius: var(--search-bar-height);
     transition-property: border-color, background-color;

From d36d104bd8c990362a3083766c52b5427178f4b1 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Wed, 12 Apr 2023 16:58:06 +0800
Subject: [PATCH 79/92] fix(SearchSelect): fix article search regex

---
 .../SearchSelect/SearchingArea/EditorSearchingArea.tsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx b/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
index 01179edb6f..8ac8582c3e 100644
--- a/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
+++ b/src/components/SearchSelect/SearchingArea/EditorSearchingArea.tsx
@@ -173,7 +173,7 @@ const EditorSearchingArea: React.FC<SearchingAreaProps> = ({
     // Used to match links of the format like👇
     // https://matters.news/@az/12-来自matters的第一封信-致好朋友-zdpuAnuMKxNv6SUj7kTRzgrWRdp9q4aMMKHJ6TGtn8tp4FwX2
     const regex = new RegExp(
-      `^https://${process.env.NEXT_PUBLIC_SITE_DOMAIN}/@\\w+/\\d+.?$`
+      `^https://${process.env.NEXT_PUBLIC_SITE_DOMAIN}/@\\w+/\\d+.*$`
     )
     if (searchType === 'Article' && isUrl(key) && regex.test(key)) {
       const urlObj = parseURL(key)

From bdaf3d57f7e176ec364efd24891225af1b0ad2f4 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Wed, 12 Apr 2023 17:22:05 +0800
Subject: [PATCH 80/92] fix(SearchSelect): fix SearchInput style

---
 .../SearchSelect/SearchingArea/SearchInput/styles.css          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/SearchSelect/SearchingArea/SearchInput/styles.css b/src/components/SearchSelect/SearchingArea/SearchInput/styles.css
index c7a2eaa198..b65b7e9be3 100644
--- a/src/components/SearchSelect/SearchingArea/SearchInput/styles.css
+++ b/src/components/SearchSelect/SearchingArea/SearchInput/styles.css
@@ -16,11 +16,12 @@ form {
   line-height: var(--search-input-height);
 
   & :global(input[type='search']) {
-    height: 100%;
+    height: calc(var(--search-input-height) - 2px);
     padding: 0 calc(var(--search-input-button-width) + var(--spacing-x-tight));
     font-size: var(--font-size-sm);
     color: var(--color-black);
     caret-color: var(--color-matters-green);
+    background: white;
 
     &::placeholder {
       color: var(--color-grey);

From f8bc164b97fe3095b61afc02cd4949dd4f679161 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Wed, 12 Apr 2023 17:24:36 +0800
Subject: [PATCH 81/92] fix(ArticleDigest): fix ArticleDigestDropdown style

---
 src/components/ArticleDigest/Dropdown/styles.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/ArticleDigest/Dropdown/styles.css b/src/components/ArticleDigest/Dropdown/styles.css
index 97b11ebc79..7fb55bdf3b 100644
--- a/src/components/ArticleDigest/Dropdown/styles.css
+++ b/src/components/ArticleDigest/Dropdown/styles.css
@@ -22,6 +22,10 @@
 
     min-width: 0;
     line-height: 1;
+
+    @mixin line-clamp;
+
+    white-space: normal;
   }
 
   & .extra-button {

From 355fe0a8ea5b0e2d5042d24417a580e5bf744089 Mon Sep 17 00:00:00 2001
From: bluecloud <96812901+pitb2022@users.noreply.github.com>
Date: Wed, 12 Apr 2023 17:32:35 +0800
Subject: [PATCH 82/92] fix(Search): replace png with svg

---
 .../illustration-empty-search-history.png     | Bin 10405 -> 0 bytes
 .../illustration-empty-search-history.svg     |  52 ++++++++++++++++++
 .../EmptySearchHistory/index.tsx              |   4 +-
 3 files changed, 54 insertions(+), 2 deletions(-)
 delete mode 100644 public/static/images/illustration-empty-search-history.png
 create mode 100644 public/static/images/illustration-empty-search-history.svg

diff --git a/public/static/images/illustration-empty-search-history.png b/public/static/images/illustration-empty-search-history.png
deleted file mode 100644
index 74b44cf9d05195461b63d9d772938e52b06328e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10405
zcmb7qRa+ZO*EQ}Mv`Dc4!QCnD8eEENaJRd-mO#-W!JVRoLUDH*putOVhvHuR?eh=5
z?_kfGnS-_W!JfI+T(jcATFUr1R5(aTNcgHM3cCMr{9lY=Vf-8Aa)yik0k)@#i4PJI
zF3JA_87U`^^4})1kFK&DQvDRo;lBl%qpYSZ5>jI_?vph-5)w#URY6ui5cwoO$dh_8
ze?RQZZ<|pTFz1wyu`||4vRtxbHpQ%4;JT&BpZPR8R0aF>dH*ZzD95-&yvUU@S_gYZ
zT@{p>)$7}L1M2bgah*<sOi~Xu>dJ+(g>fxmFHUy<V3oJX0Q*&7A1Zy)Y3SACJ0u_$
z3O$k>BO<V{+5z>`=}7;}?b&~r;c~@b5GhW~|1&6-^MXNt#@70onsIm$79-z@tfYJ!
zJQjHc`DjR?;sa=oZO5Z=p=Kyn7x{>tgCg)82}^$Z$&zEF*oIx>>NoOA%q);;4zD2Z
zk2KI94D-JS7Sl0jKix<w{7O9O%pMT5xSQT-EBwKyQ5Z@l07a9YfJ-vdn@E;m?Uk#;
zQu}}wQCO<7PpbvPP-B#Yzv7|Sg7<X^=oWr8xfO?@jD8ADlMJ{NY5vXb8~EuhmO7qf
z<E~!6?&BGCaB4m4icyLXao@eWb$MZ&2K_5jHV459axBsWvTti_QG`yWf(}5h2{J$E
zQz09reD2ZktLKdo{JfO%KksEQeWfS_6O8xa>duYaYX{8O$o3lOonrWoiaSt8>B5^Z
zEX2jqpvrhw&`D_GCQ&8Z>IIb*Gvu-5R&oD?^CmjeM)(J<azEbIhy7vdtumyeaR*{$
z0%icU7d;bRAyP;(5&3HOF1nf&5fr`W>UTVm;{rj~*kDEhNpgPER}z{~vq=)_ZL01`
zrl4FX+BWBJR}=<)e>jUBI-mhfIvxdEZjW(Tq6cgLMCohqZE`Q&an(*9hy_9OpZ-oh
zs(C}us6&%!C<x#K=Hv6w)3#<g+LV_r8@3Fb%8w&J%n+IIFavVKDWnHus#ikI7&9Ag
zH#3nO8D(68rBYVEzn{Iw-4QnMwb4V2`#71!y24)fybmXr0dii~w8xL?YB#z{uAt8R
zH6JBA!q>ka4&am_8>GcN&)1kd6Rye;Z4u~_1da#l(m|(KoP26P;SC8p#q4>)HxXF1
z`zMdTyF)P9{OMg}PRSnRP$AX@lWzgMwe9`BY?Pi6@G988P3Vuz(wZ2!r9<J?a$kUt
zJDJ1Kc~HR^=Zn>8TeP*zfM6VqNJsK)DlY74(BeLFcDU~__)RZXJUgCxB2@J_eB=H?
z=6bwtxsYc?aeL>vFPym{DI&mk>Ms*SGxD$K27*>vPRNQgsxj7{RzSlCM3IN971z%T
zH^fDY6U&S?<HFUTGfiCDV_l)i3E^aVAc1}PSRnA<YsmHa!D-03(d$zbRt09kNau~f
zmr=SCNncOu(790DY`Oq!W<595h9Qu;4XT2}h5g%vk~f^+KnG&h!Pc~J_e)l<>2@s&
zH=eh@q5`f$NB$C%YVJIKeRVkhP-%fZ<5FQgktdL~$u8P0edZ<FE6XIM6yzjNzs(d+
z7&D*y;W_MSa=qAnNcL%`S-bDVmzD_S7XH-+mQ1_a{UMa)gr!u$M&LZ@jOT{RBKY93
zFY#z+u9+)vzL0%|kP92ATV*k_6e_u1RB_~ZW%<*g?GoG3nU1L6cxU|njALDtbxMqz
zqQ5*M^4P1SaD`KHYpF17H=Y54^tsa>w@f{XLL%#=LT#Qua4(ZGqk<I|2L;tupy=qq
zBKT>e{HXLLVezYaaa+EYai<MB*L`LbcAW1?*>`&N2nEkWj+;XeFS2)g_AO*DiWe~6
zvjUfXJ{sNJEPM)|qKI`hD|ecC5JdaeE8*^QZQ>bD;kcaCpD_=|1z7DTy5e54t@7pG
zt^R2GlsZu+_VS(ZPDhw6G435l-qgwc$!A1P-%<ia@#;w|_g9fKeCsoxudn`37oE~N
zCS57S``|V5uopPt>v3H3?_`ta6@LfV0<s2jVPBj5_$t@DKODo(1-P1x!qWQj^nqC8
z(LHJ+AJ(F`%n{aa?OiC{b<c7VHLQ%4mK#Meq+<>Hj6Uef6Bg0ZZeD-T-RdC~`;%@`
z;;k)4;APEwsURYDtFxl(mdJyi6In&N)h-*c4v38e&f~bz%lRKsho*z3(q-mbYebJx
zsD(P-(-TKBrggjyV<YzZeJSY=Db5h-^i@)R*bR}8V*eJyyLIRdadjyv#_Dt`M^><r
zk}@BBs9;3K)Z*ImW&aF*6+dx5#CqDEdyH(p^LUjs+?CVvcy`)x7W5@$|K;huDf%=j
zJTI>Q+(YX*UMiigkOl=Fh&Sf94J-J>^3m<}>MNb)Ou;91&sOZ$!!;?+l=G;-tSR#b
zWc-@5pI!cpWk-_HC=4!X<Kfob3fwS_?4O68k$9P~30_sSS;*lJDST<KyGjV{knN>8
zC#O|TT+iJDM>iOG{dxAa{MM>dm7a1e&S^QLQKkM>73=FrC7*HSh7&0FWI!AFXCL5S
z!!o^uF8f!n-0T}HvKe0_)YimM{3UvL2nh@GShp~>2-&Zz3k%$z)MU!yNnKB-0Dg$b
zi5ydFv%luE*5Q;NRt=J3BW3skf_aFY+uu&cNKv;(gHn(lJl8+(?<As8Bx!2PpS}xy
z*?lF-l<?7-JRUFE@Y#!FR%(AQ45Tjo%O^WO_-!G|#k1LX<Y=={Qn_X|kPRG0*s(>Z
zTaV|$0)qypwjo9Nceq>hB}f{{&^-NFEnGpi|GP&0l~@1J1XkkUi6!#P1zsmXe$TC_
z6cBPWOZXPP9=6Z$oB3)ftHZEFp(LE=`L9?90l~&<h_*X531cMrcCqev=viSJ?YG+s
zF5Ab$D+;Yd?N7M4dI(V7TkdG-<uah1wN+0DoZPvWY@)-2VNlTDs{fM4y|m3%q9QsV
z<R+?66ayc6qSwb0qjkrd{|>~@rT<~b^~$S50zYabIVX|sgOw&d9+%pT3br5vs{3i#
zLkykWb8@N7TRL_>JcsXJT4YUl0Si+T&*a@eh7u6bgWF*MLD9DF&dm4e!B$So1s+1X
zb6itw^#%VaKK3<AMkM@1H`}x<?!40=r=5u+#FDByMjj$}9a&{8l%j32nZSDxtJ`;T
zReqEw<_QrArmhx_V~RXnG;8w5SYfAj1nb=@h-XZyjms0rL(xNTMUn$b?Xfn##Zz&2
z&=Q>c1wLBu4Y?AUrV`EaruHrQr<4-Kzb}qxELX9hx;L75Y)UUF3X>N*Us%$%xxX2M
zJ^#xwzudQu=d!)D$54Cr?@Ey!p8#OPPdw9xv1WZZa}>gQBuD~nk&+q{$wr>e&+|ij
zYgf{9GlXa6?7~EF&|UZj3SHy|(a$0=M*JD?$t-sM64rd_Gr;>MUgvCpLq)C29CoI0
zb;D>!ZMf%5`Lc4``*29uXX9Eq_1(fqiJllL|7H9otZRQZu2HuaZe!SrT``ek{bz{~
zKe5gx&C<SBhKO8sq569J-l1jJhVr_V@O_T|KnovUmfJSnU@bZN{0x3h*R6Qne?s+c
z(;Bi~=E*S>!Xy)SvjJ-{mW5%2zx_t1&Io(x*WweEzm9HyJKY-6hcO9z0q6HZIvU`-
zZ`Esjt_OuXR9w?n#ovn0!u=?tbJ6x533GFVt&|(V@7bS1UwGEZf8A41FWmnVI;up&
zx6hNq@bmT8C#~r#*Z1uxJx?#oRxzWr7|xyc6&R8(Ei>C@Isb8tuzoF8k<(tesnSFg
z{Zaz<QU!@b-vOmp^o@U^G(JY)=f?H1XjrC|reVnVSg$Hv@AW#oQO%~rm-YTbH8jc-
z=~QMl*Rat$@^pD)K6TYl-icZv$n(^yj=~b1j)tP`dQb0qob5y(B+5!&-N*C{QmH;5
zl#Q~%O&ya7A@&+8v95h>I$AgKdMsCB=6hhNyEV=vn`otJJow=G{6uHv{6~Dq&@Dn?
zk)=V96;h>o&~=VOleofo_js3t>zS2V_4o-F^NEuzoA`&`oqOsLCxdze>#|YU21pQD
zlQnI-SVJa%?AG_{&&b;v0<STf{-21&33BG36E0J9zDGgU&Vc6?x{crW>rtD>;nS0y
zU>a^u<)4v#egm!8ZLnyjug?T5_{ew8rJlXpGZT$QG4FAh*#z54moc?NAX+~yi?Mr_
z+aIQ4d)o!OR6q+>9lzoa<$hG%$qWt*c-eX%)%PthpS^;)nz%E4v<Qa|GFmrh4qwxQ
zf{&hwEd5z)U#_H!(P1geTkz8q!`*;N?S5(pk*;LzKKTRh-K&nnsO`fW#JKMH31Jx0
z?~aAZu2>4oAu@G08~m4CAy@x|q2j{^X}u!|MilFlTbEl!lb!&BV1DSvyO>^Yn$=nw
zJK2wA0bI?W>=kB&Z(Ga^FLvijansuS-(I#+uYUa`iNU?XKz@?L1bABaA6-S9_nOE<
zcZ~Lb(#V(}lOgOpd-hchcKRKfSQyijZW>WCL|17Al2@lwnyIGWzshloQFgqiF4^Dc
z@$u+?+%%oO3TX7b4bC67Si{2Cl8@g}0qwXfeqx%}|3Qsc82919tJ_yKnu;hB7F0CZ
zP1CXH7NI)fz-+TPZ8MgQ9s|g3WLK!RrOk$W#1-h1igPD_4o<G04;Zsw`;dzb@ugA&
zo^%9#iAQJLG%Hn#)MN$-2(c{YIL_yt<eWzKweVOw9Nl^1qXq)hv^d4m*8KR3D*cpG
zeS9QGf4rB*gD*_c{Y_PB6i81;90(?=@K34^X+gXd<XI`8w!i~9dypsQLH%ja*RQ|+
z5+9iQu~vkC?Z-Mp+wUBe1qyg!+qdE{Shp=_$&X$x_q9GeUj|LzX(}}|6h<mlGAN{}
z9#P3QU`j#M(4fpDYGfo()a`V4(}Qv49+bl&w6bZOp;ZnmbP7c54Uvc`E&dT}(pKZ>
zu|zRCAD|S{Uy;MeI!na3X(|q>e6ghLdd%S?(?|gyZ21KmmY{oPtt3aws4q{%l7X=^
z`S1@9k0>$UAUHYORm#Y$M@p@ja<u4S%?lHb6}X~goj}DBu`Xk&!|-95%)x;_T~0$f
zKp#{;IO%?IzlnD$ue)FfO&TEwAGrt9Ak6hfYt`{?$D<NAhrHt|-Ks4%;WV{mE2n1X
zK00G0L7J;Bwn6tQI<=RhHE|HJ!P(t8yeZp2Ouqf^e4S2OMvuWLFl7lShM@l9aBPgU
zCZ#k!t$_BWe1uKP{1+m?UixZ)@GZ^hP+C9-yGWmpz`!2C{*qt{SjMnNaafNwg?>yZ
z*QA<kY>!7!vAPTSKNeyCxLoJPXi-c}wF0nzc(%YNvv+UM`dfq&WUz!p&GV-feL9nY
zq-GeOb`DsWyq>?nlKO3mp;Gy*Z+ZiXh8s&CZ-0tpsCQgPNFavzCr#gHCl6bleN~=P
zkZ!W}8Fp7^O3O>rTpNA!>E}l;%u3FzQvB?_RAk9*({Woayp<T(fISu7gflkI2HPO>
zkf<PoIyWHoja%s-c0a+?@B?4K?|cH|r8UC~uSQ?0dd=Y)DQ-8D^R>TrilaKO<fJ%)
zonY^=J*Fz`_MO27IcX0|4t#&xLq(f-lEkKJh0DG9Bk%Ex2m_8C-4n0etboBxp&ANF
zZW`J+Bc2I=7RFRp!p|OEYI67M`)hAsSLy-;4J7KF8%pV+jXQkt8@1Kkd3M;BJid_y
zmI?oIpH4u~xV1ieSY-)MilHzZbWbHF^~)8hf9o~C>}n$USNosKAD7kLxU%)S(<ite
z?SeZ3WjS(GGT+tD9pTbu4OhY()Cv3@S*aL1?M(%)5_qtN(T304&Fzz2e8dwx0z`kj
zHTu)VvCN*}2*KlVhND9(${7?c`|8dJ2aZ+3?TZ8Z&W>_g-P|1SZxwwTDMq-YTB)B_
zca?wnLVkB`|E8Tse_l#5hO(4fKcpMSHmc9wq-T^xNjHb$*Y+g{CV63)AGk<#gRy-Z
z(~ZXrygidps*W+VM^iy#<#5`4M0Hy)?*gvo0<k)u`ryZ%h`#*I|H%{ENPI)a&oP`b
zY-3xTc79M<#;TG3b_TOs&`CAb<qcL|S09$+BI2d4cLuFEj_0o{<{@nkY(P>t?_>3N
zARAQ_u%ofDD%(tB7OfMJ;?_EL^TTk<4Fxx95=J=+?Xr%nKN9>Utf9b4&$s%QsaRi5
zKB+U~<Z8_qmHl(%(o{$u+&7piFWV;I!-|y&ido+HD3AuT;#f#C%AtaR3wv=gS2$*1
z66r{WwQt0@f>}{Ed(U;<51_@q^tZH_Q(-WE=kNXOa|^C-{(^M_8<40Vi=c8Ji09qz
z8^>+l;83}_!Zr0b3YO$@8~z`=RKwmBZ!=Pr{)n@vIcxzRNLq8b2E|t&Gyxd$dTBJ-
z{uyy^;KSQaHe*RxsR^!;GgR1~q)jHmXHM$}k2zKn7>|Xo)_pwwjNT+?y`<B6C}!W9
z=gul9QT=%ON$%smbf>isktvdPr}Bc*7p(!YIA3vmJrX_srd{JAWG4XxnDG!7twflO
zQAxV<;x-gQtU|d)z(eUIzo2ZB&ga=~jyQG0lt6e!NW=yW){ZM@dMK)ZPH1n56dCaM
z-K{ld5}ya+hF30Hf=79}cjH)MXF;D5S8<>tB-l6lr1(O8xmdGh#hLY(JEk93+tJaM
z$wVqT_-=nawBzUQx(LLTf42btii~y5WW=)-nH8$-5Rm3%0}-tr!{Oi<_{nqM$TA@v
zo!IuM#LrNc9FGEkq8C+51k-mki%XWPM9dn^%@Srj9E`_m+KrNFBG@n?bVL(59W2$k
zc`Gv#!^Ta1m{|-T%>HHS-uv51S-SHjL}-%lrTr$CQ1~kEG%Zn0e?1to!B*{)f*Vyc
z$YU<L%EWov+IQ)-G2JF6rq4?_c7B0)FW<%Oo`YpuYki~^BqkRntHMkoRk>WJfTBsC
zM)PfP3nfZ1<wmyn+RI!TMQF-gWx?t9#}nrTSoNQXQgd>oXT;NF{U5p6k7c?lptj#o
zWZ#siz-HYVIYo_xex!Ca#Fnv~1$pSC622xylv{2&7)i4~OqlEa3`**5AN8KhL^cj6
z!p^F~s?8NMX2?GiSXgTyrh$u3w7<~(&Wx9CScoca(^#C`-M+P&bSbv${b$;7E0@%r
zbh1Gr5P2*dUb48_NG!O2>^mzc)57--N6Fc2D()A1bD|1qMrzwF%XhyprH=srGM98S
z*tnO9M)XcusXs*`Al@ccGUC`AVmUdFe!?MuJ+!lfrJ=mmSZAys28gkHm{BECnz4+R
z!SV8Q4WIf>m*pZ+!a0s_#qL`+ic%NnB~}!ZETEY*?u@OcCC<+2LV2cT?O|oKJwf|L
zY#iE!Cp2&)>|{dY)+!Tx{YlrboXrPW4d_P?5Z{{hd)8sGsvINb3wcA5fB1v_+ad;h
zDroB4Vd?l4k1lJI^~SNMc)rv$t#OXnWcuP-$$Y4~ai}qH>h`@%fZxE-@T(Ds6zZMh
z?O=le&4J<39@^(<rC(pmnOnuhz(RYN8eFj40aZu3^v@Ocw2|U+FkXP#nq<NkVz<SP
z<d73e!8d9^A#j-2ge|WdRq`qXF6V^>kTE*qe8>Aqw2T)^TgyU*BLyawxB^=3rjcB2
zg)arvL`3t4ZYoTbU~wLw{_<QGi7grjGghH^*U;p|Zdn;%wti<IDAT-hB8B6#1&(}u
zfsF_UEq$Bm#-7k(9+9`d3;0h&pNkwojjd=LtI`gDqr8vOH0m;7tV&6|K@f1sDmM_B
zX3*ZWu%|Xkr=iZBsN~q{WxalM*Rj{DO}D?Oe`!dRU}q-l#M8^N{8Za{R%MTf2BqrD
z1n&&L%QT*WRrB6bX!B1Iw0Qhw<jhomy>!DPq)Bv{dai)2S;F;aKaW?l>`M6UCP#6c
zh1y{XGN=J@iKv6Tq$}(r5lBTIq(k#ETyn&WSk@Y%o$2ne+E0;<bn%KK`t#T^_|~wV
zpG^)Ng4Ak2=4|m-+$Xoc$>*1U;!HQWHSRhtw){72F<*Y=b)Y#~kdWtKMk!@uSZi(1
zqPf2h^gJ|;=6~oslY<U39BTM>>bie}`sE7e+K_7BJ#s7=6lu3&D*|F!<m1b*Anzc~
zhp6At4(9gaB|`dy&T8q|-z})w%uB?Y#%HX4)h&+3xU+Tmflu||MDy#dp7G;_w8h<8
zEEx{E2lAfnn!z2-KO!;`T>1$5erGfr7@NxIXt}6aJ~f#7JO0V|*rlj>pqO7|2DAhM
zZH-~POP<l4rFdBkcYLPU>y@I6hPzV~ncKX{QVX6fix~4jaCwP)Q#Fm5e@ijO7(u&|
zCn-@#QwCnEKe?bQ#++isGx2%hPxu1F-Is8Fqr9P$=T*sJNz`I>Y^l3!>#L(Mrl}~c
zY(c5}0jvOz3Vi>Avg2q+RDknOg?emUExEzkw!MW<`!r>zeldxZa;Y5u<~=BQjL7Ph
z6|`?6-F3I`r^0&ibN7QRxMUm`=1|29%^7$$e~q{$3;5jp7MKXHAYtJ&=k}(?v1cca
z<4EPBOxBdEjOxeuN-fpgf!kq*zE6xX(rKhV%t6e1pCnioTl$5dZW29HAR}Ia^Op~k
zS&cX6hCg<ciG;Y}+B-DOSb!=yX*?Zn3~o|0BQK&LsR#3L2q-GC5D_rHs(1&F-~M)(
zmJIh|=EvEuw}?~_M-SjS3)ikaDd5Pwlq(kh(egJVV5G5RH6ar<9ba9*A`_M4iq=Ki
z;z<$N@m-B{AhjUFk5xIAsn^Jt_<l7s05yK;hYXq54+g3cLopa<Wxwg!*l|~k0(jzf
z^Q8hkuGzaHY{W=D^*>V^_L*~t^Gg&xmbV)ggSjbux>2b5kUtmGq0it7Srso86K`T`
zE;<)r3FcD{`;;fNo1t)qN(-`0O5;y6GKeJjtR+(zFNp#z>CNt}=G!r6JFm<+y{p!=
zTIEgkvzAJ9mO@Tw5vR9(H{)J`to-P92O|D~{1V_$9Mne}7|%!$VJLU6y}opOr8On5
zkQg)F?1cV>amA!z-4(R0%Z0CLe`+1bX^r2!df8v$@+({31kiyxI1url_hk+#)^rki
zw1ni<Ed#E%_-aeh2ZJOsh|Y=@>l2$VM(77GJTt1SMjVDF%m3o=4sg8!>X4bpvTW)}
zb3Q>8rl*$}6xC7;ip7*5x`+;qJ|_CPo`+M1JT|M?%u|?X%s<&+>d7F&L6$7XFU(HY
z$xGlBxF;f;!;kj#>eUE}*g5Z5-njLHnGjmMZ70}gb=2!OJNq1yCMRktloi0NkJ@fr
zAe>B!HJPK1GCnCF=hI|_%gh5J%Zs8CVj0mAsmskMo$owzR}?v#_LczWh=>LG?X_1v
zhA7@W&MHu?<>o}5|1waans1F^kLLW*v0JmVou#bgXi49y&Qaj(ACwh!TH6)lE}l_f
z%cUZ?6MEReP50i=@6G%D6&7~6?5c=UiL44HlXp%gsbf~=vlhk>>FOwBhrJS34&8}K
zMh<V`0_<RX-vFhO#m$Gg=q>@C*yV*<%+^6{qixl|?T6ZgVLuNYm$duDnj&4uo>}Ay
zcg}taia!8LlOV^dmz@H8*vTy$1p{VEL@ar9dh18$?kvKg%<(?$C1!>58>5o<?N-@m
z556%dDL`{*LlSDwNE|op`S_5yeDeUYpka&()SiC!Gx{*R02Fa0ijU+}(-LfcxBs6(
z<lZr9zKaw$Vil)2S!g4^TqMYFRd4p=(<c>mj8i*BcI<^uJFfH-Z5D#$4E4YSOt_sv
zz1F8e!3F8e?|$K>v2*P9U1K?kR%ZMK8b9Z>vln7v^;;-F7aJ=UcZM<N6m*6Nutr*x
z!*qFHH_8{-UK4y_<*rr&S*PVRs)Yu>$$(2Wj5)t@=3;EZHqJ3<I%Gtbd}!j*ecaBQ
zYK@w%ZmAkf8$&scyTLYV09C8Qo=l-GgsK;NPL%9cWK|U9JIr#ShHR!BCp|WL9G7Nx
zPmBx>x8$j?e`mCl1(oN>`}mWt@;Dfh2kg}T$QTEeP5zi|9)eD3j2!&%wV;hQrEHoB
zcvQ0?@op0D5T_T*kG>caRTwSt{?EyyvNf+JW?}F@;axRXmywr0-x1K$g(<aKm3o#m
zd7liTcw_@vL*`7ilE+>2!pd)K`OAFFwWT$gf_pe=4^>z?PpCV!sy&DVhJ7n#9WV`J
z?tK<9=BK{oN6GHZo-oQt@{)1|#+swPTm5f5=qLA|o%^x@^CGUpID%%$ntgUQRPKkz
z^&rFIHakXx6nd*&7ygV97MLDiJ848Lege)2#zNR}m18lwlTZMhkj&p?vOI*M#QbY_
zVD`|RC`CJt?ZtS^I%b_}Wm5-^s0qo4i+hm5)<>%qz7%g(;qTQlA2YuJVSoM$@meUR
zy)h2PiF$A{Ui{uwYjEgo@OtLm!jrD)Tpc+SVZt$(AKdaL4yjs%iz&^u&*JJ>vs{VP
z<fK}gS_kKNyc%39cerI!drfNB%<g$(b^@;<#?C+I#k{!gc<dp@h$+k9R8>U&z*g&f
z(W0Tn*;nW9Rhu#ANIsQkV6wW2N;twG1~>%Px^v)NQ-o@Jx3XhxTt!|kj2RoqtAC6}
z@yAoAtJ|ZrK;W%uWF%3K<;<xA(M-syYkb=z1r*1GKtlr-34)#q%m=4ax{NwoU&0L=
zfl@47s=E+$x8|8yTjsm&!J5J4bR|t#y*IccyZXi)lv$ABlkj1nR)apeX%ch1%H@9Y
zAVajeh*_b;$<zRaVJt1BCatppf^hV1hYEQDvyKY1Xf0?hgOAqb#;ScAhg|n-I0ve`
z{?lHUpEbABR2jCOGWMKQE_`4G>no^#L^H3$ELOYZu7$ackKgq*)duR_ONi6(rtu#A
z@h3hpRSJ*65<s5cfE+<9(i)>6Vy@HtcMdj>;^SqB%FfhN>B0BGfNkrgxK7eLzs?;+
za~>MwmF1ol^tDKaILMGP(R{{3z8gIHEVJ{ojB^ngG`_oSPOzEa{_=iU)cQ?IVrD_@
zctXtZ&syI_MG!FMANKR_KZT`c)K~e+_R8{rsz+WJH@p4>0x_|pp<ef#cADODOLK;u
ztji}>=lAo&=!}?=UuK|o)_rvrVEs>Zii~=_d5dN;z%P_pg#;`vfX)Y{C0i8`o#mdw
z9o!_tfZ^zZp^yZ9>)$u)_??oM@gepXvXQ@)0#WB|)%~XtorEr9?;5biasq>oc0A?8
zW*RwWO4>S~?326e%(K*i_Wivh_#ex-DAlo59QB5QH~>;ICXv8q^qM<E?`A`eG<mK6
zpz3fDp(>2`321t~-C)cw#q{mwRli*8fT7QBOZ>kKO4L21Ru6<j#tx&0>2+<dG0Ee#
zG4rGO(V)=A@14WZ2QlKCho%BwTP=_O9Px7nmoh{c<7$k8*%A{JO%@D?))=jWapzK7
z?5PuQ?8Ps+SFr5x(z;AVBEq{o`bun?4ToA#9rVKgAbkInS=^=0SB~;bdUaz_=~mjF
zDDMe5R+0U%8Q1^%#ls5_U#4km5@1CEVjrB!93u3zt$0hnm=JmYR7)ZB{*81PN(JIu
z_Te98=?U2kU#E9=c)9@*L{j0o63p^Vw#$9yz5TO<;Nn!2hoKz<l~KoZMYcp8NbzPI
zB#)a)rewu;Dl*!t9OM_{K0o&fFhaB9p0Qbtu?$s!<eVuzrrD|fMwA%OWl6qCmnYi&
z{hv<FrWxFts!1IOy~#SyG1R+WuLX`4cWm>)2frf~@!W<JRl<0jiz0mC9+b|KN#B@a
zU#w`H>DvlvCR@^$T9nMU?SF6U9n7)1+kH3yo=b95v=MK%c3%x#EGO#tyXz@c|05RH
z6o-=X$9y%)<J#0r6)y<7g?~(ip*Z}@5SYDH*11ar!g+(DXz=Sd-^j!?Hh71LS6Cbm
zTHWwn1rIKc#Xb+y{?++{TfOX_@yisr<6SJ|w3Ld8OV0s7Q=D%el04Phw+P1XJv4;4
zVRTdXwxN<5%mT(An(ZZ{Yp|NRi<_M!|GlOl*y?f`F`-MSIXC=L$FbycNQrMMym&ea
ztif{%@XsOL5kCo|#>ZD7ZxYgov3f1B?Yx@xm$3ji9kk2mm)H@{*!G-b`v#kysm*4n
zj2$&f^?8rWcCIwXKdyJaWYcsv$eW}*AiNoaj{Yt#&E2HFxa?cR9qcw)l~q$?H>Ngf
zppL9b;FmIaG#>1N!yumhRSaZg2>u9(i-n6y2$>b$)Lx4dfrxMY3f4(a4C|Jwz6y<=
zErs<z`w7kE$G$U4FY$NFC?Wm4Aacb769BFU4r6w2Oir^hcR{SWqeYDIHM<~*E)6J=
z!%=%+==+rb3IpZ#s#dGZ>sW6vHEBYry~5?f#n<WTLcUv-#>K1QG_4WLrv8wSecdmF
zg3d-j;)J*5KdHLC$)z7xoG2lY;N;e*w}?E>?jmDSu1)vuh@SR>ypgjXW0RLW4V~Eq
zTHGHje?HIc)fjnRfE)z}uu8Wxx9$K-(mH}<Kcj||%>y4r<iQ)ld)rQTk*8zVy`zMZ
zcDywn+sd!Vq~E8huF`>9zNx8X7e?P+7tAqr=;wrWg*oVQ@VZr!KR9ukQ?Zl&oF8<+
z)cexv>7Wq7`j#9oDH1vC4_2@jsC96h>BE?*!m9gXSCqN?U82ml{bGh_h~!Rb(HHFH
z_kak7vBNBY2A0kObnI<R2SH9n;kCzlZ{3Pm<A2&UZ*euG@oz`o^kRn4OIsjbY6IDy
z&0|QT!g(#O2Qzs`V}@gCtqRULQ+h%kjkNjL$+rq&soHtm6m61jSH09YAt$3RK6D`G
zf!j==B(U$$_ns4=;tm9il&?=sC(G%mL?C?R^byT(6VjTgrnr4h5yd3yB_!w<k*^N!
zh&VaWOL6NA*gT?#suE8&h)*mVHJypyTNAai^KZ5#%3Qc_LjNseal(1``g0ca@iSI~
zRzIVP7F=ij%mgBxG%(i&ClpFDO{4XBBz5kLn^N>r(K@&aFbr`fmshuIHFkJYZDn+w
z-OM{TwqeD4*Ki!zd08@YoIX2iam8B;#Dc1O?{AeWTQa1VZlx+Bs2Kah(XvL*y-gat
zN?B@c!Az|{fN$KLJnWZpfM{`Dsh-6g<U0zO>3{`C(}%`fhF&2X_d*clT*0jHZLh~8
z+{u~2dfc$D{14p#zy|3KU;dLZ<yFyJbyH#yjQN7w+r0PDVTzNPc2|x)=<XhmL<KRC
zIVJ0uSt-1K<rD6;pycc<^{+dNd>FiO7xf*eJUgT3I0KQzq<GxNSU7g0HjWj$GpLb4
z0?)eO)ue^NO?H(foR%*-XBSs9>?(!%J*alQgdrjt>c^VxfaUWKHHLi&W#zx!S5*{v
zu{^>AwHSlAvb;)IxhF&?Nk%7RiDWBXmU1SB>mlGd<6J+RKy}iz@z2R<X(Y-Y9F3eJ
zh%^>NpNb$5(~_-FfpacPts09@&OHC^O4khgdbbZ0L5x4E{E4oY81p-+^QSo;wre95
z!DLPoFSZ}@($1KSg(1xnLSvQU%e3r<r*RDixI#HVR8(YbJbaPz6#r(-X%B!{c58Ns
zN8mpqH1g{&Hm{QUabQg)D!P9(vhyBKe3&vH)5+d`J8<BI=0*WjX;qm4j2SArO%&fi
zy8!b6l%u6#;V7LI8vUlv)O|4%Sj^9f7nsxETz?ua#PdS8DY5+V(D~8+Ka6+(v*-y@
bzhXoaskO3G9EARJ6(XrBYAMvqSw;RI{p;b*

diff --git a/public/static/images/illustration-empty-search-history.svg b/public/static/images/illustration-empty-search-history.svg
new file mode 100644
index 0000000000..04fac679a1
--- /dev/null
+++ b/public/static/images/illustration-empty-search-history.svg
@@ -0,0 +1,52 @@
+<svg width="201" height="200" viewBox="0 0 201 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_22276_56879)">
+<path d="M151.966 116.83C155.025 112.579 152.612 105.576 146.576 101.19C140.54 96.8042 133.167 96.6952 130.108 100.947C127.048 105.199 129.462 112.201 135.498 116.587C141.534 120.973 148.907 121.082 151.966 116.83Z" fill="#EFDBB4"/>
+<path d="M107.451 117.537C107.451 117.537 116.451 112.065 125.274 106.998C134.097 101.931 135.358 93.0646 135.358 81.6643V52.5303H155.525V95.598C155.525 106.998 154.265 115.865 137.879 124.732C121.493 133.599 113.93 137.399 113.93 137.399L107.451 117.537Z" fill="#E5C888"/>
+<path d="M87.4611 157.666L83.0495 176.21C82.4193 179.732 85.4696 182.924 89.5409 183C89.6921 183 89.8308 183 89.982 183C90.0577 183 90.1333 183 90.2089 183C94.4189 182.962 97.507 179.517 96.6373 175.919L93.7634 157.666H87.4611Z" fill="#E5C888"/>
+<path d="M93.7634 157.666H87.4611L83.6797 173.55C88.3308 172.208 92.6038 168.8 95.1373 166.432L93.7634 157.666Z" fill="#D8B877"/>
+<path d="M115.696 152.371H112.23L110.15 161.099C112.709 160.364 115.054 158.489 116.453 157.185L115.696 152.371Z" fill="#D8B877"/>
+<path d="M109.595 152.637L111.46 167.42C111.964 170.168 115.078 171.663 118.065 170.586C118.166 170.548 118.279 170.51 118.393 170.46C118.443 170.434 118.506 170.422 118.557 170.396C121.619 169.206 122.93 165.824 121.304 163.429L114.195 150.889L109.582 152.637H109.595Z" fill="#E5C888"/>
+<path d="M119.313 159.921L114.195 150.902L109.582 152.65L111.448 167.432C111.536 167.888 111.712 168.294 111.926 168.674C114.309 166.343 117.699 162.023 119.313 159.933V159.921Z" fill="#D8B877"/>
+<path d="M70.3323 152.637L68.4668 167.42C67.9627 170.168 64.8493 171.663 61.862 170.586C61.7612 170.548 61.6477 170.51 61.5343 170.46C61.4839 170.434 61.4208 170.422 61.3704 170.396C58.3075 169.206 56.9966 165.824 58.6226 163.429L65.7316 150.889L70.3449 152.637H70.3323Z" fill="#E5C888"/>
+<path d="M65.7311 150.889L58.6221 163.429C58.1809 164.075 57.9792 164.797 57.9414 165.532C62.3656 165.912 66.9411 164.823 68.8696 164.278L70.3444 152.637L65.7311 150.889Z" fill="#D8B877"/>
+<path d="M125.162 143.492C125.137 142.896 125.074 142.288 124.948 141.68C121.04 122.123 109.797 99.4106 89.9697 99.4106C70.1426 99.4106 58.8992 122.123 54.9918 141.68C54.8657 142.288 54.8153 142.896 54.7775 143.492C54.7145 143.986 54.6641 144.492 54.6641 144.999C54.6641 156.197 70.4703 165.266 89.9571 165.266C109.444 165.266 125.25 156.197 125.25 144.999C125.25 144.492 125.212 143.986 125.137 143.492H125.162Z" fill="#F4E2B3"/>
+<path d="M93.1328 141.199C101.834 141.199 108.889 134.11 108.889 125.365C108.889 116.62 101.834 109.531 93.1328 109.531C84.4311 109.531 77.377 116.62 77.377 125.365C77.377 134.11 84.4311 141.199 93.1328 141.199Z" fill="#BFE3DF"/>
+<path d="M93.1341 109.531C90.109 109.531 87.2855 110.406 84.8906 111.888C86.6679 111.191 88.5964 110.798 90.6131 110.798C99.3104 110.798 106.369 117.892 106.369 126.632C106.369 132.332 103.356 137.31 98.8566 140.11C104.718 137.804 108.89 132.079 108.89 125.365C108.89 116.625 101.831 109.531 93.1341 109.531Z" fill="#81B7AD"/>
+<path d="M81.234 115.004C78.8391 117.778 77.377 121.4 77.377 125.365C77.377 134.105 84.4356 141.199 93.1328 141.199C99.4981 141.199 104.969 137.399 107.452 131.952L81.234 115.016V115.004Z" fill="#9BCFC6"/>
+<path d="M92.8184 106.998C82.5456 106.998 74.2266 115.358 74.2266 125.682C74.2266 136.006 82.5456 144.366 92.8184 144.366C103.091 144.366 111.41 136.006 111.41 125.682C111.41 115.358 103.091 106.998 92.8184 106.998ZM94.1167 138.02C86.6169 138.02 80.5415 131.914 80.5415 124.377C80.5415 116.841 86.6169 110.735 94.1167 110.735C101.616 110.735 107.692 116.841 107.692 124.377C107.692 131.914 101.616 138.02 94.1167 138.02Z" fill="#F7EBD0"/>
+<path d="M92.8186 144.366C82.5458 144.366 74.2267 136.006 74.2267 125.682C74.2267 118.12 78.7014 111.634 85.1297 108.683C76.735 110.494 70.4453 117.98 70.4453 126.949C70.4453 137.272 78.7644 145.632 89.0372 145.632C91.785 145.632 94.3815 145.024 96.726 143.948C95.4656 144.214 94.1547 144.366 92.8186 144.366Z" fill="#E5C888"/>
+<path d="M160.467 51.6814C159.635 47.8813 153.219 44.9299 145.442 44.9299C137.665 44.9299 131.249 47.8813 130.417 51.6814H130.316V58.4329H130.417C131.249 62.233 137.665 65.1844 145.442 65.1844C153.219 65.1844 159.635 62.233 160.467 58.4329H160.568V51.6814H160.467Z" fill="#EFDBB4"/>
+<path d="M145.442 60.1303C153.796 60.1303 160.568 56.7276 160.568 52.5301C160.568 48.3326 153.796 44.9299 145.442 44.9299C137.088 44.9299 130.316 48.3326 130.316 52.5301C130.316 56.7276 137.088 60.1303 145.442 60.1303Z" fill="#F7EAD5"/>
+<path d="M144.95 102.97C151.164 107.061 154.177 113.458 151.694 117.258L155.261 111.786L155.185 111.736C156.635 108.151 153.484 102.539 147.698 98.7266C141.913 94.9138 135.535 94.2551 132.85 97.0165L132.774 96.9659L129.207 102.438C131.69 98.6379 138.736 98.8659 144.938 102.957L144.95 102.97Z" fill="#F7EAD5"/>
+<path d="M151.593 117.436L151.706 117.258C151.706 117.258 151.618 117.372 151.58 117.423H151.593V117.436Z" fill="#F7EAD5"/>
+<path d="M129.118 102.628C129.118 102.628 129.181 102.501 129.219 102.438L129.105 102.615H129.118V102.628Z" fill="#F7EAD5"/>
+<path d="M145.441 56.3303C151.01 56.3303 155.525 54.2489 155.525 51.6815C155.525 49.114 151.01 47.0327 145.441 47.0327C139.872 47.0327 135.357 49.114 135.357 51.6815C135.357 54.2489 139.872 56.3303 145.441 56.3303Z" fill="#CEAD6A"/>
+<path d="M144.812 102.324C138.447 98.3846 131.225 98.5366 128.691 102.679C128.187 103.489 127.922 104.401 127.834 105.364C128.351 105.022 128.805 104.705 129.094 104.465C135.346 99.3853 139.897 103.021 143.842 106.985C146.023 108.683 147.459 110.786 147.8 112.673C148.72 115.232 148.266 117.866 145.065 120.146C148.001 120.096 150.459 119.019 151.732 116.942C154.266 112.8 151.153 106.251 144.787 102.311L144.812 102.324Z" fill="#F7EAD5"/>
+<path d="M131.16 123.187C133.353 123.187 135.13 121.043 135.13 118.398C135.13 115.754 133.353 113.61 131.16 113.61C128.967 113.61 127.189 115.754 127.189 118.398C127.189 121.043 128.967 123.187 131.16 123.187Z" fill="#D3B476"/>
+<path d="M130.946 122.199C132.686 122.199 134.097 120.497 134.097 118.398C134.097 116.3 132.686 114.598 130.946 114.598C129.206 114.598 127.795 116.3 127.795 118.398C127.795 120.497 129.206 122.199 130.946 122.199Z" fill="#E5C888"/>
+<path d="M129.346 119.121L132.837 117.132" stroke="#D3B476" stroke-width="0.25" stroke-miterlimit="10"/>
+<path d="M130.945 115.865V120.932" stroke="#D3B476" stroke-width="0.25" stroke-miterlimit="10"/>
+<path d="M148.806 83.919C150.999 83.919 152.777 81.7753 152.777 79.1309C152.777 76.4865 150.999 74.3428 148.806 74.3428C146.614 74.3428 144.836 76.4865 144.836 79.1309C144.836 81.7753 146.614 83.919 148.806 83.919Z" fill="#D3B476"/>
+<path d="M148.593 82.931C150.333 82.931 151.744 81.2296 151.744 79.1309C151.744 77.0322 150.333 75.3308 148.593 75.3308C146.852 75.3308 145.441 77.0322 145.441 79.1309C145.441 81.2296 146.852 82.931 148.593 82.931Z" fill="#E5C888"/>
+<path d="M146.992 79.853L150.484 77.8643" stroke="#D3B476" stroke-width="0.25" stroke-miterlimit="10"/>
+<path d="M148.592 76.5974V81.6642" stroke="#D3B476" stroke-width="0.25" stroke-miterlimit="10"/>
+<path d="M142.556 39.7999L138.787 35.7084L131.149 33.7451C130.468 33.555 129.951 33.403 129.623 33.2637C129.283 33.1244 129.031 32.9597 128.855 32.7824C128.577 32.4784 128.451 32.111 128.489 31.6803C128.527 31.2497 128.703 30.8696 129.044 30.5656C129.397 30.2363 129.762 30.0843 130.128 30.1096C130.493 30.135 131.149 30.287 132.069 30.553L138.081 32.225L136.896 26.0562C136.821 25.6762 136.758 25.3595 136.707 25.1062C136.657 24.8528 136.619 24.5995 136.606 24.3335C136.606 24.0802 136.632 23.8395 136.695 23.6368C136.77 23.4215 136.909 23.2188 137.123 23.0288C137.451 22.7248 137.816 22.5728 138.232 22.5854C138.648 22.5854 138.989 22.7375 139.241 23.0288C139.455 23.2568 139.606 23.5355 139.707 23.8648C139.808 24.1942 139.909 24.6882 140.01 25.3468L141.371 33.289L145.14 37.3805C145.631 37.9125 145.883 38.4318 145.871 38.9132C145.871 39.4072 145.682 39.8252 145.304 40.1799C144.913 40.5346 144.484 40.6992 144.005 40.6612C143.526 40.6232 143.035 40.3319 142.543 39.7999H142.556Z" fill="#94D3C4"/>
+<path d="M147.951 47.0453L147.144 47.1847L147.774 50.8581C147.863 51.3394 147.812 51.7194 147.636 51.9854C147.459 52.2514 147.207 52.4161 146.867 52.4668C146.501 52.5301 146.199 52.4668 145.947 52.2515C145.695 52.0361 145.543 51.7194 145.468 51.2508L143.968 42.4345C143.88 41.9405 143.93 41.5479 144.119 41.2945C144.308 41.0285 144.649 40.8638 145.14 40.7752L148.896 40.1292C149.413 40.0405 149.867 39.9898 150.232 39.9645C150.611 39.9518 150.951 39.9772 151.279 40.0658C151.657 40.1545 152.01 40.3192 152.337 40.5472C152.665 40.7752 152.917 41.0665 153.131 41.4212C153.333 41.7632 153.472 42.1559 153.547 42.5612C153.699 43.4099 153.573 44.1446 153.182 44.7273C152.791 45.3226 152.123 45.804 151.19 46.184C151.632 46.336 152.085 46.5893 152.526 46.9567C152.968 47.324 153.384 47.7167 153.762 48.1473C154.14 48.578 154.442 48.9707 154.669 49.338C154.896 49.6927 155.022 49.9461 155.047 50.0981C155.073 50.2501 155.047 50.4021 154.984 50.5667C154.909 50.7314 154.808 50.8708 154.657 50.9848C154.505 51.0988 154.316 51.1748 154.102 51.2128C153.837 51.2634 153.61 51.2381 153.421 51.1368C153.22 51.0481 153.043 50.9214 152.892 50.7441C152.728 50.5794 152.514 50.3261 152.237 50.0094L151.052 48.616C150.623 48.1093 150.258 47.7293 149.942 47.476C149.627 47.2227 149.325 47.0707 149.048 47.0073C148.77 46.944 148.417 46.944 148.001 47.0073L147.951 47.0453ZM148.455 42.0039L146.325 42.3712L146.867 45.5126L148.934 45.1579C149.489 45.0566 149.942 44.9299 150.308 44.7779C150.674 44.6133 150.926 44.3979 151.09 44.1319C151.253 43.8659 151.291 43.5239 151.228 43.1186C151.178 42.8019 151.052 42.5359 150.85 42.3205C150.648 42.1052 150.396 41.9659 150.094 41.8899C149.804 41.8265 149.262 41.8519 148.468 41.9912L148.455 42.0039Z" fill="#58A596"/>
+<path d="M135.786 40.0786L133.983 41.3833L135.962 44.1447C136.24 44.5374 136.366 44.9047 136.328 45.2467C136.29 45.5888 136.126 45.8548 135.849 46.0574C135.559 46.2728 135.244 46.3488 134.916 46.2728C134.588 46.2094 134.286 45.9688 134.009 45.5761L128.626 38.0646C128.311 37.6339 128.198 37.2539 128.261 36.9119C128.324 36.5825 128.576 36.2659 129.005 35.9492L131.525 34.1251C132.269 33.5805 132.887 33.2258 133.366 33.0484C133.845 32.8711 134.311 32.8078 134.79 32.8584C135.256 32.9091 135.71 33.0611 136.126 33.3271C136.542 33.5931 136.92 33.9605 137.248 34.4165C137.966 35.4045 138.193 36.3799 137.954 37.3299C137.714 38.2799 136.983 39.1919 135.786 40.066V40.0786ZM132.105 35.9619L130.782 36.9245L132.912 39.9013L134.235 38.9386C134.702 38.6092 135.055 38.2799 135.294 37.9506C135.534 37.6212 135.66 37.2919 135.66 36.9499C135.66 36.6079 135.534 36.2659 135.282 35.8985C134.967 35.4678 134.601 35.2145 134.147 35.1258C133.656 35.0372 132.975 35.3158 132.093 35.9492L132.105 35.9619Z" fill="#58A596"/>
+<path d="M146.136 52.8215C145.871 52.5428 145.569 52.3401 145.216 52.2135C144.863 52.0868 144.447 52.0108 143.981 51.9728C143.514 51.9475 142.998 51.9475 142.443 51.9728C142.002 51.9728 141.674 51.9855 141.472 51.9728C141.271 51.9728 141.069 51.9475 140.867 51.8968C140.666 51.8461 140.489 51.7701 140.351 51.6688C140.212 51.5675 140.111 51.4154 140.061 51.2254C139.972 50.9214 140.061 50.6301 140.288 50.3261C140.527 50.0347 140.893 49.8067 141.372 49.6801C141.901 49.5281 142.304 49.5281 142.594 49.6547C142.884 49.7814 143.161 49.9967 143.426 50.3008C143.628 50.5161 143.792 50.6554 143.943 50.7314C144.082 50.8074 144.258 50.8201 144.472 50.7568C144.712 50.6934 144.876 50.5414 144.989 50.3261C145.09 50.0981 145.115 49.8701 145.052 49.6547C144.989 49.4141 144.85 49.1734 144.649 48.9454C144.447 48.7174 144.182 48.5274 143.842 48.3754C143.502 48.2234 143.111 48.122 142.645 48.0967C142.191 48.0714 141.674 48.1347 141.107 48.2994C140.388 48.502 139.809 48.7807 139.342 49.1481C138.876 49.5154 138.561 49.9334 138.397 50.4021C138.233 50.8834 138.22 51.3774 138.359 51.8841C138.51 52.4161 138.762 52.8341 139.128 53.1255C139.493 53.4168 139.935 53.5942 140.439 53.6828C140.943 53.7715 141.561 53.7968 142.266 53.7588C142.796 53.7335 143.224 53.7335 143.552 53.7588C143.88 53.7715 144.157 53.8602 144.409 53.9995C144.649 54.1388 144.813 54.3669 144.901 54.6709C145.014 55.0635 144.926 55.4309 144.649 55.7982C144.497 55.9882 144.296 56.1529 144.069 56.2922C144.51 56.3176 144.964 56.3429 145.418 56.3429C145.733 56.3429 146.035 56.3429 146.338 56.3176C146.489 56.0896 146.615 55.8489 146.691 55.5956C146.855 55.0635 146.855 54.5189 146.691 53.9488C146.565 53.4802 146.363 53.1002 146.111 52.8341L146.136 52.8215Z" fill="#B4DED6"/>
+<path d="M140.577 55.2156C140.4 55.1269 140.224 55.1142 140.022 55.1649C139.833 55.2156 139.695 55.3169 139.594 55.4562C140.123 55.6336 140.69 55.7856 141.283 55.8996C141.22 55.8236 141.157 55.7602 141.094 55.6716C140.93 55.4436 140.753 55.2916 140.59 55.2029L140.577 55.2156Z" fill="#B4DED6"/>
+<path d="M159.697 45.7407L159.558 44.246L155.197 43.0299L154.302 44.2713C153.949 44.7526 153.685 45.0693 153.483 45.2213C153.294 45.3733 153.029 45.3987 152.714 45.31C152.437 45.234 152.222 45.0693 152.071 44.8033C151.92 44.55 151.882 44.284 151.945 44.0306C151.983 43.8786 152.046 43.7393 152.147 43.5999C152.248 43.4606 152.386 43.2579 152.563 43.0173L157.239 36.7851C157.378 36.6078 157.529 36.3924 157.718 36.1391C157.907 35.8858 158.084 35.6831 158.26 35.5311C158.437 35.3791 158.638 35.2777 158.878 35.2144C159.117 35.1637 159.382 35.1637 159.672 35.2524C159.974 35.3411 160.214 35.4678 160.378 35.6324C160.542 35.7971 160.668 35.9998 160.743 36.2151C160.819 36.4304 160.869 36.6584 160.894 36.8865C160.92 37.1145 160.958 37.4311 160.995 37.8111L161.878 45.5507C161.953 46.146 161.953 46.5514 161.878 46.792C161.815 47.0454 161.638 47.248 161.373 47.3874C161.109 47.5394 160.831 47.5774 160.542 47.4887C160.365 47.438 160.226 47.3747 160.126 47.2734C160.025 47.172 159.937 47.0707 159.886 46.9314C159.836 46.8047 159.785 46.6147 159.747 46.374C159.71 46.1333 159.684 45.918 159.659 45.728L159.697 45.7407ZM156.218 41.5479L159.42 42.4473L159.029 37.5451L156.206 41.5479H156.218Z" fill="#94D3C4"/>
+<path d="M126.799 35.7085C127.253 35.8352 127.732 35.9365 128.249 36.0252C128.766 36.1138 129.119 36.2025 129.308 36.2912C129.497 36.3798 129.635 36.5572 129.724 36.8105C129.787 36.9879 129.761 37.2032 129.661 37.4439C129.56 37.6845 129.383 37.8492 129.144 37.9252C128.955 37.9886 128.69 38.0012 128.375 37.9759C128.06 37.9379 127.669 37.8746 127.228 37.7605C126.774 37.6465 126.283 37.5072 125.728 37.3299C125.047 38.0266 124.102 38.5839 122.917 38.9892C121.947 39.3186 121.026 39.4579 120.157 39.4073C119.287 39.3566 118.493 39.1286 117.774 38.7232C117.056 38.3179 116.438 37.7605 115.896 37.0385C115.354 36.3165 114.938 35.4932 114.623 34.5558C114.308 33.5931 114.144 32.6684 114.157 31.7691C114.157 30.8697 114.333 30.059 114.661 29.3117C114.989 28.5643 115.48 27.931 116.136 27.3736C116.779 26.8163 117.585 26.3856 118.543 26.0689C119.842 25.6383 121.026 25.5243 122.136 25.7396C123.245 25.9549 124.19 26.4616 124.997 27.2723C125.804 28.083 126.421 29.147 126.85 30.4517C127.518 32.4404 127.505 34.2011 126.825 35.7212L126.799 35.7085ZM124.354 34.9865C124.568 34.4671 124.669 33.8971 124.657 33.2891C124.644 32.6811 124.505 32.0097 124.266 31.2877C123.963 30.3757 123.547 29.6284 123.031 29.0583C122.514 28.4883 121.921 28.121 121.253 27.9563C120.598 27.8043 119.905 27.8296 119.199 28.0703C118.695 28.235 118.266 28.4883 117.901 28.8303C117.535 29.1597 117.258 29.565 117.069 30.0337C116.88 30.5024 116.791 31.0471 116.804 31.6804C116.804 32.3011 116.943 32.9724 117.169 33.6818C117.648 35.1258 118.354 36.1138 119.287 36.6712C120.22 37.2285 121.19 37.3299 122.211 36.9879C122.627 36.8485 123.031 36.6079 123.421 36.2912C123.094 36.1772 122.69 36.0885 122.224 36.0252C121.758 35.9618 121.43 35.8985 121.241 35.8352C121.064 35.7845 120.938 35.6452 120.863 35.4552C120.812 35.2905 120.825 35.1132 120.926 34.9358C121.026 34.7585 121.153 34.6445 121.329 34.5811C121.846 34.4038 122.854 34.5431 124.354 34.9991V34.9865Z" fill="#8DCEC1"/>
+<path d="M152.375 20.318L150.8 25.3595L158.362 21.192C158.728 20.9894 159.03 20.85 159.257 20.774C159.497 20.698 159.774 20.7107 160.089 20.812C160.505 20.9387 160.808 21.1794 160.984 21.496C161.161 21.8254 161.198 22.1674 161.085 22.5094C160.946 22.9274 160.606 23.2821 160.039 23.5607L155.463 25.8028L157.694 32.9343C157.858 33.4283 157.959 33.8463 158.01 34.201C158.06 34.5557 158.035 34.8724 157.946 35.151C157.846 35.4677 157.631 35.7084 157.316 35.8604C156.989 36.0124 156.61 36.0251 156.182 35.8984C155.778 35.7717 155.476 35.5817 155.274 35.3284C155.073 35.075 154.934 34.771 154.846 34.429C154.758 34.087 154.682 33.7703 154.619 33.4917L152.854 27.1075L149.766 28.6402L148.833 31.6169C148.644 32.2123 148.367 32.6176 148.001 32.8203C147.636 33.023 147.245 33.061 146.804 32.9216C146.552 32.8456 146.338 32.7063 146.149 32.5036C145.959 32.301 145.846 32.073 145.783 31.8069C145.745 31.5916 145.758 31.3636 145.821 31.1229C145.871 30.8696 145.972 30.5276 146.123 30.0589L149.476 19.368C149.665 18.7853 149.93 18.38 150.27 18.1646C150.623 17.9493 151.014 17.9113 151.455 18.0506C151.896 18.19 152.199 18.4433 152.375 18.8233C152.552 19.2033 152.552 19.6847 152.375 20.28V20.318Z" fill="#71BFB2"/>
+<path d="M160.908 36.8485L163.341 33.2764L161.286 30.097C161.097 29.793 160.946 29.527 160.858 29.299C160.757 29.071 160.706 28.8683 160.706 28.6656C160.706 28.463 160.795 28.273 160.984 28.0956C161.173 27.931 161.4 27.8423 161.664 27.8423C161.967 27.8423 162.206 27.931 162.383 28.1083C162.559 28.2856 162.786 28.6276 163.089 29.1216L164.727 31.7817L166.479 29.1216C166.618 28.8936 166.744 28.7036 166.845 28.5516C166.946 28.387 167.047 28.2603 167.135 28.159C167.223 28.0576 167.336 27.9816 167.45 27.9183C167.563 27.8676 167.702 27.8423 167.853 27.8423C168.131 27.8423 168.357 27.931 168.534 28.0956C168.71 28.2603 168.799 28.463 168.799 28.691C168.799 29.0203 168.61 29.4763 168.231 30.0463L166.089 33.2764L168.395 36.8485C168.61 37.1652 168.761 37.4185 168.849 37.6339C168.95 37.8365 168.988 38.0392 168.988 38.2165C168.988 38.3939 168.95 38.5459 168.862 38.6979C168.773 38.8372 168.66 38.9512 168.509 39.0399C168.357 39.1286 168.181 39.1666 167.992 39.1666C167.778 39.1666 167.614 39.1159 167.463 39.0399C167.324 38.9512 167.198 38.8499 167.11 38.7105C167.021 38.5839 166.858 38.3305 166.605 37.9505L164.69 34.9231L162.648 38.0392C162.484 38.2925 162.383 38.4572 162.307 38.5585C162.244 38.6599 162.156 38.7612 162.068 38.8499C161.98 38.9512 161.866 39.0146 161.74 39.0779C161.614 39.1286 161.463 39.1539 161.286 39.1539C161.022 39.1539 160.795 39.0779 160.618 38.9006C160.442 38.7359 160.354 38.4952 160.354 38.1912C160.354 37.8239 160.53 37.3678 160.896 36.8358L160.908 36.8485Z" fill="#58A596"/>
+<path d="M85.9358 84.3369C85.835 83.7795 85.9862 83.1842 86.3896 82.7915C88.608 80.5621 89.9819 77.484 89.9819 74.0893C89.9819 70.1119 88.1164 66.5778 85.2173 64.323C84.3476 63.639 83.9947 62.4863 84.3602 61.435C84.8014 60.1809 85.0535 58.8256 85.0661 57.4069C85.1165 51.2254 80.415 45.8293 74.3017 45.0439C73.4068 44.9299 72.5371 44.9172 71.6926 44.9932C70.7724 45.0819 69.8775 44.7779 69.1842 44.1572C67.0162 42.1938 64.1424 40.9905 60.9786 40.9905C56.0628 40.9905 51.815 43.9039 49.8613 48.1093C49.2815 49.3507 47.9454 50.098 46.5967 49.9587C45.5253 49.8447 44.4161 49.87 43.2817 50.0347C36.9037 51.0101 32.0509 56.6469 32.0005 63.1197C31.9627 67.5658 34.1055 71.5052 37.4205 73.9499C38.3154 74.6086 38.5171 75.8247 37.8112 76.686C36.3239 78.5101 35.5928 80.9801 36.0844 83.6148C36.7272 87.0096 39.4877 89.695 42.8783 90.2523C44.7438 90.5563 46.5211 90.2523 48.0336 89.4797C49.3445 88.821 50.9201 89.201 51.9032 90.2903C54.1469 92.7731 57.3863 94.3311 60.9912 94.3311C65.7305 94.3311 69.8271 91.633 71.8816 87.6936C72.5119 86.4903 73.8353 85.8822 75.1588 86.1609C75.9781 86.3382 76.8352 86.4269 77.705 86.4269C79.0663 86.4269 80.3772 86.1989 81.5998 85.7936C82.2805 85.5656 83.0241 85.7682 83.5031 86.3129L85.293 88.3776C85.7846 88.9476 86.7047 88.4916 86.566 87.7569L85.9484 84.3495L85.9358 84.3369Z" fill="#B9E3DB"/>
+<path d="M47.5424 71.5307C49.1644 71.5307 50.4792 70.2094 50.4792 68.5793C50.4792 66.9493 49.1644 65.6279 47.5424 65.6279C45.9204 65.6279 44.6055 66.9493 44.6055 68.5793C44.6055 70.2094 45.9204 71.5307 47.5424 71.5307Z" fill="#65B7B3"/>
+<path d="M61.6205 71.5307C63.2425 71.5307 64.5574 70.2094 64.5574 68.5793C64.5574 66.9493 63.2425 65.6279 61.6205 65.6279C59.9985 65.6279 58.6836 66.9493 58.6836 68.5793C58.6836 70.2094 59.9985 71.5307 61.6205 71.5307Z" fill="#65B7B3"/>
+<path d="M75.7006 71.5307C77.3226 71.5307 78.6374 70.2094 78.6374 68.5793C78.6374 66.9493 77.3226 65.6279 75.7006 65.6279C74.0786 65.6279 72.7637 66.9493 72.7637 68.5793C72.7637 70.2094 74.0786 71.5307 75.7006 71.5307Z" fill="#65B7B3"/>
+</g>
+<defs>
+<clipPath id="clip0_22276_56879">
+<rect width="137" height="165" fill="white" transform="translate(32 18)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/components/Search/SearchHistory/EmptySearchHistory/index.tsx b/src/components/Search/SearchHistory/EmptySearchHistory/index.tsx
index 2e036bd0a5..83c382cb59 100644
--- a/src/components/Search/SearchHistory/EmptySearchHistory/index.tsx
+++ b/src/components/Search/SearchHistory/EmptySearchHistory/index.tsx
@@ -1,4 +1,4 @@
-import IMAGE_EMPTY_SEARCH_HISTORY from '@/public/static/images/illustration-empty-search-history.png'
+import IMAGE_EMPTY_SEARCH_HISTORY from '@/public/static/images/illustration-empty-search-history.svg'
 import { Translate } from '~/components'
 
 import styles from './styles.css'
@@ -6,7 +6,7 @@ import styles from './styles.css'
 const EmptySearchHistory = () => {
   return (
     <section className="container">
-      <img src={IMAGE_EMPTY_SEARCH_HISTORY.src} alt="empty search history" />
+      <img src={IMAGE_EMPTY_SEARCH_HISTORY} alt="empty search history" />
       <section className="hint">
         <Translate
           zh_hant="輸入關鍵詞餵食搜尋怪，幫你找到相關內容哦！"

From 014890783e1e88f18dfda0498771dcf6327a63e5 Mon Sep 17 00:00:00 2001
From: Matty <98379126+matters-tech@users.noreply.github.com>
Date: Wed, 12 Apr 2023 17:08:53 +0700
Subject: [PATCH 83/92] New translations default.json (Chinese Simplified)

---
 lang/zh-Hans.json | 1783 ++++++++++++++++++++++-----------------------
 1 file changed, 868 insertions(+), 915 deletions(-)

diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json
index 360d711866..19a81f689d 100644
--- a/lang/zh-Hans.json
+++ b/lang/zh-Hans.json
@@ -1,1297 +1,1250 @@
 {
-  "cfL5uk": {
-    "defaultMessage": "已超过 200 字，目前 {numbers} 字",
-    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx"
+  "+7SAix": {
+    "defaultMessage": "2-12 个字符",
+    "description": ""
   },
-  "3uQKhx": {
-    "defaultMessage": "若你希望向 Matters 提出建议，或遭遇操作异常，请发送邮件至",
-    "description": "src/views/Help/index.tsx"
+  "+a+2ug": {
+    "defaultMessage": "成员",
+    "description": ""
+  },
+  "+hfUcV": {
+    "defaultMessage": "在围炉 {circlename} 发布了新广播",
+    "description": "src/components/Notice/CommentNotice/CircleNewBroadcastNotice.tsx"
+  },
+  "/+XWDi": {
+    "defaultMessage": "航行日志 2.0",
+    "description": "src/components/UserProfile/DropdownActions/index.tsx"
+  },
+  "/3G89K": {
+    "defaultMessage": " 又成长了",
+    "description": "src/components/Notice/ArticleNotice/CircleNewArticle.tsx"
+  },
+  "/3kw6k": {
+    "defaultMessage": "尝试将内容写入 IPFS 网络中，需要一段时间，请耐心等候。若等候时间过久，可通过发布文章来加速。",
+    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  },
+  "/IMR+8": {
+    "defaultMessage": "支持排行榜",
+    "description": ""
+  },
+  "/asuIY": {
+    "defaultMessage": "进入社区",
+    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
   },
   "/ns2st": {
     "defaultMessage": "下载应用",
     "description": ""
   },
-  "FaTb0A": {
-    "defaultMessage": "安装 MetaMask",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  "/nu5ho": {
+    "defaultMessage": "回复了你在作品 ",
+    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
   },
-  "FhWC22": {
-    "defaultMessage": "社区共建基地",
+  "/podGX": {
+    "defaultMessage": "公开",
+    "description": "src/views/Circle/Analytics/ContentAnalytics/ContentTabs/index.tsx"
+  },
+  "0Azlrb": {
+    "defaultMessage": "管理",
     "description": ""
   },
-  "Xd0J7Y": {
-    "defaultMessage": "开放社区",
+  "1EYCdR": {
+    "defaultMessage": "标签",
     "description": ""
   },
-  "dnsfmR": {
-    "defaultMessage": "，我们会尽快回复!",
-    "description": "src/views/Help/index.tsx"
+  "1pFLGZ": {
+    "defaultMessage": "漏洞赏金计划",
+    "description": ""
   },
-  "ZjDH42": {
-    "defaultMessage": "关于我们",
+  "1qQzV0": {
+    "defaultMessage": "免费邀请",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  },
+  "20bImY": {
+    "defaultMessage": "众聊",
     "description": ""
   },
-  "6flWFg": {
-    "defaultMessage": "用户协议",
+  "2CqWQE": {
+    "defaultMessage": "总数",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  },
+  "2atspc": {
+    "defaultMessage": "我的草稿",
     "description": ""
   },
-  "uVCg1l": {
-    "defaultMessage": "玩转 Matters 实用指南",
+  "2eebTb": {
+    "defaultMessage": " 收藏了你的作品",
+    "description": "src/components/Notice/ArticleNotice/ArticleNewSubscriberNotice.tsx"
+  },
+  "2slIPX": {
+    "defaultMessage": "我的赞赏",
     "description": ""
   },
-  "HzaRKA": {
-    "defaultMessage": "一键搬家",
+  "2uRduT": {
+    "defaultMessage": " 的评论",
+    "description": "src/components/Notice/CommentNotice/CommentPinnedNotice.tsx"
+  },
+  "2uwwz+": {
+    "defaultMessage": "累计阅读时長代表了你的作品被登入用户阅读的总时数，每次阅读过程超过一定时间后才会计入。此外，同一个用户的多次阅读也会进行累计。",
+    "description": "src/components/Dialogs/HelpDialog/index.tsx"
+  },
+  "32bml8": {
+    "defaultMessage": "追踪",
+    "description": "src/components/Layout/SideNav/index.tsx"
+  },
+  "3KNMbJ": {
+    "defaultMessage": "作品",
     "description": ""
   },
-  "fOgusL": {
-    "defaultMessage": "选择进入方式",
-    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
+  "3WKlPP": {
+    "defaultMessage": "commented in",
+    "description": ""
   },
-  "t8/r8X": {
-    "defaultMessage": "连接加密钱包",
-    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
+  "3kbIhS": {
+    "defaultMessage": "未命名",
+    "description": ""
   },
-  "iCFXtS": {
-    "defaultMessage": "欢迎未注册或已启用钱包登入的朋友使用",
-    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
+  "3uQKhx": {
+    "defaultMessage": "若你希望向 Matters 提出建议，或遭遇操作异常，请发送邮件至",
+    "description": "src/views/Help/index.tsx"
   },
-  "xiKjd/": {
-    "defaultMessage": "使用电子邮箱",
-    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
+  "3yk8fB": {
+    "defaultMessage": "我的钱包",
+    "description": ""
   },
-  "J+LXrH": {
-    "defaultMessage": "持续支持邮箱進入，未來可随时启用钱包登入",
-    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
+  "3ynsJ3": {
+    "defaultMessage": "想了解更多？详见 ",
+    "description": "src/views/Me/Analytics/EmptyAnalytics/index.tsx"
   },
-  "XcTMMM": {
-    "defaultMessage": "已有帐户？",
-    "description": "src/components/Forms/EmailSignUpForm/Buttons.tsx"
+  "47FYwb": {
+    "defaultMessage": "取消",
+    "description": ""
   },
-  "ipQlDG": {
-    "defaultMessage": "以邮箱登入",
-    "description": "src/components/Forms/EmailSignUpForm/Buttons.tsx"
+  "4Odb0J": {
+    "defaultMessage": "置顶作品",
+    "description": "src/components/ArticleDigest/DropdownActions/StickyButton.tsx"
   },
-  "pwlQEY": {
-    "defaultMessage": "姓名",
-    "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
+  "4giHJT": {
+    "defaultMessage": "在行动装置上使用问题，参考 ",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "4mbdyI": {
-    "defaultMessage": "邮箱",
-    "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
+  "4vkwo0": {
+    "defaultMessage": "你的修订作品已发布到分布式网络",
+    "description": "src/components/Notice/ArticleNotice/RevisedArticlePublishedNotice.tsx"
   },
-  "0Rw3H/": {
-    "defaultMessage": "我已阅读并同意",
-    "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
+  "50cquj": {
+    "defaultMessage": "还没有众聊",
+    "description": "src/views/Circle/Discussion/Discussion.tsx"
   },
-  "LphWYP": {
-    "defaultMessage": "Matters 用户协议和隐私政策",
+  "5FO4vn": {
+    "defaultMessage": "你尚无权限进行该操作",
     "description": ""
   },
-  "agfumL": {
-    "defaultMessage": "下一步",
-    "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
-  },
-  "l5vWO8": {
-    "defaultMessage": "你的站内暱称，之后可以修改",
-    "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
+  "5sAbzJ": {
+    "defaultMessage": " 众聊中发表话题 ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
   "5sg7KC": {
     "defaultMessage": "密码",
     "description": ""
   },
-  "ml3SZN": {
-    "defaultMessage": "至少 8 个字符，支持英文大小写字母、数字和特殊符号",
+  "63HuBz": {
+    "defaultMessage": "此标签目前无人主理",
+    "description": "src/views/TagDetail/Owner/index.tsx"
+  },
+  "69+D96": {
+    "defaultMessage": "开始创作",
     "description": ""
   },
-  "NzfL1d": {
-    "defaultMessage": "再次输入密码",
-    "description": "src/components/Forms/EmailSignUpForm/Password.tsx"
+  "6BXcdo": {
+    "defaultMessage": "设定围炉门槛（每月）",
+    "description": "src/components/Forms/CreateCircleForm/Init.tsx"
   },
-  "XH0Lb6": {
-    "defaultMessage": "欢迎加入 Matters！",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
+  "6OBAOi": {
+    "defaultMessage": "目前总订阅人数",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "stjoBH": {
-    "defaultMessage": "现在，去为你喜欢的作者打赏吧！你的每一次打赏都将为作者带来收入。",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
+  "6flWFg": {
+    "defaultMessage": "用户协议",
+    "description": ""
   },
-  "reOeq5": {
-    "defaultMessage": "你已拥有个人创作空间站，期待你的第一篇作品。",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
+  "77tYPg": {
+    "defaultMessage": "确认删除后，{commentType}会立即消失。",
+    "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
   },
-  "ANhCde": {
-    "defaultMessage": "马上开始你的创作吧！",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
+  "7DIW6+": {
+    "defaultMessage": "了解更多",
+    "description": ""
   },
-  "/asuIY": {
-    "defaultMessage": "进入社区",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
+  "7xnrxG": {
+    "defaultMessage": "作品已添加至精选",
+    "description": "src/components/ArticleDigest/DropdownActions/SetTagSelectedButton.tsx"
   },
-  "nsaJRn": {
-    "defaultMessage": "上站成功",
+  "8KFsZN": {
+    "defaultMessage": "阅读次数",
     "description": ""
   },
-  "lD4FPZ": {
-    "defaultMessage": "请输入邮箱",
+  "8cv9D4": {
+    "defaultMessage": "Next Step",
     "description": ""
   },
-  "IFY8r4": {
-    "defaultMessage": "请输入密码",
-    "description": "src/components/Forms/EmailLoginForm/index.tsx"
+  "8xPi0N": {
+    "defaultMessage": "离开围炉",
+    "description": "src/views/Circle/Profile/DropdownActions/index.tsx"
   },
-  "z+209N": {
-    "defaultMessage": "注册",
+  "9+Ddtu": {
+    "defaultMessage": "下一步",
     "description": ""
   },
-  "nYeDrI": {
-    "defaultMessage": "沒有帐户？",
-    "description": "src/components/Forms/EmailLoginForm/Buttons.tsx"
+  "9nNpKP": {
+    "defaultMessage": "讨论已送出",
+    "description": "src/views/Circle/Discussion/Discussion.tsx"
   },
-  "xGh9O7": {
-    "defaultMessage": "提醒：信箱将不作为登入使用，仅作为联系渠道",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
+  "A3LOng": {
+    "defaultMessage": " 众聊中回复话题 ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "N3K1H9": {
-    "defaultMessage": "Matters 不会透过任何渠道询问你的钱包私钥。",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
+  "A3rLZt": {
+    "defaultMessage": "最近 {months} 个月",
+    "description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
   },
-  "hWs95P": {
-    "defaultMessage": "重要讯息将透过邮件通知，请填入信箱完成设定。",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
+  "A3wDZ8": {
+    "defaultMessage": "我的 NFT 收藏",
+    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/NFTCollection/index.tsx"
   },
-  "cg1VJ2": {
-    "defaultMessage": "连接加密钱包",
+  "A41QIy": {
+    "defaultMessage": "Enter Password",
     "description": ""
   },
-  "YjNkcK": {
-    "defaultMessage": "若要变更地址，请直接操作钱包切換",
+  "A7ugfn": {
+    "defaultMessage": "更多操作",
     "description": ""
   },
-  "wSEOxH": {
-    "defaultMessage": "联系渠道",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
-  },
-  "CwSpld": {
-    "defaultMessage": "非登入用途",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
+  "A8MpFX": {
+    "defaultMessage": "请输入个人简介",
+    "description": ""
   },
-  "qswU4E": {
-    "defaultMessage": "邮箱将不作为登入使用，仅作为联系渠道",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
+  "AGcU5J": {
+    "defaultMessage": "置顶",
+    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
   },
-  "EfJYPI": {
-    "defaultMessage": "验证码",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
+  "ANA7sk": {
+    "defaultMessage": "主理",
+    "description": "src/views/TagDetail/Owner/index.tsx"
   },
-  "jgLiba": {
-    "defaultMessage": "请输入验证码",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
+  "ANhCde": {
+    "defaultMessage": "马上开始你的创作吧！",
+    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
   },
-  "jL2ZHb": {
-    "defaultMessage": "验证码有效期 20 分钟",
-    "description": ""
+  "AYTnjk": {
+    "defaultMessage": "追踪",
+    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
   },
-  "4giHJT": {
-    "defaultMessage": "在行动装置上使用问题，参考 ",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  "BHFHeY": {
+    "defaultMessage": " 在围炉 {commentCircle}",
+    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
   },
-  "uw32VR": {
-    "defaultMessage": "教学指南",
+  "Bc20la": {
+    "defaultMessage": "天",
     "description": ""
   },
-  "hrfF+i": {
-    "defaultMessage": "刚接触加密钱包？参考 ",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
-  },
-  "HxcjQl": {
-    "defaultMessage": "Matters 将提供更多创作与区块链结合的服务，接入钱包后即可在未来第一时间体验新功能。",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
-  },
-  "LqxIEU": {
-    "defaultMessage": "钱包地址将作为身份识别之一在个人页公开显示。",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  "Bjdw71": {
+    "defaultMessage": "目前总追踪人数",
+    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
   },
-  "UOdEqi": {
-    "defaultMessage": "原有透过电子信箱登入方式将为你保留。为维护你的帐户安全，加密钱包连接后无法重设。",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  "BjzRe8": {
+    "defaultMessage": "，快去查看自己的收入吧！",
+    "description": "src/components/Notice/TransactionNotice/PaymentReceivedDonationNotice.tsx"
   },
-  "VrOoVf": {
-    "defaultMessage": "Matters 不会透过任何渠道主动询问你的钱包私钥。",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  "CBDDR5": {
+    "defaultMessage": "Must be between 2-20 characters long. Only lowercase letters, numbers and underline are allowed.",
+    "description": ""
   },
-  "v6YjIn": {
-    "defaultMessage": "账户",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  "Cdkhl8": {
+    "defaultMessage": "刪除{commentType}",
+    "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
   },
-  "H8KGyc": {
-    "defaultMessage": "进入",
+  "CnPG8j": {
+    "defaultMessage": "精华",
     "description": ""
   },
-  "sy+pv5": {
-    "defaultMessage": "邮箱",
+  "Cu3Cty": {
+    "defaultMessage": "月",
     "description": ""
   },
-  "JxlxVc": {
-    "defaultMessage": "忘记密码？",
-    "description": "src/components/Forms/EmailLoginForm/Buttons.tsx"
+  "CwSpld": {
+    "defaultMessage": "非登入用途",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "deEeEI": {
-    "defaultMessage": "注册",
-    "description": ""
+  "D2Sw/t": {
+    "defaultMessage": "添加以下任一网址到 RSS 阅读器",
+    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
   },
-  "N2IrpM": {
-    "defaultMessage": "确认",
+  "D3idYv": {
+    "defaultMessage": "设定",
     "description": ""
   },
-  "EwVnoC": {
-    "defaultMessage": "我已阅读并同意",
-    "description": ""
+  "DMlmcU": {
+    "defaultMessage": "免费资格",
+    "description": "src/views/Circle/Settings/index.tsx"
   },
-  "9+Ddtu": {
-    "defaultMessage": "下一步",
+  "DXJ8ys": {
+    "defaultMessage": "阅读次数代表了你的作品被登入用户阅读的总次数，每次阅读过程超过一定时间后才会计入。此外，同一个用户的多次阅读也会进行累计。",
+    "description": "src/components/Dialogs/HelpDialog/index.tsx"
+  },
+  "E8W3qa": {
+    "defaultMessage": "2-20 个字符",
     "description": ""
   },
-  "k5NnNF": {
-    "defaultMessage": "追踪了你",
-    "description": "src/components/Notice/UserNotice/UserNewFollowerNotice.tsx"
+  "EQeKnO": {
+    "defaultMessage": "邀请管理",
+    "description": "src/views/Circle/Settings/index.tsx"
   },
-  "KZlRde": {
-    "defaultMessage": " 关联了你的作品 ",
-    "description": "src/components/Notice/ArticleArticleNotice/ArticleNewCollectedNotice.tsx"
+  "EW5R4p": {
+    "defaultMessage": "催更、提问、分享、讨论…",
+    "description": "src/views/Circle/Discussion/Discussion.tsx"
   },
-  "/nu5ho": {
-    "defaultMessage": "回复了你在作品 ",
-    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
+  "EfJYPI": {
+    "defaultMessage": "验证码",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "ZUPQzl": {
-    "defaultMessage": " 的评论",
-    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
+  "EoNvLu": {
+    "defaultMessage": "创作了",
+    "description": "src/views/User/Articles/UserArticles.tsx"
   },
-  "b+LSgI": {
-    "defaultMessage": "回复了你在围炉 ",
-    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
+  "EwVnoC": {
+    "defaultMessage": "我已阅读并同意",
+    "description": ""
   },
-  "aaUBvF": {
-    "defaultMessage": " 中的发言",
-    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
+  "FALWef": {
+    "defaultMessage": " 广播中留言 ",
+    "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
   },
-  "DIQKiC": {
-    "defaultMessage": " 在作品 ",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
+  "FOOymB": {
+    "defaultMessage": "还没有成员",
+    "description": "src/views/Circle/Profile/MembersDialog/Content.tsx"
   },
-  "jqACL/": {
-    "defaultMessage": " 的评论中提及你",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
+  "FaTb0A": {
+    "defaultMessage": "安装 MetaMask",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "+AdTsY": {
-    "defaultMessage": " 众聊提及你",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
+  "Fe682o": {
+    "defaultMessage": "下月预期营收",
+    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
   },
-  "ISn3eZ": {
-    "defaultMessage": " 广播提及你",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
+  "FhWC22": {
+    "defaultMessage": "社区共建基地",
+    "description": ""
   },
-  "uqmi/b": {
-    "defaultMessage": " 置顶了你在作品 ",
-    "description": "src/components/Notice/CommentNotice/CommentPinnedNotice.tsx"
+  "FmWYRt": {
+    "defaultMessage": "免费资格时长",
+    "description": ""
   },
-  "VjxGd7": {
-    "defaultMessage": "评论了作品 ",
-    "description": "src/components/Notice/CommentNotice/ArticleNewCommentNotice.tsx"
+  "GBm/sD": {
+    "defaultMessage": " 众聊中发表话题，其中有提及你 ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "U/Tqmx": {
-    "defaultMessage": "评论了你收藏的作品 ",
-    "description": "src/components/Notice/CommentNotice/SubscribedArticleNewCommentNotice.tsx"
+  "GRtGnZ": {
+    "defaultMessage": "辞去权限",
+    "description": "src/views/TagDetail/DropdownActions/index.tsx"
   },
-  "VoOZni": {
-    "defaultMessage": "在围炉 ",
-    "description": "src/components/Notice/CommentNotice/CircleNewBroadcastNotice.tsx"
+  "GZJpDf": {
+    "defaultMessage": "数据后台",
+    "description": ""
   },
-  "oaDToH": {
-    "defaultMessage": " 发布了新广播",
-    "description": "src/components/Notice/CommentNotice/CircleNewBroadcastNotice.tsx"
+  "GugBCe": {
+    "defaultMessage": "本月新增追踪人数",
+    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
   },
-  "qPPrzm": {
-    "defaultMessage": " 支持了你的作品 ",
-    "description": "src/components/Notice/TransactionNotice/PaymentReceivedDonationNotice.tsx"
+  "H0JBH6": {
+    "defaultMessage": "登出",
+    "description": ""
   },
-  "BjzRe8": {
-    "defaultMessage": "，快去查看自己的收入吧！",
-    "description": "src/components/Notice/TransactionNotice/PaymentReceivedDonationNotice.tsx"
+  "H8KGyc": {
+    "defaultMessage": "进入",
+    "description": ""
   },
-  "z4NaU2": {
-    "defaultMessage": "你的 ",
-    "description": "src/components/Notice/TransactionNotice/PaymentPayoutNotice.tsx"
+  "HFVDeB": {
+    "defaultMessage": "相关标签",
+    "description": "src/views/TagDetail/RelatedTags/index.tsx"
   },
-  "bVZDVx": {
-    "defaultMessage": " 提现流程已开始，到帐时间请关注银行提醒。",
-    "description": "src/components/Notice/TransactionNotice/PaymentPayoutNotice.tsx"
+  "HtSDyc": {
+    "defaultMessage": "帮助中心",
+    "description": ""
   },
-  "nto8ly": {
-    "defaultMessage": "订阅了你的围炉",
-    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
+  "HxcjQl": {
+    "defaultMessage": "Matters 将提供更多创作与区块链结合的服务，接入钱包后即可在未来第一时间体验新功能。",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "qYzBk8": {
-    "defaultMessage": "退订了你的围炉",
-    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
+  "HzaRKA": {
+    "defaultMessage": "一键搬家",
+    "description": ""
   },
-  "LW1aX1": {
-    "defaultMessage": "恭喜你！",
-    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
+  "IFY8r4": {
+    "defaultMessage": "请输入密码",
+    "description": "src/components/Forms/EmailLoginForm/index.tsx"
   },
-  "KyWDUu": {
-    "defaultMessage": " 邀请你免费加入围炉 ",
-    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
+  "Ic4hqD": {
+    "defaultMessage": "字",
+    "description": "src/views/User/Articles/UserArticles.tsx"
   },
-  "jF+Mle": {
-    "defaultMessage": " 天，前去免费体验，与大家谈天说地吧。",
-    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
+  "J+LXrH": {
+    "defaultMessage": "持续支持邮箱進入，未來可随时启用钱包登入",
+    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
   },
-  "wqaNK4": {
-    "defaultMessage": "在你的围炉 ",
+  "J+dIsA": {
+    "defaultMessage": "订阅",
     "description": ""
   },
-  "FALWef": {
-    "defaultMessage": " 广播中留言 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
+  "J3yk6u": {
+    "defaultMessage": "在围炉 ",
+    "description": ""
   },
-  "YlxpJl": {
-    "defaultMessage": " 广播中留言，其中有提及你 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
+  "JIjMWL": {
+    "defaultMessage": "你的作品已发布到分布式网络",
+    "description": "src/components/Notice/ArticleNotice/ArticlePublishedNotice.tsx"
   },
-  "qQmSxu": {
-    "defaultMessage": "你已成功登记参加空投且完成以太坊钱包设定，空投活动将在 2021/11/12 进行。你设定的空投地址：",
-    "description": "src/components/Notice/CryptoNotice/CryptoWalletAirdropNotice.tsx"
+  "JXdbo8": {
+    "defaultMessage": "完成",
+    "description": ""
   },
-  "UgvfcU": {
-    "defaultMessage": "你已完成以太坊钱包设定。你设定的地址：",
-    "description": "src/components/Notice/CryptoNotice/CryptoWalletConnectedNotice.tsx"
+  "Jc+W6M": {
+    "defaultMessage": " 辞去了标签主理人权限，你要不要试试看成为新的主理人？",
+    "description": "src/components/Notice/TagNotice/TagLeaveNotice.tsx"
   },
-  "+hfUcV": {
-    "defaultMessage": "在围炉 {circlename} 发布了新广播",
-    "description": "src/components/Notice/CommentNotice/CircleNewBroadcastNotice.tsx"
+  "JpS59y": {
+    "defaultMessage": "已接受",
+    "description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
   },
-  "An0rpe": {
-    "defaultMessage": "{circlename} 广播中留言 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
+  "Js/Fij": {
+    "defaultMessage": "作品已取消精选",
+    "description": "src/components/ArticleDigest/DropdownActions/SetTagUnselectedButton.tsx"
   },
-  "VO4Elt": {
-    "defaultMessage": " 在作品 {commentArticle} 的评论中提及你",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
+  "JxlxVc": {
+    "defaultMessage": "忘记密码？",
+    "description": "src/components/Forms/EmailLoginForm/Buttons.tsx"
   },
-  "BHFHeY": {
-    "defaultMessage": " 在围炉 {commentCircle}",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
+  "K3r6DQ": {
+    "defaultMessage": "刪除",
+    "description": ""
   },
-  "5sAbzJ": {
-    "defaultMessage": " 众聊中发表话题 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  "KL502d": {
+    "defaultMessage": "资料已保存",
+    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx"
   },
-  "A3LOng": {
-    "defaultMessage": " 众聊中回复话题 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  "KLQ1/z": {
+    "defaultMessage": "围炉创建成功",
+    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
   },
-  "ftD7Hy": {
-    "defaultMessage": " 众聊提及了你 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  "KMcrz8": {
+    "defaultMessage": "认领",
+    "description": "src/views/TagDetail/Owner/index.tsx"
   },
-  "g/L3Fm": {
-    "defaultMessage": " 众聊中发表与回复话题 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  "KZlRde": {
+    "defaultMessage": " 关联了你的作品 ",
+    "description": "src/components/Notice/ArticleArticleNotice/ArticleNewCollectedNotice.tsx"
   },
-  "GBm/sD": {
-    "defaultMessage": " 众聊中发表话题，其中有提及你 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  "KyWDUu": {
+    "defaultMessage": " 邀请你免费加入围炉 ",
+    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
   },
-  "tQsujN": {
-    "defaultMessage": " 众聊中回复话题，其中有提及你 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  "L0J61B": {
+    "defaultMessage": "免费",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "uuEGON": {
-    "defaultMessage": " 众聊中发表与回复话题，其中有提及你 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  "L4NXXh": {
+    "defaultMessage": "目前总营收",
+    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
   },
-  "J3yk6u": {
-    "defaultMessage": "在围炉 ",
-    "description": ""
+  "L7Si5/": {
+    "defaultMessage": "管理社群",
+    "description": "src/views/TagDetail/DropdownActions/index.tsx"
   },
-  "hk2aiz": {
-    "defaultMessage": " 追踪了你的围炉",
-    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
+  "LGox1K": {
+    "defaultMessage": "已追踪",
+    "description": ""
   },
-  "mPe6DK": {
-    "defaultMessage": " 订阅了你的围炉",
-    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
+  "LOefol": {
+    "defaultMessage": "上锁",
+    "description": "src/views/Circle/Analytics/ContentAnalytics/ContentTabs/index.tsx"
   },
-  "JIjMWL": {
-    "defaultMessage": "你的作品已发布到分布式网络",
-    "description": "src/components/Notice/ArticleNotice/ArticlePublishedNotice.tsx"
+  "LW1aX1": {
+    "defaultMessage": "恭喜你！",
+    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
   },
-  "sncOwi": {
-    "defaultMessage": " 在作品中提及你",
-    "description": "src/components/Notice/ArticleNotice/ArticleMentionedYouNotice.tsx"
+  "Lc/azT": {
+    "defaultMessage": "IPNS 订阅",
+    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
   },
-  "2eebTb": {
-    "defaultMessage": " 收藏了你的作品",
-    "description": "src/components/Notice/ArticleNotice/ArticleNewSubscriberNotice.tsx"
+  "LphWYP": {
+    "defaultMessage": "Matters 用户协议和隐私政策",
+    "description": ""
   },
-  "YIes/F": {
-    "defaultMessage": "等 {actorsCount} 人",
-    "description": "src/components/Notice/ArticleNotice/ArticleNewSubscriberNotice.tsx"
+  "LqxIEU": {
+    "defaultMessage": "钱包地址将作为身份识别之一在个人页公开显示。",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "PjT72J": {
-    "defaultMessage": "喜欢并赞赏了你的作品",
-    "description": "src/components/Notice/ArticleNotice/ArticleNewAppreciationNotice.tsx"
+  "MDNaxs": {
+    "defaultMessage": "人",
+    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
   },
-  "4vkwo0": {
-    "defaultMessage": "你的修订作品已发布到分布式网络",
-    "description": "src/components/Notice/ArticleNotice/RevisedArticlePublishedNotice.tsx"
+  "MkwOFW": {
+    "defaultMessage": "浏览记录",
+    "description": ""
   },
-  "QV19cI": {
-    "defaultMessage": "你的修订作品发布失败",
-    "description": "src/components/Notice/ArticleNotice/RevisedArticleNotPublishedNotice.tsx"
+  "N2IrpM": {
+    "defaultMessage": "确认",
+    "description": ""
   },
-  "euNJsE": {
-    "defaultMessage": "新作品已经加入围炉，马上前往阅读吧!",
-    "description": "src/components/Notice/ArticleNotice/CircleNewArticle.tsx"
+  "N3K1H9": {
+    "defaultMessage": "Matters 不会透过任何渠道询问你的钱包私钥。",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "/3G89K": {
-    "defaultMessage": " 又成长了",
-    "description": "src/components/Notice/ArticleNotice/CircleNewArticle.tsx"
+  "NAidKb": {
+    "defaultMessage": "通知",
+    "description": ""
   },
-  "xwj01D": {
-    "defaultMessage": " 邀请你成为标签的协作者",
-    "description": "src/components/Notice/TagNotice/TagAddEditorNotice.tsx"
+  "NONfAh": {
+    "defaultMessage": "豆瓣",
+    "description": "src/components/Share/Buttons/Douban.tsx"
   },
-  "t7ah39": {
-    "defaultMessage": " 成为了标签的主理人，你的作品也在其中。快来看看其他作者的精彩创作吧",
-    "description": "src/components/Notice/TagNotice/TagAdoptionNotice.tsx"
+  "NzfL1d": {
+    "defaultMessage": "再次输入密码",
+    "description": "src/components/Forms/EmailSignUpForm/Password.tsx"
   },
   "O03Rkc": {
     "defaultMessage": " 辞去了权限。你可以邀请新的协作者加入了",
     "description": "src/components/Notice/TagNotice/TagLeaveEditorNotice.tsx"
   },
-  "dsBCfK": {
-    "defaultMessage": "哎呀，标签协作者",
-    "description": "src/components/Notice/TagNotice/TagLeaveEditorNotice.tsx"
+  "O0QB1v": {
+    "defaultMessage": "用户将收到你的围炉免费资格邀请函，设置免费的时限，邀请他们一起加入吧！",
+    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/PreSend.tsx"
   },
-  "Jc+W6M": {
-    "defaultMessage": " 辞去了标签主理人权限，你要不要试试看成为新的主理人？",
-    "description": "src/components/Notice/TagNotice/TagLeaveNotice.tsx"
+  "OIj8pQ": {
+    "defaultMessage": "成功发送邀请",
+    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/Sent.tsx"
+  },
+  "OKhRC6": {
+    "defaultMessage": "分享",
+    "description": ""
+  },
+  "PjT72J": {
+    "defaultMessage": "喜欢并赞赏了你的作品",
+    "description": "src/components/Notice/ArticleNotice/ArticleNewAppreciationNotice.tsx"
   },
-  "OKhRC6": {
-    "defaultMessage": "分享",
+  "Po+kJe": {
+    "defaultMessage": "最近 {month} 个月",
+    "description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
+  },
+  "Pp/0po": {
+    "defaultMessage": "换一批",
     "description": ""
   },
-  "u5aHb4": {
-    "defaultMessage": "复制链接",
+  "Q8Qw5B": {
+    "defaultMessage": "个人简介",
     "description": ""
   },
-  "NONfAh": {
-    "defaultMessage": "豆瓣",
-    "description": "src/components/Share/Buttons/Douban.tsx"
+  "QCo7Gc": {
+    "defaultMessage": "选择 NFT 作为你的头像",
+    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/NFTCollection/index.tsx"
   },
-  "rBjwQy": {
-    "defaultMessage": "微博",
-    "description": "src/components/Share/Buttons/Weibo.tsx"
+  "QUqfbW": {
+    "defaultMessage": "说说围炉的有趣之处，吸引支持者加入",
+    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
   },
-  "bBYO6x": {
-    "defaultMessage": "取消屏蔽",
-    "description": "src/components/BlockUser/Button/index.tsx"
+  "QV19cI": {
+    "defaultMessage": "你的修订作品发布失败",
+    "description": "src/components/Notice/ArticleNotice/RevisedArticleNotPublishedNotice.tsx"
   },
-  "vAc1Bw": {
-    "defaultMessage": "封锁用户",
-    "description": ""
+  "QZXKhG": {
+    "defaultMessage": "设置围炉网址（创建后不可修改）",
+    "description": "src/components/Forms/CreateCircleForm/Init.tsx"
   },
-  "mSAY3/": {
-    "defaultMessage": "已取消屏蔽。该用户现在可以评论你的作品和围炉。",
-    "description": "src/components/BlockUser/Button/index.tsx"
+  "RFzVUD": {
+    "defaultMessage": "取消置顶",
+    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
   },
-  "wEQDC6": {
-    "defaultMessage": "编辑资料",
+  "RxiHr/": {
+    "defaultMessage": "还没有任何用户回覆你的邀请喔！",
+    "description": "src/views/Circle/Settings/ManageInvitation/Invites/Accepted/index.tsx"
+  },
+  "SENRqu": {
+    "defaultMessage": "Help",
     "description": ""
   },
-  "/+XWDi": {
-    "defaultMessage": "航行日志 2.0",
-    "description": "src/components/UserProfile/DropdownActions/index.tsx"
+  "SNh1n0": {
+    "defaultMessage": "查看名单",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "qyzJxi": {
-    "defaultMessage": "航行日志 1.0",
-    "description": "src/components/UserProfile/DropdownActions/index.tsx"
+  "SdXoXI": {
+    "defaultMessage": "你已寄出邀请给朋友们，快去已邀请管理查看他们加入的进度吧！",
+    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/Sent.tsx"
   },
-  "A7ugfn": {
-    "defaultMessage": "更多操作",
+  "Seanpx": {
+    "defaultMessage": "Required",
     "description": ""
   },
-  "b1FfGy": {
-    "defaultMessage": "内容订阅",
-    "description": "src/components/UserProfile/index.tsx"
-  },
-  "/3kw6k": {
-    "defaultMessage": "尝试将内容写入 IPFS 网络中，需要一段时间，请耐心等候。若等候时间过久，可通过发布文章来加速。",
-    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  "Szd1tH": {
+    "defaultMessage": "登出失败，再来一次",
+    "description": ""
   },
-  "Lc/azT": {
-    "defaultMessage": "IPNS 订阅",
-    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  "TQLBox": {
+    "defaultMessage": "取消置顶",
+    "description": "src/components/ArticleDigest/DropdownActions/StickyButton.tsx"
   },
-  "cf37Zy": {
-    "defaultMessage": "添加 IPFS 生成的 IPNS 指纹到阅读器，如：",
-    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  "TSDiqB": {
+    "defaultMessage": "付费人数",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "zxlwbc": {
-    "defaultMessage": "等待写入完成...",
-    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  "TjWWxF": {
+    "defaultMessage": "广播已送出",
+    "description": "src/views/Circle/Broadcast/Broadcast.tsx"
   },
-  "gMZfHO": {
-    "defaultMessage": "RSS 订阅",
-    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  "TzhzIH": {
+    "defaultMessage": "创作者",
+    "description": ""
   },
-  "D2Sw/t": {
-    "defaultMessage": "添加以下任一网址到 RSS 阅读器",
-    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  "U/Tqmx": {
+    "defaultMessage": "评论了你收藏的作品 ",
+    "description": "src/components/Notice/CommentNotice/SubscribedArticleNewCommentNotice.tsx"
   },
-  "rf0ew3": {
-    "defaultMessage": "快来搭建围炉，呼召你的支持者加入!",
-    "description": "src/components/UserProfile/CircleWidget/index.tsx"
+  "U9IXic": {
+    "defaultMessage": "添加作品",
+    "description": "src/views/Circle/Profile/AddCircleArticle/Button.tsx"
   },
-  "pzTOmv": {
-    "defaultMessage": "追踪者",
+  "UNUROl": {
+    "defaultMessage": "建议 50 字以内，最长 200 字",
     "description": ""
   },
-  "i/4KO2": {
-    "defaultMessage": "此帐户因为违反社区约章而被注销",
-    "description": "src/components/UserProfile/index.tsx"
-  },
-  "oNYnCM": {
-    "defaultMessage": "已注销用户",
-    "description": "src/components/UserProfile/index.tsx"
+  "UOdEqi": {
+    "defaultMessage": "原有透过电子信箱登入方式将为你保留。为维护你的帐户安全，加密钱包连接后无法重设。",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "rs0YS2": {
-    "defaultMessage": "已禁言用户",
-    "description": "src/components/UserProfile/index.tsx"
+  "UgvfcU": {
+    "defaultMessage": "你已完成以太坊钱包设定。你设定的地址：",
+    "description": "src/components/Notice/CryptoNotice/CryptoWalletConnectedNotice.tsx"
   },
-  "EoNvLu": {
-    "defaultMessage": "创作了",
-    "description": "src/views/User/Articles/UserArticles.tsx"
+  "UjKkhq": {
+    "defaultMessage": "作品已添加标签",
+    "description": "src/views/TagDetail/DropdownActions/index.tsx"
   },
   "UxfPXa": {
     "defaultMessage": "累积创作",
     "description": "src/views/User/Articles/UserArticles.tsx"
   },
-  "Ic4hqD": {
-    "defaultMessage": "字",
-    "description": "src/views/User/Articles/UserArticles.tsx"
+  "VO4Elt": {
+    "defaultMessage": " 在作品 {commentArticle} 的评论中提及你",
+    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
   },
-  "J+dIsA": {
-    "defaultMessage": "订阅",
-    "description": ""
+  "VjxGd7": {
+    "defaultMessage": "评论了作品 ",
+    "description": "src/components/Notice/CommentNotice/ArticleNewCommentNotice.tsx"
   },
-  "3KNMbJ": {
-    "defaultMessage": "作品",
-    "description": ""
+  "VrOoVf": {
+    "defaultMessage": "Matters 不会透过任何渠道主动询问你的钱包私钥。",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  },
+  "VwuiYK": {
+    "defaultMessage": "Oops！此网址名称已被使用了，换一个试试",
+    "description": "src/components/Forms/CreateCircleForm/Init.tsx"
   },
   "WBVVYd": {
     "defaultMessage": "回应",
     "description": ""
   },
-  "1EYCdR": {
-    "defaultMessage": "标签",
-    "description": ""
-  },
-  "sT9HoG": {
-    "defaultMessage": "欢迎加入 Matters，一个自由、自主、永续的创作与公共讨论空间。",
-    "description": "src/views/Follow/PickAuthors/index.tsx"
-  },
-  "7DIW6+": {
-    "defaultMessage": "了解更多",
-    "description": ""
-  },
-  "Z6ewE3": {
-    "defaultMessage": "参与开发",
-    "description": "src/views/Me/Settings/AnonymousSettings/Enhance/index.tsx"
-  },
-  "1pFLGZ": {
-    "defaultMessage": "漏洞赏金计划",
-    "description": ""
+  "WSUAwk": {
+    "defaultMessage": "添加到精选",
+    "description": "src/components/ArticleDigest/DropdownActions/SetTagSelectedButton.tsx"
   },
-  "mk+LCk": {
-    "defaultMessage": "界面设定",
-    "description": "src/views/Me/Settings/AnonymousSettings/DisplayPreferences/index.tsx"
+  "WpvsPu": {
+    "defaultMessage": "订阅",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "y1Z3or": {
-    "defaultMessage": "修改介面语言",
-    "description": ""
+  "WuvE8X": {
+    "defaultMessage": "{circleName} 的追踪者",
+    "description": "src/views/Circle/Profile/FollowersDialog/index.tsx"
   },
-  "itPgxd": {
-    "defaultMessage": "个人主页",
-    "description": ""
+  "X+Xvgq": {
+    "defaultMessage": "取消精选",
+    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
   },
-  "vH8sCb": {
-    "defaultMessage": "我的围炉",
-    "description": ""
+  "XH0Lb6": {
+    "defaultMessage": "欢迎加入 Matters！",
+    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
   },
-  "2atspc": {
-    "defaultMessage": "我的草稿",
-    "description": ""
+  "XHMco9": {
+    "defaultMessage": "人",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "3yk8fB": {
-    "defaultMessage": "我的钱包",
+  "XVYrS/": {
+    "defaultMessage": "还没有追踪者",
     "description": ""
   },
-  "GZJpDf": {
-    "defaultMessage": "数据后台",
-    "description": ""
+  "XcTMMM": {
+    "defaultMessage": "已有帐户？",
+    "description": "src/components/Forms/EmailSignUpForm/Buttons.tsx"
   },
-  "nGBrvw": {
-    "defaultMessage": "我的收藏",
+  "Xd0J7Y": {
+    "defaultMessage": "开放社区",
     "description": ""
   },
-  "2slIPX": {
-    "defaultMessage": "我的赞赏",
+  "XgdZSb": {
+    "defaultMessage": "值得关注",
     "description": ""
   },
-  "2uRduT": {
-    "defaultMessage": " 的评论",
-    "description": "src/components/Notice/CommentNotice/CommentPinnedNotice.tsx"
-  },
-  "MkwOFW": {
-    "defaultMessage": "浏览记录",
-    "description": ""
+  "Xz/AHp": {
+    "defaultMessage": "broadcast and mentioned you",
+    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
   },
-  "fG41Ux": {
-    "defaultMessage": "登出成功",
-    "description": ""
+  "YIes/F": {
+    "defaultMessage": "等 {actorsCount} 人",
+    "description": "src/components/Notice/ArticleNotice/ArticleNewSubscriberNotice.tsx"
   },
-  "Szd1tH": {
-    "defaultMessage": "登出失败，再来一次",
+  "YjNkcK": {
+    "defaultMessage": "若要变更地址，请直接操作钱包切換",
     "description": ""
   },
-  "HtSDyc": {
-    "defaultMessage": "帮助中心",
-    "description": ""
+  "YlxpJl": {
+    "defaultMessage": " 广播中留言，其中有提及你 ",
+    "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
   },
-  "D3idYv": {
-    "defaultMessage": "设定",
-    "description": ""
+  "Z6cII7": {
+    "defaultMessage": "累计阅读时数",
+    "description": "src/components/Dialogs/HelpDialog/index.tsx"
   },
-  "H0JBH6": {
-    "defaultMessage": "登出",
-    "description": ""
+  "Z6ewE3": {
+    "defaultMessage": "参与开发",
+    "description": "src/views/Me/Settings/AnonymousSettings/Enhance/index.tsx"
   },
-  "cE4Hfw": {
-    "defaultMessage": "发现",
-    "description": ""
+  "ZAs170": {
+    "defaultMessage": "基本资料",
+    "description": "src/views/Circle/Settings/index.tsx"
   },
-  "NAidKb": {
-    "defaultMessage": "通知",
-    "description": ""
+  "ZUPQzl": {
+    "defaultMessage": " 的评论",
+    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
   },
-  "enMIYK": {
-    "defaultMessage": "我的",
-    "description": ""
+  "ZVoJan": {
+    "defaultMessage": "修订作品",
+    "description": "src/components/ArticleDigest/DropdownActions/EditButton.tsx"
   },
-  "xmcVZ0": {
-    "defaultMessage": "搜索",
+  "ZjDH42": {
+    "defaultMessage": "关于我们",
     "description": ""
   },
-  "47FYwb": {
-    "defaultMessage": "取消",
-    "description": ""
+  "aa0nss": {
+    "defaultMessage": "取消精选",
+    "description": "src/components/ArticleDigest/DropdownActions/SetTagUnselectedButton.tsx"
   },
-  "ll/ufR": {
-    "defaultMessage": "热门",
-    "description": ""
+  "aaUBvF": {
+    "defaultMessage": " 中的发言",
+    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
   },
   "adThp5": {
     "defaultMessage": "最新",
     "description": ""
   },
-  "CnPG8j": {
-    "defaultMessage": "精华",
-    "description": ""
+  "b+LSgI": {
+    "defaultMessage": "回复了你在围炉 ",
+    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
   },
-  "wbcwKd": {
-    "defaultMessage": "查看全部",
-    "description": ""
+  "b1FfGy": {
+    "defaultMessage": "内容订阅",
+    "description": "src/components/UserProfile/index.tsx"
   },
-  "XgdZSb": {
-    "defaultMessage": "值得关注",
-    "description": ""
+  "b3onWZ": {
+    "defaultMessage": "最近 {days} 天",
+    "description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
   },
-  "kc79d3": {
-    "defaultMessage": "找你想看的",
-    "description": ""
+  "b8ogKp": {
+    "defaultMessage": "新增邀请",
+    "description": "src/views/Circle/Settings/ManageInvitation/AddButton/index.tsx"
   },
-  "Pp/0po": {
-    "defaultMessage": "换一批",
+  "bBYO6x": {
+    "defaultMessage": "取消屏蔽",
+    "description": "src/components/BlockUser/Button/index.tsx"
+  },
+  "beLe/F": {
+    "defaultMessage": "广播",
     "description": ""
   },
-  "6gOpfl": {
-    "defaultMessage": "暂时隐藏公告栏 7 天",
-    "description": "src/views/Home/Announcements/index.tsx"
+  "cE4Hfw": {
+    "defaultMessage": "发现",
+    "description": ""
   },
-  "3kbIhS": {
-    "defaultMessage": "未命名",
+  "cd/II9": {
+    "defaultMessage": "{totalCount, plural, =1 {篇文章} other {篇文章}}",
     "description": ""
   },
-  "MW9PzQ": {
-    "defaultMessage": "Top Supporters",
-    "description": "src/views/Me/Analytics/EmptyAnalytics/index.tsx"
+  "cf37Zy": {
+    "defaultMessage": "添加 IPFS 生成的 IPNS 指纹到阅读器，如：",
+    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
   },
-  "cmtHjM": {
-    "defaultMessage": "由于你尚未发布任何作品，这裡还没有任何数据能与你分享哦！发布第一篇作品来介绍你自己，以此开启你的创作之旅吧！",
-    "description": "src/views/Me/Analytics/EmptyAnalytics/index.tsx"
+  "cfL5uk": {
+    "defaultMessage": "已超过 200 字，目前 {numbers} 字",
+    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx"
   },
-  "69+D96": {
-    "defaultMessage": "开始创作",
+  "cg1VJ2": {
+    "defaultMessage": "连接加密钱包",
     "description": ""
   },
-  "3ynsJ3": {
-    "defaultMessage": "想了解更多？详见 ",
+  "cmtHjM": {
+    "defaultMessage": "由于你尚未发布任何作品，这裡还没有任何数据能与你分享哦！发布第一篇作品来介绍你自己，以此开启你的创作之旅吧！",
     "description": "src/views/Me/Analytics/EmptyAnalytics/index.tsx"
   },
-  "0Azlrb": {
-    "defaultMessage": "管理",
-    "description": ""
+  "d4waan": {
+    "defaultMessage": "营收",
+    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
   },
-  "eXDZGQ": {
-    "defaultMessage": "主理人",
+  "deEeEI": {
+    "defaultMessage": "注册",
     "description": ""
   },
   "dg3JCQ": {
     "defaultMessage": "协作者",
     "description": ""
   },
-  "TzhzIH": {
-    "defaultMessage": "创作者",
-    "description": ""
-  },
-  "Pdx3j1": {
-    "defaultMessage": "创作新的作品",
-    "description": "src/views/TagDetail/Buttons/AddButton/CreateDraftMenuItem/index.tsx"
-  },
-  "5FO4vn": {
-    "defaultMessage": "你尚无权限进行该操作",
-    "description": ""
+  "dnsfmR": {
+    "defaultMessage": "，我们会尽快回复!",
+    "description": "src/views/Help/index.tsx"
   },
-  "8ttGfR": {
-    "defaultMessage": "添加我的作品",
-    "description": "src/views/TagDetail/Buttons/AddButton/AddMyArticlesButton/index.tsx"
+  "dsBCfK": {
+    "defaultMessage": "哎呀，标签协作者",
+    "description": "src/components/Notice/TagNotice/TagLeaveEditorNotice.tsx"
   },
-  "ieGrWo": {
-    "defaultMessage": "追踪",
+  "eTpiYa": {
+    "defaultMessage": "尚无支持数据",
     "description": ""
   },
-  "izWS4J": {
-    "defaultMessage": "取消追踪",
+  "eXDZGQ": {
+    "defaultMessage": "主理人",
     "description": ""
   },
-  "LGox1K": {
-    "defaultMessage": "已追踪",
-    "description": ""
+  "ei+kyp": {
+    "defaultMessage": "围炉名称",
+    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
   },
-  "ikVIu3": {
-    "defaultMessage": "篇作品",
+  "enMIYK": {
+    "defaultMessage": "我的",
     "description": ""
   },
-  "HFVDeB": {
-    "defaultMessage": "相关标签",
-    "description": "src/views/TagDetail/RelatedTags/index.tsx"
-  },
-  "o2Na0B": {
-    "defaultMessage": "返回全部",
+  "eov+J2": {
+    "defaultMessage": "自定义网址名称",
     "description": ""
   },
-  "KMcrz8": {
-    "defaultMessage": "认领",
-    "description": "src/views/TagDetail/Owner/index.tsx"
-  },
-  "63HuBz": {
-    "defaultMessage": "此标签目前无人主理",
-    "description": "src/views/TagDetail/Owner/index.tsx"
-  },
-  "UjKkhq": {
-    "defaultMessage": "作品已添加标签",
-    "description": "src/views/TagDetail/DropdownActions/index.tsx"
-  },
-  "GRtGnZ": {
-    "defaultMessage": "辞去权限",
-    "description": "src/views/TagDetail/DropdownActions/index.tsx"
-  },
-  "L7Si5/": {
-    "defaultMessage": "管理社群",
-    "description": "src/views/TagDetail/DropdownActions/index.tsx"
-  },
-  "ySGgTo": {
-    "defaultMessage": "添加精选",
-    "description": "src/views/TagDetail/DropdownActions/index.tsx"
-  },
-  "beLe/F": {
-    "defaultMessage": "广播",
-    "description": ""
+  "euNJsE": {
+    "defaultMessage": "新作品已经加入围炉，马上前往阅读吧!",
+    "description": "src/components/Notice/ArticleNotice/CircleNewArticle.tsx"
   },
-  "20bImY": {
-    "defaultMessage": "众聊",
+  "fG41Ux": {
+    "defaultMessage": "登出成功",
     "description": ""
   },
-  "jx7Hn3": {
-    "defaultMessage": "作品",
-    "description": ""
+  "fOgusL": {
+    "defaultMessage": "选择进入方式",
+    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
   },
-  "U9IXic": {
-    "defaultMessage": "添加作品",
-    "description": "src/views/Circle/Profile/AddCircleArticle/Button.tsx"
+  "fWDtpq": {
+    "defaultMessage": "邀请中",
+    "description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
   },
-  "q+N5Wd": {
-    "defaultMessage": "管理围炉",
-    "description": "src/views/Circle/Profile/DropdownActions/index.tsx"
+  "ftD7Hy": {
+    "defaultMessage": " 众聊提及了你 ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "8xPi0N": {
-    "defaultMessage": "离开围炉",
-    "description": "src/views/Circle/Profile/DropdownActions/index.tsx"
+  "g/L3Fm": {
+    "defaultMessage": " 众聊中发表与回复话题 ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "WuvE8X": {
-    "defaultMessage": "{circleName} 的追踪者",
-    "description": "src/views/Circle/Profile/FollowersDialog/index.tsx"
+  "gMZfHO": {
+    "defaultMessage": "RSS 订阅",
+    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
   },
-  "XVYrS/": {
-    "defaultMessage": "还没有追踪者",
-    "description": ""
+  "h9CG9E": {
+    "defaultMessage": "{commentType}已刪除",
+    "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
   },
-  "+a+2ug": {
-    "defaultMessage": "成员",
-    "description": ""
+  "hWs95P": {
+    "defaultMessage": "重要讯息将透过邮件通知，请填入信箱完成设定。",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "KL502d": {
-    "defaultMessage": "资料已保存",
-    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx"
+  "hYG5fb": {
+    "defaultMessage": "人追踪",
+    "description": "src/views/TagDetail/Followers/index.tsx"
   },
-  "rfz/fN": {
-    "defaultMessage": "建议封面尺寸 1600 x 900 像素",
-    "description": ""
+  "hk2aiz": {
+    "defaultMessage": " 追踪了你的围炉",
+    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
   },
-  "lhaIoi": {
-    "defaultMessage": "请输入姓名",
-    "description": ""
+  "hrfF+i": {
+    "defaultMessage": "刚接触加密钱包？参考 ",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "E8W3qa": {
-    "defaultMessage": "2-20 个字符",
+  "hrgo+E": {
+    "defaultMessage": "隐藏",
     "description": ""
   },
-  "Q8Qw5B": {
-    "defaultMessage": "个人简介",
-    "description": ""
+  "i/4KO2": {
+    "defaultMessage": "此帐户因为违反社区约章而被注销",
+    "description": "src/components/UserProfile/index.tsx"
   },
-  "A8MpFX": {
-    "defaultMessage": "请输入个人简介",
-    "description": ""
+  "iCFXtS": {
+    "defaultMessage": "欢迎未注册或已启用钱包登入的朋友使用",
+    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
   },
-  "UNUROl": {
-    "defaultMessage": "建议 50 字以内，最长 200 字",
+  "ieGrWo": {
+    "defaultMessage": "追踪",
     "description": ""
   },
-  "jvo0vs": {
-    "defaultMessage": "保存",
+  "ikVIu3": {
+    "defaultMessage": "篇作品",
     "description": ""
   },
-  "A3wDZ8": {
-    "defaultMessage": "我的 NFT 收藏",
-    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/NFTCollection/index.tsx"
-  },
-  "QCo7Gc": {
-    "defaultMessage": "选择 NFT 作为你的头像",
-    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/NFTCollection/index.tsx"
+  "ipQlDG": {
+    "defaultMessage": "以邮箱登入",
+    "description": "src/components/Forms/EmailSignUpForm/Buttons.tsx"
   },
-  "eTpiYa": {
-    "defaultMessage": "尚无支持数据",
+  "itPgxd": {
+    "defaultMessage": "个人主页",
     "description": ""
   },
-  "/IMR+8": {
-    "defaultMessage": "支持排行榜",
+  "izWS4J": {
+    "defaultMessage": "取消追踪",
     "description": ""
   },
-  "b3onWZ": {
-    "defaultMessage": "最近 {days} 天",
-    "description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
-  },
-  "Po+kJe": {
-    "defaultMessage": "最近 {month} 个月",
-    "description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
+  "jF+Mle": {
+    "defaultMessage": " 天，前去免费体验，与大家谈天说地吧。",
+    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
   },
-  "A3rLZt": {
-    "defaultMessage": "最近 {months} 个月",
-    "description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
+  "jJ1Brc": {
+    "defaultMessage": "喜欢回应",
+    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
   },
-  "zQvVDJ": {
-    "defaultMessage": "全部",
+  "jL2ZHb": {
+    "defaultMessage": "验证码有效期 20 分钟",
     "description": ""
   },
-  "FOOymB": {
-    "defaultMessage": "还没有成员",
-    "description": "src/views/Circle/Profile/MembersDialog/Content.tsx"
-  },
-  "hYG5fb": {
-    "defaultMessage": "人追踪",
-    "description": "src/views/TagDetail/Followers/index.tsx"
+  "jgLiba": {
+    "defaultMessage": "请输入验证码",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "ANA7sk": {
-    "defaultMessage": "主理",
-    "description": "src/views/TagDetail/Owner/index.tsx"
+  "jvo0vs": {
+    "defaultMessage": "保存",
+    "description": ""
   },
-  "4Odb0J": {
-    "defaultMessage": "置顶作品",
-    "description": "src/components/ArticleDigest/DropdownActions/StickyButton.tsx"
+  "k5NnNF": {
+    "defaultMessage": "追踪了你",
+    "description": "src/components/Notice/UserNotice/UserNewFollowerNotice.tsx"
   },
-  "TQLBox": {
-    "defaultMessage": "取消置顶",
-    "description": "src/components/ArticleDigest/DropdownActions/StickyButton.tsx"
+  "kc79d3": {
+    "defaultMessage": "找你想看的",
+    "description": ""
   },
-  "ZVoJan": {
-    "defaultMessage": "修订作品",
-    "description": "src/components/ArticleDigest/DropdownActions/EditButton.tsx"
+  "lD4FPZ": {
+    "defaultMessage": "请输入邮箱",
+    "description": ""
   },
-  "hrgo+E": {
-    "defaultMessage": "隐藏",
+  "lIir/P": {
+    "defaultMessage": "我知道了",
     "description": ""
   },
-  "uIdMon": {
-    "defaultMessage": "确认隐藏，其他用户将无法从站内访问该作品。隐藏后无法回退，如需再次呈现作品，你需要重新发布。",
-    "description": "src/components/ArticleDigest/DropdownActions/ArchiveArticle/Dialog.tsx"
+  "lNjDPr": {
+    "defaultMessage": "你还没有邀请任何用户喔！点击新增邀请，添加站内或站外朋友加入围炉赠与对方免费资格的固定时长",
+    "description": "src/views/Circle/Settings/ManageInvitation/Invites/Pending/index.tsx"
   },
-  "oIkacT": {
-    "defaultMessage": "作品已隐藏",
-    "description": "src/components/ArticleDigest/DropdownActions/ArchiveArticle/Dialog.tsx"
+  "ldNgRA": {
+    "defaultMessage": "Display name, can be changed later",
+    "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
   },
-  "K3r6DQ": {
-    "defaultMessage": "刪除",
+  "lhaIoi": {
+    "defaultMessage": "请输入姓名",
     "description": ""
   },
-  "mikY/9": {
-    "defaultMessage": "编辑",
-    "description": "src/components/Comment/DropdownActions/EditButton.tsx"
-  },
-  "50cquj": {
-    "defaultMessage": "还没有众聊",
-    "description": "src/views/Circle/Discussion/Discussion.tsx"
+  "ll/ufR": {
+    "defaultMessage": "热门",
+    "description": ""
   },
-  "EW5R4p": {
-    "defaultMessage": "催更、提问、分享、讨论…",
-    "description": "src/views/Circle/Discussion/Discussion.tsx"
+  "mCAIcg": {
+    "defaultMessage": "站内阅读热门排行",
+    "description": "src/views/Circle/Analytics/ContentAnalytics/index.tsx"
   },
-  "9nNpKP": {
-    "defaultMessage": "讨论已送出",
-    "description": "src/views/Circle/Discussion/Discussion.tsx"
+  "mPe6DK": {
+    "defaultMessage": " 订阅了你的围炉",
+    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
   },
-  "TjWWxF": {
-    "defaultMessage": "广播已送出",
-    "description": "src/views/Circle/Broadcast/Broadcast.tsx"
+  "mSAY3/": {
+    "defaultMessage": "已取消屏蔽。该用户现在可以评论你的作品和围炉。",
+    "description": "src/components/BlockUser/Button/index.tsx"
   },
   "mWjpk9": {
     "defaultMessage": "还没有广播",
     "description": "src/views/Circle/Broadcast/Broadcast.tsx"
   },
-  "zb8Kx1": {
-    "defaultMessage": "公告、提醒、碎碎念…"
+  "mikY/9": {
+    "defaultMessage": "编辑",
+    "description": "src/components/Comment/DropdownActions/EditButton.tsx"
   },
-  "AGcU5J": {
-    "defaultMessage": "置顶",
-    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
+  "mjMpv4": {
+    "defaultMessage": "围炉已更新",
+    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
   },
-  "jJ1Brc": {
-    "defaultMessage": "喜欢回应",
-    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
+  "mk+LCk": {
+    "defaultMessage": "界面设定",
+    "description": "src/views/Me/Settings/AnonymousSettings/DisplayPreferences/index.tsx"
   },
-  "RFzVUD": {
-    "defaultMessage": "取消置顶",
-    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
+  "ml3SZN": {
+    "defaultMessage": "至少 8 个字符，支持英文大小写字母、数字和特殊符号",
+    "description": ""
   },
-  "X+Xvgq": {
-    "defaultMessage": "取消精选",
-    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
+  "nGBrvw": {
+    "defaultMessage": "我的收藏",
+    "description": ""
   },
-  "7xnrxG": {
-    "defaultMessage": "作品已添加至精选",
-    "description": "src/components/ArticleDigest/DropdownActions/SetTagSelectedButton.tsx"
+  "nYeDrI": {
+    "defaultMessage": "沒有帐户？",
+    "description": "src/components/Forms/EmailLoginForm/Buttons.tsx"
   },
-  "WSUAwk": {
-    "defaultMessage": "添加到精选",
-    "description": "src/components/ArticleDigest/DropdownActions/SetTagSelectedButton.tsx"
+  "nsaJRn": {
+    "defaultMessage": "上站成功",
+    "description": ""
   },
-  "Js/Fij": {
-    "defaultMessage": "作品已取消精选",
-    "description": "src/components/ArticleDigest/DropdownActions/SetTagUnselectedButton.tsx"
+  "o2Na0B": {
+    "defaultMessage": "返回全部",
+    "description": ""
   },
-  "aa0nss": {
-    "defaultMessage": "取消精选",
-    "description": "src/components/ArticleDigest/DropdownActions/SetTagUnselectedButton.tsx"
+  "oIkacT": {
+    "defaultMessage": "作品已隐藏",
+    "description": "src/components/ArticleDigest/DropdownActions/ArchiveArticle/Dialog.tsx"
   },
-  "32bml8": {
-    "defaultMessage": "追踪",
-    "description": "src/components/Layout/SideNav/index.tsx"
+  "oNYnCM": {
+    "defaultMessage": "已注销用户",
+    "description": "src/components/UserProfile/index.tsx"
   },
   "ohgTH4": {
     "defaultMessage": "追踪中",
     "description": "src/components/UserProfile/index.tsx"
   },
-  "Cu3Cty": {
-    "defaultMessage": "月",
-    "description": ""
-  },
-  "qlki7w": {
-    "defaultMessage": "移除作品",
-    "description": "src/components/ArticleDigest/DropdownActions/RemoveTagButton.tsx"
-  },
   "pRV+UD": {
     "defaultMessage": "折叠",
     "description": "src/components/Comment/DropdownActions/CollapseComment/Button.tsx"
   },
-  "h9CG9E": {
-    "defaultMessage": "{commentType}已刪除",
-    "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
-  },
-  "Cdkhl8": {
-    "defaultMessage": "刪除{commentType}",
-    "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
-  },
-  "77tYPg": {
-    "defaultMessage": "确认删除后，{commentType}会立即消失。",
-    "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
+  "ptqBN1": {
+    "defaultMessage": "暂时不要",
+    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/PreSend.tsx"
   },
-  "cd/II9": {
-    "defaultMessage": "{totalCount, plural, =1 {篇文章} other {篇文章}}",
+  "pwlQEY": {
+    "defaultMessage": "姓名",
     "description": ""
   },
-  "ZAs170": {
-    "defaultMessage": "基本资料",
-    "description": "src/views/Circle/Settings/index.tsx"
-  },
-  "DMlmcU": {
-    "defaultMessage": "免费资格",
-    "description": "src/views/Circle/Settings/index.tsx"
-  },
-  "EQeKnO": {
-    "defaultMessage": "邀请管理",
-    "description": "src/views/Circle/Settings/index.tsx"
-  },
-  "KLQ1/z": {
-    "defaultMessage": "围炉创建成功",
-    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+  "pzTOmv": {
+    "defaultMessage": "追踪者",
+    "description": ""
   },
-  "mjMpv4": {
-    "defaultMessage": "围炉已更新",
-    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+  "q+N5Wd": {
+    "defaultMessage": "管理围炉",
+    "description": "src/views/Circle/Profile/DropdownActions/index.tsx"
   },
-  "ei+kyp": {
+  "q9oMKE": {
     "defaultMessage": "围炉名称",
-    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+    "description": ""
   },
-  "tW3hM/": {
-    "defaultMessage": "围炉描述",
-    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+  "qPPrzm": {
+    "defaultMessage": " 支持了你的作品 ",
+    "description": "src/components/Notice/TransactionNotice/PaymentReceivedDonationNotice.tsx"
   },
-  "CwWLOr": {
-    "defaultMessage": "给围炉取一个吸引人的名字吧",
-    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+  "qQmSxu": {
+    "defaultMessage": "你已成功登记参加空投且完成以太坊钱包设定，空投活动将在 2021/11/12 进行。你设定的空投地址：",
+    "description": "src/components/Notice/CryptoNotice/CryptoWalletAirdropNotice.tsx"
   },
-  "QUqfbW": {
-    "defaultMessage": "说说围炉的有趣之处，吸引支持者加入",
-    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+  "qYzBk8": {
+    "defaultMessage": "退订了你的围炉",
+    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
   },
-  "JXdbo8": {
-    "defaultMessage": "完成",
-    "description": ""
+  "qlki7w": {
+    "defaultMessage": "移除作品",
+    "description": "src/components/ArticleDigest/DropdownActions/RemoveTagButton.tsx"
   },
-  "q9oMKE": {
-    "defaultMessage": "围炉名称",
+  "qswU4E": {
+    "defaultMessage": "邮箱将不作为登入使用，仅作为联系渠道",
     "description": ""
   },
-  "QZXKhG": {
-    "defaultMessage": "设置围炉网址（创建后不可修改）",
-    "description": "src/components/Forms/CreateCircleForm/Init.tsx"
-  },
-  "6BXcdo": {
-    "defaultMessage": "设定围炉门槛（每月）",
-    "description": "src/components/Forms/CreateCircleForm/Init.tsx"
+  "qyzJxi": {
+    "defaultMessage": "航行日志 1.0",
+    "description": "src/components/UserProfile/DropdownActions/index.tsx"
   },
-  "VwuiYK": {
-    "defaultMessage": "Oops！此网址名称已被使用了，换一个试试",
-    "description": "src/components/Forms/CreateCircleForm/Init.tsx"
+  "rBjwQy": {
+    "defaultMessage": "微博",
+    "description": "src/components/Share/Buttons/Weibo.tsx"
   },
-  "gMZZ9I": {
-    "defaultMessage": "2-20 个字符，仅支持英文小写字母、数字或下划线",
+  "rXnmeE": {
+    "defaultMessage": "确认发送",
     "description": ""
   },
-  "+7SAix": {
-    "defaultMessage": "2-12 个字符",
-    "description": ""
+  "reOeq5": {
+    "defaultMessage": "你已拥有个人创作空间站，期待你的第一篇作品。",
+    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
   },
-  "eov+J2": {
-    "defaultMessage": "自定义网址名称",
-    "description": ""
+  "rf0ew3": {
+    "defaultMessage": "快来搭建围炉，呼召你的支持者加入!",
+    "description": "src/components/UserProfile/CircleWidget/index.tsx"
   },
-  "8KFsZN": {
-    "defaultMessage": "阅读次数",
+  "rfz/fN": {
+    "defaultMessage": "建议封面尺寸 1600 x 900 像素",
     "description": ""
   },
-  "LOefol": {
-    "defaultMessage": "上锁",
-    "description": "src/views/Circle/Analytics/ContentAnalytics/ContentTabs/index.tsx"
-  },
-  "/podGX": {
-    "defaultMessage": "公开",
-    "description": "src/views/Circle/Analytics/ContentAnalytics/ContentTabs/index.tsx"
+  "rs0YS2": {
+    "defaultMessage": "已禁言用户",
+    "description": "src/components/UserProfile/index.tsx"
   },
-  "mCAIcg": {
-    "defaultMessage": "站内阅读热门排行",
-    "description": "src/views/Circle/Analytics/ContentAnalytics/index.tsx"
+  "sPgUkN": {
+    "defaultMessage": "本月营收",
+    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
   },
-  "lNjDPr": {
-    "defaultMessage": "你还没有邀请任何用户喔！点击新增邀请，添加站内或站外朋友加入围炉赠与对方免费资格的固定时长",
-    "description": "src/views/Circle/Settings/ManageInvitation/Invites/Pending/index.tsx"
+  "skbUBl": {
+    "defaultMessage": "Log in",
+    "description": "src/components/Buttons/Login/index.tsx"
   },
-  "RxiHr/": {
-    "defaultMessage": "还没有任何用户回覆你的邀请喔！",
-    "description": "src/views/Circle/Settings/ManageInvitation/Invites/Accepted/index.tsx"
+  "sncOwi": {
+    "defaultMessage": " 在作品中提及你",
+    "description": "src/components/Notice/ArticleNotice/ArticleMentionedYouNotice.tsx"
   },
-  "b8ogKp": {
-    "defaultMessage": "新增邀请",
-    "description": "src/views/Circle/Settings/ManageInvitation/AddButton/index.tsx"
+  "stjoBH": {
+    "defaultMessage": "现在，去为你喜欢的作者打赏吧！你的每一次打赏都将为作者带来收入。",
+    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
   },
-  "FmWYRt": {
-    "defaultMessage": "免费资格时长",
+  "sy+pv5": {
+    "defaultMessage": "邮箱",
     "description": ""
   },
-  "Bc20la": {
-    "defaultMessage": "天",
-    "description": ""
+  "t7ah39": {
+    "defaultMessage": " 成为了标签的主理人，你的作品也在其中。快来看看其他作者的精彩创作吧",
+    "description": "src/components/Notice/TagNotice/TagAdoptionNotice.tsx"
   },
-  "O0QB1v": {
-    "defaultMessage": "用户将收到你的围炉免费资格邀请函，设置免费的时限，邀请他们一起加入吧！",
-    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/PreSend.tsx"
+  "t8/r8X": {
+    "defaultMessage": "连接加密钱包",
+    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
   },
-  "rXnmeE": {
-    "defaultMessage": "确认发送",
-    "description": ""
+  "tQsujN": {
+    "defaultMessage": " 众聊中回复话题，其中有提及你 ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "ptqBN1": {
-    "defaultMessage": "暂时不要",
-    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/PreSend.tsx"
+  "tW3hM/": {
+    "defaultMessage": "围炉描述",
+    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
   },
   "tzq2+W": {
     "defaultMessage": "寄出邀请",
     "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/PreSend.tsx"
   },
-  "fWDtpq": {
-    "defaultMessage": "邀请中",
-    "description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
-  },
-  "JpS59y": {
-    "defaultMessage": "已接受",
-    "description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
+  "u5aHb4": {
+    "defaultMessage": "复制链接",
+    "description": ""
   },
-  "Bjdw71": {
-    "defaultMessage": "目前总追踪人数",
-    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  "uIdMon": {
+    "defaultMessage": "确认隐藏，其他用户将无法从站内访问该作品。隐藏后无法回退，如需再次呈现作品，你需要重新发布。",
+    "description": "src/components/ArticleDigest/DropdownActions/ArchiveArticle/Dialog.tsx"
   },
-  "xWZr13": {
-    "defaultMessage": "{follower, plural, =1 {人} other {人}}",
-    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  "uVCg1l": {
+    "defaultMessage": "玩转 Matters 实用指南",
+    "description": ""
   },
-  "GugBCe": {
-    "defaultMessage": "本月新增追踪人数",
-    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  "uqmi/b": {
+    "defaultMessage": " 置顶了你在作品 ",
+    "description": "src/components/Notice/CommentNotice/CommentPinnedNotice.tsx"
   },
-  "MDNaxs": {
-    "defaultMessage": "人",
-    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  "uuEGON": {
+    "defaultMessage": " 众聊中发表与回复话题，其中有提及你 ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "zKOr2x": {
-    "defaultMessage": "已追踪用户占总观看人数比例",
-    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  "uw32VR": {
+    "defaultMessage": "教学指南",
+    "description": ""
   },
-  "AYTnjk": {
-    "defaultMessage": "追踪",
-    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  "v6YjIn": {
+    "defaultMessage": "账户",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "sPgUkN": {
-    "defaultMessage": "本月营收",
-    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
+  "vAc1Bw": {
+    "defaultMessage": "封锁用户",
+    "description": ""
   },
-  "Fe682o": {
-    "defaultMessage": "下月预期营收",
-    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
+  "vH8sCb": {
+    "defaultMessage": "我的围炉",
+    "description": ""
   },
-  "L4NXXh": {
-    "defaultMessage": "目前总营收",
-    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
+  "wEQDC6": {
+    "defaultMessage": "编辑资料",
+    "description": ""
   },
-  "d4waan": {
-    "defaultMessage": "营收",
-    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
+  "wSEOxH": {
+    "defaultMessage": "联系渠道",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "6OBAOi": {
-    "defaultMessage": "目前总订阅人数",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "wXzTZ0": {
+    "defaultMessage": "Enter the name of your Circle",
+    "description": ""
   },
-  "zxy15q": {
-    "defaultMessage": "{subscriber, plural, =1 {人} other {人}}",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "wbcwKd": {
+    "defaultMessage": "查看全部",
+    "description": ""
   },
-  "TSDiqB": {
-    "defaultMessage": "付费人数",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "wqaNK4": {
+    "defaultMessage": "在你的围炉 ",
+    "description": ""
   },
-  "XHMco9": {
-    "defaultMessage": "人",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "xGh9O7": {
+    "defaultMessage": "提醒：信箱将不作为登入使用，仅作为联系渠道",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "1qQzV0": {
-    "defaultMessage": "免费邀请",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "xWZr13": {
+    "defaultMessage": "{follower, plural, =1 {人} other {人}}",
+    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
   },
-  "WpvsPu": {
-    "defaultMessage": "订阅",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "xiKjd/": {
+    "defaultMessage": "使用电子邮箱",
+    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
   },
-  "SNh1n0": {
-    "defaultMessage": "查看名单",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "xmcVZ0": {
+    "defaultMessage": "搜索",
+    "description": ""
   },
-  "2CqWQE": {
-    "defaultMessage": "总数",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "xwj01D": {
+    "defaultMessage": " 邀请你成为标签的协作者",
+    "description": "src/components/Notice/TagNotice/TagAddEditorNotice.tsx"
   },
   "y0b6Kp": {
     "defaultMessage": "付费",
     "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "L0J61B": {
-    "defaultMessage": "免费",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "y1Z3or": {
+    "defaultMessage": "修改介面语言",
+    "description": ""
   },
-  "SdXoXI": {
-    "defaultMessage": "你已寄出邀请给朋友们，快去已邀请管理查看他们加入的进度吧！",
-    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/Sent.tsx"
+  "ySGgTo": {
+    "defaultMessage": "添加精选",
+    "description": "src/views/TagDetail/DropdownActions/index.tsx"
   },
-  "OIj8pQ": {
-    "defaultMessage": "成功发送邀请",
-    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/Sent.tsx"
+  "yZfKI4": {
+    "defaultMessage": "discussion and mentioned you",
+    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
   },
-  "lIir/P": {
-    "defaultMessage": "我知道了",
+  "zKOr2x": {
+    "defaultMessage": "已追踪用户占总观看人数比例",
+    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  },
+  "zQvVDJ": {
+    "defaultMessage": "全部",
     "description": ""
   },
-  "2uwwz+": {
-    "defaultMessage": "累计阅读时長代表了你的作品被登入用户阅读的总时数，每次阅读过程超过一定时间后才会计入。此外，同一个用户的多次阅读也会进行累计。",
-    "description": "src/components/Dialogs/HelpDialog/index.tsx"
+  "zb8Kx1": {
+    "defaultMessage": "公告、提醒、碎碎念…"
   },
-  "Z6cII7": {
-    "defaultMessage": "累计阅读时数",
-    "description": "src/components/Dialogs/HelpDialog/index.tsx"
+  "zxlwbc": {
+    "defaultMessage": "等待写入完成...",
+    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
   },
-  "DXJ8ys": {
-    "defaultMessage": "阅读次数代表了你的作品被登入用户阅读的总次数，每次阅读过程超过一定时间后才会计入。此外，同一个用户的多次阅读也会进行累计。",
-    "description": "src/components/Dialogs/HelpDialog/index.tsx"
+  "zxy15q": {
+    "defaultMessage": "{subscriber, plural, =1 {人} other {人}}",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   }
 }
+

From 83e298cbaecca586b58adb861856816636c3f865 Mon Sep 17 00:00:00 2001
From: Matty <98379126+matters-tech@users.noreply.github.com>
Date: Wed, 12 Apr 2023 17:08:53 +0700
Subject: [PATCH 84/92] New translations default.json (Chinese Traditional)

---
 lang/zh-Hant.json | 1793 ++++++++++++++++++++++-----------------------
 1 file changed, 873 insertions(+), 920 deletions(-)

diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json
index a000082a9c..773b50877b 100644
--- a/lang/zh-Hant.json
+++ b/lang/zh-Hant.json
@@ -1,1297 +1,1250 @@
 {
-  "cfL5uk": {
-    "defaultMessage": "已超過 200 字，目前 {numbers} 字",
-    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx"
+  "+7SAix": {
+    "defaultMessage": "2-12 個字元",
+    "description": ""
   },
-  "3uQKhx": {
-    "defaultMessage": "若你希望向 Matters 提出建議，或遭遇操作異常，请發送郵件至",
-    "description": "src/views/Help/index.tsx"
+  "+a+2ug": {
+    "defaultMessage": "成員",
+    "description": ""
+  },
+  "+hfUcV": {
+    "defaultMessage": "在圍爐 {circlename} 發布了新廣播",
+    "description": "src/components/Notice/CommentNotice/CircleNewBroadcastNotice.tsx"
+  },
+  "/+XWDi": {
+    "defaultMessage": "航行日誌 2.0",
+    "description": "src/components/UserProfile/DropdownActions/index.tsx"
+  },
+  "/3G89K": {
+    "defaultMessage": " 又成長了",
+    "description": "src/components/Notice/ArticleNotice/CircleNewArticle.tsx"
+  },
+  "/3kw6k": {
+    "defaultMessage": "嘗試將內容寫入 IPFS 網絡中，需要一段時間，請耐心等候。若等候時間過久，可透過發佈文章來加速。",
+    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  },
+  "/IMR+8": {
+    "defaultMessage": "支持排行榜",
+    "description": ""
+  },
+  "/asuIY": {
+    "defaultMessage": "進入社區",
+    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
   },
   "/ns2st": {
     "defaultMessage": "下載應用",
     "description": ""
   },
-  "FaTb0A": {
-    "defaultMessage": "安裝 MetaMask",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  "/nu5ho": {
+    "defaultMessage": "回覆了你在作品 ",
+    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
   },
-  "FhWC22": {
-    "defaultMessage": "社區共建基地",
-    "description": ""
+  "/podGX": {
+    "defaultMessage": "公開",
+    "description": "src/views/Circle/Analytics/ContentAnalytics/ContentTabs/index.tsx"
   },
-  "Xd0J7Y": {
-    "defaultMessage": "開放社區",
+  "0Azlrb": {
+    "defaultMessage": "管理",
     "description": ""
   },
-  "dnsfmR": {
-    "defaultMessage": "，我們會儘快回覆!",
-    "description": "src/views/Help/index.tsx"
-  },
-  "ZjDH42": {
-    "defaultMessage": "關於我們",
+  "1EYCdR": {
+    "defaultMessage": "標籤",
     "description": ""
   },
-  "6flWFg": {
-    "defaultMessage": "用戶協議",
+  "1pFLGZ": {
+    "defaultMessage": "漏洞賞金計畫",
     "description": ""
   },
-  "uVCg1l": {
-    "defaultMessage": "玩轉 Matters 實用指南",
+  "1qQzV0": {
+    "defaultMessage": "免費邀請",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  },
+  "20bImY": {
+    "defaultMessage": "眾聊",
     "description": ""
   },
-  "HzaRKA": {
-    "defaultMessage": "一鍵搬家",
+  "2CqWQE": {
+    "defaultMessage": "總數",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  },
+  "2atspc": {
+    "defaultMessage": "我的草稿",
     "description": ""
   },
-  "fOgusL": {
-    "defaultMessage": "選擇進入方式",
-    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
+  "2eebTb": {
+    "defaultMessage": " 收藏了你的作品",
+    "description": "src/components/Notice/ArticleNotice/ArticleNewSubscriberNotice.tsx"
   },
-  "t8/r8X": {
-    "defaultMessage": "連接加密錢包",
-    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
+  "2slIPX": {
+    "defaultMessage": "我的讚賞",
+    "description": ""
   },
-  "iCFXtS": {
-    "defaultMessage": "歡迎未註冊或已啟用錢包登入的朋友使用",
-    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
+  "2uRduT": {
+    "defaultMessage": " 的評論",
+    "description": "src/components/Notice/CommentNotice/CommentPinnedNotice.tsx"
   },
-  "xiKjd/": {
-    "defaultMessage": "使用電子信箱",
-    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
+  "2uwwz+": {
+    "defaultMessage": "累計閱讀時數代表了你的作品被登入用戶閱讀的總時數，每次閱讀過程超過一定時間後才會計入。此外，同一個用戶的多次閱讀也會進行累計。",
+    "description": "src/components/Dialogs/HelpDialog/index.tsx"
   },
-  "J+LXrH": {
-    "defaultMessage": "持續提供信箱進入，未來可隨時啟用錢包登入",
-    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
+  "32bml8": {
+    "defaultMessage": "追蹤",
+    "description": "src/components/Layout/SideNav/index.tsx"
   },
-  "XcTMMM": {
-    "defaultMessage": "已有帳戶？",
-    "description": "src/components/Forms/EmailSignUpForm/Buttons.tsx"
+  "3KNMbJ": {
+    "defaultMessage": "作品",
+    "description": ""
   },
-  "ipQlDG": {
-    "defaultMessage": "以郵箱登入",
-    "description": "src/components/Forms/EmailSignUpForm/Buttons.tsx"
+  "3WKlPP": {
+    "defaultMessage": "commented in",
+    "description": ""
   },
-  "pwlQEY": {
-    "defaultMessage": "姓名",
+  "3kbIhS": {
+    "defaultMessage": "未命名",
     "description": ""
   },
-  "4mbdyI": {
-    "defaultMessage": "電子信箱",
-    "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
+  "3uQKhx": {
+    "defaultMessage": "若你希望向 Matters 提出建議，或遭遇操作異常，请發送郵件至",
+    "description": "src/views/Help/index.tsx"
   },
-  "0Rw3H/": {
-    "defaultMessage": "我已閱讀並同意",
-    "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
+  "3yk8fB": {
+    "defaultMessage": "我的錢包",
+    "description": ""
   },
-  "LphWYP": {
-    "defaultMessage": "Matters 用戶協議和隱私政策",
+  "3ynsJ3": {
+    "defaultMessage": "想了解更多？詳見 ",
+    "description": "src/views/Me/Analytics/EmptyAnalytics/index.tsx"
+  },
+  "47FYwb": {
+    "defaultMessage": "取消",
     "description": ""
   },
-  "agfumL": {
-    "defaultMessage": "下一步",
-    "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
+  "4Odb0J": {
+    "defaultMessage": "置頂作品",
+    "description": "src/components/ArticleDigest/DropdownActions/StickyButton.tsx"
   },
-  "l5vWO8": {
-    "defaultMessage": "你的站內暱稱，之後可以修改",
-    "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
+  "4giHJT": {
+    "defaultMessage": "在行動裝置上使用問題，參考 ",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "5sg7KC": {
-    "defaultMessage": "密碼",
+  "4vkwo0": {
+    "defaultMessage": "你的修訂作品已發布到分佈式網絡",
+    "description": "src/components/Notice/ArticleNotice/RevisedArticlePublishedNotice.tsx"
+  },
+  "50cquj": {
+    "defaultMessage": "還沒有眾聊",
+    "description": "src/views/Circle/Discussion/Discussion.tsx"
+  },
+  "5FO4vn": {
+    "defaultMessage": "你尚無權限進行該操作",
     "description": ""
   },
-  "ml3SZN": {
-    "defaultMessage": "至少 8 個字元，支持英文大小寫字母、數字和特殊符號",
+  "5sAbzJ": {
+    "defaultMessage": " 眾聊中發表話題 ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  },
+  "5sg7KC": {
+    "defaultMessage": "密碼",
     "description": ""
   },
-  "NzfL1d": {
-    "defaultMessage": "再次輸入密碼",
-    "description": "src/components/Forms/EmailSignUpForm/Password.tsx"
+  "63HuBz": {
+    "defaultMessage": "此標籤目前無人主理",
+    "description": "src/views/TagDetail/Owner/index.tsx"
   },
-  "N2IrpM": {
-    "defaultMessage": "確認",
+  "69+D96": {
+    "defaultMessage": "開始創作",
     "description": ""
   },
-  "XH0Lb6": {
-    "defaultMessage": "歡迎加入 Matters！",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
+  "6BXcdo": {
+    "defaultMessage": "設定圍爐門檻（每月）",
+    "description": "src/components/Forms/CreateCircleForm/Init.tsx"
   },
-  "stjoBH": {
-    "defaultMessage": "現在，去為你喜歡的作者打賞吧！你的每一次打賞都將為作者帶來收入。",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
+  "6OBAOi": {
+    "defaultMessage": "目前總訂閱人數",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "reOeq5": {
-    "defaultMessage": "你已擁有個人創作空間站，期待你的第一篇作品。",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
+  "6flWFg": {
+    "defaultMessage": "用戶協議",
+    "description": ""
   },
-  "ANhCde": {
-    "defaultMessage": "馬上開始你的創作吧！",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
+  "77tYPg": {
+    "defaultMessage": "確認刪除後，{commentType}會立即消失。",
+    "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
   },
-  "/asuIY": {
-    "defaultMessage": "進入社區",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
+  "7DIW6+": {
+    "defaultMessage": "暸解更多",
+    "description": ""
   },
-  "nsaJRn": {
-    "defaultMessage": "登入成功",
+  "7xnrxG": {
+    "defaultMessage": "作品已添加至精選",
+    "description": "src/components/ArticleDigest/DropdownActions/SetTagSelectedButton.tsx"
+  },
+  "8KFsZN": {
+    "defaultMessage": "閱讀次數",
     "description": ""
   },
-  "lD4FPZ": {
-    "defaultMessage": "請輸入電子信箱",
+  "8cv9D4": {
+    "defaultMessage": "Next Step",
     "description": ""
   },
-  "IFY8r4": {
-    "defaultMessage": "請輸入密碼",
-    "description": "src/components/Forms/EmailLoginForm/index.tsx"
+  "8xPi0N": {
+    "defaultMessage": "離開圍爐",
+    "description": "src/views/Circle/Profile/DropdownActions/index.tsx"
   },
-  "z+209N": {
-    "defaultMessage": "註冊",
+  "9+Ddtu": {
+    "defaultMessage": "下一步",
     "description": ""
   },
-  "nYeDrI": {
-    "defaultMessage": "沒有帳戶？",
-    "description": "src/components/Forms/EmailLoginForm/Buttons.tsx"
+  "9nNpKP": {
+    "defaultMessage": "討論已送出",
+    "description": "src/views/Circle/Discussion/Discussion.tsx"
   },
-  "xGh9O7": {
-    "defaultMessage": "提醒：信箱將不作為登入使用，僅作為聯繫渠道",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
+  "A3LOng": {
+    "defaultMessage": " 眾聊中回覆話題 ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "N3K1H9": {
-    "defaultMessage": "Matters 不會透過任何渠道詢問你的錢包私鑰。",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
+  "A3rLZt": {
+    "defaultMessage": "最近 {months} 個月",
+    "description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
   },
-  "hWs95P": {
-    "defaultMessage": "重要訊息將透過郵件通知，請填入信箱完成設定。",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
+  "A3wDZ8": {
+    "defaultMessage": "我的 NFT 收藏",
+    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/NFTCollection/index.tsx"
   },
-  "cg1VJ2": {
-    "defaultMessage": "連接加密錢包",
+  "A41QIy": {
+    "defaultMessage": "Enter Password",
     "description": ""
   },
-  "YjNkcK": {
-    "defaultMessage": "若要變更地址，請直接操作錢包切換",
-    "description": ""
-  },
-  "wSEOxH": {
-    "defaultMessage": "聯繫渠道",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
-  },
-  "CwSpld": {
-    "defaultMessage": "非登入用途",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
-  },
-  "qswU4E": {
-    "defaultMessage": "信箱將不作為登入使用，僅作為聯繫渠道",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
-  },
-  "EfJYPI": {
-    "defaultMessage": "驗證碼",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
-  },
-  "jgLiba": {
-    "defaultMessage": "請輸入驗證碼",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
-  },
-  "jL2ZHb": {
-    "defaultMessage": "驗證碼有效期 20 分鐘",
+  "A7ugfn": {
+    "defaultMessage": "更多操作",
     "description": ""
   },
-  "4giHJT": {
-    "defaultMessage": "在行動裝置上使用問題，參考 ",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
-  },
-  "uw32VR": {
-    "defaultMessage": "教學指南",
+  "A8MpFX": {
+    "defaultMessage": "請輸入個人簡介",
     "description": ""
   },
-  "hrfF+i": {
-    "defaultMessage": "剛接觸加密錢包？參考 ",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
-  },
-  "HxcjQl": {
-    "defaultMessage": "Matters 將提供更多創作與區塊鏈結合的服務，接入錢包後即可在未來第一時間體驗新功能。",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  "AGcU5J": {
+    "defaultMessage": "置頂",
+    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
   },
-  "LqxIEU": {
-    "defaultMessage": "錢包地址將作為身份識別之一在個人頁公開顯示。",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  "ANA7sk": {
+    "defaultMessage": "主理",
+    "description": "src/views/TagDetail/Owner/index.tsx"
   },
-  "UOdEqi": {
-    "defaultMessage": "原有透過電子信箱登入方式將為你保留。為維護你的帳戶安全，加密錢包連接後無法重設。",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  "ANhCde": {
+    "defaultMessage": "馬上開始你的創作吧！",
+    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
   },
-  "VrOoVf": {
-    "defaultMessage": "Matters 不會透過任何渠道主動詢問你的錢包私鑰。",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  "AYTnjk": {
+    "defaultMessage": "追蹤",
+    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
   },
-  "v6YjIn": {
-    "defaultMessage": "帳戶",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  "BHFHeY": {
+    "defaultMessage": " 在圍爐 {commentCircle}",
+    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
   },
-  "H8KGyc": {
-    "defaultMessage": "進入",
+  "Bc20la": {
+    "defaultMessage": "天",
     "description": ""
   },
-  "sy+pv5": {
-    "defaultMessage": "電子郵箱",
-    "description": ""
+  "Bjdw71": {
+    "defaultMessage": "目前總追蹤人數",
+    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
   },
-  "JxlxVc": {
-    "defaultMessage": "忘記密碼？",
-    "description": "src/components/Forms/EmailLoginForm/Buttons.tsx"
+  "BjzRe8": {
+    "defaultMessage": "，快去查看自己的收入吧！",
+    "description": "src/components/Notice/TransactionNotice/PaymentReceivedDonationNotice.tsx"
   },
-  "deEeEI": {
-    "defaultMessage": "註冊",
+  "CBDDR5": {
+    "defaultMessage": "Must be between 2-20 characters long. Only lowercase letters, numbers and underline are allowed.",
     "description": ""
   },
-  "EwVnoC": {
-    "defaultMessage": "我已閱讀並同意",
-    "description": ""
+  "Cdkhl8": {
+    "defaultMessage": "刪除{commentType}",
+    "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
   },
-  "9+Ddtu": {
-    "defaultMessage": "下一步",
+  "CnPG8j": {
+    "defaultMessage": "精華",
     "description": ""
   },
-  "k5NnNF": {
-    "defaultMessage": "追蹤了你",
-    "description": "src/components/Notice/UserNotice/UserNewFollowerNotice.tsx"
-  },
-  "KZlRde": {
-    "defaultMessage": " 關聯了你的作品 ",
-    "description": "src/components/Notice/ArticleArticleNotice/ArticleNewCollectedNotice.tsx"
-  },
-  "/nu5ho": {
-    "defaultMessage": "回覆了你在作品 ",
-    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
-  },
-  "ZUPQzl": {
-    "defaultMessage": " 的評論",
-    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
-  },
-  "b+LSgI": {
-    "defaultMessage": "回覆了你在圍爐 ",
-    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
-  },
-  "aaUBvF": {
-    "defaultMessage": " 中的發言",
-    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
-  },
-  "DIQKiC": {
-    "defaultMessage": " 在作品 ",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
-  },
-  "jqACL/": {
-    "defaultMessage": " 的評論中提及你",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
-  },
-  "+AdTsY": {
-    "defaultMessage": " 眾聊提及你",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
+  "Cu3Cty": {
+    "defaultMessage": "月",
+    "description": ""
   },
-  "ISn3eZ": {
-    "defaultMessage": " 廣播提及你",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
+  "CwSpld": {
+    "defaultMessage": "非登入用途",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "uqmi/b": {
-    "defaultMessage": " 置頂了你在作品 ",
-    "description": "src/components/Notice/CommentNotice/CommentPinnedNotice.tsx"
+  "D2Sw/t": {
+    "defaultMessage": "添加以下任一網址到 RSS 閱讀器",
+    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
   },
-  "VjxGd7": {
-    "defaultMessage": "評論了作品 ",
-    "description": "src/components/Notice/CommentNotice/ArticleNewCommentNotice.tsx"
+  "D3idYv": {
+    "defaultMessage": "設定",
+    "description": ""
   },
-  "U/Tqmx": {
-    "defaultMessage": "評論了你收藏的作品 ",
-    "description": "src/components/Notice/CommentNotice/SubscribedArticleNewCommentNotice.tsx"
+  "DMlmcU": {
+    "defaultMessage": "免費資格",
+    "description": "src/views/Circle/Settings/index.tsx"
   },
-  "VoOZni": {
-    "defaultMessage": "在圍爐 ",
-    "description": "src/components/Notice/CommentNotice/CircleNewBroadcastNotice.tsx"
+  "DXJ8ys": {
+    "defaultMessage": "閱讀次數代表了你的作品被登入用戶閱讀的總次數，每次閱讀過程超過一定時間後才會計入。此外，同一個用戶的多次閱讀也會進行累計。",
+    "description": "src/components/Dialogs/HelpDialog/index.tsx"
   },
-  "oaDToH": {
-    "defaultMessage": " 發布了新廣播",
-    "description": "src/components/Notice/CommentNotice/CircleNewBroadcastNotice.tsx"
+  "E8W3qa": {
+    "defaultMessage": "2-20 個字元",
+    "description": ""
   },
-  "qPPrzm": {
-    "defaultMessage": " 支持了你的作品 ",
-    "description": "src/components/Notice/TransactionNotice/PaymentReceivedDonationNotice.tsx"
+  "EQeKnO": {
+    "defaultMessage": "邀請管理",
+    "description": "src/views/Circle/Settings/index.tsx"
   },
-  "BjzRe8": {
-    "defaultMessage": "，快去查看自己的收入吧！",
-    "description": "src/components/Notice/TransactionNotice/PaymentReceivedDonationNotice.tsx"
+  "EW5R4p": {
+    "defaultMessage": "催更、提問、分享、討論…",
+    "description": "src/views/Circle/Discussion/Discussion.tsx"
   },
-  "z4NaU2": {
-    "defaultMessage": "你的 ",
-    "description": "src/components/Notice/TransactionNotice/PaymentPayoutNotice.tsx"
+  "EfJYPI": {
+    "defaultMessage": "驗證碼",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "bVZDVx": {
-    "defaultMessage": "提現流程已開始，到帳時間請關注銀行提醒。",
-    "description": "src/components/Notice/TransactionNotice/PaymentPayoutNotice.tsx"
+  "EoNvLu": {
+    "defaultMessage": "創作了",
+    "description": "src/views/User/Articles/UserArticles.tsx"
   },
-  "nto8ly": {
-    "defaultMessage": "訂閱了你的圍爐",
-    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
+  "EwVnoC": {
+    "defaultMessage": "我已閱讀並同意",
+    "description": ""
   },
-  "qYzBk8": {
-    "defaultMessage": "退訂了你的圍爐",
-    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
+  "FALWef": {
+    "defaultMessage": " 廣播中留言 ",
+    "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
   },
-  "LW1aX1": {
-    "defaultMessage": "恭喜你！",
-    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
+  "FOOymB": {
+    "defaultMessage": "還沒有成員",
+    "description": "src/views/Circle/Profile/MembersDialog/Content.tsx"
   },
-  "KyWDUu": {
-    "defaultMessage": " 邀請你免費加入圍爐 ",
-    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
+  "FaTb0A": {
+    "defaultMessage": "安裝 MetaMask",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "jF+Mle": {
-    "defaultMessage": " 天，前去免費體驗，與大家談天說地吧。",
-    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
+  "Fe682o": {
+    "defaultMessage": "下月預期營收",
+    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
   },
-  "wqaNK4": {
-    "defaultMessage": "在你的圍爐 ",
+  "FhWC22": {
+    "defaultMessage": "社區共建基地",
     "description": ""
   },
-  "FALWef": {
-    "defaultMessage": " 廣播中留言 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
+  "FmWYRt": {
+    "defaultMessage": "免費資格時長",
+    "description": ""
   },
-  "YlxpJl": {
-    "defaultMessage": " 廣播中留言，其中有提及你 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
+  "GBm/sD": {
+    "defaultMessage": " 眾聊中發表話題，其中有提及你 ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "qQmSxu": {
-    "defaultMessage": "你已成功登記參加空投且完成以太坊錢包設定，空投活動將在 2021/11/12 進行。你設定的空投地址：",
-    "description": "src/components/Notice/CryptoNotice/CryptoWalletAirdropNotice.tsx"
+  "GRtGnZ": {
+    "defaultMessage": "辭去權限",
+    "description": "src/views/TagDetail/DropdownActions/index.tsx"
   },
-  "UgvfcU": {
-    "defaultMessage": "你已完成以太坊錢包設定。你設定的地址：",
-    "description": "src/components/Notice/CryptoNotice/CryptoWalletConnectedNotice.tsx"
+  "GZJpDf": {
+    "defaultMessage": "數據後台",
+    "description": ""
   },
-  "+hfUcV": {
-    "defaultMessage": "在圍爐 {circlename} 發布了新廣播",
-    "description": "src/components/Notice/CommentNotice/CircleNewBroadcastNotice.tsx"
+  "GugBCe": {
+    "defaultMessage": "本月新增追蹤人數",
+    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
   },
-  "An0rpe": {
-    "defaultMessage": " {circlename} 廣播中留言 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
+  "H0JBH6": {
+    "defaultMessage": "登出",
+    "description": ""
   },
-  "VO4Elt": {
-    "defaultMessage": " 在作品 {commentArticle} 的評論中提及你",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
+  "H8KGyc": {
+    "defaultMessage": "進入",
+    "description": ""
   },
-  "BHFHeY": {
-    "defaultMessage": " 在圍爐 {commentCircle}",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
+  "HFVDeB": {
+    "defaultMessage": "相關標籤",
+    "description": "src/views/TagDetail/RelatedTags/index.tsx"
   },
-  "5sAbzJ": {
-    "defaultMessage": " 眾聊中發表話題 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  "HtSDyc": {
+    "defaultMessage": "幫助中心",
+    "description": ""
   },
-  "A3LOng": {
-    "defaultMessage": " 眾聊中回覆話題 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  "HxcjQl": {
+    "defaultMessage": "Matters 將提供更多創作與區塊鏈結合的服務，接入錢包後即可在未來第一時間體驗新功能。",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "ftD7Hy": {
-    "defaultMessage": " 眾聊提及了你 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  "HzaRKA": {
+    "defaultMessage": "一鍵搬家",
+    "description": ""
   },
-  "g/L3Fm": {
-    "defaultMessage": " 眾聊中發表與回覆話題 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  "IFY8r4": {
+    "defaultMessage": "請輸入密碼",
+    "description": "src/components/Forms/EmailLoginForm/index.tsx"
   },
-  "GBm/sD": {
-    "defaultMessage": " 眾聊中發表話題，其中有提及你 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  "Ic4hqD": {
+    "defaultMessage": "字",
+    "description": "src/views/User/Articles/UserArticles.tsx"
   },
-  "tQsujN": {
-    "defaultMessage": " 眾聊中回覆話題，其中有提及你 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  "J+LXrH": {
+    "defaultMessage": "持續提供信箱進入，未來可隨時啟用錢包登入",
+    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
   },
-  "uuEGON": {
-    "defaultMessage": " 眾聊中發表與回覆話題，其中有提及你 ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  "J+dIsA": {
+    "defaultMessage": "訂閱",
+    "description": ""
   },
   "J3yk6u": {
     "defaultMessage": "在圍爐 ",
     "description": ""
   },
-  "hk2aiz": {
-    "defaultMessage": " 追蹤了你的圍爐",
-    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
-  },
-  "mPe6DK": {
-    "defaultMessage": " 訂閱了你的圍爐",
-    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
-  },
   "JIjMWL": {
     "defaultMessage": "你的作品已發布到分佈式網絡",
     "description": "src/components/Notice/ArticleNotice/ArticlePublishedNotice.tsx"
   },
-  "sncOwi": {
-    "defaultMessage": " 在作品中提及你",
-    "description": "src/components/Notice/ArticleNotice/ArticleMentionedYouNotice.tsx"
+  "JXdbo8": {
+    "defaultMessage": "完成",
+    "description": ""
   },
-  "2eebTb": {
-    "defaultMessage": " 收藏了你的作品",
-    "description": "src/components/Notice/ArticleNotice/ArticleNewSubscriberNotice.tsx"
+  "Jc+W6M": {
+    "defaultMessage": " 辭去了標籤主理人權限，你要不要試試看成為新的主理人？",
+    "description": "src/components/Notice/TagNotice/TagLeaveNotice.tsx"
   },
-  "YIes/F": {
-    "defaultMessage": "等 {actorsCount} 人",
-    "description": "src/components/Notice/ArticleNotice/ArticleNewSubscriberNotice.tsx"
+  "JpS59y": {
+    "defaultMessage": "已接受",
+    "description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
   },
-  "PjT72J": {
-    "defaultMessage": "喜歡並讚賞了你的作品",
-    "description": "src/components/Notice/ArticleNotice/ArticleNewAppreciationNotice.tsx"
+  "Js/Fij": {
+    "defaultMessage": "作品已取消精選",
+    "description": "src/components/ArticleDigest/DropdownActions/SetTagUnselectedButton.tsx"
   },
-  "4vkwo0": {
-    "defaultMessage": "你的修訂作品已發布到分佈式網絡",
-    "description": "src/components/Notice/ArticleNotice/RevisedArticlePublishedNotice.tsx"
+  "JxlxVc": {
+    "defaultMessage": "忘記密碼？",
+    "description": "src/components/Forms/EmailLoginForm/Buttons.tsx"
   },
-  "QV19cI": {
-    "defaultMessage": "你的修訂作品發布失敗",
-    "description": "src/components/Notice/ArticleNotice/RevisedArticleNotPublishedNotice.tsx"
+  "K3r6DQ": {
+    "defaultMessage": "刪除",
+    "description": ""
   },
-  "euNJsE": {
-    "defaultMessage": "新作品已經加入圍爐，馬上前往閱讀吧！",
-    "description": "src/components/Notice/ArticleNotice/CircleNewArticle.tsx"
+  "KL502d": {
+    "defaultMessage": "資料已保存",
+    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx"
   },
-  "/3G89K": {
-    "defaultMessage": " 又成長了",
-    "description": "src/components/Notice/ArticleNotice/CircleNewArticle.tsx"
+  "KLQ1/z": {
+    "defaultMessage": "圍爐創建成功",
+    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
   },
-  "xwj01D": {
-    "defaultMessage": " 邀請你成為標籤的協作者",
-    "description": "src/components/Notice/TagNotice/TagAddEditorNotice.tsx"
+  "KMcrz8": {
+    "defaultMessage": "認領",
+    "description": "src/views/TagDetail/Owner/index.tsx"
   },
-  "t7ah39": {
-    "defaultMessage": " 成為了標籤的主理人，你的作品也在其中。快來看看其他作者的精彩創作吧",
-    "description": "src/components/Notice/TagNotice/TagAdoptionNotice.tsx"
+  "KZlRde": {
+    "defaultMessage": " 關聯了你的作品 ",
+    "description": "src/components/Notice/ArticleArticleNotice/ArticleNewCollectedNotice.tsx"
   },
-  "O03Rkc": {
-    "defaultMessage": " 辭去了權限。你可以邀請新的協作者加入了",
-    "description": "src/components/Notice/TagNotice/TagLeaveEditorNotice.tsx"
+  "KyWDUu": {
+    "defaultMessage": " 邀請你免費加入圍爐 ",
+    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
   },
-  "dsBCfK": {
-    "defaultMessage": "哎呀，標籤協作者",
-    "description": "src/components/Notice/TagNotice/TagLeaveEditorNotice.tsx"
+  "L0J61B": {
+    "defaultMessage": "免費",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "Jc+W6M": {
-    "defaultMessage": " 辭去了標籤主理人權限，你要不要試試看成為新的主理人？",
-    "description": "src/components/Notice/TagNotice/TagLeaveNotice.tsx"
+  "L4NXXh": {
+    "defaultMessage": "目前總營收",
+    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
   },
-  "OKhRC6": {
-    "defaultMessage": "分享",
-    "description": ""
+  "L7Si5/": {
+    "defaultMessage": "管理社群",
+    "description": "src/views/TagDetail/DropdownActions/index.tsx"
   },
-  "u5aHb4": {
-    "defaultMessage": "複製鏈接",
+  "LGox1K": {
+    "defaultMessage": "已追蹤",
     "description": ""
   },
-  "NONfAh": {
-    "defaultMessage": "豆瓣",
-    "description": "src/components/Share/Buttons/Douban.tsx"
+  "LOefol": {
+    "defaultMessage": "上鎖",
+    "description": "src/views/Circle/Analytics/ContentAnalytics/ContentTabs/index.tsx"
   },
-  "rBjwQy": {
-    "defaultMessage": "微博",
-    "description": "src/components/Share/Buttons/Weibo.tsx"
+  "LW1aX1": {
+    "defaultMessage": "恭喜你！",
+    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
   },
-  "bBYO6x": {
-    "defaultMessage": "取消封鎖k",
-    "description": "src/components/BlockUser/Button/index.tsx"
+  "Lc/azT": {
+    "defaultMessage": "IPNS 訂閱",
+    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
   },
-  "vAc1Bw": {
-    "defaultMessage": "封鎖用戶",
+  "LphWYP": {
+    "defaultMessage": "Matters 用戶協議和隱私政策",
     "description": ""
   },
-  "mSAY3/": {
-    "defaultMessage": "已取消封鎖。該用戶現在可以評論你的作品和圍爐。",
-    "description": "src/components/BlockUser/Button/index.tsx"
+  "LqxIEU": {
+    "defaultMessage": "錢包地址將作為身份識別之一在個人頁公開顯示。",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "/+XWDi": {
-    "defaultMessage": "航行日誌 2.0",
-    "description": "src/components/UserProfile/DropdownActions/index.tsx"
+  "MDNaxs": {
+    "defaultMessage": "人",
+    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
   },
-  "qyzJxi": {
-    "defaultMessage": "航行日誌 1.0",
-    "description": "src/components/UserProfile/DropdownActions/index.tsx"
+  "MkwOFW": {
+    "defaultMessage": "瀏覽紀錄",
+    "description": ""
   },
-  "A7ugfn": {
-    "defaultMessage": "更多操作",
+  "N2IrpM": {
+    "defaultMessage": "確認",
+    "description": ""
+  },
+  "N3K1H9": {
+    "defaultMessage": "Matters 不會透過任何渠道詢問你的錢包私鑰。",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
+  },
+  "NAidKb": {
+    "defaultMessage": "通知",
     "description": ""
   },
-  "b1FfGy": {
-    "defaultMessage": "内容訂閱",
-    "description": "src/components/UserProfile/index.tsx"
+  "NONfAh": {
+    "defaultMessage": "豆瓣",
+    "description": "src/components/Share/Buttons/Douban.tsx"
   },
-  "/3kw6k": {
-    "defaultMessage": "嘗試將內容寫入 IPFS 網絡中，需要一段時間，請耐心等候。若等候時間過久，可透過發佈文章來加速。",
-    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  "NzfL1d": {
+    "defaultMessage": "再次輸入密碼",
+    "description": "src/components/Forms/EmailSignUpForm/Password.tsx"
   },
-  "Lc/azT": {
-    "defaultMessage": "IPNS 訂閱",
-    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  "O03Rkc": {
+    "defaultMessage": " 辭去了權限。你可以邀請新的協作者加入了",
+    "description": "src/components/Notice/TagNotice/TagLeaveEditorNotice.tsx"
   },
-  "cf37Zy": {
-    "defaultMessage": "添加 IPFS 生成的 IPNS 指紋到閱讀器，如：",
-    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  "O0QB1v": {
+    "defaultMessage": "用戶將收到你的圍爐免費資格邀請函，設置免費的時限，邀請他們一起加入吧！",
+    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/PreSend.tsx"
   },
-  "zxlwbc": {
-    "defaultMessage": "等候寫入完成...",
-    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  "OIj8pQ": {
+    "defaultMessage": "成功發送邀請",
+    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/Sent.tsx"
   },
-  "gMZfHO": {
-    "defaultMessage": "RSS 訂閱",
-    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  "OKhRC6": {
+    "defaultMessage": "分享",
+    "description": ""
   },
-  "D2Sw/t": {
-    "defaultMessage": "添加以下任一網址到 RSS 閱讀器",
-    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  "PjT72J": {
+    "defaultMessage": "喜歡並讚賞了你的作品",
+    "description": "src/components/Notice/ArticleNotice/ArticleNewAppreciationNotice.tsx"
   },
-  "rf0ew3": {
-    "defaultMessage": "快來搭建圍爐，呼召你的支持者加入",
-    "description": "src/components/UserProfile/CircleWidget/index.tsx"
+  "Po+kJe": {
+    "defaultMessage": "最近 {month} 個月",
+    "description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
   },
-  "pzTOmv": {
-    "defaultMessage": "追蹤者",
+  "Pp/0po": {
+    "defaultMessage": "換一批",
     "description": ""
   },
-  "i/4KO2": {
-    "defaultMessage": "此帳戶因為違反社區約章而被註銷",
-    "description": "src/components/UserProfile/index.tsx"
+  "Q8Qw5B": {
+    "defaultMessage": "個人簡介",
+    "description": ""
   },
-  "oNYnCM": {
-    "defaultMessage": "已註銷用戶",
-    "description": "src/components/UserProfile/index.tsx"
+  "QCo7Gc": {
+    "defaultMessage": "選擇 NFT 作為你的頭像",
+    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/NFTCollection/index.tsx"
   },
-  "rs0YS2": {
-    "defaultMessage": "已禁言用戶",
-    "description": "src/components/UserProfile/index.tsx"
+  "QUqfbW": {
+    "defaultMessage": "說說圍爐的有趣之處，吸引支持者加入",
+    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
   },
-  "EoNvLu": {
-    "defaultMessage": "創作了",
-    "description": "src/views/User/Articles/UserArticles.tsx"
+  "QV19cI": {
+    "defaultMessage": "你的修訂作品發布失敗",
+    "description": "src/components/Notice/ArticleNotice/RevisedArticleNotPublishedNotice.tsx"
   },
-  "UxfPXa": {
-    "defaultMessage": "累積創作",
-    "description": "src/views/User/Articles/UserArticles.tsx"
+  "QZXKhG": {
+    "defaultMessage": "設置圍爐網址（創建後不可修改）",
+    "description": "src/components/Forms/CreateCircleForm/Init.tsx"
   },
-  "Ic4hqD": {
-    "defaultMessage": "字",
-    "description": "src/views/User/Articles/UserArticles.tsx"
+  "RFzVUD": {
+    "defaultMessage": "取消置頂",
+    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
   },
-  "J+dIsA": {
-    "defaultMessage": "訂閱",
-    "description": ""
+  "RxiHr/": {
+    "defaultMessage": "還沒有任何用戶回覆你的邀請喔！",
+    "description": "src/views/Circle/Settings/ManageInvitation/Invites/Accepted/index.tsx"
   },
-  "WBVVYd": {
-    "defaultMessage": "回應",
+  "SENRqu": {
+    "defaultMessage": "Help",
     "description": ""
   },
-  "1EYCdR": {
-    "defaultMessage": "標籤",
-    "description": ""
+  "SNh1n0": {
+    "defaultMessage": "查看名單",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "sT9HoG": {
-    "defaultMessage": "歡迎加入 Matters，一個自由、自主、永續的創作與公共討論空間。",
-    "description": "src/views/Follow/PickAuthors/index.tsx"
+  "SdXoXI": {
+    "defaultMessage": "你已寄出邀請給朋友們，快去已邀請管理查看他們加入的進度吧！",
+    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/Sent.tsx"
   },
-  "7DIW6+": {
-    "defaultMessage": "暸解更多",
+  "Seanpx": {
+    "defaultMessage": "Required",
     "description": ""
   },
-  "Z6ewE3": {
-    "defaultMessage": "參與開發",
-    "description": "src/views/Me/Settings/AnonymousSettings/Enhance/index.tsx"
-  },
-  "1pFLGZ": {
-    "defaultMessage": "漏洞賞金計畫",
+  "Szd1tH": {
+    "defaultMessage": "登出失敗，請重試",
     "description": ""
   },
-  "mk+LCk": {
-    "defaultMessage": "介面設定",
-    "description": "src/views/Me/Settings/AnonymousSettings/DisplayPreferences/index.tsx"
+  "TQLBox": {
+    "defaultMessage": "取消置頂",
+    "description": "src/components/ArticleDigest/DropdownActions/StickyButton.tsx"
   },
-  "y1Z3or": {
-    "defaultMessage": "修改界面語言",
-    "description": ""
+  "TSDiqB": {
+    "defaultMessage": "付費人數",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "itPgxd": {
-    "defaultMessage": "個人主頁",
-    "description": ""
+  "TjWWxF": {
+    "defaultMessage": "廣播已送出",
+    "description": "src/views/Circle/Broadcast/Broadcast.tsx"
   },
-  "vH8sCb": {
-    "defaultMessage": "我的圍爐",
+  "TzhzIH": {
+    "defaultMessage": "創作者",
     "description": ""
   },
-  "2atspc": {
-    "defaultMessage": "我的草稿",
-    "description": ""
+  "U/Tqmx": {
+    "defaultMessage": "評論了你收藏的作品 ",
+    "description": "src/components/Notice/CommentNotice/SubscribedArticleNewCommentNotice.tsx"
   },
-  "3yk8fB": {
-    "defaultMessage": "我的錢包",
-    "description": ""
+  "U9IXic": {
+    "defaultMessage": "添加作品",
+    "description": "src/views/Circle/Profile/AddCircleArticle/Button.tsx"
   },
-  "GZJpDf": {
-    "defaultMessage": "數據後台",
+  "UNUROl": {
+    "defaultMessage": "建議 50 字以內，最長 200 字",
     "description": ""
   },
-  "nGBrvw": {
-    "defaultMessage": "我的收藏",
-    "description": ""
+  "UOdEqi": {
+    "defaultMessage": "原有透過電子信箱登入方式將為你保留。為維護你的帳戶安全，加密錢包連接後無法重設。",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "2slIPX": {
-    "defaultMessage": "我的讚賞",
-    "description": ""
+  "UgvfcU": {
+    "defaultMessage": "你已完成以太坊錢包設定。你設定的地址：",
+    "description": "src/components/Notice/CryptoNotice/CryptoWalletConnectedNotice.tsx"
   },
-  "2uRduT": {
-    "defaultMessage": " 的評論",
-    "description": "src/components/Notice/CommentNotice/CommentPinnedNotice.tsx"
+  "UjKkhq": {
+    "defaultMessage": "作品已添加標籤",
+    "description": "src/views/TagDetail/DropdownActions/index.tsx"
   },
-  "MkwOFW": {
-    "defaultMessage": "瀏覽紀錄",
-    "description": ""
+  "UxfPXa": {
+    "defaultMessage": "累積創作",
+    "description": "src/views/User/Articles/UserArticles.tsx"
   },
-  "fG41Ux": {
-    "defaultMessage": "登出成功",
-    "description": ""
+  "VO4Elt": {
+    "defaultMessage": " 在作品 {commentArticle} 的評論中提及你",
+    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
   },
-  "Szd1tH": {
-    "defaultMessage": "登出失敗，請重試",
-    "description": ""
+  "VjxGd7": {
+    "defaultMessage": "評論了作品 ",
+    "description": "src/components/Notice/CommentNotice/ArticleNewCommentNotice.tsx"
   },
-  "HtSDyc": {
-    "defaultMessage": "幫助中心",
-    "description": ""
+  "VrOoVf": {
+    "defaultMessage": "Matters 不會透過任何渠道主動詢問你的錢包私鑰。",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "D3idYv": {
-    "defaultMessage": "設定",
-    "description": ""
+  "VwuiYK": {
+    "defaultMessage": "Oops！此網址已被使用了，換一個試試",
+    "description": "src/components/Forms/CreateCircleForm/Init.tsx"
   },
-  "H0JBH6": {
-    "defaultMessage": "登出",
+  "WBVVYd": {
+    "defaultMessage": "回應",
     "description": ""
   },
-  "cE4Hfw": {
-    "defaultMessage": "發現",
-    "description": ""
+  "WSUAwk": {
+    "defaultMessage": "添加到精選",
+    "description": "src/components/ArticleDigest/DropdownActions/SetTagSelectedButton.tsx"
   },
-  "NAidKb": {
-    "defaultMessage": "通知",
-    "description": ""
+  "WpvsPu": {
+    "defaultMessage": "訂閱",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "enMIYK": {
-    "defaultMessage": "我的",
-    "description": ""
+  "WuvE8X": {
+    "defaultMessage": "{circleName} 的追蹤者",
+    "description": "src/views/Circle/Profile/FollowersDialog/index.tsx"
   },
-  "xmcVZ0": {
-    "defaultMessage": "搜尋",
-    "description": ""
+  "X+Xvgq": {
+    "defaultMessage": "取消精選",
+    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
   },
-  "47FYwb": {
-    "defaultMessage": "取消",
-    "description": ""
+  "XH0Lb6": {
+    "defaultMessage": "歡迎加入 Matters！",
+    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
   },
-  "ll/ufR": {
-    "defaultMessage": "熱門",
-    "description": ""
+  "XHMco9": {
+    "defaultMessage": "人",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "adThp5": {
-    "defaultMessage": "最新",
+  "XVYrS/": {
+    "defaultMessage": "還沒有追蹤者",
     "description": ""
   },
-  "CnPG8j": {
-    "defaultMessage": "精華",
-    "description": ""
+  "XcTMMM": {
+    "defaultMessage": "已有帳戶？",
+    "description": "src/components/Forms/EmailSignUpForm/Buttons.tsx"
   },
-  "wbcwKd": {
-    "defaultMessage": "查看全部",
+  "Xd0J7Y": {
+    "defaultMessage": "開放社區",
     "description": ""
   },
   "XgdZSb": {
     "defaultMessage": "值得關注",
     "description": ""
   },
-  "kc79d3": {
-    "defaultMessage": "找你想看的",
-    "description": ""
+  "Xz/AHp": {
+    "defaultMessage": "broadcast and mentioned you",
+    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
   },
-  "Pp/0po": {
-    "defaultMessage": "換一批",
+  "YIes/F": {
+    "defaultMessage": "等 {actorsCount} 人",
+    "description": "src/components/Notice/ArticleNotice/ArticleNewSubscriberNotice.tsx"
+  },
+  "YjNkcK": {
+    "defaultMessage": "若要變更地址，請直接操作錢包切換",
     "description": ""
   },
-  "6gOpfl": {
-    "defaultMessage": "暫時隱藏公告欄 7 天",
-    "description": "src/views/Home/Announcements/index.tsx"
+  "YlxpJl": {
+    "defaultMessage": " 廣播中留言，其中有提及你 ",
+    "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
   },
-  "3kbIhS": {
-    "defaultMessage": "未命名",
-    "description": ""
+  "Z6cII7": {
+    "defaultMessage": "累計閱讀時數",
+    "description": "src/components/Dialogs/HelpDialog/index.tsx"
   },
-  "MW9PzQ": {
-    "defaultMessage": "支持排行榜",
-    "description": "src/views/Me/Analytics/EmptyAnalytics/index.tsx"
+  "Z6ewE3": {
+    "defaultMessage": "參與開發",
+    "description": "src/views/Me/Settings/AnonymousSettings/Enhance/index.tsx"
   },
-  "cmtHjM": {
-    "defaultMessage": "由於你尚未發布任何作品，這裡還沒有任何數據能與你分享哦！發布第一篇作品來介紹你自己，以此開啟你的創作之旅吧！",
-    "description": "src/views/Me/Analytics/EmptyAnalytics/index.tsx"
+  "ZAs170": {
+    "defaultMessage": "基本資料",
+    "description": "src/views/Circle/Settings/index.tsx"
   },
-  "69+D96": {
-    "defaultMessage": "開始創作",
-    "description": ""
+  "ZUPQzl": {
+    "defaultMessage": " 的評論",
+    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
   },
-  "3ynsJ3": {
-    "defaultMessage": "想了解更多？詳見 ",
-    "description": "src/views/Me/Analytics/EmptyAnalytics/index.tsx"
+  "ZVoJan": {
+    "defaultMessage": "修訂作品",
+    "description": "src/components/ArticleDigest/DropdownActions/EditButton.tsx"
   },
-  "0Azlrb": {
-    "defaultMessage": "管理",
+  "ZjDH42": {
+    "defaultMessage": "關於我們",
     "description": ""
   },
-  "eXDZGQ": {
-    "defaultMessage": "主理人",
-    "description": ""
+  "aa0nss": {
+    "defaultMessage": "取消精選",
+    "description": "src/components/ArticleDigest/DropdownActions/SetTagUnselectedButton.tsx"
   },
-  "dg3JCQ": {
-    "defaultMessage": "協作者",
-    "description": ""
+  "aaUBvF": {
+    "defaultMessage": " 中的發言",
+    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
   },
-  "TzhzIH": {
-    "defaultMessage": "創作者",
+  "adThp5": {
+    "defaultMessage": "最新",
     "description": ""
   },
-  "Pdx3j1": {
-    "defaultMessage": "創作新的作品",
-    "description": "src/views/TagDetail/Buttons/AddButton/CreateDraftMenuItem/index.tsx"
+  "b+LSgI": {
+    "defaultMessage": "回覆了你在圍爐 ",
+    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
   },
-  "5FO4vn": {
-    "defaultMessage": "你尚無權限進行該操作",
-    "description": ""
+  "b1FfGy": {
+    "defaultMessage": "内容訂閱",
+    "description": "src/components/UserProfile/index.tsx"
   },
-  "8ttGfR": {
-    "defaultMessage": "添加我的作品",
-    "description": "src/views/TagDetail/Buttons/AddButton/AddMyArticlesButton/index.tsx"
+  "b3onWZ": {
+    "defaultMessage": "最近 {days} 天",
+    "description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
   },
-  "ieGrWo": {
-    "defaultMessage": "追蹤",
-    "description": ""
+  "b8ogKp": {
+    "defaultMessage": "新增邀請",
+    "description": "src/views/Circle/Settings/ManageInvitation/AddButton/index.tsx"
   },
-  "izWS4J": {
-    "defaultMessage": "取消追蹤",
+  "bBYO6x": {
+    "defaultMessage": "取消封鎖k",
+    "description": "src/components/BlockUser/Button/index.tsx"
+  },
+  "beLe/F": {
+    "defaultMessage": "廣播",
     "description": ""
   },
-  "LGox1K": {
-    "defaultMessage": "已追蹤",
+  "cE4Hfw": {
+    "defaultMessage": "發現",
     "description": ""
   },
-  "ikVIu3": {
-    "defaultMessage": "篇作品",
+  "cd/II9": {
+    "defaultMessage": "{totalCount, plural, =1 {篇文章} other {篇文章}}",
     "description": ""
   },
-  "HFVDeB": {
-    "defaultMessage": "相關標籤",
-    "description": "src/views/TagDetail/RelatedTags/index.tsx"
+  "cf37Zy": {
+    "defaultMessage": "添加 IPFS 生成的 IPNS 指紋到閱讀器，如：",
+    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
   },
-  "o2Na0B": {
-    "defaultMessage": "返回全部",
+  "cfL5uk": {
+    "defaultMessage": "已超過 200 字，目前 {numbers} 字",
+    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx"
+  },
+  "cg1VJ2": {
+    "defaultMessage": "連接加密錢包",
     "description": ""
   },
-  "KMcrz8": {
-    "defaultMessage": "認領",
-    "description": "src/views/TagDetail/Owner/index.tsx"
+  "cmtHjM": {
+    "defaultMessage": "由於你尚未發布任何作品，這裡還沒有任何數據能與你分享哦！發布第一篇作品來介紹你自己，以此開啟你的創作之旅吧！",
+    "description": "src/views/Me/Analytics/EmptyAnalytics/index.tsx"
   },
-  "63HuBz": {
-    "defaultMessage": "此標籤目前無人主理",
-    "description": "src/views/TagDetail/Owner/index.tsx"
+  "d4waan": {
+    "defaultMessage": "營收",
+    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
   },
-  "UjKkhq": {
-    "defaultMessage": "作品已添加標籤",
-    "description": "src/views/TagDetail/DropdownActions/index.tsx"
+  "deEeEI": {
+    "defaultMessage": "註冊",
+    "description": ""
   },
-  "GRtGnZ": {
-    "defaultMessage": "辭去權限",
-    "description": "src/views/TagDetail/DropdownActions/index.tsx"
+  "dg3JCQ": {
+    "defaultMessage": "協作者",
+    "description": ""
   },
-  "L7Si5/": {
-    "defaultMessage": "管理社群",
-    "description": "src/views/TagDetail/DropdownActions/index.tsx"
+  "dnsfmR": {
+    "defaultMessage": "，我們會儘快回覆!",
+    "description": "src/views/Help/index.tsx"
   },
-  "ySGgTo": {
-    "defaultMessage": "添加精選",
-    "description": "src/views/TagDetail/DropdownActions/index.tsx"
+  "dsBCfK": {
+    "defaultMessage": "哎呀，標籤協作者",
+    "description": "src/components/Notice/TagNotice/TagLeaveEditorNotice.tsx"
   },
-  "wEQDC6": {
-    "defaultMessage": "編輯資料",
+  "eTpiYa": {
+    "defaultMessage": "尚無支持數據",
     "description": ""
   },
-  "beLe/F": {
-    "defaultMessage": "廣播",
+  "eXDZGQ": {
+    "defaultMessage": "主理人",
     "description": ""
   },
-  "20bImY": {
-    "defaultMessage": "眾聊",
+  "ei+kyp": {
+    "defaultMessage": "圍爐名稱",
+    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+  },
+  "enMIYK": {
+    "defaultMessage": "我的",
     "description": ""
   },
-  "jx7Hn3": {
-    "defaultMessage": "作品",
+  "eov+J2": {
+    "defaultMessage": "自定義網址名稱",
     "description": ""
   },
-  "U9IXic": {
-    "defaultMessage": "添加作品",
-    "description": "src/views/Circle/Profile/AddCircleArticle/Button.tsx"
+  "euNJsE": {
+    "defaultMessage": "新作品已經加入圍爐，馬上前往閱讀吧！",
+    "description": "src/components/Notice/ArticleNotice/CircleNewArticle.tsx"
   },
-  "q+N5Wd": {
-    "defaultMessage": "管理圍爐",
-    "description": "src/views/Circle/Profile/DropdownActions/index.tsx"
+  "fG41Ux": {
+    "defaultMessage": "登出成功",
+    "description": ""
   },
-  "8xPi0N": {
-    "defaultMessage": "離開圍爐",
-    "description": "src/views/Circle/Profile/DropdownActions/index.tsx"
+  "fOgusL": {
+    "defaultMessage": "選擇進入方式",
+    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
   },
-  "WuvE8X": {
-    "defaultMessage": "{circleName} 的追蹤者",
-    "description": "src/views/Circle/Profile/FollowersDialog/index.tsx"
+  "fWDtpq": {
+    "defaultMessage": "邀請中",
+    "description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
   },
-  "XVYrS/": {
-    "defaultMessage": "還沒有追蹤者",
-    "description": ""
+  "ftD7Hy": {
+    "defaultMessage": " 眾聊提及了你 ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "+a+2ug": {
-    "defaultMessage": "成員",
-    "description": ""
+  "g/L3Fm": {
+    "defaultMessage": " 眾聊中發表與回覆話題 ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "KL502d": {
-    "defaultMessage": "資料已保存",
-    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx"
+  "gMZfHO": {
+    "defaultMessage": "RSS 訂閱",
+    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
   },
-  "rfz/fN": {
-    "defaultMessage": "建議封面尺寸 1600 x 900 像素",
-    "description": ""
+  "h9CG9E": {
+    "defaultMessage": "{commentType}已刪除",
+    "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
   },
-  "lhaIoi": {
-    "defaultMessage": "請輸入姓名",
-    "description": ""
+  "hWs95P": {
+    "defaultMessage": "重要訊息將透過郵件通知，請填入信箱完成設定。",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "E8W3qa": {
-    "defaultMessage": "2-20 個字元",
-    "description": ""
+  "hYG5fb": {
+    "defaultMessage": "人追蹤",
+    "description": "src/views/TagDetail/Followers/index.tsx"
   },
-  "Q8Qw5B": {
-    "defaultMessage": "個人簡介",
-    "description": ""
+  "hk2aiz": {
+    "defaultMessage": " 追蹤了你的圍爐",
+    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
   },
-  "A8MpFX": {
-    "defaultMessage": "請輸入個人簡介",
-    "description": ""
+  "hrfF+i": {
+    "defaultMessage": "剛接觸加密錢包？參考 ",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "UNUROl": {
-    "defaultMessage": "建議 50 字以內，最長 200 字",
+  "hrgo+E": {
+    "defaultMessage": "隱藏",
     "description": ""
   },
-  "jvo0vs": {
-    "defaultMessage": "儲存",
+  "i/4KO2": {
+    "defaultMessage": "此帳戶因為違反社區約章而被註銷",
+    "description": "src/components/UserProfile/index.tsx"
+  },
+  "iCFXtS": {
+    "defaultMessage": "歡迎未註冊或已啟用錢包登入的朋友使用",
+    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
+  },
+  "ieGrWo": {
+    "defaultMessage": "追蹤",
     "description": ""
   },
-  "A3wDZ8": {
-    "defaultMessage": "我的 NFT 收藏",
-    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/NFTCollection/index.tsx"
+  "ikVIu3": {
+    "defaultMessage": "篇作品",
+    "description": ""
   },
-  "QCo7Gc": {
-    "defaultMessage": "選擇 NFT 作為你的頭像",
-    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/NFTCollection/index.tsx"
+  "ipQlDG": {
+    "defaultMessage": "以郵箱登入",
+    "description": "src/components/Forms/EmailSignUpForm/Buttons.tsx"
   },
-  "eTpiYa": {
-    "defaultMessage": "尚無支持數據",
+  "itPgxd": {
+    "defaultMessage": "個人主頁",
     "description": ""
   },
-  "/IMR+8": {
-    "defaultMessage": "支持排行榜",
+  "izWS4J": {
+    "defaultMessage": "取消追蹤",
     "description": ""
   },
-  "b3onWZ": {
-    "defaultMessage": "最近 {days} 天",
-    "description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
-  },
-  "Po+kJe": {
-    "defaultMessage": "最近 {month} 個月",
-    "description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
+  "jF+Mle": {
+    "defaultMessage": " 天，前去免費體驗，與大家談天說地吧。",
+    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
   },
-  "A3rLZt": {
-    "defaultMessage": "最近 {months} 個月",
-    "description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
+  "jJ1Brc": {
+    "defaultMessage": "喜歡回應",
+    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
   },
-  "zQvVDJ": {
-    "defaultMessage": "全部",
+  "jL2ZHb": {
+    "defaultMessage": "驗證碼有效期 20 分鐘",
     "description": ""
   },
-  "FOOymB": {
-    "defaultMessage": "還沒有成員",
-    "description": "src/views/Circle/Profile/MembersDialog/Content.tsx"
-  },
-  "hYG5fb": {
-    "defaultMessage": "人追蹤",
-    "description": "src/views/TagDetail/Followers/index.tsx"
-  },
-  "ANA7sk": {
-    "defaultMessage": "主理",
-    "description": "src/views/TagDetail/Owner/index.tsx"
+  "jgLiba": {
+    "defaultMessage": "請輸入驗證碼",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "3KNMbJ": {
-    "defaultMessage": "作品",
+  "jvo0vs": {
+    "defaultMessage": "儲存",
     "description": ""
   },
-  "4Odb0J": {
-    "defaultMessage": "置頂作品",
-    "description": "src/components/ArticleDigest/DropdownActions/StickyButton.tsx"
+  "k5NnNF": {
+    "defaultMessage": "追蹤了你",
+    "description": "src/components/Notice/UserNotice/UserNewFollowerNotice.tsx"
   },
-  "TQLBox": {
-    "defaultMessage": "取消置頂",
-    "description": "src/components/ArticleDigest/DropdownActions/StickyButton.tsx"
+  "kc79d3": {
+    "defaultMessage": "找你想看的",
+    "description": ""
   },
-  "ZVoJan": {
-    "defaultMessage": "修訂作品",
-    "description": "src/components/ArticleDigest/DropdownActions/EditButton.tsx"
+  "lD4FPZ": {
+    "defaultMessage": "請輸入電子信箱",
+    "description": ""
   },
-  "hrgo+E": {
-    "defaultMessage": "隱藏",
+  "lIir/P": {
+    "defaultMessage": "我知道了",
     "description": ""
   },
-  "uIdMon": {
-    "defaultMessage": "確認隱藏，其他用戶將無法從站內訪問該作品。隱藏後無法回退，如需再次呈現作品，你需要重新發布。",
-    "description": "src/components/ArticleDigest/DropdownActions/ArchiveArticle/Dialog.tsx"
+  "lNjDPr": {
+    "defaultMessage": "你還沒有邀請任何用戶喔！點擊新增邀請，添加站內或站外朋友加入圍爐贈與對方免費資格的固定時長",
+    "description": "src/views/Circle/Settings/ManageInvitation/Invites/Pending/index.tsx"
   },
-  "oIkacT": {
-    "defaultMessage": "作品已隱藏",
-    "description": "src/components/ArticleDigest/DropdownActions/ArchiveArticle/Dialog.tsx"
+  "ldNgRA": {
+    "defaultMessage": "Display name, can be changed later",
+    "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
   },
-  "K3r6DQ": {
-    "defaultMessage": "刪除",
+  "lhaIoi": {
+    "defaultMessage": "請輸入姓名",
     "description": ""
   },
-  "mikY/9": {
-    "defaultMessage": "編輯",
-    "description": "src/components/Comment/DropdownActions/EditButton.tsx"
-  },
-  "50cquj": {
-    "defaultMessage": "還沒有眾聊",
-    "description": "src/views/Circle/Discussion/Discussion.tsx"
+  "ll/ufR": {
+    "defaultMessage": "熱門",
+    "description": ""
   },
-  "EW5R4p": {
-    "defaultMessage": "催更、提問、分享、討論…",
-    "description": "src/views/Circle/Discussion/Discussion.tsx"
+  "mCAIcg": {
+    "defaultMessage": "站內閱讀熱門排行",
+    "description": "src/views/Circle/Analytics/ContentAnalytics/index.tsx"
   },
-  "9nNpKP": {
-    "defaultMessage": "討論已送出",
-    "description": "src/views/Circle/Discussion/Discussion.tsx"
+  "mPe6DK": {
+    "defaultMessage": " 訂閱了你的圍爐",
+    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
   },
-  "TjWWxF": {
-    "defaultMessage": "廣播已送出",
-    "description": "src/views/Circle/Broadcast/Broadcast.tsx"
+  "mSAY3/": {
+    "defaultMessage": "已取消封鎖。該用戶現在可以評論你的作品和圍爐。",
+    "description": "src/components/BlockUser/Button/index.tsx"
   },
   "mWjpk9": {
     "defaultMessage": "還沒有廣播",
     "description": "src/views/Circle/Broadcast/Broadcast.tsx"
   },
-  "zb8Kx1": {
-    "defaultMessage": "公告、提醒、碎碎念…"
+  "mikY/9": {
+    "defaultMessage": "編輯",
+    "description": "src/components/Comment/DropdownActions/EditButton.tsx"
   },
-  "AGcU5J": {
-    "defaultMessage": "置頂",
-    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
+  "mjMpv4": {
+    "defaultMessage": "圍爐已更新",
+    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
   },
-  "jJ1Brc": {
-    "defaultMessage": "喜歡回應",
-    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
+  "mk+LCk": {
+    "defaultMessage": "介面設定",
+    "description": "src/views/Me/Settings/AnonymousSettings/DisplayPreferences/index.tsx"
   },
-  "RFzVUD": {
-    "defaultMessage": "取消置頂",
-    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
+  "ml3SZN": {
+    "defaultMessage": "至少 8 個字元，支持英文大小寫字母、數字和特殊符號",
+    "description": ""
   },
-  "X+Xvgq": {
-    "defaultMessage": "取消精選",
-    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
+  "nGBrvw": {
+    "defaultMessage": "我的收藏",
+    "description": ""
   },
-  "7xnrxG": {
-    "defaultMessage": "作品已添加至精選",
-    "description": "src/components/ArticleDigest/DropdownActions/SetTagSelectedButton.tsx"
+  "nYeDrI": {
+    "defaultMessage": "沒有帳戶？",
+    "description": "src/components/Forms/EmailLoginForm/Buttons.tsx"
   },
-  "WSUAwk": {
-    "defaultMessage": "添加到精選",
-    "description": "src/components/ArticleDigest/DropdownActions/SetTagSelectedButton.tsx"
+  "nsaJRn": {
+    "defaultMessage": "登入成功",
+    "description": ""
   },
-  "Js/Fij": {
-    "defaultMessage": "作品已取消精選",
-    "description": "src/components/ArticleDigest/DropdownActions/SetTagUnselectedButton.tsx"
+  "o2Na0B": {
+    "defaultMessage": "返回全部",
+    "description": ""
   },
-  "aa0nss": {
-    "defaultMessage": "取消精選",
-    "description": "src/components/ArticleDigest/DropdownActions/SetTagUnselectedButton.tsx"
+  "oIkacT": {
+    "defaultMessage": "作品已隱藏",
+    "description": "src/components/ArticleDigest/DropdownActions/ArchiveArticle/Dialog.tsx"
   },
-  "32bml8": {
-    "defaultMessage": "追蹤",
-    "description": "src/components/Layout/SideNav/index.tsx"
+  "oNYnCM": {
+    "defaultMessage": "已註銷用戶",
+    "description": "src/components/UserProfile/index.tsx"
   },
   "ohgTH4": {
     "defaultMessage": "追蹤中",
     "description": "src/components/UserProfile/index.tsx"
   },
-  "Cu3Cty": {
-    "defaultMessage": "月",
-    "description": ""
-  },
-  "qlki7w": {
-    "defaultMessage": "移除作品",
-    "description": "src/components/ArticleDigest/DropdownActions/RemoveTagButton.tsx"
-  },
   "pRV+UD": {
     "defaultMessage": "闔上",
     "description": "src/components/Comment/DropdownActions/CollapseComment/Button.tsx"
   },
-  "h9CG9E": {
-    "defaultMessage": "{commentType}已刪除",
-    "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
-  },
-  "Cdkhl8": {
-    "defaultMessage": "刪除{commentType}",
-    "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
-  },
-  "77tYPg": {
-    "defaultMessage": "確認刪除後，{commentType}會立即消失。",
-    "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
+  "ptqBN1": {
+    "defaultMessage": "暫時不要",
+    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/PreSend.tsx"
   },
-  "cd/II9": {
-    "defaultMessage": "{totalCount, plural, =1 {篇文章} other {篇文章}}",
+  "pwlQEY": {
+    "defaultMessage": "姓名",
     "description": ""
   },
-  "ZAs170": {
-    "defaultMessage": "基本資料",
-    "description": "src/views/Circle/Settings/index.tsx"
-  },
-  "DMlmcU": {
-    "defaultMessage": "免費資格",
-    "description": "src/views/Circle/Settings/index.tsx"
-  },
-  "EQeKnO": {
-    "defaultMessage": "邀請管理",
-    "description": "src/views/Circle/Settings/index.tsx"
-  },
-  "KLQ1/z": {
-    "defaultMessage": "圍爐創建成功",
-    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+  "pzTOmv": {
+    "defaultMessage": "追蹤者",
+    "description": ""
   },
-  "mjMpv4": {
-    "defaultMessage": "圍爐已更新",
-    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+  "q+N5Wd": {
+    "defaultMessage": "管理圍爐",
+    "description": "src/views/Circle/Profile/DropdownActions/index.tsx"
   },
-  "ei+kyp": {
+  "q9oMKE": {
     "defaultMessage": "圍爐名稱",
-    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+    "description": ""
   },
-  "tW3hM/": {
-    "defaultMessage": "圍爐描述",
-    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+  "qPPrzm": {
+    "defaultMessage": " 支持了你的作品 ",
+    "description": "src/components/Notice/TransactionNotice/PaymentReceivedDonationNotice.tsx"
   },
-  "CwWLOr": {
-    "defaultMessage": "給圍爐取一個吸引人的名字吧",
-    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+  "qQmSxu": {
+    "defaultMessage": "你已成功登記參加空投且完成以太坊錢包設定，空投活動將在 2021/11/12 進行。你設定的空投地址：",
+    "description": "src/components/Notice/CryptoNotice/CryptoWalletAirdropNotice.tsx"
   },
-  "QUqfbW": {
-    "defaultMessage": "說說圍爐的有趣之處，吸引支持者加入",
-    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+  "qYzBk8": {
+    "defaultMessage": "退訂了你的圍爐",
+    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
   },
-  "JXdbo8": {
-    "defaultMessage": "完成",
-    "description": ""
+  "qlki7w": {
+    "defaultMessage": "移除作品",
+    "description": "src/components/ArticleDigest/DropdownActions/RemoveTagButton.tsx"
   },
-  "q9oMKE": {
-    "defaultMessage": "圍爐名稱",
+  "qswU4E": {
+    "defaultMessage": "信箱將不作為登入使用，僅作為聯繫渠道",
     "description": ""
   },
-  "QZXKhG": {
-    "defaultMessage": "設置圍爐網址（創建後不可修改）",
-    "description": "src/components/Forms/CreateCircleForm/Init.tsx"
-  },
-  "6BXcdo": {
-    "defaultMessage": "設定圍爐門檻（每月）",
-    "description": "src/components/Forms/CreateCircleForm/Init.tsx"
+  "qyzJxi": {
+    "defaultMessage": "航行日誌 1.0",
+    "description": "src/components/UserProfile/DropdownActions/index.tsx"
   },
-  "VwuiYK": {
-    "defaultMessage": "Oops！此網址已被使用了，換一個試試",
-    "description": "src/components/Forms/CreateCircleForm/Init.tsx"
+  "rBjwQy": {
+    "defaultMessage": "微博",
+    "description": "src/components/Share/Buttons/Weibo.tsx"
   },
-  "gMZZ9I": {
-    "defaultMessage": "2-20 個字元，僅支持英文小寫字母、數字或下劃線",
+  "rXnmeE": {
+    "defaultMessage": "確認發送",
     "description": ""
   },
-  "+7SAix": {
-    "defaultMessage": "2-12 個字元",
-    "description": ""
+  "reOeq5": {
+    "defaultMessage": "你已擁有個人創作空間站，期待你的第一篇作品。",
+    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
   },
-  "eov+J2": {
-    "defaultMessage": "自定義網址名稱",
-    "description": ""
+  "rf0ew3": {
+    "defaultMessage": "快來搭建圍爐，呼召你的支持者加入",
+    "description": "src/components/UserProfile/CircleWidget/index.tsx"
   },
-  "8KFsZN": {
-    "defaultMessage": "閱讀次數",
+  "rfz/fN": {
+    "defaultMessage": "建議封面尺寸 1600 x 900 像素",
     "description": ""
   },
-  "LOefol": {
-    "defaultMessage": "上鎖",
-    "description": "src/views/Circle/Analytics/ContentAnalytics/ContentTabs/index.tsx"
-  },
-  "/podGX": {
-    "defaultMessage": "公開",
-    "description": "src/views/Circle/Analytics/ContentAnalytics/ContentTabs/index.tsx"
+  "rs0YS2": {
+    "defaultMessage": "已禁言用戶",
+    "description": "src/components/UserProfile/index.tsx"
   },
-  "mCAIcg": {
-    "defaultMessage": "站內閱讀熱門排行",
-    "description": "src/views/Circle/Analytics/ContentAnalytics/index.tsx"
+  "sPgUkN": {
+    "defaultMessage": "本月營收",
+    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
   },
-  "lNjDPr": {
-    "defaultMessage": "你還沒有邀請任何用戶喔！點擊新增邀請，添加站內或站外朋友加入圍爐贈與對方免費資格的固定時長",
-    "description": "src/views/Circle/Settings/ManageInvitation/Invites/Pending/index.tsx"
+  "skbUBl": {
+    "defaultMessage": "Log in",
+    "description": "src/components/Buttons/Login/index.tsx"
   },
-  "RxiHr/": {
-    "defaultMessage": "還沒有任何用戶回覆你的邀請喔！",
-    "description": "src/views/Circle/Settings/ManageInvitation/Invites/Accepted/index.tsx"
+  "sncOwi": {
+    "defaultMessage": " 在作品中提及你",
+    "description": "src/components/Notice/ArticleNotice/ArticleMentionedYouNotice.tsx"
   },
-  "b8ogKp": {
-    "defaultMessage": "新增邀請",
-    "description": "src/views/Circle/Settings/ManageInvitation/AddButton/index.tsx"
+  "stjoBH": {
+    "defaultMessage": "現在，去為你喜歡的作者打賞吧！你的每一次打賞都將為作者帶來收入。",
+    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
   },
-  "FmWYRt": {
-    "defaultMessage": "免費資格時長",
+  "sy+pv5": {
+    "defaultMessage": "電子郵箱",
     "description": ""
   },
-  "Bc20la": {
-    "defaultMessage": "天",
-    "description": ""
+  "t7ah39": {
+    "defaultMessage": " 成為了標籤的主理人，你的作品也在其中。快來看看其他作者的精彩創作吧",
+    "description": "src/components/Notice/TagNotice/TagAdoptionNotice.tsx"
   },
-  "O0QB1v": {
-    "defaultMessage": "用戶將收到你的圍爐免費資格邀請函，設置免費的時限，邀請他們一起加入吧！",
-    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/PreSend.tsx"
+  "t8/r8X": {
+    "defaultMessage": "連接加密錢包",
+    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
   },
-  "rXnmeE": {
-    "defaultMessage": "確認發送",
-    "description": ""
+  "tQsujN": {
+    "defaultMessage": " 眾聊中回覆話題，其中有提及你 ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "ptqBN1": {
-    "defaultMessage": "暫時不要",
-    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/PreSend.tsx"
+  "tW3hM/": {
+    "defaultMessage": "圍爐描述",
+    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
   },
   "tzq2+W": {
     "defaultMessage": "寄出邀請",
     "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/PreSend.tsx"
   },
-  "fWDtpq": {
-    "defaultMessage": "邀請中",
-    "description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
-  },
-  "JpS59y": {
-    "defaultMessage": "已接受",
-    "description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
+  "u5aHb4": {
+    "defaultMessage": "複製鏈接",
+    "description": ""
   },
-  "Bjdw71": {
-    "defaultMessage": "目前總追蹤人數",
-    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  "uIdMon": {
+    "defaultMessage": "確認隱藏，其他用戶將無法從站內訪問該作品。隱藏後無法回退，如需再次呈現作品，你需要重新發布。",
+    "description": "src/components/ArticleDigest/DropdownActions/ArchiveArticle/Dialog.tsx"
   },
-  "xWZr13": {
-    "defaultMessage": "{follower, plural, =1 {人} other {人}}",
-    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  "uVCg1l": {
+    "defaultMessage": "玩轉 Matters 實用指南",
+    "description": ""
   },
-  "GugBCe": {
-    "defaultMessage": "本月新增追蹤人數",
-    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  "uqmi/b": {
+    "defaultMessage": " 置頂了你在作品 ",
+    "description": "src/components/Notice/CommentNotice/CommentPinnedNotice.tsx"
   },
-  "MDNaxs": {
-    "defaultMessage": "人",
-    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  "uuEGON": {
+    "defaultMessage": " 眾聊中發表與回覆話題，其中有提及你 ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "zKOr2x": {
-    "defaultMessage": "已追蹤用戶佔總觀看人數比例",
-    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  "uw32VR": {
+    "defaultMessage": "教學指南",
+    "description": ""
   },
-  "AYTnjk": {
-    "defaultMessage": "追蹤",
-    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  "v6YjIn": {
+    "defaultMessage": "帳戶",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "sPgUkN": {
-    "defaultMessage": "本月營收",
-    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
+  "vAc1Bw": {
+    "defaultMessage": "封鎖用戶",
+    "description": ""
   },
-  "Fe682o": {
-    "defaultMessage": "下月預期營收",
-    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
+  "vH8sCb": {
+    "defaultMessage": "我的圍爐",
+    "description": ""
   },
-  "L4NXXh": {
-    "defaultMessage": "目前總營收",
-    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
+  "wEQDC6": {
+    "defaultMessage": "編輯資料",
+    "description": ""
   },
-  "d4waan": {
-    "defaultMessage": "營收",
-    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
+  "wSEOxH": {
+    "defaultMessage": "聯繫渠道",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "6OBAOi": {
-    "defaultMessage": "目前總訂閱人數",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "wXzTZ0": {
+    "defaultMessage": "Enter the name of your Circle",
+    "description": ""
   },
-  "zxy15q": {
-    "defaultMessage": "{subscriber, plural, =1 {人} other {人}}",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "wbcwKd": {
+    "defaultMessage": "查看全部",
+    "description": ""
   },
-  "TSDiqB": {
-    "defaultMessage": "付費人數",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "wqaNK4": {
+    "defaultMessage": "在你的圍爐 ",
+    "description": ""
   },
-  "XHMco9": {
-    "defaultMessage": "人",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "xGh9O7": {
+    "defaultMessage": "提醒：信箱將不作為登入使用，僅作為聯繫渠道",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "1qQzV0": {
-    "defaultMessage": "免費邀請",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "xWZr13": {
+    "defaultMessage": "{follower, plural, =1 {人} other {人}}",
+    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
   },
-  "WpvsPu": {
-    "defaultMessage": "訂閱",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "xiKjd/": {
+    "defaultMessage": "使用電子信箱",
+    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
   },
-  "SNh1n0": {
-    "defaultMessage": "查看名單",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "xmcVZ0": {
+    "defaultMessage": "搜尋",
+    "description": ""
   },
-  "2CqWQE": {
-    "defaultMessage": "總數",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "xwj01D": {
+    "defaultMessage": " 邀請你成為標籤的協作者",
+    "description": "src/components/Notice/TagNotice/TagAddEditorNotice.tsx"
   },
   "y0b6Kp": {
     "defaultMessage": "付費",
     "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "L0J61B": {
-    "defaultMessage": "免費",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "y1Z3or": {
+    "defaultMessage": "修改界面語言",
+    "description": ""
   },
-  "SdXoXI": {
-    "defaultMessage": "你已寄出邀請給朋友們，快去已邀請管理查看他們加入的進度吧！",
-    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/Sent.tsx"
+  "ySGgTo": {
+    "defaultMessage": "添加精選",
+    "description": "src/views/TagDetail/DropdownActions/index.tsx"
   },
-  "OIj8pQ": {
-    "defaultMessage": "成功發送邀請",
-    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/Sent.tsx"
+  "yZfKI4": {
+    "defaultMessage": "discussion and mentioned you",
+    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
   },
-  "lIir/P": {
-    "defaultMessage": "我知道了",
+  "zKOr2x": {
+    "defaultMessage": "已追蹤用戶佔總觀看人數比例",
+    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  },
+  "zQvVDJ": {
+    "defaultMessage": "全部",
     "description": ""
   },
-  "2uwwz+": {
-    "defaultMessage": "累計閱讀時數代表了你的作品被登入用戶閱讀的總時數，每次閱讀過程超過一定時間後才會計入。此外，同一個用戶的多次閱讀也會進行累計。",
-    "description": "src/components/Dialogs/HelpDialog/index.tsx"
+  "zb8Kx1": {
+    "defaultMessage": "公告、提醒、碎碎念…"
   },
-  "Z6cII7": {
-    "defaultMessage": "累計閱讀時數",
-    "description": "src/components/Dialogs/HelpDialog/index.tsx"
+  "zxlwbc": {
+    "defaultMessage": "等候寫入完成...",
+    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
   },
-  "DXJ8ys": {
-    "defaultMessage": "閱讀次數代表了你的作品被登入用戶閱讀的總次數，每次閱讀過程超過一定時間後才會計入。此外，同一個用戶的多次閱讀也會進行累計。",
-    "description": "src/components/Dialogs/HelpDialog/index.tsx"
+  "zxy15q": {
+    "defaultMessage": "{subscriber, plural, =1 {人} other {人}}",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   }
 }
+

From 1d153274a93839e18b509a1e1ba87083c3f22808 Mon Sep 17 00:00:00 2001
From: Matty <98379126+matters-tech@users.noreply.github.com>
Date: Wed, 12 Apr 2023 17:08:54 +0700
Subject: [PATCH 85/92] New translations default.json (English)

---
 lang/en.json | 1787 ++++++++++++++++++++++++--------------------------
 1 file changed, 870 insertions(+), 917 deletions(-)

diff --git a/lang/en.json b/lang/en.json
index 8bcebe2173..e33631e4be 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1,1297 +1,1250 @@
 {
-  "3uQKhx": {
-    "defaultMessage": "Please email",
-    "description": "src/views/Help/index.tsx"
+  "+7SAix": {
+    "defaultMessage": "Must be between 2-12 characters long.",
+    "description": ""
   },
-  "k5NnNF": {
-    "defaultMessage": " followed you",
-    "description": "src/components/Notice/UserNotice/UserNewFollowerNotice.tsx"
+  "+a+2ug": {
+    "defaultMessage": "Members",
+    "description": ""
+  },
+  "+hfUcV": {
+    "defaultMessage": "sent a new broadcast on {circlename}",
+    "description": "src/components/Notice/CommentNotice/CircleNewBroadcastNotice.tsx"
+  },
+  "/+XWDi": {
+    "defaultMessage": "Logbook 2.0",
+    "description": "src/components/UserProfile/DropdownActions/index.tsx"
+  },
+  "/3G89K": {
+    "defaultMessage": " is growing",
+    "description": "src/components/Notice/ArticleNotice/CircleNewArticle.tsx"
+  },
+  "/3kw6k": {
+    "defaultMessage": "Adding contents into IPFS network, and it usually takes some times, please wait. You can accelerate the process by publishing new article.",
+    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  },
+  "/IMR+8": {
+    "defaultMessage": "Top Supporters",
+    "description": ""
+  },
+  "/asuIY": {
+    "defaultMessage": "Enter Community",
+    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
   },
   "/ns2st": {
     "defaultMessage": "Download App",
     "description": ""
   },
-  "FaTb0A": {
-    "defaultMessage": "Install MetaMask",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  "/nu5ho": {
+    "defaultMessage": "replied to your comment on ",
+    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
   },
-  "J+LXrH": {
-    "defaultMessage": "User registered by email can login and enable wallet login later",
-    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
+  "/podGX": {
+    "defaultMessage": "Public",
+    "description": "src/views/Circle/Analytics/ContentAnalytics/ContentTabs/index.tsx"
   },
-  "FhWC22": {
-    "defaultMessage": "Matters Community",
+  "0Azlrb": {
+    "defaultMessage": "Manage",
     "description": ""
   },
-  "Xd0J7Y": {
-    "defaultMessage": "Open Source",
+  "1EYCdR": {
+    "defaultMessage": "Tags",
     "description": ""
   },
-  "cfL5uk": {
-    "defaultMessage": "Over 200 words, current {numbers}",
-    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx"
+  "1pFLGZ": {
+    "defaultMessage": "Bug Bounty",
+    "description": ""
   },
-  "dnsfmR": {
-    "defaultMessage": "for bug reports or suggestions. We will reply to you as soon we can!",
-    "description": "src/views/Help/index.tsx"
+  "1qQzV0": {
+    "defaultMessage": "Invitees",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "fOgusL": {
-    "defaultMessage": "Choose a method to enter",
-    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
+  "20bImY": {
+    "defaultMessage": "Discussion",
+    "description": ""
   },
-  "iCFXtS": {
-    "defaultMessage": "For unregistered or users enabled wallet login",
-    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
+  "2CqWQE": {
+    "defaultMessage": "Total",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "ZjDH42": {
-    "defaultMessage": "About Us",
+  "2atspc": {
+    "defaultMessage": "Drafts",
     "description": ""
   },
-  "6flWFg": {
-    "defaultMessage": "Term of Services",
-    "description": "src/views/Help/index.tsx"
+  "2eebTb": {
+    "defaultMessage": " bookmarked your article",
+    "description": "src/components/Notice/ArticleNotice/ArticleNewSubscriberNotice.tsx"
   },
-  "uVCg1l": {
-    "defaultMessage": "Explore Matters",
+  "2slIPX": {
+    "defaultMessage": "Likes",
     "description": ""
   },
-  "HzaRKA": {
-    "defaultMessage": "Migrate to Matters",
-    "description": ""
+  "2uRduT": {
+    "defaultMessage": "comment",
+    "description": "src/components/Notice/CommentNotice/CommentPinnedNotice.tsx"
   },
-  "skbUBl": {
-    "defaultMessage": "Log in",
-    "description": "src/components/Buttons/Login/index.tsx"
+  "2uwwz+": {
+    "defaultMessage": "Accumulated read time indicates the total time length that registered users read.",
+    "description": "src/components/Dialogs/HelpDialog/index.tsx"
   },
-  "t8/r8X": {
-    "defaultMessage": "Continue with Wallet",
-    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
+  "32bml8": {
+    "defaultMessage": "Following",
+    "description": "src/components/Layout/SideNav/index.tsx"
   },
-  "xiKjd/": {
-    "defaultMessage": "Continue with Email",
-    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
+  "3KNMbJ": {
+    "defaultMessage": "Articles",
+    "description": ""
   },
-  "z+209N": {
-    "defaultMessage": "Register",
+  "3WKlPP": {
+    "defaultMessage": "commented in",
     "description": ""
   },
-  "XcTMMM": {
-    "defaultMessage": "Have an account?",
-    "description": "src/components/Forms/EmailSignUpForm/Buttons.tsx"
+  "3kbIhS": {
+    "defaultMessage": "Untitled",
+    "description": ""
   },
-  "ipQlDG": {
-    "defaultMessage": "Login with Email",
-    "description": "src/components/Forms/EmailSignUpForm/Buttons.tsx"
+  "3uQKhx": {
+    "defaultMessage": "Please email",
+    "description": "src/views/Help/index.tsx"
   },
-  "pwlQEY": {
-    "defaultMessage": "Display Name",
+  "3yk8fB": {
+    "defaultMessage": "Wallet",
     "description": ""
   },
-  "LphWYP": {
-    "defaultMessage": "Terms and Privacy Policy",
+  "3ynsJ3": {
+    "defaultMessage": "Want to know more? Check the ",
+    "description": "src/views/Me/Analytics/EmptyAnalytics/index.tsx"
+  },
+  "47FYwb": {
+    "defaultMessage": "Cancel",
     "description": ""
   },
-  "agfumL": {
-    "defaultMessage": "Next",
+  "4Odb0J": {
+    "defaultMessage": "Pin article",
+    "description": "src/components/ArticleDigest/DropdownActions/StickyButton.tsx"
+  },
+  "4giHJT": {
+    "defaultMessage": "Have wallet questions on mobile device ? Click the ",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  },
+  "4vkwo0": {
+    "defaultMessage": "Your article has been republished to decentralized network",
+    "description": "src/components/Notice/ArticleNotice/RevisedArticlePublishedNotice.tsx"
+  },
+  "50cquj": {
+    "defaultMessage": "No discussion yet",
+    "description": "src/views/Circle/Discussion/Discussion.tsx"
+  },
+  "5FO4vn": {
+    "defaultMessage": "You do not have permission to perform this operation",
     "description": ""
   },
-  "l5vWO8": {
-    "defaultMessage": "Display name, can be changed later",
-    "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
+  "5sAbzJ": {
+    "defaultMessage": " started a new topic ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
   "5sg7KC": {
     "defaultMessage": "Password",
     "description": ""
   },
-  "ml3SZN": {
-    "defaultMessage": "Minimum 8 characters. Uppercase/lowercase letters, numbers and symbols are allowed",
+  "63HuBz": {
+    "defaultMessage": "This tag has no manager currently",
+    "description": "src/views/TagDetail/Owner/index.tsx"
+  },
+  "69+D96": {
+    "defaultMessage": "Start Creating",
     "description": ""
   },
-  "NzfL1d": {
-    "defaultMessage": "Enter password again",
-    "description": "src/components/Forms/EmailSignUpForm/Password.tsx"
+  "6BXcdo": {
+    "defaultMessage": "Set threshold for circle (per month)",
+    "description": "src/components/Forms/CreateCircleForm/Init.tsx"
   },
-  "XH0Lb6": {
-    "defaultMessage": "Welcome to Matters!",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
+  "6OBAOi": {
+    "defaultMessage": "subscribers_empty",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "stjoBH": {
-    "defaultMessage": "Now, go like the authors you support! Your Likes will become their income",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
+  "6flWFg": {
+    "defaultMessage": "Term of Services",
+    "description": ""
   },
-  "reOeq5": {
-    "defaultMessage": "You have created your personal creative space. Publish your first work!",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
+  "77tYPg": {
+    "defaultMessage": "After deletion, the {commentType} will be removed immediately",
+    "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
   },
-  "ANhCde": {
-    "defaultMessage": "Start creating now!",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
+  "7DIW6+": {
+    "defaultMessage": "Learn More",
+    "description": ""
   },
-  "/asuIY": {
-    "defaultMessage": "Enter Community",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
+  "7xnrxG": {
+    "defaultMessage": "The article has been added to the Trending",
+    "description": "src/components/ArticleDigest/DropdownActions/SetTagSelectedButton.tsx"
   },
-  "nsaJRn": {
-    "defaultMessage": "Logged in successfully",
+  "8KFsZN": {
+    "defaultMessage": "Read Counts",
     "description": ""
   },
-  "lD4FPZ": {
-    "defaultMessage": "Enter Email",
+  "8cv9D4": {
+    "defaultMessage": "Next Step",
     "description": ""
   },
-  "IFY8r4": {
-    "defaultMessage": "Enter Password",
-    "description": "src/components/Forms/EmailLoginForm/index.tsx"
+  "8xPi0N": {
+    "defaultMessage": "Unsubscribe Circle",
+    "description": "src/views/Circle/Profile/DropdownActions/index.tsx"
   },
-  "nYeDrI": {
-    "defaultMessage": "Not Registered?",
-    "description": "src/components/Forms/EmailLoginForm/Buttons.tsx"
+  "9+Ddtu": {
+    "defaultMessage": "Next",
+    "description": ""
   },
-  "xGh9O7": {
-    "defaultMessage": "As a reminder, the email address will not be used as a login but only as a contact channel.",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
+  "9nNpKP": {
+    "defaultMessage": "Discussion sent",
+    "description": "src/views/Circle/Discussion/Discussion.tsx"
   },
-  "N3K1H9": {
-    "defaultMessage": "Matters will never ask for your wallet mnemonic through any channel.",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
+  "A3LOng": {
+    "defaultMessage": " replied to topics ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "hWs95P": {
-    "defaultMessage": "Important information will be notified by email. So filling in your email address will be required.",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
+  "A3rLZt": {
+    "defaultMessage": "Last {months} months",
+    "description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
   },
-  "cg1VJ2": {
-    "defaultMessage": "Connect Wallet",
+  "A3wDZ8": {
+    "defaultMessage": "My NFT Collections",
+    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/NFTCollection/index.tsx"
+  },
+  "A41QIy": {
+    "defaultMessage": "Enter Password",
     "description": ""
   },
-  "YjNkcK": {
-    "defaultMessage": "To change, switch it directly on your wallet",
+  "A7ugfn": {
+    "defaultMessage": "More Actions",
     "description": ""
   },
-  "wSEOxH": {
-    "defaultMessage": "Contact Channel",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
-  },
-  "CwSpld": {
-    "defaultMessage": "Not for login",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
-  },
-  "qswU4E": {
-    "defaultMessage": "Email will not be used as a login but only as a contact channel.",
-    "description": ""
-  },
-  "EfJYPI": {
-    "defaultMessage": "Verification Code",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
-  },
-  "0Rw3H/": {
-    "defaultMessage": "I have read and agree to",
-    "description": ""
-  },
-  "jgLiba": {
-    "defaultMessage": "Enter verification code",
-    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
-  },
-  "jL2ZHb": {
-    "defaultMessage": "Code will expire after 20 minutes",
-    "description": ""
-  },
-  "4giHJT": {
-    "defaultMessage": "Have wallet questions on mobile device ? Click the ",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
-  },
-  "uw32VR": {
-    "defaultMessage": "tutorial",
+  "A8MpFX": {
+    "defaultMessage": "Enter Bio",
     "description": ""
   },
-  "hrfF+i": {
-    "defaultMessage": "Don't have a wallet yet? Check the ",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
-  },
-  "HxcjQl": {
-    "defaultMessage": "Matters continues to provide services that combine creativity with blockchain technology. You will be the first to experience them after completing connecting wallet.",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  "AGcU5J": {
+    "defaultMessage": "Pin Broadcast",
+    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
   },
-  "LqxIEU": {
-    "defaultMessage": "Wallet address will be part of your digital identity and shown in your profile page.",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  "ANA7sk": {
+    "defaultMessage": "Maintain",
+    "description": "src/views/TagDetail/Owner/index.tsx"
   },
-  "UOdEqi": {
-    "defaultMessage": "The original login via email will be kept for you. Please note that your wallet cannot be reset once it is connected because of your account security.",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  "ANhCde": {
+    "defaultMessage": "Start creating now!",
+    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
   },
-  "VrOoVf": {
-    "defaultMessage": "Matters will never ask your wallet key through any channel.",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  "AYTnjk": {
+    "defaultMessage": "Followers",
+    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
   },
-  "v6YjIn": {
-    "defaultMessage": "Account",
-    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  "BHFHeY": {
+    "defaultMessage": " commented in {commentCircle}",
+    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
   },
-  "H8KGyc": {
-    "defaultMessage": "Enter",
+  "Bc20la": {
+    "defaultMessage": "days",
     "description": ""
   },
-  "sy+pv5": {
-    "defaultMessage": "Email",
-    "description": ""
+  "Bjdw71": {
+    "defaultMessage": "followers_empty",
+    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
   },
-  "JxlxVc": {
-    "defaultMessage": "Forget Password",
-    "description": "src/components/Forms/EmailLoginForm/Buttons.tsx"
+  "BjzRe8": {
+    "defaultMessage": ". Take a look at your income",
+    "description": "src/components/Notice/TransactionNotice/PaymentReceivedDonationNotice.tsx"
   },
-  "deEeEI": {
-    "defaultMessage": "Register",
+  "CBDDR5": {
+    "defaultMessage": "Must be between 2-20 characters long. Only lowercase letters, numbers and underline are allowed.",
     "description": ""
   },
-  "N2IrpM": {
-    "defaultMessage": "Confirm",
-    "description": ""
+  "Cdkhl8": {
+    "defaultMessage": "Delete {commentType}",
+    "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
   },
-  "EwVnoC": {
-    "defaultMessage": "I have read and agree to",
+  "CnPG8j": {
+    "defaultMessage": "Featured",
     "description": ""
   },
-  "9+Ddtu": {
-    "defaultMessage": "Next",
+  "Cu3Cty": {
+    "defaultMessage": "month",
     "description": ""
   },
-  "KZlRde": {
-    "defaultMessage": " replied to ",
-    "description": "src/components/Notice/ArticleArticleNotice/ArticleNewCollectedNotice.tsx"
-  },
-  "/nu5ho": {
-    "defaultMessage": "replied to your comment on ",
-    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
-  },
-  "ZUPQzl": {
-    "defaultMessage": "",
-    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
-  },
-  "b+LSgI": {
-    "defaultMessage": " replied to your discussion on ",
-    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
-  },
-  "aaUBvF": {
-    "defaultMessage": "",
-    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
-  },
-  "DIQKiC": {
-    "defaultMessage": " mentioned you in a comment on ",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
-  },
-  "jqACL/": {
-    "defaultMessage": "",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
-  },
-  "+8Q3Y4": {
-    "defaultMessage": " commented in ",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
-  },
-  "+AdTsY": {
-    "defaultMessage": " discussion and mentioned you",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
-  },
-  "ISn3eZ": {
-    "defaultMessage": " broadcast and mentioned you",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
-  },
-  "uqmi/b": {
-    "defaultMessage": " pinned your comment on ",
-    "description": "src/components/Notice/CommentNotice/CommentPinnedNotice.tsx"
-  },
-  "VjxGd7": {
-    "defaultMessage": " commented on ",
-    "description": "src/components/Notice/CommentNotice/ArticleNewCommentNotice.tsx"
-  },
-  "U/Tqmx": {
-    "defaultMessage": " commented on your bookmarked article ",
-    "description": "src/components/Notice/CommentNotice/SubscribedArticleNewCommentNotice.tsx"
-  },
-  "VoOZni": {
-    "defaultMessage": " sent a new broadcast on ",
-    "description": "src/components/Notice/CommentNotice/CircleNewBroadcastNotice.tsx"
-  },
-  "oaDToH": {
-    "defaultMessage": "",
-    "description": "src/components/Notice/CommentNotice/CircleNewBroadcastNotice.tsx"
+  "CwSpld": {
+    "defaultMessage": "Not for login",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "qPPrzm": {
-    "defaultMessage": " supported your article ",
-    "description": "src/components/Notice/TransactionNotice/PaymentReceivedDonationNotice.tsx"
+  "D2Sw/t": {
+    "defaultMessage": "Add any URL in the following list into RSS reader",
+    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
   },
-  "BjzRe8": {
-    "defaultMessage": ". Take a look at your income",
-    "description": "src/components/Notice/TransactionNotice/PaymentReceivedDonationNotice.tsx"
+  "D3idYv": {
+    "defaultMessage": "Settings",
+    "description": ""
   },
-  "z4NaU2": {
-    "defaultMessage": "Your",
-    "description": "src/components/Notice/TransactionNotice/PaymentPayoutNotice.tsx"
+  "DMlmcU": {
+    "defaultMessage": "Free Trial",
+    "description": "src/views/Circle/Settings/index.tsx"
   },
-  "bVZDVx": {
-    "defaultMessage": " withdrawal process has started. Please refer to your bank for payout status.",
-    "description": "src/components/Notice/TransactionNotice/PaymentPayoutNotice.tsx"
+  "DXJ8ys": {
+    "defaultMessage": "Read counts indicates how many registered users read.",
+    "description": "src/components/Dialogs/HelpDialog/index.tsx"
   },
-  "nto8ly": {
-    "defaultMessage": " subscribed your circle",
-    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
+  "E8W3qa": {
+    "defaultMessage": "Must be between 2-20 characters long. Chinese characters, letters, numbers and underscores are allowed.",
+    "description": ""
   },
-  "qYzBk8": {
-    "defaultMessage": " unsubscribed your circle",
-    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
+  "EQeKnO": {
+    "defaultMessage": "Manage Invitation",
+    "description": "src/views/Circle/Settings/index.tsx"
   },
-  "LW1aX1": {
-    "defaultMessage": "Congrats!",
-    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
+  "EW5R4p": {
+    "defaultMessage": "Request an update, ask, share and discuss",
+    "description": "src/views/Circle/Discussion/Discussion.tsx"
   },
-  "KyWDUu": {
-    "defaultMessage": " invites you to join Circle for ",
-    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
+  "EfJYPI": {
+    "defaultMessage": "Verification Code",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "jF+Mle": {
-    "defaultMessage": " days for free. Try it and have fun!",
-    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
+  "EoNvLu": {
+    "defaultMessage": "Created",
+    "description": "src/views/User/Articles/UserArticles.tsx"
   },
-  "J3yk6u": {
-    "defaultMessage": "in circle",
+  "EwVnoC": {
+    "defaultMessage": "I have read and agree to",
     "description": ""
   },
   "FALWef": {
     "defaultMessage": " commented in Broadcast",
     "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
   },
-  "YlxpJl": {
-    "defaultMessage": " Broadcast and mentioned you ",
-    "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
-  },
-  "qQmSxu": {
-    "defaultMessage": "Airdrop registration completed. Your NFT will be revealed on November 12. Confirm your ETH wallet address:",
-    "description": "src/components/Notice/CryptoNotice/CryptoWalletAirdropNotice.tsx"
-  },
-  "UgvfcU": {
-    "defaultMessage": "You have successfully completed Ethereum wallet settings. Please confirm wallet address:",
-    "description": "src/components/Notice/CryptoNotice/CryptoWalletConnectedNotice.tsx"
-  },
-  "+hfUcV": {
-    "defaultMessage": "sent a new broadcast on {circlename}",
-    "description": "src/components/Notice/CommentNotice/CircleNewBroadcastNotice.tsx"
-  },
-  "An0rpe": {
-    "defaultMessage": "{circlename} Broadcast",
-    "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
-  },
-  "VO4Elt": {
-    "defaultMessage": " mentioned you in a comment on  {commentArticle}",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
-  },
-  "BHFHeY": {
-    "defaultMessage": " commented in {commentCircle}",
-    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
+  "FOOymB": {
+    "defaultMessage": "No members yet",
+    "description": "src/views/Circle/Profile/MembersDialog/Content.tsx"
   },
-  "5sAbzJ": {
-    "defaultMessage": " started a new topic ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  "FaTb0A": {
+    "defaultMessage": "Install MetaMask",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "A3LOng": {
-    "defaultMessage": " replied to topics ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  "Fe682o": {
+    "defaultMessage": "Next Month (Estimation)",
+    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
   },
-  "ftD7Hy": {
-    "defaultMessage": " mentioned you ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  "FhWC22": {
+    "defaultMessage": "Matters Community",
+    "description": ""
   },
-  "g/L3Fm": {
-    "defaultMessage": " posted and replied to topics ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  "FmWYRt": {
+    "defaultMessage": "Free trial period",
+    "description": ""
   },
   "GBm/sD": {
     "defaultMessage": " posted a new topic and mentioned you ",
     "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "tQsujN": {
-    "defaultMessage": " replied to topics and mentioned you ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
-  },
-  "uuEGON": {
-    "defaultMessage": " posted and replied to topics and mentioned you ",
-    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
-  },
-  "hk2aiz": {
-    "defaultMessage": " followed your circle",
-    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
+  "GRtGnZ": {
+    "defaultMessage": "Resign From Maintainer",
+    "description": "src/views/TagDetail/DropdownActions/index.tsx"
   },
-  "mPe6DK": {
-    "defaultMessage": " subscribed your circle",
-    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
+  "GZJpDf": {
+    "defaultMessage": "Analytics",
+    "description": ""
   },
-  "JIjMWL": {
-    "defaultMessage": "Your article has been published to decentralized network",
-    "description": "src/components/Notice/ArticleNotice/ArticlePublishedNotice.tsx"
+  "GugBCe": {
+    "defaultMessage": "New Followers This Month",
+    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
   },
-  "sncOwi": {
-    "defaultMessage": " mentioned you in an article",
-    "description": "src/components/Notice/ArticleNotice/ArticleMentionedYouNotice.tsx"
+  "H0JBH6": {
+    "defaultMessage": "Log Out",
+    "description": ""
   },
-  "2eebTb": {
-    "defaultMessage": " bookmarked your article",
-    "description": "src/components/Notice/ArticleNotice/ArticleNewSubscriberNotice.tsx"
+  "H8KGyc": {
+    "defaultMessage": "Enter",
+    "description": ""
   },
-  "YIes/F": {
-    "defaultMessage": "etc. {actorsCount} users",
-    "description": "src/components/Notice/ArticleNotice/ArticleNewSubscriberNotice.tsx"
+  "HFVDeB": {
+    "defaultMessage": "Related Tags",
+    "description": "src/views/TagDetail/RelatedTags/index.tsx"
   },
-  "PjT72J": {
-    "defaultMessage": " liked your article",
-    "description": "src/components/Notice/ArticleNotice/ArticleNewAppreciationNotice.tsx"
+  "HtSDyc": {
+    "defaultMessage": "Help Center",
+    "description": ""
   },
-  "4vkwo0": {
-    "defaultMessage": "Your article has been republished to decentralized network",
-    "description": "src/components/Notice/ArticleNotice/RevisedArticlePublishedNotice.tsx"
+  "HxcjQl": {
+    "defaultMessage": "Matters continues to provide services that combine creativity with blockchain technology. You will be the first to experience them after completing connecting wallet.",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "QV19cI": {
-    "defaultMessage": "Failed to republish article",
-    "description": "src/components/Notice/ArticleNotice/RevisedArticleNotPublishedNotice.tsx"
+  "HzaRKA": {
+    "defaultMessage": "Migrate to Matters",
+    "description": ""
   },
-  "euNJsE": {
-    "defaultMessage": "A new article has been added to the circle, read it now!",
-    "description": "src/components/Notice/ArticleNotice/CircleNewArticle.tsx"
+  "IFY8r4": {
+    "defaultMessage": "Enter Password",
+    "description": "src/components/Forms/EmailLoginForm/index.tsx"
   },
-  "/3G89K": {
-    "defaultMessage": " is growing",
-    "description": "src/components/Notice/ArticleNotice/CircleNewArticle.tsx"
+  "Ic4hqD": {
+    "defaultMessage": "words",
+    "description": "src/views/User/Articles/UserArticles.tsx"
   },
-  "wqaNK4": {
-    "defaultMessage": " in your circle ",
-    "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
+  "J+LXrH": {
+    "defaultMessage": "User registered by email can login and enable wallet login later",
+    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
   },
-  "xwj01D": {
-    "defaultMessage": " invites you to become a collaborator",
-    "description": "src/components/Notice/TagNotice/TagAddEditorNotice.tsx"
+  "J+dIsA": {
+    "defaultMessage": "Subscriptions",
+    "description": ""
   },
-  "t7ah39": {
-    "defaultMessage": " just became the maintainer of a tag your article is in. Check out more articles under this tag",
-    "description": "src/components/Notice/TagNotice/TagAdoptionNotice.tsx"
+  "J3yk6u": {
+    "defaultMessage": "in circle",
+    "description": ""
   },
-  "O03Rkc": {
-    "defaultMessage": " resigned as tag collaborator. You can invite new collaborators to join",
-    "description": "src/components/Notice/TagNotice/TagLeaveEditorNotice.tsx"
+  "JIjMWL": {
+    "defaultMessage": "Your article has been published to decentralized network",
+    "description": "src/components/Notice/ArticleNotice/ArticlePublishedNotice.tsx"
   },
-  "dsBCfK": {
-    "defaultMessage": "uh-oh,",
-    "description": "src/components/Notice/TagNotice/TagLeaveEditorNotice.tsx"
+  "JXdbo8": {
+    "defaultMessage": "Done",
+    "description": ""
   },
   "Jc+W6M": {
     "defaultMessage": " resigned as tag maintainer. Would you like to be the new tag maintainer?",
     "description": "src/components/Notice/TagNotice/TagLeaveNotice.tsx"
   },
-  "OKhRC6": {
-    "defaultMessage": "Share",
-    "description": ""
+  "JpS59y": {
+    "defaultMessage": "Accepted",
+    "description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
   },
-  "u5aHb4": {
-    "defaultMessage": "Copy Link",
+  "Js/Fij": {
+    "defaultMessage": "This article has been removed from Trending",
+    "description": "src/components/ArticleDigest/DropdownActions/SetTagUnselectedButton.tsx"
+  },
+  "JxlxVc": {
+    "defaultMessage": "Forget Password",
+    "description": "src/components/Forms/EmailLoginForm/Buttons.tsx"
+  },
+  "K3r6DQ": {
+    "defaultMessage": "Delete",
     "description": ""
   },
-  "NONfAh": {
-    "defaultMessage": "Douban",
-    "description": "src/components/Share/Buttons/Douban.tsx"
+  "KL502d": {
+    "defaultMessage": "Profile updated",
+    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx"
   },
-  "rBjwQy": {
-    "defaultMessage": "Weibo",
-    "description": "src/components/Share/Buttons/Weibo.tsx"
+  "KLQ1/z": {
+    "defaultMessage": "Circle successfully created",
+    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
   },
-  "bBYO6x": {
-    "defaultMessage": "Unblock",
-    "description": "src/components/BlockUser/Button/index.tsx"
+  "KMcrz8": {
+    "defaultMessage": "Maintain Tag",
+    "description": "src/views/TagDetail/Owner/index.tsx"
   },
-  "vAc1Bw": {
-    "defaultMessage": "Block User",
-    "description": ""
+  "KZlRde": {
+    "defaultMessage": " replied to ",
+    "description": "src/components/Notice/ArticleArticleNotice/ArticleNewCollectedNotice.tsx"
   },
-  "mSAY3/": {
-    "defaultMessage": "User unblocked. User can now comment on your articles.",
-    "description": "src/components/BlockUser/Button/index.tsx"
+  "KyWDUu": {
+    "defaultMessage": " invites you to join Circle for ",
+    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
   },
-  "/+XWDi": {
-    "defaultMessage": "Logbook 2.0",
-    "description": "src/components/UserProfile/DropdownActions/index.tsx"
+  "L0J61B": {
+    "defaultMessage": "Free",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "qyzJxi": {
-    "defaultMessage": "Logbook 1.0",
-    "description": "src/components/UserProfile/DropdownActions/index.tsx"
+  "L4NXXh": {
+    "defaultMessage": "Total",
+    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
   },
-  "A7ugfn": {
-    "defaultMessage": "More Actions",
-    "description": ""
+  "L7Si5/": {
+    "defaultMessage": "Manage Community",
+    "description": "src/views/TagDetail/DropdownActions/index.tsx"
   },
-  "b1FfGy": {
-    "defaultMessage": "Content Feed",
-    "description": "src/components/UserProfile/index.tsx"
+  "LGox1K": {
+    "defaultMessage": "Followed",
+    "description": ""
   },
-  "/3kw6k": {
-    "defaultMessage": "Adding contents into IPFS network, and it usually takes some times, please wait. You can accelerate the process by publishing new article.",
-    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  "LOefol": {
+    "defaultMessage": "Paywalled",
+    "description": "src/views/Circle/Analytics/ContentAnalytics/ContentTabs/index.tsx"
+  },
+  "LW1aX1": {
+    "defaultMessage": "Congrats!",
+    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
   },
   "Lc/azT": {
     "defaultMessage": "IPNS Subscription",
     "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
   },
-  "cf37Zy": {
-    "defaultMessage": "Add hash from IPFS into compatible reader such as ",
-    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  "LphWYP": {
+    "defaultMessage": "Terms and Privacy Policy",
+    "description": ""
   },
-  "zxlwbc": {
-    "defaultMessage": "Waiting ...",
-    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  "LqxIEU": {
+    "defaultMessage": "Wallet address will be part of your digital identity and shown in your profile page.",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "gMZfHO": {
-    "defaultMessage": "RSS Subscription",
-    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  "MDNaxs": {
+    "defaultMessage": "followers",
+    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
   },
-  "D2Sw/t": {
-    "defaultMessage": "Add any URL in the following list into RSS reader",
-    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
+  "MkwOFW": {
+    "defaultMessage": "Read History",
+    "description": ""
   },
-  "rf0ew3": {
-    "defaultMessage": "Come build a Circle and call on your supporters to join you!",
-    "description": "src/components/UserProfile/CircleWidget/index.tsx"
+  "N2IrpM": {
+    "defaultMessage": "Confirm",
+    "description": ""
   },
-  "sT9HoG": {
-    "defaultMessage": "Welcome to Matters, a free, autonomous and permanent space for creation and civil discourse.",
-    "description": "src/views/Follow/PickAuthors/index.tsx"
+  "N3K1H9": {
+    "defaultMessage": "Matters will never ask for your wallet mnemonic through any channel.",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "7DIW6+": {
-    "defaultMessage": "Learn More",
+  "NAidKb": {
+    "defaultMessage": "Notifications",
     "description": ""
   },
-  "Z6ewE3": {
-    "defaultMessage": "Build Together",
-    "description": "src/views/Me/Settings/AnonymousSettings/Enhance/index.tsx"
+  "NONfAh": {
+    "defaultMessage": "Douban",
+    "description": "src/components/Share/Buttons/Douban.tsx"
   },
-  "1pFLGZ": {
-    "defaultMessage": "Bug Bounty",
-    "description": ""
+  "NzfL1d": {
+    "defaultMessage": "Enter password again",
+    "description": "src/components/Forms/EmailSignUpForm/Password.tsx"
   },
-  "mk+LCk": {
-    "defaultMessage": "Display Preferences",
-    "description": "src/views/Me/Settings/AnonymousSettings/DisplayPreferences/index.tsx"
+  "O03Rkc": {
+    "defaultMessage": " resigned as tag collaborator. You can invite new collaborators to join",
+    "description": "src/components/Notice/TagNotice/TagLeaveEditorNotice.tsx"
   },
-  "y1Z3or": {
-    "defaultMessage": "Language",
-    "description": ""
+  "O0QB1v": {
+    "defaultMessage": "Friends will receive free trial invitations to Circle. Set up your invitations now!",
+    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/PreSend.tsx"
   },
-  "itPgxd": {
-    "defaultMessage": "Profile",
-    "description": ""
+  "OIj8pQ": {
+    "defaultMessage": "Invitation Sent",
+    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/Sent.tsx"
   },
-  "vH8sCb": {
-    "defaultMessage": "Circle",
+  "OKhRC6": {
+    "defaultMessage": "Share",
     "description": ""
   },
-  "2atspc": {
-    "defaultMessage": "Drafts",
-    "description": ""
+  "PjT72J": {
+    "defaultMessage": " liked your article",
+    "description": "src/components/Notice/ArticleNotice/ArticleNewAppreciationNotice.tsx"
   },
-  "3yk8fB": {
-    "defaultMessage": "Wallet",
-    "description": ""
+  "Po+kJe": {
+    "defaultMessage": "Last {months} month",
+    "description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
   },
-  "GZJpDf": {
-    "defaultMessage": "Analytics",
+  "Pp/0po": {
+    "defaultMessage": "Shuffle",
     "description": ""
   },
-  "nGBrvw": {
-    "defaultMessage": "Bookmarks",
+  "Q8Qw5B": {
+    "defaultMessage": "Description",
     "description": ""
   },
-  "2slIPX": {
-    "defaultMessage": "Likes",
-    "description": ""
+  "QCo7Gc": {
+    "defaultMessage": "Select NFT as your avatar",
+    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/NFTCollection/index.tsx"
   },
-  "2uRduT": {
-    "defaultMessage": "",
-    "description": "src/components/Notice/CommentNotice/CommentPinnedNotice.tsx"
+  "QUqfbW": {
+    "defaultMessage": "Describe more about your Circle",
+    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
   },
-  "MkwOFW": {
-    "defaultMessage": "Read History",
+  "QV19cI": {
+    "defaultMessage": "Failed to republish article",
+    "description": "src/components/Notice/ArticleNotice/RevisedArticleNotPublishedNotice.tsx"
+  },
+  "QZXKhG": {
+    "defaultMessage": "Set the Circle URL (cannot be modified after creation)",
+    "description": "src/components/Forms/CreateCircleForm/Init.tsx"
+  },
+  "RFzVUD": {
+    "defaultMessage": "Unpin Broadcast",
+    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
+  },
+  "RxiHr/": {
+    "defaultMessage": "friends have not accepted your invitations.",
+    "description": "src/views/Circle/Settings/ManageInvitation/Invites/Accepted/index.tsx"
+  },
+  "SENRqu": {
+    "defaultMessage": "Help",
     "description": ""
   },
-  "fG41Ux": {
-    "defaultMessage": "Logged out successfully",
+  "SNh1n0": {
+    "defaultMessage": "View Members",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  },
+  "SdXoXI": {
+    "defaultMessage": "Invitations have been sent. You can check invitation status on the invitation management page.",
+    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/Sent.tsx"
+  },
+  "Seanpx": {
+    "defaultMessage": "Required",
     "description": ""
   },
   "Szd1tH": {
     "defaultMessage": "Failed to log out, please try again.",
     "description": ""
   },
-  "HtSDyc": {
-    "defaultMessage": "Help Center",
-    "description": ""
+  "TQLBox": {
+    "defaultMessage": "Unpin",
+    "description": "src/components/ArticleDigest/DropdownActions/StickyButton.tsx"
   },
-  "D3idYv": {
-    "defaultMessage": "Settings",
-    "description": ""
+  "TSDiqB": {
+    "defaultMessage": "Subscribers",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "H0JBH6": {
-    "defaultMessage": "Log Out",
-    "description": ""
+  "TjWWxF": {
+    "defaultMessage": "Broadcast sent",
+    "description": "src/views/Circle/Broadcast/Broadcast.tsx"
   },
-  "cE4Hfw": {
-    "defaultMessage": "Discover",
+  "TzhzIH": {
+    "defaultMessage": "Creators",
     "description": ""
   },
-  "i/4KO2": {
-    "defaultMessage": "This account is archived due to violation of community guidelines",
-    "description": "src/components/UserProfile/index.tsx"
+  "U/Tqmx": {
+    "defaultMessage": " commented on your bookmarked article ",
+    "description": "src/components/Notice/CommentNotice/SubscribedArticleNewCommentNotice.tsx"
   },
-  "oNYnCM": {
-    "defaultMessage": "Account Archived",
-    "description": "src/components/UserProfile/index.tsx"
+  "U9IXic": {
+    "defaultMessage": "添加作品",
+    "description": "src/views/Circle/Profile/AddCircleArticle/Button.tsx"
   },
-  "rs0YS2": {
-    "defaultMessage": "Account Banned",
-    "description": "src/components/UserProfile/index.tsx"
+  "UNUROl": {
+    "defaultMessage": "Maximum 200 characters.",
+    "description": ""
   },
-  "EoNvLu": {
-    "defaultMessage": "Created",
-    "description": "src/views/User/Articles/UserArticles.tsx"
+  "UOdEqi": {
+    "defaultMessage": "The original login via email will be kept for you. Please note that your wallet cannot be reset once it is connected because of your account security.",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  },
+  "UgvfcU": {
+    "defaultMessage": "You have successfully completed Ethereum wallet settings. Please confirm wallet address:",
+    "description": "src/components/Notice/CryptoNotice/CryptoWalletConnectedNotice.tsx"
+  },
+  "UjKkhq": {
+    "defaultMessage": "Tags added",
+    "description": "src/views/TagDetail/DropdownActions/index.tsx"
   },
   "UxfPXa": {
     "defaultMessage": "In total",
     "description": "src/views/User/Articles/UserArticles.tsx"
   },
-  "Ic4hqD": {
-    "defaultMessage": "words",
-    "description": "src/views/User/Articles/UserArticles.tsx"
+  "VO4Elt": {
+    "defaultMessage": " mentioned you in a comment on  {commentArticle}",
+    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
   },
-  "J+dIsA": {
-    "defaultMessage": "Subscriptions",
-    "description": ""
+  "VjxGd7": {
+    "defaultMessage": " commented on ",
+    "description": "src/components/Notice/CommentNotice/ArticleNewCommentNotice.tsx"
+  },
+  "VrOoVf": {
+    "defaultMessage": "Matters will never ask your wallet key through any channel.",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
+  },
+  "VwuiYK": {
+    "defaultMessage": "This URL name has already been used, try another one",
+    "description": "src/components/Forms/CreateCircleForm/Init.tsx"
   },
   "WBVVYd": {
     "defaultMessage": "Responses",
     "description": ""
   },
-  "1EYCdR": {
-    "defaultMessage": "Tags",
-    "description": ""
+  "WSUAwk": {
+    "defaultMessage": "Add to Featured",
+    "description": "src/components/ArticleDigest/DropdownActions/SetTagSelectedButton.tsx"
   },
-  "NAidKb": {
-    "defaultMessage": "Notifications",
-    "description": ""
+  "WpvsPu": {
+    "defaultMessage": "Subscribe",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "enMIYK": {
-    "defaultMessage": "My Page",
-    "description": ""
+  "WuvE8X": {
+    "defaultMessage": "Followers of {circleName}",
+    "description": "src/views/Circle/Profile/FollowersDialog/index.tsx"
   },
-  "xmcVZ0": {
-    "defaultMessage": "Search",
-    "description": ""
+  "X+Xvgq": {
+    "defaultMessage": "Unpin Comment",
+    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
   },
-  "47FYwb": {
-    "defaultMessage": "Cancel",
-    "description": ""
+  "XH0Lb6": {
+    "defaultMessage": "Welcome to Matters!",
+    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
   },
-  "ll/ufR": {
-    "defaultMessage": "Trending",
-    "description": ""
+  "XHMco9": {
+    "defaultMessage": "subscribers",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "adThp5": {
-    "defaultMessage": "Latest",
+  "XVYrS/": {
+    "defaultMessage": "No followers yet",
     "description": ""
   },
-  "CnPG8j": {
-    "defaultMessage": "Featured",
-    "description": ""
+  "XcTMMM": {
+    "defaultMessage": "Have an account?",
+    "description": "src/components/Forms/EmailSignUpForm/Buttons.tsx"
   },
-  "wbcwKd": {
-    "defaultMessage": "View All",
+  "Xd0J7Y": {
+    "defaultMessage": "Open Source",
     "description": ""
   },
   "XgdZSb": {
     "defaultMessage": "Authors",
     "description": ""
   },
-  "kc79d3": {
-    "defaultMessage": "Topics",
-    "description": ""
+  "Xz/AHp": {
+    "defaultMessage": "broadcast and mentioned you",
+    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
   },
-  "Pp/0po": {
-    "defaultMessage": "Shuffle",
+  "YIes/F": {
+    "defaultMessage": "etc. {actorsCount} users",
+    "description": "src/components/Notice/ArticleNotice/ArticleNewSubscriberNotice.tsx"
+  },
+  "YjNkcK": {
+    "defaultMessage": "To change, switch it directly on your wallet",
     "description": ""
   },
-  "6gOpfl": {
-    "defaultMessage": "You won't see announcements for 7 days",
-    "description": "src/views/Home/Announcements/index.tsx"
+  "YlxpJl": {
+    "defaultMessage": " Broadcast and mentioned you ",
+    "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
   },
-  "3kbIhS": {
-    "defaultMessage": "Untitled",
-    "description": ""
+  "Z6cII7": {
+    "defaultMessage": "Accumulated Read Time",
+    "description": "src/components/Dialogs/HelpDialog/index.tsx"
   },
-  "MW9PzQ": {
-    "defaultMessage": "支持排行榜",
-    "description": "src/views/Me/Analytics/EmptyAnalytics/index.tsx"
+  "Z6ewE3": {
+    "defaultMessage": "Build Together",
+    "description": "src/views/Me/Settings/AnonymousSettings/Enhance/index.tsx"
   },
-  "cmtHjM": {
-    "defaultMessage": "You haven‘t published any articles yet, so there is no data available. Create one now to introduce yourself!",
-    "description": "src/views/Me/Analytics/EmptyAnalytics/index.tsx"
+  "ZAs170": {
+    "defaultMessage": "Profile",
+    "description": "src/views/Circle/Settings/index.tsx"
   },
-  "69+D96": {
-    "defaultMessage": "Start Creating",
-    "description": ""
+  "ZUPQzl": {
+    "defaultMessage": "comment",
+    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
   },
-  "3ynsJ3": {
-    "defaultMessage": "Want to know more? Check the ",
-    "description": "src/views/Me/Analytics/EmptyAnalytics/index.tsx"
+  "ZVoJan": {
+    "defaultMessage": "Edit",
+    "description": "src/components/ArticleDigest/DropdownActions/EditButton.tsx"
   },
-  "0Azlrb": {
-    "defaultMessage": "Manage",
+  "ZjDH42": {
+    "defaultMessage": "About Us",
     "description": ""
   },
-  "eXDZGQ": {
-    "defaultMessage": "Maintainer",
-    "description": ""
+  "aa0nss": {
+    "defaultMessage": "Unpin from Trending",
+    "description": "src/components/ArticleDigest/DropdownActions/SetTagUnselectedButton.tsx"
   },
-  "dg3JCQ": {
-    "defaultMessage": "collaborators",
-    "description": ""
+  "aaUBvF": {
+    "defaultMessage": "comment_circle",
+    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
   },
-  "TzhzIH": {
-    "defaultMessage": "Creators",
+  "adThp5": {
+    "defaultMessage": "Latest",
     "description": ""
   },
-  "Pdx3j1": {
-    "defaultMessage": "New Article",
-    "description": "src/views/TagDetail/Buttons/AddButton/CreateDraftMenuItem/index.tsx"
+  "b+LSgI": {
+    "defaultMessage": " replied to your discussion on ",
+    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
+  },
+  "b1FfGy": {
+    "defaultMessage": "Content Feed",
+    "description": "src/components/UserProfile/index.tsx"
   },
-  "5FO4vn": {
-    "defaultMessage": "You do not have permission to perform this operation",
-    "description": ""
+  "b3onWZ": {
+    "defaultMessage": "Last {days} days",
+    "description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
   },
-  "8ttGfR": {
-    "defaultMessage": "Add Article",
-    "description": "src/views/TagDetail/Buttons/AddButton/AddMyArticlesButton/index.tsx"
+  "b8ogKp": {
+    "defaultMessage": "Add Invitation",
+    "description": "src/views/Circle/Settings/ManageInvitation/AddButton/index.tsx"
   },
-  "ieGrWo": {
-    "defaultMessage": "Follow",
-    "description": ""
+  "bBYO6x": {
+    "defaultMessage": "Unblock",
+    "description": "src/components/BlockUser/Button/index.tsx"
   },
-  "izWS4J": {
-    "defaultMessage": "Unfollow",
+  "beLe/F": {
+    "defaultMessage": "Broadcast",
     "description": ""
   },
-  "LGox1K": {
-    "defaultMessage": "Followed",
+  "cE4Hfw": {
+    "defaultMessage": "Discover",
     "description": ""
   },
-  "3KNMbJ": {
-    "defaultMessage": "Articles",
+  "cd/II9": {
+    "defaultMessage": "{totalCount, plural, =1 {article} other {articles}}",
     "description": ""
   },
-  "HFVDeB": {
-    "defaultMessage": "Related Tags",
-    "description": "src/views/TagDetail/RelatedTags/index.tsx"
+  "cf37Zy": {
+    "defaultMessage": "Add hash from IPFS into compatible reader such as ",
+    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
   },
-  "o2Na0B": {
-    "defaultMessage": "Back to All",
+  "cfL5uk": {
+    "defaultMessage": "Over 200 words, current {numbers}",
+    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx"
+  },
+  "cg1VJ2": {
+    "defaultMessage": "Connect Wallet",
     "description": ""
   },
-  "KMcrz8": {
-    "defaultMessage": "Maintain Tag",
-    "description": "src/views/TagDetail/Owner/index.tsx"
+  "cmtHjM": {
+    "defaultMessage": "You haven‘t published any articles yet, so there is no data available. Create one now to introduce yourself!",
+    "description": "src/views/Me/Analytics/EmptyAnalytics/index.tsx"
   },
-  "63HuBz": {
-    "defaultMessage": "This tag has no manager currently",
-    "description": "src/views/TagDetail/Owner/index.tsx"
+  "d4waan": {
+    "defaultMessage": "Income",
+    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
   },
-  "pzTOmv": {
-    "defaultMessage": "Followers",
+  "deEeEI": {
+    "defaultMessage": "Register",
     "description": ""
   },
-  "UjKkhq": {
-    "defaultMessage": "Tags added",
-    "description": "src/views/TagDetail/DropdownActions/index.tsx"
-  },
-  "GRtGnZ": {
-    "defaultMessage": "Resign From Maintainer",
-    "description": "src/views/TagDetail/DropdownActions/index.tsx"
+  "dg3JCQ": {
+    "defaultMessage": "collaborators",
+    "description": ""
   },
-  "L7Si5/": {
-    "defaultMessage": "Manage Community",
-    "description": "src/views/TagDetail/DropdownActions/index.tsx"
+  "dnsfmR": {
+    "defaultMessage": "for bug reports or suggestions. We will reply to you as soon we can!",
+    "description": "src/views/Help/index.tsx"
   },
-  "ySGgTo": {
-    "defaultMessage": "Add Articles into Featured",
-    "description": "src/views/TagDetail/DropdownActions/index.tsx"
+  "dsBCfK": {
+    "defaultMessage": "uh-oh,",
+    "description": "src/components/Notice/TagNotice/TagLeaveEditorNotice.tsx"
   },
-  "wEQDC6": {
-    "defaultMessage": "Edit",
+  "eTpiYa": {
+    "defaultMessage": "No data yet.",
     "description": ""
   },
-  "beLe/F": {
-    "defaultMessage": "Broadcast",
+  "eXDZGQ": {
+    "defaultMessage": "Maintainer",
     "description": ""
   },
-  "20bImY": {
-    "defaultMessage": "Discussion",
+  "ei+kyp": {
+    "defaultMessage": "Name of the Circle",
+    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+  },
+  "enMIYK": {
+    "defaultMessage": "My Page",
     "description": ""
   },
-  "U9IXic": {
-    "defaultMessage": "Add Articles",
-    "description": "src/views/Circle/Profile/AddCircleArticle/Button.tsx"
+  "eov+J2": {
+    "defaultMessage": "Custom URL Name",
+    "description": ""
   },
-  "q+N5Wd": {
-    "defaultMessage": "Manage Circle",
-    "description": "src/views/Circle/Profile/DropdownActions/index.tsx"
+  "euNJsE": {
+    "defaultMessage": "A new article has been added to the circle, read it now!",
+    "description": "src/components/Notice/ArticleNotice/CircleNewArticle.tsx"
   },
-  "8xPi0N": {
-    "defaultMessage": "Unsubscribe Circle",
-    "description": "src/views/Circle/Profile/DropdownActions/index.tsx"
+  "fG41Ux": {
+    "defaultMessage": "Logged out successfully",
+    "description": ""
   },
-  "WuvE8X": {
-    "defaultMessage": "Followers of {circleName}",
-    "description": "src/views/Circle/Profile/FollowersDialog/index.tsx"
+  "fOgusL": {
+    "defaultMessage": "Choose a method to enter",
+    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
   },
-  "XVYrS/": {
-    "defaultMessage": "No followers yet",
-    "description": ""
+  "fWDtpq": {
+    "defaultMessage": "Pending",
+    "description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
   },
-  "+a+2ug": {
-    "defaultMessage": "Members",
-    "description": ""
+  "ftD7Hy": {
+    "defaultMessage": " mentioned you ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "KL502d": {
-    "defaultMessage": "Profile updated",
-    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx"
+  "g/L3Fm": {
+    "defaultMessage": " posted and replied to topics ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "rfz/fN": {
-    "defaultMessage": "Recommended size: 1600px x 900px",
-    "description": ""
+  "gMZfHO": {
+    "defaultMessage": "RSS Subscription",
+    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
   },
-  "lhaIoi": {
-    "defaultMessage": "Enter Display Name",
-    "description": ""
+  "h9CG9E": {
+    "defaultMessage": "{commentType} has been deleted",
+    "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
   },
-  "E8W3qa": {
-    "defaultMessage": "Must be between 2-20 characters long. Chinese characters, letters, numbers and underscores are allowed.",
-    "description": ""
+  "hWs95P": {
+    "defaultMessage": "Important information will be notified by email. So filling in your email address will be required.",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "Q8Qw5B": {
-    "defaultMessage": "Description",
-    "description": ""
+  "hYG5fb": {
+    "defaultMessage": "are following",
+    "description": "src/views/TagDetail/Followers/index.tsx"
   },
-  "A8MpFX": {
-    "defaultMessage": "Enter Bio",
-    "description": ""
+  "hk2aiz": {
+    "defaultMessage": " followed your circle",
+    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
   },
-  "UNUROl": {
-    "defaultMessage": "Maximum 200 characters.",
-    "description": ""
+  "hrfF+i": {
+    "defaultMessage": "Don't have a wallet yet? Check the ",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "jvo0vs": {
-    "defaultMessage": "Save",
+  "hrgo+E": {
+    "defaultMessage": "Archive",
     "description": ""
   },
-  "A3wDZ8": {
-    "defaultMessage": "My NFT Collections",
-    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/NFTCollection/index.tsx"
+  "i/4KO2": {
+    "defaultMessage": "This account is archived due to violation of community guidelines",
+    "description": "src/components/UserProfile/index.tsx"
   },
-  "QCo7Gc": {
-    "defaultMessage": "Select NFT as your avatar",
-    "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/NFTCollection/index.tsx"
+  "iCFXtS": {
+    "defaultMessage": "For unregistered or users enabled wallet login",
+    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
   },
-  "eTpiYa": {
-    "defaultMessage": "No data yet.",
+  "ieGrWo": {
+    "defaultMessage": "Follow",
     "description": ""
   },
-  "/IMR+8": {
-    "defaultMessage": "Top Supporters",
+  "ikVIu3": {
+    "defaultMessage": "articles",
     "description": ""
   },
-  "b3onWZ": {
-    "defaultMessage": "Last {days} days",
-    "description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
-  },
-  "Po+kJe": {
-    "defaultMessage": "Last {months} month",
-    "description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
+  "ipQlDG": {
+    "defaultMessage": "Login with Email",
+    "description": "src/components/Forms/EmailSignUpForm/Buttons.tsx"
   },
-  "A3rLZt": {
-    "defaultMessage": "Last {months} months",
-    "description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
+  "itPgxd": {
+    "defaultMessage": "Profile",
+    "description": ""
   },
-  "zQvVDJ": {
-    "defaultMessage": "All",
+  "izWS4J": {
+    "defaultMessage": "Unfollow",
     "description": ""
   },
-  "FOOymB": {
-    "defaultMessage": "No members yet",
-    "description": "src/views/Circle/Profile/MembersDialog/Content.tsx"
+  "jF+Mle": {
+    "defaultMessage": " days for free. Try it and have fun!",
+    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
   },
-  "ikVIu3": {
-    "defaultMessage": "articles",
+  "jJ1Brc": {
+    "defaultMessage": "Pin Comment",
+    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
+  },
+  "jL2ZHb": {
+    "defaultMessage": "Code will expire after 20 minutes",
     "description": ""
   },
-  "hYG5fb": {
-    "defaultMessage": "are following",
-    "description": "src/views/TagDetail/Followers/index.tsx"
+  "jgLiba": {
+    "defaultMessage": "Enter verification code",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "ANA7sk": {
-    "defaultMessage": "Maintain",
-    "description": "src/views/TagDetail/Owner/index.tsx"
+  "jvo0vs": {
+    "defaultMessage": "Save",
+    "description": ""
   },
-  "4Odb0J": {
-    "defaultMessage": "Pin article",
-    "description": "src/components/ArticleDigest/DropdownActions/StickyButton.tsx"
+  "k5NnNF": {
+    "defaultMessage": " followed you",
+    "description": "src/components/Notice/UserNotice/UserNewFollowerNotice.tsx"
   },
-  "TQLBox": {
-    "defaultMessage": "Unpin",
-    "description": "src/components/ArticleDigest/DropdownActions/StickyButton.tsx"
+  "kc79d3": {
+    "defaultMessage": "Topics",
+    "description": ""
   },
-  "ZVoJan": {
-    "defaultMessage": "Edit",
-    "description": "src/components/ArticleDigest/DropdownActions/EditButton.tsx"
+  "lD4FPZ": {
+    "defaultMessage": "Enter Email",
+    "description": ""
   },
-  "hrgo+E": {
-    "defaultMessage": "Archive",
+  "lIir/P": {
+    "defaultMessage": "I see",
     "description": ""
   },
-  "uIdMon": {
-    "defaultMessage": "Are you sure you want to archive the article?",
-    "description": "src/components/ArticleDigest/DropdownActions/ArchiveArticle/Dialog.tsx"
+  "lNjDPr": {
+    "defaultMessage": "You have not invited anyone yet! Invite friends to join your circle by clicking 'invite friends'.",
+    "description": "src/views/Circle/Settings/ManageInvitation/Invites/Pending/index.tsx"
   },
-  "oIkacT": {
-    "defaultMessage": "Article is hidden",
-    "description": "src/components/ArticleDigest/DropdownActions/ArchiveArticle/Dialog.tsx"
+  "ldNgRA": {
+    "defaultMessage": "Display name, can be changed later",
+    "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
   },
-  "K3r6DQ": {
-    "defaultMessage": "Delete",
+  "lhaIoi": {
+    "defaultMessage": "Enter Display Name",
     "description": ""
   },
-  "mikY/9": {
-    "defaultMessage": "Edit",
-    "description": "src/components/Comment/DropdownActions/EditButton.tsx"
-  },
-  "50cquj": {
-    "defaultMessage": "No discussion yet",
-    "description": "src/views/Circle/Discussion/Discussion.tsx"
+  "ll/ufR": {
+    "defaultMessage": "Trending",
+    "description": ""
   },
-  "EW5R4p": {
-    "defaultMessage": "Request an update, ask, share and discuss",
-    "description": "src/views/Circle/Discussion/Discussion.tsx"
+  "mCAIcg": {
+    "defaultMessage": "Hottest",
+    "description": "src/views/Circle/Analytics/ContentAnalytics/index.tsx"
   },
-  "9nNpKP": {
-    "defaultMessage": "Discussion sent",
-    "description": "src/views/Circle/Discussion/Discussion.tsx"
+  "mPe6DK": {
+    "defaultMessage": " subscribed your circle",
+    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
   },
-  "TjWWxF": {
-    "defaultMessage": "Broadcast sent",
-    "description": "src/views/Circle/Broadcast/Broadcast.tsx"
+  "mSAY3/": {
+    "defaultMessage": "User unblocked. User can now comment on your articles.",
+    "description": "src/components/BlockUser/Button/index.tsx"
   },
   "mWjpk9": {
     "defaultMessage": "No broadcast yet.",
     "description": "src/views/Circle/Broadcast/Broadcast.tsx"
   },
-  "zb8Kx1": {
-    "defaultMessage": "Announcement, reminder, chattering..."
+  "mikY/9": {
+    "defaultMessage": "Edit",
+    "description": "src/components/Comment/DropdownActions/EditButton.tsx"
   },
-  "AGcU5J": {
-    "defaultMessage": "Pin Broadcast",
-    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
+  "mjMpv4": {
+    "defaultMessage": "Circle Edited",
+    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
   },
-  "jJ1Brc": {
-    "defaultMessage": "Pin Comment",
-    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
+  "mk+LCk": {
+    "defaultMessage": "Display Preferences",
+    "description": "src/views/Me/Settings/AnonymousSettings/DisplayPreferences/index.tsx"
   },
-  "RFzVUD": {
-    "defaultMessage": "Unpin Broadcast",
-    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
+  "ml3SZN": {
+    "defaultMessage": "Minimum 8 characters. Uppercase/lowercase letters, numbers and symbols are allowed",
+    "description": ""
   },
-  "X+Xvgq": {
-    "defaultMessage": "Unpin Comment",
-    "description": "src/components/Comment/DropdownActions/PinButton.tsx"
+  "nGBrvw": {
+    "defaultMessage": "Bookmarks",
+    "description": ""
   },
-  "7xnrxG": {
-    "defaultMessage": "The article has been added to the Trending",
-    "description": "src/components/ArticleDigest/DropdownActions/SetTagSelectedButton.tsx"
+  "nYeDrI": {
+    "defaultMessage": "Not Registered?",
+    "description": "src/components/Forms/EmailLoginForm/Buttons.tsx"
   },
-  "WSUAwk": {
-    "defaultMessage": "Add to Featured",
-    "description": "src/components/ArticleDigest/DropdownActions/SetTagSelectedButton.tsx"
+  "nsaJRn": {
+    "defaultMessage": "Logged in successfully",
+    "description": ""
   },
-  "Js/Fij": {
-    "defaultMessage": "This article has been removed from Trending",
-    "description": "src/components/ArticleDigest/DropdownActions/SetTagUnselectedButton.tsx"
+  "o2Na0B": {
+    "defaultMessage": "Back to All",
+    "description": ""
   },
-  "aa0nss": {
-    "defaultMessage": "Unpin from Trending",
-    "description": "src/components/ArticleDigest/DropdownActions/SetTagUnselectedButton.tsx"
+  "oIkacT": {
+    "defaultMessage": "Article is hidden",
+    "description": "src/components/ArticleDigest/DropdownActions/ArchiveArticle/Dialog.tsx"
   },
-  "32bml8": {
-    "defaultMessage": "Following",
-    "description": "src/components/Layout/SideNav/index.tsx"
+  "oNYnCM": {
+    "defaultMessage": "Account Archived",
+    "description": "src/components/UserProfile/index.tsx"
   },
   "ohgTH4": {
     "defaultMessage": "Following",
     "description": "src/components/UserProfile/index.tsx"
   },
-  "Cu3Cty": {
-    "defaultMessage": "month",
-    "description": ""
-  },
-  "qlki7w": {
-    "defaultMessage": "Remove Article",
-    "description": "src/components/ArticleDigest/DropdownActions/RemoveTagButton.tsx"
-  },
   "pRV+UD": {
     "defaultMessage": "Collapse",
     "description": "src/components/Comment/DropdownActions/CollapseComment/Button.tsx"
   },
-  "h9CG9E": {
-    "defaultMessage": "{commentType} has been deleted",
-    "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
-  },
-  "Cdkhl8": {
-    "defaultMessage": "Delete {commentType}",
-    "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
-  },
-  "77tYPg": {
-    "defaultMessage": "After deletion, the {commentType} will be removed immediately",
-    "description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
+  "ptqBN1": {
+    "defaultMessage": "Not Now",
+    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/PreSend.tsx"
   },
-  "cd/II9": {
-    "defaultMessage": "{totalCount, plural, =1 {article} other {articles}}",
+  "pwlQEY": {
+    "defaultMessage": "Display Name",
     "description": ""
   },
-  "ZAs170": {
-    "defaultMessage": "Profile",
-    "description": "src/views/Circle/Settings/index.tsx"
-  },
-  "DMlmcU": {
-    "defaultMessage": "Free Trial",
-    "description": "src/views/Circle/Settings/index.tsx"
-  },
-  "EQeKnO": {
-    "defaultMessage": "Manage Invitation",
-    "description": "src/views/Circle/Settings/index.tsx"
-  },
-  "KLQ1/z": {
-    "defaultMessage": "Circle successfully created",
-    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+  "pzTOmv": {
+    "defaultMessage": "Followers",
+    "description": ""
   },
-  "mjMpv4": {
-    "defaultMessage": "Circle Edited",
-    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+  "q+N5Wd": {
+    "defaultMessage": "Manage Circle",
+    "description": "src/views/Circle/Profile/DropdownActions/index.tsx"
   },
-  "ei+kyp": {
-    "defaultMessage": "Name of the Circle",
-    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+  "q9oMKE": {
+    "defaultMessage": "Circle Name",
+    "description": ""
   },
-  "tW3hM/": {
-    "defaultMessage": "Description of the Circle",
-    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+  "qPPrzm": {
+    "defaultMessage": " supported your article ",
+    "description": "src/components/Notice/TransactionNotice/PaymentReceivedDonationNotice.tsx"
   },
-  "CwWLOr": {
-    "defaultMessage": "Enter the name of your Circle",
-    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+  "qQmSxu": {
+    "defaultMessage": "Airdrop registration completed. Your NFT will be revealed on November 12. Confirm your ETH wallet address:",
+    "description": "src/components/Notice/CryptoNotice/CryptoWalletAirdropNotice.tsx"
   },
-  "QUqfbW": {
-    "defaultMessage": "Describe more about your Circle",
-    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
+  "qYzBk8": {
+    "defaultMessage": " unsubscribed your circle",
+    "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
   },
-  "JXdbo8": {
-    "defaultMessage": "Done",
-    "description": ""
+  "qlki7w": {
+    "defaultMessage": "Remove Article",
+    "description": "src/components/ArticleDigest/DropdownActions/RemoveTagButton.tsx"
   },
-  "q9oMKE": {
-    "defaultMessage": "Circle Name",
+  "qswU4E": {
+    "defaultMessage": "Email will not be used as a login but only as a contact channel.",
     "description": ""
   },
-  "QZXKhG": {
-    "defaultMessage": "Set the Circle URL (cannot be modified after creation)",
-    "description": "src/components/Forms/CreateCircleForm/Init.tsx"
-  },
-  "6BXcdo": {
-    "defaultMessage": "Set threshold for circle (per month)",
-    "description": "src/components/Forms/CreateCircleForm/Init.tsx"
+  "qyzJxi": {
+    "defaultMessage": "Logbook 1.0",
+    "description": "src/components/UserProfile/DropdownActions/index.tsx"
   },
-  "VwuiYK": {
-    "defaultMessage": "This URL name has already been used, try another one",
-    "description": "src/components/Forms/CreateCircleForm/Init.tsx"
+  "rBjwQy": {
+    "defaultMessage": "Weibo",
+    "description": "src/components/Share/Buttons/Weibo.tsx"
   },
-  "gMZZ9I": {
-    "defaultMessage": "Must be between 2-20 characters long. Only lowercase letters, numbers and underline are allowed.",
+  "rXnmeE": {
+    "defaultMessage": "Confirm and Send",
     "description": ""
   },
-  "+7SAix": {
-    "defaultMessage": "Must be between 2-12 characters long.",
-    "description": ""
+  "reOeq5": {
+    "defaultMessage": "You have created your personal creative space. Publish your first work!",
+    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
   },
-  "eov+J2": {
-    "defaultMessage": "Custom URL Name",
-    "description": ""
+  "rf0ew3": {
+    "defaultMessage": "Come build a Circle and call on your supporters to join you!",
+    "description": "src/components/UserProfile/CircleWidget/index.tsx"
   },
-  "8KFsZN": {
-    "defaultMessage": "Read Counts",
+  "rfz/fN": {
+    "defaultMessage": "Recommended size: 1600px x 900px",
     "description": ""
   },
-  "LOefol": {
-    "defaultMessage": "Paywalled",
-    "description": "src/views/Circle/Analytics/ContentAnalytics/ContentTabs/index.tsx"
-  },
-  "/podGX": {
-    "defaultMessage": "Public",
-    "description": "src/views/Circle/Analytics/ContentAnalytics/ContentTabs/index.tsx"
+  "rs0YS2": {
+    "defaultMessage": "Account Banned",
+    "description": "src/components/UserProfile/index.tsx"
   },
-  "mCAIcg": {
-    "defaultMessage": "Hottest",
-    "description": "src/views/Circle/Analytics/ContentAnalytics/index.tsx"
+  "sPgUkN": {
+    "defaultMessage": "This Month",
+    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
   },
-  "lNjDPr": {
-    "defaultMessage": "You have not invited anyone yet! Invite friends to join your circle by clicking 'invite friends'.",
-    "description": "src/views/Circle/Settings/ManageInvitation/Invites/Pending/index.tsx"
+  "skbUBl": {
+    "defaultMessage": "Log in",
+    "description": "src/components/Buttons/Login/index.tsx"
   },
-  "RxiHr/": {
-    "defaultMessage": "friends have not accepted your invitations.",
-    "description": "src/views/Circle/Settings/ManageInvitation/Invites/Accepted/index.tsx"
+  "sncOwi": {
+    "defaultMessage": " mentioned you in an article",
+    "description": "src/components/Notice/ArticleNotice/ArticleMentionedYouNotice.tsx"
   },
-  "b8ogKp": {
-    "defaultMessage": "Add Invitation",
-    "description": "src/views/Circle/Settings/ManageInvitation/AddButton/index.tsx"
+  "stjoBH": {
+    "defaultMessage": "Now, go like the authors you support! Your Likes will become their income",
+    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
   },
-  "FmWYRt": {
-    "defaultMessage": "Free trial period",
+  "sy+pv5": {
+    "defaultMessage": "Email",
     "description": ""
   },
-  "Bc20la": {
-    "defaultMessage": "days",
-    "description": ""
+  "t7ah39": {
+    "defaultMessage": " just became the maintainer of a tag your article is in. Check out more articles under this tag",
+    "description": "src/components/Notice/TagNotice/TagAdoptionNotice.tsx"
   },
-  "O0QB1v": {
-    "defaultMessage": "Friends will receive free trial invitations to Circle. Set up your invitations now!",
-    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/PreSend.tsx"
+  "t8/r8X": {
+    "defaultMessage": "Continue with Wallet",
+    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
   },
-  "rXnmeE": {
-    "defaultMessage": "Confirm and Send",
-    "description": ""
+  "tQsujN": {
+    "defaultMessage": " replied to topics and mentioned you ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "ptqBN1": {
-    "defaultMessage": "Not Now",
-    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/PreSend.tsx"
+  "tW3hM/": {
+    "defaultMessage": "Description of the Circle",
+    "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
   },
   "tzq2+W": {
     "defaultMessage": "Send",
     "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/PreSend.tsx"
   },
-  "fWDtpq": {
-    "defaultMessage": "Pending",
-    "description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
-  },
-  "JpS59y": {
-    "defaultMessage": "Accepted",
-    "description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
+  "u5aHb4": {
+    "defaultMessage": "Copy Link",
+    "description": ""
   },
-  "Bjdw71": {
-    "defaultMessage": "",
-    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  "uIdMon": {
+    "defaultMessage": "Are you sure you want to archive the article?",
+    "description": "src/components/ArticleDigest/DropdownActions/ArchiveArticle/Dialog.tsx"
   },
-  "xWZr13": {
-    "defaultMessage": "{follower, plural, =1 {follower} other {followers}}",
-    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  "uVCg1l": {
+    "defaultMessage": "Explore Matters",
+    "description": ""
   },
-  "GugBCe": {
-    "defaultMessage": "New Followers This Month",
-    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  "uqmi/b": {
+    "defaultMessage": " pinned your comment on ",
+    "description": "src/components/Notice/CommentNotice/CommentPinnedNotice.tsx"
   },
-  "MDNaxs": {
-    "defaultMessage": "",
-    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  "uuEGON": {
+    "defaultMessage": " posted and replied to topics and mentioned you ",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
-  "zKOr2x": {
-    "defaultMessage": "Conversion Rate of Followers",
-    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  "uw32VR": {
+    "defaultMessage": "tutorial",
+    "description": ""
   },
-  "AYTnjk": {
-    "defaultMessage": "Followers",
-    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  "v6YjIn": {
+    "defaultMessage": "Account",
+    "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "sPgUkN": {
-    "defaultMessage": "This Month",
-    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
+  "vAc1Bw": {
+    "defaultMessage": "Block User",
+    "description": ""
   },
-  "Fe682o": {
-    "defaultMessage": "Next Month (Estimation)",
-    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
+  "vH8sCb": {
+    "defaultMessage": "Circle",
+    "description": ""
   },
-  "L4NXXh": {
-    "defaultMessage": "Total",
-    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
+  "wEQDC6": {
+    "defaultMessage": "Edit",
+    "description": ""
   },
-  "d4waan": {
-    "defaultMessage": "Income",
-    "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
+  "wSEOxH": {
+    "defaultMessage": "Contact Channel",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "6OBAOi": {
-    "defaultMessage": "",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "wXzTZ0": {
+    "defaultMessage": "Enter the name of your Circle",
+    "description": ""
   },
-  "zxy15q": {
-    "defaultMessage": "{subscriber, plural, =1 {subscriber} other {subscribers}}",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "wbcwKd": {
+    "defaultMessage": "View All",
+    "description": ""
   },
-  "TSDiqB": {
-    "defaultMessage": "Subscribers",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "wqaNK4": {
+    "defaultMessage": " in your circle ",
+    "description": ""
   },
-  "XHMco9": {
-    "defaultMessage": "",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "xGh9O7": {
+    "defaultMessage": "As a reminder, the email address will not be used as a login but only as a contact channel.",
+    "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
-  "1qQzV0": {
-    "defaultMessage": "Invitees",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "xWZr13": {
+    "defaultMessage": "{follower, plural, =1 {follower} other {followers}}",
+    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
   },
-  "WpvsPu": {
-    "defaultMessage": "Subscribe",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "xiKjd/": {
+    "defaultMessage": "Continue with Email",
+    "description": "src/components/Forms/SelectAuthMethodForm/index.tsx"
   },
-  "SNh1n0": {
-    "defaultMessage": "View Members",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "xmcVZ0": {
+    "defaultMessage": "Search",
+    "description": ""
   },
-  "2CqWQE": {
-    "defaultMessage": "Total",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "xwj01D": {
+    "defaultMessage": " invites you to become a collaborator",
+    "description": "src/components/Notice/TagNotice/TagAddEditorNotice.tsx"
   },
   "y0b6Kp": {
     "defaultMessage": "Pay",
     "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "L0J61B": {
-    "defaultMessage": "Free",
-    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
+  "y1Z3or": {
+    "defaultMessage": "Language",
+    "description": ""
   },
-  "SdXoXI": {
-    "defaultMessage": "Invitations have been sent. You can check invitation status on the invitation management page.",
-    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/Sent.tsx"
+  "ySGgTo": {
+    "defaultMessage": "Add Articles into Featured",
+    "description": "src/views/TagDetail/DropdownActions/index.tsx"
   },
-  "OIj8pQ": {
-    "defaultMessage": "Invitation Sent",
-    "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/Sent.tsx"
+  "yZfKI4": {
+    "defaultMessage": "discussion and mentioned you",
+    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
   },
-  "lIir/P": {
-    "defaultMessage": "I see",
+  "zKOr2x": {
+    "defaultMessage": "Conversion Rate of Followers",
+    "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
+  },
+  "zQvVDJ": {
+    "defaultMessage": "All",
     "description": ""
   },
-  "2uwwz+": {
-    "defaultMessage": "Accumulated read time indicates the total time length that registered users read.",
-    "description": "src/components/Dialogs/HelpDialog/index.tsx"
+  "zb8Kx1": {
+    "defaultMessage": "Announcement, reminder, chattering..."
   },
-  "Z6cII7": {
-    "defaultMessage": "Accumulated Read Time",
-    "description": "src/components/Dialogs/HelpDialog/index.tsx"
+  "zxlwbc": {
+    "defaultMessage": "Waiting ...",
+    "description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
   },
-  "DXJ8ys": {
-    "defaultMessage": "Read counts indicates how many registered users read.",
-    "description": "src/components/Dialogs/HelpDialog/index.tsx"
+  "zxy15q": {
+    "defaultMessage": "{subscriber, plural, =1 {subscriber} other {subscribers}}",
+    "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   }
 }
+

From 0fbf7c65c07458aad79f3a63c4e31ed6c04c6465 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Wed, 12 Apr 2023 17:30:29 +0700
Subject: [PATCH 86/92] fix(i18n): add missing translations

---
 src/common/utils/form/validate.ts | 34 ++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/common/utils/form/validate.ts b/src/common/utils/form/validate.ts
index 2d50e1f129..b326d245c7 100644
--- a/src/common/utils/form/validate.ts
+++ b/src/common/utils/form/validate.ts
@@ -38,6 +38,7 @@ export const validateTagName = (value: string, lang: Language) => {
     return translate({
       zh_hant: '不支持單獨使用標點符號',
       zh_hans: '不支持单独使用标点符号',
+      en: 'Not support using punctuation marks alone.',
       lang,
     })
   }
@@ -105,11 +106,15 @@ export const validateUserName = (value: string, lang: Language) => {
     return translate({ id: 'required', lang })
   }
 
+  const en =
+    'Must be between 4-15 characters long. Only lowercase letters, numbers and underline are accepted.'
+
   // 4-15 characters, only accept alphabet, number and _.
   if (value.length < 4) {
     return translate({
       zh_hant: '輸入字數過短，僅供輸入 4-15 個字元',
       zh_hans: '输入字数过短，仅供输入 4-15 个字符',
+      en,
       lang,
     })
   }
@@ -118,6 +123,7 @@ export const validateUserName = (value: string, lang: Language) => {
     return translate({
       zh_hant: '輸入字數過長，僅供輸入 4-15 個字元',
       zh_hans: '输入字数过长，仅供输入 4-15 个字符',
+      en,
       lang,
     })
   }
@@ -126,6 +132,7 @@ export const validateUserName = (value: string, lang: Language) => {
     return translate({
       zh_hant: '不支持單獨使用標點符號',
       zh_hans: '不支持单独使用标点符号',
+      en,
       lang,
     })
   }
@@ -163,6 +170,7 @@ export const validateDisplayName = (
     return translate({
       zh_hant: '輸入字數過短，僅供輸入 2-20 個字元',
       zh_hans: '输入字数过短，仅供输入 2-20 个字符',
+      en: 'Must be between 2-20 characters long.',
       lang,
     })
   }
@@ -171,6 +179,7 @@ export const validateDisplayName = (
     return translate({
       zh_hant: '輸入字數過長，僅供輸入 2-20 個字元',
       zh_hans: '输入字数过长，仅供输入 2-20 个字符',
+      en: 'Must be between 2-20 characters long.',
       lang,
     })
   }
@@ -180,6 +189,7 @@ export const validateDisplayName = (
     return translate({
       zh_hant: `不能使用「${RESERVED_NAMES[invalidNameIndex]}」`,
       zh_hans: `不能使用 “${RESERVED_NAMES[invalidNameIndex]}”`,
+      en: `Cannot use "${RESERVED_NAMES[invalidNameIndex]}"`,
       lang,
     })
   }
@@ -188,6 +198,7 @@ export const validateDisplayName = (
     return translate({
       zh_hant: '不支持單獨使用標點符號',
       zh_hans: '不支持单独使用标点符号',
+      en: 'Not support using punctuation marks alone.',
       lang,
     })
   }
@@ -200,6 +211,7 @@ export const validateDescription = (value: string, lang: Language) => {
     return translate({
       zh_hant: `已超過 200 字，目前 ${value.length} 字`,
       zh_hans: `已超过 200 字，目前 ${value.length} 字`,
+      en: 'Maximum 200 characters, current ${value.length} characters.',
       lang,
     })
   }
@@ -212,6 +224,7 @@ export const validateSupportWords = (value: string, lang: Language) => {
       return translate({
         zh_hant: `已超過 140 字，目前 ${value.length} 字`,
         zh_hans: `已超过 140 字，目前 ${value.length} 字`,
+        en: 'Maximum 140 characters, current ${value.length} characters.',
         lang,
       })
     }
@@ -220,7 +233,12 @@ export const validateSupportWords = (value: string, lang: Language) => {
 
 export const validateToS = (value: boolean, lang: Language) => {
   if (value === false) {
-    return translate({ zh_hant: '請勾選', zh_hans: '请勾选', lang })
+    return translate({
+      zh_hant: '請勾選',
+      zh_hans: '请勾选',
+      en: 'Please check',
+      lang,
+    })
   }
 }
 
@@ -243,6 +261,7 @@ export const validateCircleName = (value: string, lang: Language) => {
     return translate({
       zh_hant: '輸入字數過短，僅供輸入 2-20 個字元',
       zh_hans: '输入字数过短，仅供输入 2-20 个字符',
+      en: 'Must be between 2-20 characters long.',
       lang,
     })
   }
@@ -251,6 +270,7 @@ export const validateCircleName = (value: string, lang: Language) => {
     return translate({
       zh_hant: '輸入字數過長，僅供輸入 2-20 個字元',
       zh_hans: '输入字数过长，仅供输入 2-20 个字符',
+      en: 'Must be between 2-20 characters long.',
       lang,
     })
   }
@@ -260,6 +280,7 @@ export const validateCircleName = (value: string, lang: Language) => {
     return translate({
       zh_hant: `不能使用「${RESERVED_CIRCLE_NAMES[invalidNameIndex]}」`,
       zh_hans: `不能使用 “${RESERVED_CIRCLE_NAMES[invalidNameIndex]}”`,
+      en: `"${RESERVED_CIRCLE_NAMES[invalidNameIndex]}" is invalid.`,
       lang,
     })
   }
@@ -268,6 +289,7 @@ export const validateCircleName = (value: string, lang: Language) => {
     return translate({
       zh_hant: '不支持單獨使用標點符號',
       zh_hans: '不支持单独使用标点符号',
+      en: 'Not support using punctuation marks alone.',
       lang,
     })
   }
@@ -289,6 +311,7 @@ export const validateCircleDisplayName = (value: string, lang: Language) => {
     return translate({
       zh_hant: '輸入字數過短，僅供輸入 2-12 個字元',
       zh_hans: '输入字数过短，仅供输入 2-12 個字符',
+      en: 'Must be between 2-12 characters long.',
       lang,
     })
   }
@@ -297,6 +320,7 @@ export const validateCircleDisplayName = (value: string, lang: Language) => {
     return translate({
       zh_hant: '輸入字數過長，僅供輸入 2-12 個字元',
       zh_hans: '输入字数过长，仅供输入 2-12 個字符',
+      en: 'Must be between 2-12 characters long.',
       lang,
     })
   }
@@ -306,6 +330,7 @@ export const validateCircleDisplayName = (value: string, lang: Language) => {
     return translate({
       zh_hant: `不能使用「${RESERVED_NAMES[invalidNameIndex]}」`,
       zh_hans: `不能使用 “${RESERVED_NAMES[invalidNameIndex]}”`,
+      en: `"${RESERVED_NAMES[invalidNameIndex]}" is invalid.`,
       lang,
     })
   }
@@ -314,6 +339,7 @@ export const validateCircleDisplayName = (value: string, lang: Language) => {
     return translate({
       zh_hant: '不支持單獨使用標點符號',
       zh_hans: '不支持单独使用标点符号',
+      en: 'Not support using punctuation marks alone.',
       lang,
     })
   }
@@ -328,6 +354,7 @@ export const validateCircleAmount = (value: number, lang: Language) => {
     return translate({
       zh_hant: `最小金額爲 HKD ${PAYMENT_MINIMAL_CIRCLE_AMOUNT.HKD}`,
       zh_hans: `最小金额为 HKD ${PAYMENT_MINIMAL_CIRCLE_AMOUNT.HKD}`,
+      en: `Minimum amount is HKD ${PAYMENT_MINIMAL_CIRCLE_AMOUNT.HKD}`,
       lang,
     })
   }
@@ -336,6 +363,7 @@ export const validateCircleAmount = (value: number, lang: Language) => {
     return translate({
       zh_hant: `最大金額爲 HKD ${PAYMENT_MAXIMUM_CIRCLE_AMOUNT.HKD}`,
       zh_hans: `最大金额为 HKD ${PAYMENT_MAXIMUM_CIRCLE_AMOUNT.HKD}`,
+      en: `Maximum amount is HKD ${PAYMENT_MAXIMUM_CIRCLE_AMOUNT.HKD}`,
       lang,
     })
   }
@@ -355,6 +383,7 @@ export const validateAmount = (value: number, lang: Language) => {
     return translate({
       zh_hant: `最小储值金額爲 HKD ${PAYMENT_MINIMAL_ADD_CREDIT_AMOUNT.HKD}`,
       zh_hans: `最小储值金额为 HKD ${PAYMENT_MINIMAL_ADD_CREDIT_AMOUNT.HKD}`,
+      en: `Minimum amount is HKD ${PAYMENT_MINIMAL_ADD_CREDIT_AMOUNT.HKD}`,
       lang,
     })
   }
@@ -407,6 +436,7 @@ export const validatePayoutAmount = ({
     return translate({
       zh_hant: `最少提現金額爲 HKD ${min}`,
       zh_hans: `最少提现金額爲 HKD ${min}`,
+      en: `Minimum amount is HKD ${min}`,
       lang,
     })
   }
@@ -415,6 +445,7 @@ export const validatePayoutAmount = ({
     return translate({
       zh_hant: `最高提現金額爲 HKD ${max}`,
       zh_hans: `最高提现金額爲 HKD ${max}`,
+      en: `Maximum amount is HKD ${max}`,
       lang,
     })
   }
@@ -425,6 +456,7 @@ export const validateCurrency = (value: string, lang: Language) => {
     return translate({
       zh_hant: '請選擇一種幣別',
       zh_hans: '请选择一种币别',
+      en: 'Please select a currency',
       lang,
     })
   }

From 887daa15c32b586dbeb0795c3de603166bea5983 Mon Sep 17 00:00:00 2001
From: Matty <98379126+matters-tech@users.noreply.github.com>
Date: Thu, 13 Apr 2023 00:38:26 +0700
Subject: [PATCH 87/92] New translations default.json (Chinese Simplified)

---
 lang/zh-Hans.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json
index 19a81f689d..dd9dea4570 100644
--- a/lang/zh-Hans.json
+++ b/lang/zh-Hans.json
@@ -96,7 +96,7 @@
     "description": ""
   },
   "3WKlPP": {
-    "defaultMessage": "commented in",
+    "defaultMessage": "在围炉 ",
     "description": ""
   },
   "3kbIhS": {
@@ -184,7 +184,7 @@
     "description": ""
   },
   "8cv9D4": {
-    "defaultMessage": "Next Step",
+    "defaultMessage": "下一步",
     "description": ""
   },
   "8xPi0N": {
@@ -212,7 +212,7 @@
     "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/NFTCollection/index.tsx"
   },
   "A41QIy": {
-    "defaultMessage": "Enter Password",
+    "defaultMessage": "输入密码",
     "description": ""
   },
   "A7ugfn": {
@@ -256,7 +256,7 @@
     "description": "src/components/Notice/TransactionNotice/PaymentReceivedDonationNotice.tsx"
   },
   "CBDDR5": {
-    "defaultMessage": "Must be between 2-20 characters long. Only lowercase letters, numbers and underline are allowed.",
+    "defaultMessage": "2-20 个字符，仅支持英文小写字母、数字或下划线",
     "description": ""
   },
   "Cdkhl8": {
@@ -568,7 +568,7 @@
     "description": "src/views/Circle/Settings/ManageInvitation/Invites/Accepted/index.tsx"
   },
   "SENRqu": {
-    "defaultMessage": "Help",
+    "defaultMessage": "說明",
     "description": ""
   },
   "SNh1n0": {
@@ -580,7 +580,7 @@
     "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/Sent.tsx"
   },
   "Seanpx": {
-    "defaultMessage": "Required",
+    "defaultMessage": "必填欄位",
     "description": ""
   },
   "Szd1tH": {
@@ -692,7 +692,7 @@
     "description": ""
   },
   "Xz/AHp": {
-    "defaultMessage": "broadcast and mentioned you",
+    "defaultMessage": " 廣播提及你",
     "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
   },
   "YIes/F": {
@@ -952,7 +952,7 @@
     "description": "src/views/Circle/Settings/ManageInvitation/Invites/Pending/index.tsx"
   },
   "ldNgRA": {
-    "defaultMessage": "Display name, can be changed later",
+    "defaultMessage": "你的站內暱稱，之後可以修改",
     "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
   },
   "lhaIoi": {
@@ -1100,7 +1100,7 @@
     "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
   },
   "skbUBl": {
-    "defaultMessage": "Log in",
+    "defaultMessage": "登入",
     "description": "src/components/Buttons/Login/index.tsx"
   },
   "sncOwi": {
@@ -1180,7 +1180,7 @@
     "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
   "wXzTZ0": {
-    "defaultMessage": "Enter the name of your Circle",
+    "defaultMessage": "給圍爐取一個吸引人的名字吧",
     "description": ""
   },
   "wbcwKd": {
@@ -1224,7 +1224,7 @@
     "description": "src/views/TagDetail/DropdownActions/index.tsx"
   },
   "yZfKI4": {
-    "defaultMessage": "discussion and mentioned you",
+    "defaultMessage": " 眾聊提及你",
     "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
   },
   "zKOr2x": {

From a588b06e5e14ab05318381f2e0ab23decb21e90a Mon Sep 17 00:00:00 2001
From: Matty <98379126+matters-tech@users.noreply.github.com>
Date: Thu, 13 Apr 2023 00:38:27 +0700
Subject: [PATCH 88/92] New translations default.json (Chinese Traditional)

---
 lang/zh-Hant.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json
index 773b50877b..a410f380cf 100644
--- a/lang/zh-Hant.json
+++ b/lang/zh-Hant.json
@@ -96,7 +96,7 @@
     "description": ""
   },
   "3WKlPP": {
-    "defaultMessage": "commented in",
+    "defaultMessage": "在圍爐 ",
     "description": ""
   },
   "3kbIhS": {
@@ -184,7 +184,7 @@
     "description": ""
   },
   "8cv9D4": {
-    "defaultMessage": "Next Step",
+    "defaultMessage": "下一步",
     "description": ""
   },
   "8xPi0N": {
@@ -212,7 +212,7 @@
     "description": "src/components/UserProfile/DropdownActions/EditProfileDialog/NFTCollection/index.tsx"
   },
   "A41QIy": {
-    "defaultMessage": "Enter Password",
+    "defaultMessage": "輸入密碼",
     "description": ""
   },
   "A7ugfn": {
@@ -256,7 +256,7 @@
     "description": "src/components/Notice/TransactionNotice/PaymentReceivedDonationNotice.tsx"
   },
   "CBDDR5": {
-    "defaultMessage": "Must be between 2-20 characters long. Only lowercase letters, numbers and underline are allowed.",
+    "defaultMessage": "2-20 個字元，僅支持英文小写字母、數字或下劃線",
     "description": ""
   },
   "Cdkhl8": {
@@ -568,7 +568,7 @@
     "description": "src/views/Circle/Settings/ManageInvitation/Invites/Accepted/index.tsx"
   },
   "SENRqu": {
-    "defaultMessage": "Help",
+    "defaultMessage": "说明",
     "description": ""
   },
   "SNh1n0": {
@@ -580,7 +580,7 @@
     "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/Sent.tsx"
   },
   "Seanpx": {
-    "defaultMessage": "Required",
+    "defaultMessage": "必填栏位",
     "description": ""
   },
   "Szd1tH": {
@@ -692,7 +692,7 @@
     "description": ""
   },
   "Xz/AHp": {
-    "defaultMessage": "broadcast and mentioned you",
+    "defaultMessage": " 广播提及你",
     "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
   },
   "YIes/F": {
@@ -952,7 +952,7 @@
     "description": "src/views/Circle/Settings/ManageInvitation/Invites/Pending/index.tsx"
   },
   "ldNgRA": {
-    "defaultMessage": "Display name, can be changed later",
+    "defaultMessage": "你的站内暱称，之后可以修改",
     "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
   },
   "lhaIoi": {
@@ -1100,7 +1100,7 @@
     "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
   },
   "skbUBl": {
-    "defaultMessage": "Log in",
+    "defaultMessage": "登录",
     "description": "src/components/Buttons/Login/index.tsx"
   },
   "sncOwi": {
@@ -1180,7 +1180,7 @@
     "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
   },
   "wXzTZ0": {
-    "defaultMessage": "Enter the name of your Circle",
+    "defaultMessage": "给围炉取一个吸引人的名字吧",
     "description": ""
   },
   "wbcwKd": {
@@ -1224,7 +1224,7 @@
     "description": "src/views/TagDetail/DropdownActions/index.tsx"
   },
   "yZfKI4": {
-    "defaultMessage": "discussion and mentioned you",
+    "defaultMessage": " 众聊提及你",
     "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
   },
   "zKOr2x": {

From 99fec12739d255b57f12877d9fb2a8e9afc08426 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Thu, 13 Apr 2023 00:42:45 +0700
Subject: [PATCH 89/92] fix(i18n): fix translations

---
 lang/en.json             |  1 -
 lang/zh-Hans.json        |  1 -
 lang/zh-Hant.json        |  1 -
 src/common/enums/text.ts | 14 +++++++-------
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/lang/en.json b/lang/en.json
index e33631e4be..ab74c5674a 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1247,4 +1247,3 @@
     "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   }
 }
-
diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json
index 19a81f689d..8f47022bea 100644
--- a/lang/zh-Hans.json
+++ b/lang/zh-Hans.json
@@ -1247,4 +1247,3 @@
     "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   }
 }
-
diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json
index 773b50877b..8fae601fc2 100644
--- a/lang/zh-Hant.json
+++ b/lang/zh-Hant.json
@@ -1247,4 +1247,3 @@
     "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   }
 }
-
diff --git a/src/common/enums/text.ts b/src/common/enums/text.ts
index 1c365f6c50..860c2d0a23 100644
--- a/src/common/enums/text.ts
+++ b/src/common/enums/text.ts
@@ -121,8 +121,8 @@ export const TEXT = {
     enterPaymentPointer: '請輸入地址',
     enterRegisteredEmail: '請輸入你的註冊電子信箱',
     enterUserDescription: '請輸入個人簡介',
-    enterUserName: '請輸入 Matters ID',
-    enterUserNameAgain: '請再次輸入 Matters ID',
+    enterUserName: '請輸入新的 Matters ID',
+    enterUserNameAgain: '請再次輸入新的 Matters ID',
     enterVerificationCode: '請輸入驗證碼',
     ENTITY_NOT_FOUND: '實體不存在',
     expand: '展開',
@@ -165,7 +165,7 @@ export const TEXT = {
     hintAddCircleInvitee: '添加站內或站外朋友加入圍爐',
     hintCircleAddArticles: '將公開作品加入圍爐，成為永久收費作品。',
     hintCircleDisplayName: '2-12 個字元',
-    hintCircleName: '2-20 個字元，僅支持英文小写字母、數字或下劃線',
+    hintCircleName: '2-20 個字元，僅支持英文小寫字母、數字或下劃線',
     hintDescription: '建議 50 字以內，最長 200 字',
     hintDisplayName: '2-20 個字元',
     hintEditCollection: '關聯自己或他人的作品，幫助讀者更好地發現內容。',
@@ -173,7 +173,7 @@ export const TEXT = {
     hintPaymentPassword: '輸入六位數字交易密碼',
     hintPaymentPointer: '錢包地址以“$”開頭',
     hintTerm: '我們的用戶協議和隱私政策發生了更改，請閱讀並同意後繼續使用。',
-    hintUserName: '4-15 個字元，僅支持英文小写字母、數字或下劃線',
+    hintUserName: '4-15 個字元，僅支持英文小寫字母、數字或下劃線',
     hintVerificationCode: '驗證碼有效期 20 分鐘',
     history: '足跡',
     hkd: '港幣',
@@ -531,8 +531,8 @@ export const TEXT = {
     enterPaymentPointer: '请输入地址',
     enterRegisteredEmail: '请输入你的注册邮箱',
     enterUserDescription: '请输入个人简介',
-    enterUserName: '请输入新 Matters ID',
-    enterUserNameAgain: '请再次输入新 Matters ID',
+    enterUserName: '请输入新的 Matters ID',
+    enterUserNameAgain: '请再次输入新的 Matters ID',
     enterVerificationCode: '请输入验证码',
     ENTITY_NOT_FOUND: '实体不存在',
     expand: '展开',
@@ -583,7 +583,7 @@ export const TEXT = {
     hintPaymentPassword: '输入六位数字交易密码',
     hintPaymentPointer: '钱包地址以“$”开头',
     hintTerm: '我们的用户协议和隐私政策发生了更改，请阅读并同意后继续使用。',
-    hintUserName: '4-15 个字符，仅支持英文小写字母、数字或下划线',
+    hintUserName: '4-15 个字符，仅支持英文小寫字母、数字或下划线',
     hintVerificationCode: '验证码有效期 20 分钟',
     history: '足迹',
     hkd: '港币',

From ee92a87d12621e754f9f5a5bcda08e3bc058661b Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Thu, 13 Apr 2023 01:17:13 +0700
Subject: [PATCH 90/92] fix(ptr): make `<article id="ptr">` as trigger element

---
 src/components/Layout/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Layout/index.tsx b/src/components/Layout/index.tsx
index 1f042021ce..7fdc0ce37a 100644
--- a/src/components/Layout/index.tsx
+++ b/src/components/Layout/index.tsx
@@ -113,12 +113,12 @@ const Main: React.FC<React.PropsWithChildren<MainProps>> = ({
     hasOnboardingTasks: showOnboardingTasks,
   })
 
-  usePullToRefresh.Register()
+  usePullToRefresh.Register('#ptr')
   usePullToRefresh.Handler(() => window.location.reload())
 
   return (
     <>
-      <article className={articleClasses}>
+      <article id="ptr" className={articleClasses}>
         <PullToRefresh>
           {children}
 

From e1a2a7f351929751af78466cce3ade49876c1b70 Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Thu, 13 Apr 2023 10:55:29 +0700
Subject: [PATCH 91/92] chore(release): v4.19.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 03766085e3..de3faa6f12 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matters-web",
-  "version": "4.18.0",
+  "version": "4.19.0",
   "description": "codebase of Matters' website",
   "sideEffects": false,
   "author": "Matters <hi@matters.news>",

From 9b049f7cde7b919a34b497be066913d0c53a734d Mon Sep 17 00:00:00 2001
From: robertu <4065233+robertu7@users.noreply.github.com>
Date: Thu, 13 Apr 2023 13:37:16 +0700
Subject: [PATCH 92/92] fix: fix translations

---
 src/common/enums/text.ts                             | 2 +-
 src/components/Dialogs/FingerprintDialog/Content.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/enums/text.ts b/src/common/enums/text.ts
index 860c2d0a23..64140189e8 100644
--- a/src/common/enums/text.ts
+++ b/src/common/enums/text.ts
@@ -583,7 +583,7 @@ export const TEXT = {
     hintPaymentPassword: '输入六位数字交易密码',
     hintPaymentPointer: '钱包地址以“$”开头',
     hintTerm: '我们的用户协议和隐私政策发生了更改，请阅读并同意后继续使用。',
-    hintUserName: '4-15 个字符，仅支持英文小寫字母、数字或下划线',
+    hintUserName: '4-15 个字符，仅支持英文小写字母、数字或下划线',
     hintVerificationCode: '验证码有效期 20 分钟',
     history: '足迹',
     hkd: '港币',
diff --git a/src/components/Dialogs/FingerprintDialog/Content.tsx b/src/components/Dialogs/FingerprintDialog/Content.tsx
index bf8acb754c..3201f05cf6 100644
--- a/src/components/Dialogs/FingerprintDialog/Content.tsx
+++ b/src/components/Dialogs/FingerprintDialog/Content.tsx
@@ -241,7 +241,7 @@ const FingerprintDialogContent = ({
               ) : (
                 <Translate
                   zh_hant="ISCN 寫入未成功"
-                  zh_hans="ISCN 寫入未成功"
+                  zh_hans="ISCN 写入未成功"
                   en="ISCN is failed to register on LikeCoin chain"
                 />
               )