Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/revise free write #4974

Merged
merged 6 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions lang/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
14 changes: 10 additions & 4 deletions lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@
"defaultMessage": "Upload file"
},
"6pc948": {
"defaultMessage": "Add to FreeWrite"
"defaultMessage": "Add to Free Write"
},
"6q0G5e": {
"defaultMessage": "Successfully added",
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
14 changes: 10 additions & 4 deletions lang/zh-Hans.json
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@
"defaultMessage": "上传档案"
},
"6pc948": {
"defaultMessage": "投稿七日书自由写"
Kechicode marked this conversation as resolved.
Show resolved Hide resolved
"defaultMessage": "参与活动"
},
"6q0G5e": {
"defaultMessage": "加入成功",
Expand Down Expand Up @@ -944,6 +944,9 @@
"defaultMessage": "验证成功",
"description": "src/components/GlobalToast/index.tsx"
},
"DpbBcd": {
"defaultMessage": "选择活动..."
},
"DqQvtL": {
"defaultMessage": "解除屏蔽",
"description": "src/views/Me/Settings/Blocked/ToggleBlockButton.tsx"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -2307,6 +2310,9 @@
"d5+b8r": {
"defaultMessage": "限制级内容"
},
"d5bM8A": {
"defaultMessage": "投稿日程⋯"
},
"dAPUJp": {
"defaultMessage": "流星雨的绚烂光芒足以点亮夜空。流星号徽章纪念你曾参与「游牧者计划」。",
"description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx"
Expand Down
14 changes: 10 additions & 4 deletions lang/zh-Hant.json
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@
"defaultMessage": "上傳檔案"
},
"6pc948": {
"defaultMessage": "投稿七日書自由寫"
"defaultMessage": "參與活動"
},
"6q0G5e": {
"defaultMessage": "加入成功",
Expand Down Expand Up @@ -944,6 +944,9 @@
"defaultMessage": "驗證成功",
"description": "src/components/GlobalToast/index.tsx"
},
"DpbBcd": {
"defaultMessage": "選擇活動⋯"
},
"DqQvtL": {
"defaultMessage": "解除封鎖",
"description": "src/views/Me/Settings/Blocked/ToggleBlockButton.tsx"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -2307,6 +2310,9 @@
"d5+b8r": {
"defaultMessage": "限制級內容"
},
"d5bM8A": {
"defaultMessage": "投稿日程⋯"
},
"dAPUJp": {
"defaultMessage": "流星雨的絢爛光芒足以點亮夜空。流星號徽章紀念你曾參與「遊牧者計畫」。",
"description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ const BaseMobileSettingsDialog = ({
children,
canComment,
toggleComment,
appliedCampaign,
campaigns,
selectedCampaign,
selectedStage,
editCampaign,
indented,
Expand Down Expand Up @@ -62,7 +63,7 @@ const BaseMobileSettingsDialog = ({

<Dialog.Content noSpacing>
{/* campaign */}
{appliedCampaign && editCampaign && (
{campaigns && selectedCampaign && editCampaign && (
<section className={styles.campaign}>
<h3 className={styles.title}>
<FormattedMessage
Expand All @@ -71,7 +72,8 @@ const BaseMobileSettingsDialog = ({
/>
</h3>
<SelectCampaign
appliedCampaign={appliedCampaign}
campaigns={campaigns}
selectedCampaign={selectedCampaign}
selectedStage={selectedStage}
editCampaign={editCampaign}
/>
Expand Down
6 changes: 4 additions & 2 deletions src/components/Editor/BottomBar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ const BottomBar: React.FC<BottomBarProps> = ({
canComment,
toggleComment,

appliedCampaign,
campaigns,
selectedCampaign,
selectedStage,
editCampaign,

Expand Down Expand Up @@ -148,7 +149,8 @@ const BottomBar: React.FC<BottomBarProps> = ({
toggleComment,
disableChangeCanComment: article?.canComment,

appliedCampaign,
campaigns,
selectedCampaign,
selectedStage,
editCampaign,

Expand Down
Loading
Loading