From d29f249bc6beacfdfc1bfa6daaeea22b0bcce756 Mon Sep 17 00:00:00 2001 From: Oleg Isonen Date: Fri, 8 Jul 2022 11:46:56 +0200 Subject: [PATCH] upgrade from feature flag branch --- apps/designer/app/designer/features/topbar/menu/menu.tsx | 5 +++-- .../designer/app/designer/shared/client-settings/settings.ts | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/designer/app/designer/features/topbar/menu/menu.tsx b/apps/designer/app/designer/features/topbar/menu/menu.tsx index 68659e753f..05b14970f7 100644 --- a/apps/designer/app/designer/features/topbar/menu/menu.tsx +++ b/apps/designer/app/designer/features/topbar/menu/menu.tsx @@ -19,7 +19,7 @@ import { useIsShareDialogOpen, useIsPublishDialogOpen, } from "~/designer/shared/nano-states"; -import { feature } from "~/shared/feature-flags"; +import { isFeatureEnabled } from "~/shared/feature-flags"; import { getSetting } from "~/designer/shared/client-settings"; const menuItemCss = { @@ -36,7 +36,7 @@ const textCss = { }; const ThemeMenuItem = () => { - if (feature("theme") === false) return null; + if (isFeatureEnabled("theme") === false) return null; const currentTheme = getSetting("theme"); @@ -55,6 +55,7 @@ const ThemeMenuItem = () => { dark: "Dark", system: "System theme", } as const; + const themes = Object.keys(labels) as Array; return ( diff --git a/apps/designer/app/designer/shared/client-settings/settings.ts b/apps/designer/app/designer/shared/client-settings/settings.ts index 049fb4f349..3b0c57d6b0 100644 --- a/apps/designer/app/designer/shared/client-settings/settings.ts +++ b/apps/designer/app/designer/shared/client-settings/settings.ts @@ -39,7 +39,7 @@ export const setSetting = (name: Name, value: Value) => { if (isValidValue) write({ ...settings, [name]: value }); }; -export const useSubscribeClientSetting = (name: Name) => { +export const useSubscribeClientSetting = () => { useSubscribe<"setClientSetting", { name: Name; value: Value }>( "setClientSetting", (payload) => {