diff --git a/packages/frontend/core/src/pages/index.tsx b/packages/frontend/core/src/pages/index.tsx index 98efe6e0af..4865f73964 100644 --- a/packages/frontend/core/src/pages/index.tsx +++ b/packages/frontend/core/src/pages/index.tsx @@ -32,12 +32,11 @@ export const Component = () => { const [creating, setCreating] = useState(false); const list = useLiveData(useService(WorkspaceListService).workspaceList); - const workspaceStatus = useLiveData(useService(WorkspaceListService).status); const { openPage } = useNavigateHelper(); useLayoutEffect(() => { - if (list.length === 0 || workspaceStatus.loading) { + if (list.length === 0) { return; } @@ -47,7 +46,7 @@ export const Component = () => { const openWorkspace = list.find(w => w.id === lastId) ?? list[0]; openPage(openWorkspace.id, WorkspaceSubPath.ALL); setNavigating(true); - }, [list, workspaceStatus, openPage]); + }, [list, openPage]); const workspaceManager = useService(WorkspaceManager); diff --git a/packages/frontend/core/src/providers/modal-provider.tsx b/packages/frontend/core/src/providers/modal-provider.tsx index 41ed373658..a1922eae86 100644 --- a/packages/frontend/core/src/providers/modal-provider.tsx +++ b/packages/frontend/core/src/providers/modal-provider.tsx @@ -216,7 +216,9 @@ export const SignOutConfirmModal = () => { const onConfirm = useAsyncCallback(async () => { setOpen(false); - await signOutCloud(); + await signOutCloud({ + redirect: false, + }); // if current workspace is affine cloud, switch to local workspace if (currentWorkspace?.flavour === WorkspaceFlavour.AFFINE_CLOUD) {