diff --git a/src/pages/Settings/Settings.tsx b/src/pages/Settings/Settings.tsx index c79aaa3..5e9ef5d 100644 --- a/src/pages/Settings/Settings.tsx +++ b/src/pages/Settings/Settings.tsx @@ -5,10 +5,9 @@ import AppLockSettings from '../../components/settings/AppLockSettings'; import { CapsuleSelector } from '../../components/common/CapsuleSelector/CapsuleSelector'; import { CustomSelect } from '../../components/common/CustomSelect/CustomSelect'; import { getSupportedCurrencies } from '../../services/exchangeRateService'; -import { getSupportedCurrencies } from '../../services/exchangeRateService'; -import { getSettings, updateSettings, updateDefaultAccounts } from '../../services/settingsService'; +import { updateSettings, updateDefaultAccounts, getSettingsWithDefaults } from '../../services/settingsService'; import { getAccounts } from '../../services/accountService'; -import type { UserSettings, Account } from '../../types'; +import type { UserSettings, UserSettingsWithDefaults, Account } from '../../types'; import { Icon } from '@iconify/react'; import { ThemePicker } from '../../components/settings/ThemePicker/ThemePicker'; import './Settings.css'; @@ -39,7 +38,7 @@ function Settings() { dateFormat: localStorage.getItem('dateFormat') || 'YYYY-MM-DD', firstDayOfWeek: parseInt(localStorage.getItem('firstDayOfWeek') || '1'), }); - const [userSettings, setUserSettings] = useState(null); + const [userSettings, setUserSettings] = useState(null); const [accounts, setAccounts] = useState([]); const [saveMessage, setSaveMessage] = useState(''); @@ -55,7 +54,7 @@ function Settings() { const loadUserSettings = async () => { try { - const data = await getSettings(); + const data = await getSettingsWithDefaults(); setUserSettings(data); } catch (err) { console.error('Failed to load user settings:', err);