fixed: network display issue

DnsChanger · Sep 26, 2023 · 06f1ab4 · 06f1ab4
1 parent e2488f8
commit 06f1ab4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/renderer/component/cards/server-info/index.tsx b/src/renderer/component/cards/server-info/index.tsx
@@ -185,13 +185,7 @@ export function ServerInfoCardComponent(prop: Prop) {
                 variant="ghost"
                 color={isConnect ? "green" : "red"}
                 size="sm"
-                value={
-                  network == "Auto"
-                    ? isConnect
-                      ? "Connected"
-                      : "Disconnect"
-                    : network
-                }
+                value={network}
                 className={`font-[0px]  ${
                   isConnect ? "text-[#42A752]" : "text-[#B43D3D]"
                 }`}

diff --git a/src/renderer/pages/home.page.tsx b/src/renderer/pages/home.page.tsx
@@ -27,13 +27,15 @@ export function HomePage() {
 
   useEffect(() => {
     async function getCurrentActive() {
+      if (!network) {
+        setNetwork(window.storePreload.get("settings").network_interface);
+        return;
+      }
       try {
         setSelectedServer(null);
         const response = await window.ipc.getCurrentActive();
         setCurrentActive(response.server);
         setSelectedServer(response.server);
-        if (!network)
-          setNetwork(window.storePreload.get("settings").network_interface);
       } finally {
         setLoadingCurrentActive(false);
       }
@@ -88,8 +90,10 @@ export function HomePage() {
                   "absolute top-[330px] left-[360px] flex flex-col gap-2 h-10"
                 }
               >
-                <DeleteButtonComponent />
-                {/*<EditButtonComponent />*/}
+                <div className={"flx flex-row gap-10"}>
+                  <DeleteButtonComponent />
+                  {/*<EditButtonComponent />*/}
+                </div>
               </div>
             </div>
           </div>