diff --git a/packages/hoppscotch-app/pages/settings.vue b/packages/hoppscotch-app/pages/settings.vue index 623f1d458..f5da4c924 100644 --- a/packages/hoppscotch-app/pages/settings.vue +++ b/packages/hoppscotch-app/pages/settings.vue @@ -155,7 +155,7 @@
{{ t("settings.extensions_use_toggle") }} @@ -184,7 +184,7 @@
{{ t("settings.proxy_use_toggle") }} @@ -311,17 +311,21 @@ watch( ) // Extensions and proxy should not be enabled at the same time -watch( - [EXTENSIONS_ENABLED, PROXY_ENABLED], - ([extEnabled, proxEnabled], [oldExtEnabled]) => { - // Detect which changed over the watch - const changedKey = extEnabled === oldExtEnabled ? "extension" : "proxy" +const toggleInterceptor = (interceptor: "extension" | "proxy") => { + if (interceptor === "extension") { + EXTENSIONS_ENABLED.value = !EXTENSIONS_ENABLED.value - if (changedKey === "extension") { - if (proxEnabled) PROXY_ENABLED.value = false - } else if (extEnabled) EXTENSIONS_ENABLED.value = false + if (EXTENSIONS_ENABLED.value) { + PROXY_ENABLED.value = false + } + } else { + PROXY_ENABLED.value = !PROXY_ENABLED.value + + if (PROXY_ENABLED.value) { + EXTENSIONS_ENABLED.value = false + } } -) +} const showConfirmModal = () => { if (TELEMETRY_ENABLED.value) confirmRemove.value = true