refactor

commafeed-client/src/app/user/slice.ts

@@ -151,10 +151,7 @@ export const userSlice = createSlice({
         })
         builder.addCase(changeNotificationSettings.pending, (state, action) => {
             if (!state.settings) return
-            state.settings.notificationSettings = {
-                ...state.settings.notificationSettings,
-                ...action.meta.arg,
-            }
+            state.settings.pushNotificationSettings = action.meta.arg
         })
 
         builder.addMatcher(

commafeed-client/src/app/user/thunks.ts

@@ -1,7 +1,7 @@
 import { createAppAsyncThunk } from "@/app/async-thunk"
 import { client } from "@/app/client"
 import { reloadEntries } from "@/app/entries/thunks"
-import type { IconDisplayMode, NotificationSettings, ReadingMode, ReadingOrder, ScrollMode, SharingSettings } from "@/app/types"
+import type { IconDisplayMode, PushNotificationSettings, ReadingMode, ReadingOrder, ScrollMode, SharingSettings } from "@/app/types"
 
 export const reloadSettings = createAppAsyncThunk("settings/reload", async () => await client.user.getSettings().then(r => r.data))
 
@@ -160,15 +160,12 @@ export const changeSharingSetting = createAppAsyncThunk(
 
 export const changeNotificationSettings = createAppAsyncThunk(
     "settings/notificationSettings",
-    (notificationUpdate: Partial<NotificationSettings>, thunkApi) => {
+    (pushNotificationSettings: PushNotificationSettings, thunkApi) => {
         const { settings } = thunkApi.getState().user
         if (!settings) return
         client.user.saveSettings({
             ...settings,
-            notificationSettings: {
-                ...settings.notificationSettings,
-                ...notificationUpdate,
-            },
+            pushNotificationSettings,
         })
     }
 )