diff --git a/blocksuite/affine/shared/src/services/feature-flag-service.ts b/blocksuite/affine/shared/src/services/feature-flag-service.ts index 5bbd6837fc..bdbf5c55b8 100644 --- a/blocksuite/affine/shared/src/services/feature-flag-service.ts +++ b/blocksuite/affine/shared/src/services/feature-flag-service.ts @@ -21,7 +21,6 @@ export interface BlockSuiteFlags { enable_table_virtual_scroll: boolean; enable_turbo_renderer: boolean; enable_dom_renderer: boolean; - enable_comment: boolean; } export class FeatureFlagService extends StoreExtension { @@ -47,7 +46,6 @@ export class FeatureFlagService extends StoreExtension { enable_table_virtual_scroll: false, enable_turbo_renderer: false, enable_dom_renderer: false, - enable_comment: false, }); setFlag(key: keyof BlockSuiteFlags, value: boolean) { diff --git a/packages/frontend/core/src/blocksuite/block-suite-editor/lit-adaper.tsx b/packages/frontend/core/src/blocksuite/block-suite-editor/lit-adaper.tsx index eb2f5c6d56..dbea49d357 100644 --- a/packages/frontend/core/src/blocksuite/block-suite-editor/lit-adaper.tsx +++ b/packages/frontend/core/src/blocksuite/block-suite-editor/lit-adaper.tsx @@ -85,10 +85,8 @@ const usePatchSpecs = (mode: DocMode) => { const serverService = useService(ServerService); const serverConfig = useLiveData(serverService.server.config$); - const enableComment = - useLiveData(featureFlagService.flags.enable_comment.$) && - // comment may not be supported by the server - serverConfig.features.includes(ServerFeature.Comment); + // comment may not be supported by the server + const enableComment = serverConfig.features.includes(ServerFeature.Comment); const patchedSpecs = useMemo(() => { const manager = getViewManager() diff --git a/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx b/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx index 3206fe6817..c7b8bdba9a 100644 --- a/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx +++ b/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx @@ -118,10 +118,8 @@ const DetailPageImpl = memo(function DetailPageImpl() { const serverService = useService(ServerService); const serverConfig = useLiveData(serverService.server.config$); - const enableComment = - useLiveData(featureFlagService.flags.enable_comment.$) && - // comment may not be supported by the server - serverConfig.features.includes(ServerFeature.Comment); + // comment may not be supported by the server + const enableComment = serverConfig.features.includes(ServerFeature.Comment); useEffect(() => { if (isActiveView) { diff --git a/packages/frontend/core/src/modules/feature-flag/constant.ts b/packages/frontend/core/src/modules/feature-flag/constant.ts index 3df3ad72df..0efa9c8736 100644 --- a/packages/frontend/core/src/modules/feature-flag/constant.ts +++ b/packages/frontend/core/src/modules/feature-flag/constant.ts @@ -264,14 +264,6 @@ export const AFFINE_FLAGS = { configurable: isCanaryBuild, defaultState: false, }, - enable_comment: { - category: 'blocksuite', - bsFlag: 'enable_comment', - displayName: 'Enable Comment', - description: 'Enable comment', - configurable: true, - defaultState: isCanaryBuild, - }, } satisfies { [key in string]: FlagInfo }; // oxlint-disable-next-line no-redeclare