Re-order imports

src/components/Location.vue

@@ -91,34 +91,23 @@ const selectLocation = (connection: HistoryEntry) => {
           </n-button>
         </template>
         <n-collapse arrow-placement="right">
-          <n-collapse-item
-            v-for="{ city, proxyList } in cities"
-            :key="city"
-            :name="city"
-            :title="city"
-          >
+          <n-collapse-item v-for="{ city, proxyList } in cities" :key="city" :name="city" :title="city">
             <template #header>
               <n-button quaternary @click.prevent="clickCountryOrCity(country, city)">
                 {{ city }}
               </n-button>
             </template>
             <n-space vertical>
-              <n-button
-                v-for="proxy in proxyList"
-                :key="proxy.hostname"
-                secondary
-                medium
-                @click="
-                  clickServer(
-                    country,
-                    proxy.location.countryCode,
-                    city,
-                    proxy.hostname,
-                    proxy.ipv4_address,
-                    proxy.port,
-                  )
-                "
-              >
+              <n-button v-for="proxy in proxyList" :key="proxy.hostname" secondary medium @click="
+      clickServer(
+        country,
+        proxy.location.countryCode,
+        city,
+        proxy.hostname,
+        proxy.ipv4_address,
+        proxy.port,
+      )
+      ">
                 {{ proxy.hostname }}
               </n-button>
             </n-space>

src/components/NotificationsCarousel.vue

@@ -2,14 +2,14 @@
 import { computed } from 'vue';
 import { NCard, NCarousel, NIcon, NImage } from 'naive-ui';
 
-import { closePopup } from '@/helpers/closePopup';
-
 import Button from '@/components/Buttons/Button.vue';
 import ExternalLinkIconLabel from '@/components/ExternalLinkIconLabel.vue';
 import IconLabel from '@/components/IconLabel.vue';
 import FeArrowLeft from '@/components/Icons/FeArrowLeft.vue';
 import FeArrowRight from '@/components/Icons/FeArrowRight.vue';
 
+import { closePopup } from '@/helpers/closePopup';
+
 import useRecommendations from '@/composables/useRecommendations/useRecommendations';
 import useWarnings from '@/composables/useWarnings/useWarnings';
 

src/components/PrivacyRecommendations/PrivacyRecommendation.vue

@@ -2,14 +2,14 @@
 import { computed, toRefs, watchEffect } from 'vue';
 import { NAvatar, NCard } from 'naive-ui';
 
-import { closePopup } from '@/helpers/closePopup';
-
 import Button from '@/components/Buttons/Button.vue';
 import IconLabel from '@/components/IconLabel.vue';
 import Instructions from '@/components/PrivacyRecommendations/Instructions.vue';
 import RecommendationIconWithTooltip from '@/components/RecommendationIconWithTooltip.vue';
 import SplitButton from '@/components/Buttons/SplitButton.vue';
 
+import { closePopup } from '@/helpers/closePopup';
+
 import type { Recommendation } from '@/composables/useRecommendations/Recommendation.types';
 import ExternalLinkIconLabel from '@/components/ExternalLinkIconLabel.vue';
 import useConnection from '@/composables/useConnection';

src/composables/useStore.ts

@@ -1,10 +1,11 @@
 import { Ref } from 'vue';
 
-import { ProxyDetails, ProxyInfoMap, ProxyInfo, ProxyDetailsMap } from '@/helpers/socksProxy.types';
-import useBrowserStorageLocal from '@/composables/useBrowserStorageLocal';
 import type { HistoryEntriesMap } from './useProxyHistory/HistoryEntries.types';
 import { Country } from './useListProxies';
 
+import { ProxyDetails, ProxyInfoMap, ProxyInfo, ProxyDetailsMap } from '@/helpers/socksProxy.types';
+import useBrowserStorageLocal from '@/composables/useBrowserStorageLocal';
+
 export type Store = {
   excludedHosts: Ref<string[]>;
   hostProxies: Ref<ProxyInfoMap>;

src/helpers/browserAction.ts

@@ -1,5 +1,5 @@
-import { getActiveProxyDetails } from '@/helpers/socksProxy';
 import { ProxyDetails } from './socksProxy.types';
+import { getActiveProxyDetails } from '@/helpers/socksProxy';
 
 export const initBrowserAction = () => {
   // Each time a tab is updated, reset the browserAction for that tab

src/helpers/connCheck.ts

@@ -11,6 +11,7 @@ n is an optional parameter to retry the connCheck any number of time.
 By default, it will retry twice because after connecting/disconnecting to/from Mullvad server, the first request results in a NetworkError and the second is successful.
 
 It's a workaround for the following bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1706377
+Workaround can be removed when Mullvad Browser 14.0 is released (the bug is fixed!).
 */
 
 export const connCheck = async (n = 3): Promise<Connection> => {

src/popup/views/License.vue

@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import { NCard } from 'naive-ui';
-
 import { closePopup } from '@/helpers/closePopup';
 </script>