diff --git a/packages/common/env/src/global.ts b/packages/common/env/src/global.ts index bc111b845f..0f05b45d84 100644 --- a/packages/common/env/src/global.ts +++ b/packages/common/env/src/global.ts @@ -30,7 +30,6 @@ export const runtimeFlagsSchema = z.object({ enableEnhanceShareMode: z.boolean(), enablePayment: z.boolean(), enablePageHistory: z.boolean(), - enableJournal: z.boolean(), // this is for the electron app serverUrlPrefix: z.string(), enableMoveDatabase: z.boolean(), diff --git a/packages/frontend/core/.webpack/runtime-config.ts b/packages/frontend/core/.webpack/runtime-config.ts index 2094657c57..6c4910ac6f 100644 --- a/packages/frontend/core/.webpack/runtime-config.ts +++ b/packages/frontend/core/.webpack/runtime-config.ts @@ -31,7 +31,6 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig { enableEnhanceShareMode: false, enablePayment: true, enablePageHistory: true, - enableJournal: false, serverUrlPrefix: 'https://app.affine.pro', editorFlags, appVersion: packageJson.version, @@ -42,7 +41,6 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig { return { ...this.stable, enablePageHistory: true, - enableJournal: false, serverUrlPrefix: 'https://insider.affine.pro', appBuildType: 'beta' as const, }; @@ -74,7 +72,6 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig { enableEnhanceShareMode: false, enablePayment: true, enablePageHistory: true, - enableJournal: true, serverUrlPrefix: 'https://affine.fail', editorFlags, appVersion: packageJson.version, @@ -138,11 +135,6 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig { : buildFlags.mode === 'development' ? true : currentBuildPreset.enablePageHistory, - enableJournal: process.env.ENABLE_JOURNAL - ? process.env.ENABLE_JOURNAL === 'true' - : buildFlags.mode === 'development' - ? true - : currentBuildPreset.enableJournal, }; if (buildFlags.mode === 'development') { diff --git a/packages/frontend/core/src/components/root-app-sidebar/index.tsx b/packages/frontend/core/src/components/root-app-sidebar/index.tsx index 50cc075932..3e888fe866 100644 --- a/packages/frontend/core/src/components/root-app-sidebar/index.tsx +++ b/packages/frontend/core/src/components/root-app-sidebar/index.tsx @@ -255,11 +255,9 @@ export const RootAppSidebar = ({ {t['com.affine.workspaceSubPath.all']()} - {runtimeConfig.enableJournal ? ( - - ) : null} + {runtimeConfig.enableNewSettingModal ? (