From 8bad2c211389b5b091a2e86cb033694dfd2b7933 Mon Sep 17 00:00:00 2001
From: GyDi <zzzgydi@gmail.com>
Date: Thu, 15 Dec 2022 21:54:48 +0800
Subject: [PATCH] fix: adjust code

---
 src/pages/profiles.tsx | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/pages/profiles.tsx b/src/pages/profiles.tsx
index ff4ab8b..0ccbd89 100644
--- a/src/pages/profiles.tsx
+++ b/src/pages/profiles.tsx
@@ -83,27 +83,20 @@ const ProfilePage = () => {
 
       let hasChange = false;
 
+      const newSelected: typeof selected = [];
       const { global, groups } = proxiesData;
-      [global, ...groups].forEach((group) => {
-        const { type, name, now } = group;
 
-        if (type !== "Selector" && type !== "Fallback") return;
-        if (!now || selectedMap[name] === now) return;
-        if (selectedMap[name] == null) {
-          selectedMap[name] = now!;
-        } else {
+      [global, ...groups].forEach(({ type, name, now }) => {
+        if (!now || (type !== "Selector" && type !== "Fallback")) return;
+        if (selectedMap[name] != null && selectedMap[name] !== now) {
           hasChange = true;
           updateProxy(name, selectedMap[name]);
         }
+        newSelected.push({ name, now });
       });
 
       // update profile selected list
-      profile.selected = Object.entries(selectedMap).map(([name, now]) => ({
-        name,
-        now,
-      }));
-
-      patchProfile(current!, { selected: profile.selected });
+      patchProfile(current!, { selected: newSelected });
       // update proxies cache
       if (hasChange) mutate("getProxies", getProxies());
     }, 100);
@@ -122,11 +115,9 @@ const ProfilePage = () => {
         mutate("getProfiles", newProfiles);
 
         const remoteItem = newProfiles.items?.find((e) => e.type === "remote");
-
         if (!newProfiles.current && remoteItem) {
           const current = remoteItem.uid;
           patchProfiles({ current });
-          mutateProfiles();
           mutateLogs();
         }
       });