Fix proxy location selection error

mullvad · Feb 15, 2024 · 972facd · 972facd
1 parent a65564f
commit 972facd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/src/components/Proxy/ProxyGlobal.vue b/src/components/Proxy/ProxyGlobal.vue
@@ -3,20 +3,20 @@ import { computed } from 'vue';
 import { NCard, NSwitch, NTooltip } from 'naive-ui';
 
 import CurrentProxyDetails from '@/components/Proxy/CurrentProxyDetails.vue';
-import ProxyGlobalButton from '@/components/Proxy/ProxyGlobalButton.vue';
+import Button from '@/components/Buttons/Button.vue';
 import TitleCategory from '@/components/TitleCategory.vue';
 
 import useSocksProxy from '@/composables/useSocksProxy';
 import useLocations from '@/composables/useLocations';
 
 const { globalProxyDetails, globalProxyEnabled, toggleGlobalProxy } = useSocksProxy();
-const { hostProxySelect } = useLocations();
+const { hostProxySelect, toggleLocations } = useLocations();
 
 const status = computed(() => (globalProxyEnabled.value ? 'Enabled' : 'Disabled'));
 
-const handleSetGlobalProxy = () => {
+const handleProxySelect = () => {
   hostProxySelect.value = false;
-  toggleGlobalProxy();
+  toggleLocations();
 };
 </script>
 
@@ -26,13 +26,13 @@ const handleSetGlobalProxy = () => {
       <TitleCategory title="Proxy for all websites" />
       <n-tooltip v-if="globalProxyDetails.server">
         <template #trigger>
-          <n-switch :value="globalProxyEnabled" @update-value="handleSetGlobalProxy" />
+          <n-switch :value="globalProxyEnabled" @update-value="toggleGlobalProxy()" />
         </template>
         <span> {{ status }}</span>
       </n-tooltip>
     </div>
 
     <CurrentProxyDetails v-if="globalProxyDetails.server" :proxy-details="globalProxyDetails" />
-    <ProxyGlobalButton> Select location </ProxyGlobalButton>
+    <Button @click="handleProxySelect"> Select location </Button>
   </n-card>
 </template>
diff --git a/src/components/Proxy/ProxyGlobalButton.vue b/src/components/Proxy/ProxyGlobalButton.vue
diff --git a/src/components/Proxy/ProxyHost.vue b/src/components/Proxy/ProxyHost.vue
@@ -29,7 +29,7 @@ const allowProxy = () => {
   excludedHosts.value = excludedHosts.value.filter((excluded) => excluded !== activeTabHost.value);
 };
 
-const handleHostProxySelect = () => {
+const handleProxySelect = () => {
   hostProxySelect.value = true;
   toggleLocations();
 };
@@ -63,7 +63,7 @@ const handleHostProxySelect = () => {
       </Button>
 
       <n-button-group v-else>
-        <Button class="flex items-center justify-center" @click="handleHostProxySelect">
+        <Button class="flex items-center justify-center" @click="handleProxySelect">
           Select location
         </Button>