From c0e0b128571a6f83a3e6b30b019402b29adc9438 Mon Sep 17 00:00:00 2001
From: JimmFly <yangjinfei001@gmail.com>
Date: Thu, 12 Dec 2024 06:16:31 +0000
Subject: [PATCH] fix(core): wrong billing information display (#9117)

close AF-1935 AF-1933

fix(core): wrong billing information display

fix(core): add reminder for no cloud workspace in upgrade to team page
---
 .../setting/workspace-setting/billing/index.tsx      |  2 +-
 .../core/src/desktop/pages/upgrade-to-team/index.tsx | 12 +++++++++---
 .../src/desktop/pages/upgrade-to-team/styles.css.ts  |  7 +++++++
 packages/frontend/i18n/src/i18n-completenesses.json  |  2 +-
 packages/frontend/i18n/src/resources/en.json         |  1 +
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/billing/index.tsx b/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/billing/index.tsx
index cbc81c8d99..8a487736b9 100644
--- a/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/billing/index.tsx
+++ b/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/billing/index.tsx
@@ -119,7 +119,7 @@ const TeamCard = () => {
     workspaceSubscriptionService,
   ]);
 
-  const expiration = teamSubscription?.end;
+  const expiration = teamSubscription?.canceledAt;
   const nextBillingDate = teamSubscription?.nextBillAt;
   const recurring = teamSubscription?.recurring;
 
diff --git a/packages/frontend/core/src/desktop/pages/upgrade-to-team/index.tsx b/packages/frontend/core/src/desktop/pages/upgrade-to-team/index.tsx
index 3b475dec6d..6790377667 100644
--- a/packages/frontend/core/src/desktop/pages/upgrade-to-team/index.tsx
+++ b/packages/frontend/core/src/desktop/pages/upgrade-to-team/index.tsx
@@ -233,15 +233,21 @@ const WorkspaceSelector = ({
 
   return (
     <div>
-      {cloudWorkspaces.length > 0 &&
+      {cloudWorkspaces.length > 0 ? (
         cloudWorkspaces.map(workspace => (
           <WorkspaceItem
             key={workspace.id}
             meta={workspace}
             onSelect={handleSelect}
           />
-        ))}
-      {cloudWorkspaces.length > 0 && <Divider size="thinner" />}
+        ))
+      ) : (
+        <div className={styles.noWorkspaceItem}>
+          {t['com.affine.upgrade-to-team-page.no-workspace-available']()}
+        </div>
+      )}
+      <Divider size="thinner" />
+
       <MenuItem
         className={styles.createWorkspaceItem}
         prefix={<NewPageIcon className={styles.itemIcon} fontSize={28} />}
diff --git a/packages/frontend/core/src/desktop/pages/upgrade-to-team/styles.css.ts b/packages/frontend/core/src/desktop/pages/upgrade-to-team/styles.css.ts
index e16860baa3..5499b1caab 100644
--- a/packages/frontend/core/src/desktop/pages/upgrade-to-team/styles.css.ts
+++ b/packages/frontend/core/src/desktop/pages/upgrade-to-team/styles.css.ts
@@ -57,6 +57,13 @@ export const createWorkspaceItem = style({
   gap: '12px',
 });
 
+export const noWorkspaceItem = style({
+  padding: '4px 12px',
+  fontSize: cssVar('fontSm'),
+  fontWeight: 500,
+  color: cssVarV2('text/secondary'),
+});
+
 export const itemContent = style({
   fontSize: cssVar('fontSm'),
   fontWeight: 500,
diff --git a/packages/frontend/i18n/src/i18n-completenesses.json b/packages/frontend/i18n/src/i18n-completenesses.json
index 65b5bddf3c..0118a4d98b 100644
--- a/packages/frontend/i18n/src/i18n-completenesses.json
+++ b/packages/frontend/i18n/src/i18n-completenesses.json
@@ -19,6 +19,6 @@
   "ru": 67,
   "sv-SE": 4,
   "ur": 2,
-  "zh-Hans": 92,
+  "zh-Hans": 91,
   "zh-Hant": 91
 }
\ No newline at end of file
diff --git a/packages/frontend/i18n/src/resources/en.json b/packages/frontend/i18n/src/resources/en.json
index 60709d9243..bb4578d816 100644
--- a/packages/frontend/i18n/src/resources/en.json
+++ b/packages/frontend/i18n/src/resources/en.json
@@ -1596,6 +1596,7 @@
   "com.affine.upgrade-to-team-page.create-and-upgrade-confirm.description": "A workspace is your virtual space to capture, create and plan as just one person or together as a team.",
   "com.affine.upgrade-to-team-page.create-and-upgrade-confirm.placeholder": "Set a workspace name",
   "com.affine.upgrade-to-team-page.create-and-upgrade-confirm.confirm": "Continue to Pricing",
+  "com.affine.upgrade-to-team-page.no-workspace-available": "No workspace available",
   "com.affine.workspace.storage": "Workspace storage",
   "com.affine.cmdk.affine.category.affine.journal": "Journal",
   "com.affine.cmdk.affine.category.affine.date-picker": "Select a specific date"