YasinOnm08/interstellar_ai
0
0
Fork 0
forked from React-Group/interstellar_ai
Code Pull requests Activity

Merge pull request 'Fixed some stuff' (#93) from sageTheDm/interstellar_ai:main into main

Browse source 
Reviewed-on: https://interstellardevelopment.org/code/code/React-Group/interstellar_ai/pulls/93
This commit is contained in:
Patrick 2024-10-03 11:38:48 +02:00
commit 9100b0c0f4
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/components/settings/Settings.tsx
View file

@ -159,18 +159,14 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (
fontFamily, fontFamily,
fontSize, fontSize,
selectedTheme, selectedTheme,
faqSettings: { faqBackgroundColor,
faqBackgroundColor, faqHeadingColor,
faqHeadingColor, faqItemBackgroundColor,
faqItemBackgroundColor, faqItemHeadingColor,
faqItemHeadingColor, faqItemTextColor,
faqItemTextColor, faqItemHoverBackgroundColor,
faqItemHoverBackgroundColor, popupBackgroundColor,
}, overlayTextColor,
popupSettings: {
popupBackgroundColor,
overlayTextColor,
},
primaryColor, primaryColor,
secondaryColor, secondaryColor,
accentColor, accentColor,
@ -317,8 +313,6 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (
const flattenedSettings = { const flattenedSettings = {
...settings.userPreferences, ...settings.userPreferences,
...settings.theme, ...settings.theme,
...settings.theme.faqSettings,
...settings.theme.popupSettings,
...settings.apiKeys, ...settings.apiKeys,
...settings.generalSettings, ...settings.generalSettings,
}; };
@ -329,8 +323,6 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (
}, [ }, [
...Object.values(settings.userPreferences), ...Object.values(settings.userPreferences),
...Object.values(settings.theme), ...Object.values(settings.theme),
...Object.values(settings.theme.faqSettings),
...Object.values(settings.theme.popupSettings),
...Object.values(settings.apiKeys), ...Object.values(settings.apiKeys),
...Object.values(settings.generalSettings), ...Object.values(settings.generalSettings),
]); ]);