diff --git a/src/frontend/src/components/settings/SelfSettingsModal.tsx b/src/frontend/src/components/settings/SelfSettingsModal.tsx index c7ec09aa..138546b9 100644 --- a/src/frontend/src/components/settings/SelfSettingsModal.tsx +++ b/src/frontend/src/components/settings/SelfSettingsModal.tsx @@ -21,7 +21,6 @@ import { normalizeUserOverrideSections, UserOverridesSections, } from './users'; -import type { PerUserSettings } from './users/types'; import { UserAccountCardContent, UserEditActions, UserIdentityHeader } from './users/UserCard'; import { useUserOverridesState } from './users/useUserOverridesState'; @@ -153,7 +152,7 @@ const SelfSettingsModalSession = ({ normalizeUserOverrideSections(context.visibleUserSettingsSections, 'self'), ); applyUserOverridesContext({ - settings: (context.user.settings || {}) as PerUserSettings, + settings: context.user.settings || {}, userOverridableKeys: context.userOverridableKeys || [], }); setEditPassword(''); diff --git a/src/frontend/src/hooks/useUsersFetch.ts b/src/frontend/src/hooks/useUsersFetch.ts index 269c67dd..743fcaf0 100644 --- a/src/frontend/src/hooks/useUsersFetch.ts +++ b/src/frontend/src/hooks/useUsersFetch.ts @@ -146,7 +146,7 @@ export const useUsersFetch = ({ onShowToast }: UseUsersFetchParams) => { if (fullUser.settings) { userSettings = { ...fullUser.settings, - } as PerUserSettings; + }; } const userOverridableSettings = new Set(); @@ -162,7 +162,7 @@ export const useUsersFetch = ({ onShowToast }: UseUsersFetchParams) => { userSettings = { ...userSettings, ...deliveryResult.value.userOverrides, - } as PerUserSettings; + }; } deliveryResult.value.keys.forEach((key) => userOverridableSettings.add(key)); } @@ -173,7 +173,7 @@ export const useUsersFetch = ({ onShowToast }: UseUsersFetchParams) => { userSettings = { ...userSettings, ...searchResult.value.userOverrides, - } as PerUserSettings; + }; } searchResult.value.keys.forEach((key) => userOverridableSettings.add(key)); } @@ -184,7 +184,7 @@ export const useUsersFetch = ({ onShowToast }: UseUsersFetchParams) => { userSettings = { ...userSettings, ...notificationResult.value.userOverrides, - } as PerUserSettings; + }; } notificationResult.value.keys.forEach((key) => userOverridableSettings.add(key)); }