move variable(notificationVolume) to SystemSettingsState

Ruizhe Pang · Ruizhe Pang · commit 99a10e7052e3 · 2025-04-23T00:46:18.000+08:00
diff --git a/src/renderer/__mocks__/state-mocks.ts b/src/renderer/__mocks__/state-mocks.ts
@@ -93,7 +93,6 @@ const mockNotificationSettings: NotificationSettingsState = {
   markAsDoneOnOpen: false,
   markAsDoneOnUnsubscribe: false,
   delayNotificationState: false,
-  notificationVolume: 20,
 };
 
 const mockSystemSettings: SystemSettingsState = {
@@ -104,6 +103,7 @@ const mockSystemSettings: SystemSettingsState = {
   playSound: true,
   useAlternateIdleIcon: false,
   openAtStartup: false,
+  notificationVolume: 20,
 };
 
 const mockFilters: FilterSettingsState = {
diff --git a/src/renderer/context/App.tsx b/src/renderer/context/App.tsx
@@ -85,7 +85,6 @@ const defaultNotificationSettings: NotificationSettingsState = {
   markAsDoneOnOpen: false,
   markAsDoneOnUnsubscribe: false,
   delayNotificationState: false,
-  notificationVolume: 20,
 };
 
 const defaultSystemSettings: SystemSettingsState = {
@@ -96,6 +95,7 @@ const defaultSystemSettings: SystemSettingsState = {
   playSound: true,
   useAlternateIdleIcon: false,
   openAtStartup: false,
+  notificationVolume: 20,
 };
 
 export const defaultFilters: FilterSettingsState = {
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
diff --git a/src/renderer/types.ts b/src/renderer/types.ts
@@ -81,7 +81,6 @@ export interface NotificationSettingsState {
   markAsDoneOnOpen: boolean;
   markAsDoneOnUnsubscribe: boolean;
   delayNotificationState: boolean;
-  notificationVolume: number;
 }
 
 export interface SystemSettingsState {
@@ -92,6 +91,7 @@ export interface SystemSettingsState {
   useAlternateIdleIcon: boolean;
   playSound: boolean;
   openAtStartup: boolean;
+  notificationVolume: number;
 }
 
 export interface FilterSettingsState {

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,6 @@ export interface NotificationSettingsState {`
`81`	`81`	`markAsDoneOnOpen: boolean;`
`82`	`82`	`markAsDoneOnUnsubscribe: boolean;`
`83`	`83`	`delayNotificationState: boolean;`
`84`		`- notificationVolume: number;`
`85`	`84`	`}`
`86`	`85`
`87`	`86`	`export interface SystemSettingsState {`
`@@ -92,6 +91,7 @@ export interface SystemSettingsState {`
`92`	`91`	`useAlternateIdleIcon: boolean;`
`93`	`92`	`playSound: boolean;`
`94`	`93`	`openAtStartup: boolean;`
	`94`	`+ notificationVolume: number;`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`export interface FilterSettingsState {`