Merge pull request #4985 from thematters/develop

Release: v5.7.1

lang/default.json

@@ -944,6 +944,9 @@
     "defaultMessage": "Verification successful",
     "description": "src/components/GlobalToast/index.tsx"
   },
+  "DpbBcd": {
+    "defaultMessage": "Select Activity..."
+  },
   "DqQvtL": {
     "defaultMessage": "Unblock",
     "description": "src/views/Me/Settings/Blocked/ToggleBlockButton.tsx"
@@ -1565,6 +1568,9 @@
     "defaultMessage": "guide",
     "description": "src/components/Forms/PaymentForm/PayTo/SetAmount/SetAmountHeader/WhyOptimismDialog/index.tsx"
   },
+  "P/7t1k": {
+    "defaultMessage": "Please select a date of activity"
+  },
   "P3y9Bo": {
     "defaultMessage": "Go to sign",
     "description": "src/components/Forms/PaymentForm/BindWallet/index.tsx"
@@ -1901,9 +1907,6 @@
     "defaultMessage": "More",
     "description": "src/views/ArticleDetail/AuthorSidebar/Tabs/index.tsx"
   },
-  "VrK0Q0": {
-    "defaultMessage": "Please select..."
-  },
   "VrOoVf": {
     "defaultMessage": "Matters will never ask your wallet key through any channel.",
     "description": "src/components/Forms/WalletAuthForm/Select.tsx"
@@ -2307,6 +2310,9 @@
   "d5+b8r": {
     "defaultMessage": "Restricted content"
   },
+  "d5bM8A": {
+    "defaultMessage": "Select Date..."
+  },
   "dAPUJp": {
     "defaultMessage": "The dazzling light of a meteor shower is enough to illuminate the night sky. The Meteor Canoe badge signifies your participation in the Nomad Matters.",
     "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx"

lang/en.json

@@ -529,7 +529,7 @@
     "defaultMessage": "Upload file"
   },
   "6pc948": {
-    "defaultMessage": "Add to FreeWrite"
+    "defaultMessage": "Add to Free Write"
   },
   "6q0G5e": {
     "defaultMessage": "Successfully added",
@@ -944,6 +944,9 @@
     "defaultMessage": "Verification successful",
     "description": "src/components/GlobalToast/index.tsx"
   },
+  "DpbBcd": {
+    "defaultMessage": "Select Activity..."
+  },
   "DqQvtL": {
     "defaultMessage": "Unblock",
     "description": "src/views/Me/Settings/Blocked/ToggleBlockButton.tsx"
@@ -1565,6 +1568,9 @@
     "defaultMessage": "guide",
     "description": "src/components/Forms/PaymentForm/PayTo/SetAmount/SetAmountHeader/WhyOptimismDialog/index.tsx"
   },
+  "P/7t1k": {
+    "defaultMessage": "Please select a date of activity"
+  },
   "P3y9Bo": {
     "defaultMessage": "Go to sign",
     "description": "src/components/Forms/PaymentForm/BindWallet/index.tsx"
@@ -1901,9 +1907,6 @@
     "defaultMessage": "More",
     "description": "src/views/ArticleDetail/AuthorSidebar/Tabs/index.tsx"
   },
-  "VrK0Q0": {
-    "defaultMessage": "Please select..."
-  },
   "VrOoVf": {
     "defaultMessage": "Matters will never ask your wallet key through any channel.",
     "description": "src/components/Forms/WalletAuthForm/Select.tsx"
@@ -2307,6 +2310,9 @@
   "d5+b8r": {
     "defaultMessage": "Restricted content"
   },
+  "d5bM8A": {
+    "defaultMessage": "Select Date..."
+  },
   "dAPUJp": {
     "defaultMessage": "The dazzling light of a meteor shower is enough to illuminate the night sky. The Meteor Canoe badge signifies your participation in the Nomad Matters.",
     "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx"

lang/zh-Hans.json

@@ -529,7 +529,7 @@
     "defaultMessage": "上传档案"
   },
   "6pc948": {
-    "defaultMessage": "投稿七日书自由写"
+    "defaultMessage": "参与活动"
   },
   "6q0G5e": {
     "defaultMessage": "加入成功",
@@ -944,6 +944,9 @@
     "defaultMessage": "验证成功",
     "description": "src/components/GlobalToast/index.tsx"
   },
+  "DpbBcd": {
+    "defaultMessage": "选择活动..."
+  },
   "DqQvtL": {
     "defaultMessage": "解除屏蔽",
     "description": "src/views/Me/Settings/Blocked/ToggleBlockButton.tsx"
@@ -1565,6 +1568,9 @@
     "defaultMessage": "教学指南",
     "description": "src/components/Forms/PaymentForm/PayTo/SetAmount/SetAmountHeader/WhyOptimismDialog/index.tsx"
   },
+  "P/7t1k": {
+    "defaultMessage": "请选定参与活动的投稿日程"
+  },
   "P3y9Bo": {
     "defaultMessage": "前往签署",
     "description": "src/components/Forms/PaymentForm/BindWallet/index.tsx"
@@ -1901,9 +1907,6 @@
     "defaultMessage": "相关推荐",
     "description": "src/views/ArticleDetail/AuthorSidebar/Tabs/index.tsx"
   },
-  "VrK0Q0": {
-    "defaultMessage": "请选择⋯"
-  },
   "VrOoVf": {
     "defaultMessage": "Matters 不会透过任何渠道主动询问你的钱包私钥。",
     "description": "src/components/Forms/WalletAuthForm/Select.tsx"
@@ -2307,6 +2310,9 @@
   "d5+b8r": {
     "defaultMessage": "限制级内容"
   },
+  "d5bM8A": {
+    "defaultMessage": "投稿日程⋯"
+  },
   "dAPUJp": {
     "defaultMessage": "流星雨的绚烂光芒足以点亮夜空。流星号徽章纪念你曾参与「游牧者计划」。",
     "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx"
@@ -2748,7 +2754,7 @@
     "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
   },
   "m1wKuC": {
-    "defaultMessage": "参与七日书活动"
+    "defaultMessage": "参与活动"
   },
   "m4GG4b": {
     "defaultMessage": "删除选集"

lang/zh-Hant.json

@@ -529,7 +529,7 @@
     "defaultMessage": "上傳檔案"
   },
   "6pc948": {
-    "defaultMessage": "投稿七日書自由寫"
+    "defaultMessage": "參與活動"
   },
   "6q0G5e": {
     "defaultMessage": "加入成功",
@@ -944,6 +944,9 @@
     "defaultMessage": "驗證成功",
     "description": "src/components/GlobalToast/index.tsx"
   },
+  "DpbBcd": {
+    "defaultMessage": "選擇活動⋯"
+  },
   "DqQvtL": {
     "defaultMessage": "解除封鎖",
     "description": "src/views/Me/Settings/Blocked/ToggleBlockButton.tsx"
@@ -1565,6 +1568,9 @@
     "defaultMessage": "教學指南",
     "description": "src/components/Forms/PaymentForm/PayTo/SetAmount/SetAmountHeader/WhyOptimismDialog/index.tsx"
   },
+  "P/7t1k": {
+    "defaultMessage": "請選定參與活動的投稿日程"
+  },
   "P3y9Bo": {
     "defaultMessage": "前往簽署",
     "description": "src/components/Forms/PaymentForm/BindWallet/index.tsx"
@@ -1901,9 +1907,6 @@
     "defaultMessage": "相關推薦",
     "description": "src/views/ArticleDetail/AuthorSidebar/Tabs/index.tsx"
   },
-  "VrK0Q0": {
-    "defaultMessage": "請選擇⋯"
-  },
   "VrOoVf": {
     "defaultMessage": "Matters 不會透過任何渠道主動詢問你的錢包私鑰。",
     "description": "src/components/Forms/WalletAuthForm/Select.tsx"
@@ -2307,6 +2310,9 @@
   "d5+b8r": {
     "defaultMessage": "限制級內容"
   },
+  "d5bM8A": {
+    "defaultMessage": "投稿日程⋯"
+  },
   "dAPUJp": {
     "defaultMessage": "流星雨的絢爛光芒足以點亮夜空。流星號徽章紀念你曾參與「遊牧者計畫」。",
     "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx"
@@ -2748,7 +2754,7 @@
     "description": "src/components/Forms/CreateCircleForm/Profile.tsx"
   },
   "m1wKuC": {
-    "defaultMessage": "參與七日書活動"
+    "defaultMessage": "參與活動"
   },
   "m4GG4b": {
     "defaultMessage": "刪除選集"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "matters-web",
-  "version": "5.7.0",
+  "version": "5.7.1",
   "description": "codebase of Matters' website",
   "author": "Matters <[email protected]>",
   "engines": {
@@ -32,7 +32,7 @@
     "storybook": "storybook dev -p 6006",
     "build-storybook": "storybook build",
     "prepare": "husky install",
-    "vercel-build": "set -xe; npm run gen:type && if [[ \"$NEXT_PUBLIC_VERCEL_GIT_COMMIT_REF\" =~ release/* ]] ; then cp -va .env.prod .env.local ; echo 'NEXT_PUBLIC_SITE_DOMAIN=web-next.matters.town' | tee -a .env.local; else cp -va .env.dev .env.local ; echo 'NEXT_PUBLIC_SITE_DOMAIN=web-dev.matters.town' | tee -a .env.local ; fi && { echo 'NEXT_PUBLIC_NEXT_ASSET_DOMAIN='; echo 'NEXT_PUBLIC_ADMIN_VIEW=true'; } | tee -a .env.local && npm run build",
+    "vercel-build": "set -xe; if [[ \"$NEXT_PUBLIC_VERCEL_GIT_COMMIT_REF\" =~ release/* ]] ; then npm run gen:type:prod && cp -va .env.prod .env.local ; echo 'NEXT_PUBLIC_SITE_DOMAIN=web-next.matters.town' | tee -a .env.local; else npm run gen:type && cp -va .env.dev .env.local ; echo 'NEXT_PUBLIC_SITE_DOMAIN=web-dev.matters.town' | tee -a .env.local ; fi && { echo 'NEXT_PUBLIC_NEXT_ASSET_DOMAIN='; echo 'NEXT_PUBLIC_ADMIN_VIEW=true'; } | tee -a .env.local && npm run build",
     "i18n:extract": "formatjs extract 'src/**/*.ts*' --ignore='**/*.d.ts' --id-interpolation-pattern '[sha512:contenthash:base64:6]' --out-file lang/default.json",
     "i18n:generate": "node bin/i18nGenerate.js",
     "i18n:compile": "formatjs compile-folder --ast lang compiled-lang",

src/common/utils/route.ts

@@ -94,6 +94,7 @@ type ToPathArgs =
       campaign: CampaignArgs
       stage?: CampaignStageArgs
       featured?: boolean
+      announcement?: boolean
     }
   | {
       page: 'userProfile' | 'userCollections'
@@ -247,7 +248,7 @@ export const toPath = (
         href = `${href}?type=${args.stage.id}`
       } else if (args.featured) {
         href = `${href}?type=featured`
-      } else {
+      } else if (args.announcement) {
         href = `${href}?type=announcement`
       }
       break

src/components/Editor/BottomBar/MobileSettingsDialog/index.tsx

@@ -20,7 +20,8 @@ const BaseMobileSettingsDialog = ({
   children,
   canComment,
   toggleComment,
-  appliedCampaign,
+  campaigns,
+  selectedCampaign,
   selectedStage,
   editCampaign,
   indented,
@@ -62,7 +63,7 @@ const BaseMobileSettingsDialog = ({
 
         <Dialog.Content noSpacing>
           {/* campaign */}
-          {appliedCampaign && editCampaign && (
+          {campaigns && campaigns.length > 0 && editCampaign && (
             <section className={styles.campaign}>
               <h3 className={styles.title}>
                 <FormattedMessage
@@ -71,7 +72,8 @@ const BaseMobileSettingsDialog = ({
                 />
               </h3>
               <SelectCampaign
-                appliedCampaign={appliedCampaign}
+                campaigns={campaigns}
+                selectedCampaign={selectedCampaign}
                 selectedStage={selectedStage}
                 editCampaign={editCampaign}
               />

src/components/Editor/BottomBar/index.tsx

@@ -92,7 +92,8 @@ const BottomBar: React.FC<BottomBarProps> = ({
   canComment,
   toggleComment,
 
-  appliedCampaign,
+  campaigns,
+  selectedCampaign,
   selectedStage,
   editCampaign,
 
@@ -148,7 +149,8 @@ const BottomBar: React.FC<BottomBarProps> = ({
     toggleComment,
     disableChangeCanComment: article?.canComment,
 
-    appliedCampaign,
+    campaigns,
+    selectedCampaign,
     selectedStage,
     editCampaign,