There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
fix(core): description of cancel is incorrect when cloud subscription is activated (#6530)
CatsJuicebb1294f42532
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/index.tsxindex c67858abc1..dd0e5d4c98 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/index.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/index.tsx@@ -254,9 +254,7 @@ const SubscriptionSettings = () => {]()}desc={t['com.affine.payment.billing-setting.cancel-subscription.description'- ]({- cancelDate: new Date(subscription.end).toLocaleDateString(),- })}+ ]()}><CancelSubscription /></SettingRow>diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/cloud-plans.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/cloud-plans.tsxindex cf101db7d1..0cb23b582e 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/cloud-plans.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/cloud-plans.tsx@@ -116,7 +116,9 @@ export function getPlanDetail(t: T) {: detail.price;return (<>- {t['com.affine.payment.cloud.pro.title.price-monthly']({ price })}+ {t['com.affine.payment.cloud.pro.title.price-monthly']({+ price: '$' + price,+ })}{recurring === SubscriptionRecurring.Yearly ? (<span className={planTitleTitleCaption}>{t['com.affine.payment.cloud.pro.title.billed-yearly']()}diff --git a/packages/frontend/i18n/src/resources/en.json b/packages/frontend/i18n/src/resources/en.jsonindex 203c9316ef..8c574b80a8 100644--- a/packages/frontend/i18n/src/resources/en.json+++ b/packages/frontend/i18n/src/resources/en.json@@ -924,7 +924,7 @@"com.affine.payment.benefit-6": "Number of members per Workspace ≤ {{capacity}}","com.affine.payment.benefit-7": "{{capacity}}-days version history","com.affine.payment.billing-setting.cancel-subscription": "Cancel Subscription",- "com.affine.payment.billing-setting.cancel-subscription.description": "Subscription cancelled, your pro account will expire on {{cancelDate}}",+ "com.affine.payment.billing-setting.cancel-subscription.description": "Once you canceled subscription you will no longer enjoy the plan benefits.","com.affine.payment.billing-setting.change-plan": "Change Plan","com.affine.payment.billing-setting.current-plan": "AFFiNE Cloud","com.affine.payment.billing-setting.current-plan.description": "You are currently on the <1>{{planName}} plan</1>.",