From bc3b21ebd69ad7d4f9f0cdd606d635fc9aefad3a Mon Sep 17 00:00:00 2001
From: 12975 <1297598740@qq.com>
Date: Thu, 29 Jan 2026 23:03:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=9E=E7=8E=B0=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=8C=85=E5=90=AB?=
 =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=81=8F=E5=A5=BD=E3=80=81=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E3=80=81=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86=E5=8F=8A=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E8=B4=A6=E6=88=B7=E9=85=8D=E7=BD=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Settings/Settings.tsx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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<UserSettings | null>(null);
+  const [userSettings, setUserSettings] = useState<UserSettingsWithDefaults | null>(null);
   const [accounts, setAccounts] = useState<Account[]>([]);
   const [saveMessage, setSaveMessage] = useState<string>('');
 
@@ -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);