diff --git a/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/members/confirm-assign-modal.tsx b/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/members/confirm-assign-modal.tsx
index d841d6e17..6e8e65d97 100644
--- a/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/members/confirm-assign-modal.tsx
+++ b/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/members/confirm-assign-modal.tsx
@@ -10,6 +10,7 @@ export const ConfirmAssignModal = ({
setOpen,
member,
inputValue,
+ placeholder,
setInputValue,
isEquals,
onConfirm,
@@ -19,6 +20,7 @@ export const ConfirmAssignModal = ({
isEquals: boolean;
member: Member;
inputValue: string;
+ placeholder?: string;
onConfirm: () => void;
setInputValue: (value: string) => void;
}) => {
@@ -35,31 +37,45 @@ export const ConfirmAssignModal = ({
confirmButtonOptions={{ disabled: !isEquals, variant: 'error' }}
>
-
-
- {t['com.affine.payment.member.team.assign.confirm.description']({
- name: member.name || member.email || member.id,
- })}
-
-
- {t['com.affine.payment.member.team.assign.confirm.description-1']()}
-
-
- {t['com.affine.payment.member.team.assign.confirm.description-2']()}
-
-
- {t['com.affine.payment.member.team.assign.confirm.description-3']()}
-
+
+ {t['com.affine.payment.member.team.assign.confirm.description']({
+ name: member.name || member.email || member.id,
+ })}
+
+
+
+
+
+ {t[
+ 'com.affine.payment.member.team.assign.confirm.description-1'
+ ]()}
+
+
+
+
+
+ {t[
+ 'com.affine.payment.member.team.assign.confirm.description-2'
+ ]()}
+
+
+
+
+
+ {t[
+ 'com.affine.payment.member.team.assign.confirm.description-3'
+ ]()}
+
+
+
{t['com.affine.payment.member.team.assign.confirm.description-4']()}
diff --git a/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/members/member-list.tsx b/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/members/member-list.tsx
index 8c9890c02..138589674 100644
--- a/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/members/member-list.tsx
+++ b/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/members/member-list.tsx
@@ -247,6 +247,7 @@ const MemberItem = ({
setOpen={setOpen}
member={member}
inputValue={inputValue}
+ placeholder={workspaceName}
setInputValue={setInputValue}
isEquals={isEquals}
onConfirm={confirmAssign}
diff --git a/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/members/styles.css.ts b/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/members/styles.css.ts
index e5a777a3b..03b9a2734 100644
--- a/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/members/styles.css.ts
+++ b/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/members/styles.css.ts
@@ -128,6 +128,25 @@ export const confirmAssignModalContent = style({
padding: '0',
});
+export const descriptions = style({
+ display: 'flex',
+ flexDirection: 'column',
+ gap: '8px',
+});
+
+export const description = style({
+ display: 'flex',
+});
+
+export const prefixDot = style({
+ background: cssVarV2('icon/activated'),
+ width: '5px',
+ height: '5px',
+ borderRadius: '50%',
+ marginRight: '12px',
+ marginTop: '10px',
+});
+
export const confirmInputContainer = style({
display: 'flex',
flexDirection: 'column',
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 c254b4d9d..17d2f7244 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
@@ -1,6 +1,8 @@
import {
+ Avatar,
Button,
Divider,
+ IconButton,
Input,
Menu,
MenuItem,
@@ -10,6 +12,7 @@ import {
Scrollable,
} from '@affine/component';
import { AuthPageContainer } from '@affine/component/auth-components';
+import { useSignOut } from '@affine/core/components/hooks/affine/use-sign-out';
import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks';
import { useWorkspaceInfo } from '@affine/core/components/hooks/use-workspace-info';
import { PureWorkspaceCard } from '@affine/core/components/workspace-selector/workspace-card';
@@ -22,7 +25,7 @@ import { buildShowcaseWorkspace } from '@affine/core/utils/first-app-data';
import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant';
import { SubscriptionPlan, SubscriptionRecurring } from '@affine/graphql';
import { type I18nString, Trans, useI18n } from '@affine/i18n';
-import { DoneIcon, NewPageIcon } from '@blocksuite/icons/rc';
+import { DoneIcon, NewPageIcon, SignOutIcon } from '@blocksuite/icons/rc';
import { useLiveData, useService } from '@toeverything/infra';
import { useCallback, useMemo, useState } from 'react';
import { useSearchParams } from 'react-router-dom';
@@ -54,11 +57,16 @@ export const Component = () => {
export const UpgradeToTeam = ({ recurring }: { recurring: string | null }) => {
const t = useI18n();
+
const workspacesList = useService(WorkspacesService).list;
const workspaces = useLiveData(workspacesList.workspaces$);
const [openUpgrade, setOpenUpgrade] = useState(false);
const [openCreate, setOpenCreate] = useState(false);
+ const authService = useService(AuthService);
+ const user = useLiveData(authService.session.account$);
+ const onSignOut = useSignOut();
+
const [selectedWorkspace, setSelectedWorkspace] =
useState
(null);
@@ -102,7 +110,6 @@ export const UpgradeToTeam = ({ recurring }: { recurring: string | null }) => {
>
{menuTriggerText}
@@ -144,6 +151,19 @@ export const UpgradeToTeam = ({ recurring }: { recurring: string | null }) => {
onSelect={setSelectedWorkspace}
/>