From 207f2e1689344249be6d6975663bac96a808410d Mon Sep 17 00:00:00 2001 From: beyondkmp Date: Tue, 12 Aug 2025 11:21:47 +0800 Subject: [PATCH] refactor(proxy): update proxy handling logic in useAppInit and GeneralSettings (#9081) - Simplified proxy setting logic by removing unnecessary dispatches for 'system' and 'none' modes. - Updated useAppInit to set proxy to undefined for 'system' mode and clarified direct mode handling with comments. --- src/renderer/src/hooks/useAppInit.ts | 5 +++-- src/renderer/src/pages/settings/GeneralSettings.tsx | 6 ------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/renderer/src/hooks/useAppInit.ts b/src/renderer/src/hooks/useAppInit.ts index a48696f3e7..548aca25f4 100644 --- a/src/renderer/src/hooks/useAppInit.ts +++ b/src/renderer/src/hooks/useAppInit.ts @@ -86,11 +86,12 @@ export function useAppInit() { useEffect(() => { if (proxyMode === 'system') { - window.api.setProxy('system', proxyBypassRules) + window.api.setProxy('system', undefined) } else if (proxyMode === 'custom') { proxyUrl && window.api.setProxy(proxyUrl, proxyBypassRules) } else { - window.api.setProxy('') + // set proxy to none for direct mode + window.api.setProxy('', undefined) } }, [proxyUrl, proxyMode, proxyBypassRules]) diff --git a/src/renderer/src/pages/settings/GeneralSettings.tsx b/src/renderer/src/pages/settings/GeneralSettings.tsx index ba0b636c49..d7c5510359 100644 --- a/src/renderer/src/pages/settings/GeneralSettings.tsx +++ b/src/renderer/src/pages/settings/GeneralSettings.tsx @@ -113,12 +113,6 @@ const GeneralSettings: FC = () => { const onProxyModeChange = (mode: 'system' | 'custom' | 'none') => { dispatch(setProxyMode(mode)) - if (mode === 'system') { - dispatch(_setProxyUrl(undefined)) - } else if (mode === 'none') { - dispatch(_setProxyUrl(undefined)) - dispatch(_setProxyBypassRules(undefined)) - } } const languagesOptions: { value: LanguageVarious; label: string; flag: string }[] = [