From 2af0af0837af8ebe39a62bdbf4b2572f9c8ab407 Mon Sep 17 00:00:00 2001
From: Tunglies <77394545+Tunglies@users.noreply.github.com>
Date: Tue, 28 Oct 2025 14:29:47 +0800
Subject: [PATCH] refactor(tray): comment out enable_tray_icon references for
 future removal #5161

Since network speed display in Tray on menu has been removed
---
 src-tauri/src/config/verge.rs                 | 11 +++++------
 src-tauri/src/feat/config.rs                  |  4 ++--
 src/components/setting/mods/layout-viewer.tsx |  4 ++--
 src/services/types.d.ts                       |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src-tauri/src/config/verge.rs b/src-tauri/src/config/verge.rs
index 3207b57c..bfa45816 100644
--- a/src-tauri/src/config/verge.rs
+++ b/src-tauri/src/config/verge.rs
@@ -203,8 +203,7 @@ pub struct IVerge {
 
     pub enable_tray_speed: Option<bool>,
 
-    pub enable_tray_icon: Option<bool>,
-
+    // pub enable_tray_icon: Option<bool>,
     /// show proxy groups directly on tray root menu
     pub tray_inline_proxy_groups: Option<bool>,
 
@@ -419,7 +418,7 @@ impl IVerge {
             webdav_username: None,
             webdav_password: None,
             enable_tray_speed: Some(false),
-            enable_tray_icon: Some(true),
+            // enable_tray_icon: Some(true),
             tray_inline_proxy_groups: Some(false),
             enable_global_hotkey: Some(true),
             enable_auto_light_weight_mode: Some(false),
@@ -515,7 +514,7 @@ impl IVerge {
         patch!(webdav_username);
         patch!(webdav_password);
         patch!(enable_tray_speed);
-        patch!(enable_tray_icon);
+        // patch!(enable_tray_icon);
         patch!(tray_inline_proxy_groups);
         patch!(enable_auto_light_weight_mode);
         patch!(auto_light_weight_minutes);
@@ -609,7 +608,7 @@ pub struct IVergeResponse {
     pub webdav_username: Option<String>,
     pub webdav_password: Option<String>,
     pub enable_tray_speed: Option<bool>,
-    pub enable_tray_icon: Option<bool>,
+    // pub enable_tray_icon: Option<bool>,
     pub tray_inline_proxy_groups: Option<bool>,
     pub enable_auto_light_weight_mode: Option<bool>,
     pub auto_light_weight_minutes: Option<u64>,
@@ -686,7 +685,7 @@ impl From<IVerge> for IVergeResponse {
             webdav_username: verge.webdav_username,
             webdav_password: verge.webdav_password,
             enable_tray_speed: verge.enable_tray_speed,
-            enable_tray_icon: verge.enable_tray_icon,
+            // enable_tray_icon: verge.enable_tray_icon,
             tray_inline_proxy_groups: verge.tray_inline_proxy_groups,
             enable_auto_light_weight_mode: verge.enable_auto_light_weight_mode,
             auto_light_weight_minutes: verge.auto_light_weight_minutes,
diff --git a/src-tauri/src/feat/config.rs b/src-tauri/src/feat/config.rs
index 797bd601..d2f90f13 100644
--- a/src-tauri/src/feat/config.rs
+++ b/src-tauri/src/feat/config.rs
@@ -94,7 +94,7 @@ fn determine_update_flags(patch: &IVerge) -> i32 {
     let http_enabled = patch.verge_http_enabled;
     let http_port = patch.verge_port;
     let enable_tray_speed = patch.enable_tray_speed;
-    let enable_tray_icon = patch.enable_tray_icon;
+    // let enable_tray_icon = patch.enable_tray_icon;
     let enable_global_hotkey = patch.enable_global_hotkey;
     let tray_event = &patch.tray_event;
     let home_cards = patch.home_cards.clone();
@@ -149,7 +149,7 @@ fn determine_update_flags(patch: &IVerge) -> i32 {
         || tun_tray_icon.is_some()
         || tray_icon.is_some()
         || enable_tray_speed.is_some()
-        || enable_tray_icon.is_some()
+    // || enable_tray_icon.is_some()
     {
         update_flags |= UpdateFlags::SystrayIcon as i32;
     }
diff --git a/src/components/setting/mods/layout-viewer.tsx b/src/components/setting/mods/layout-viewer.tsx
index 0c9d2c5a..d300822a 100644
--- a/src/components/setting/mods/layout-viewer.tsx
+++ b/src/components/setting/mods/layout-viewer.tsx
@@ -307,7 +307,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
             </GuardState>
           </Item>
         )} */}
-        {OS === "macos" && (
+        {/* {OS === "macos" && (
           <Item>
             <ListItemText primary={t("Enable Tray Icon")} />
             <GuardState
@@ -326,7 +326,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
               <Switch edge="end" />
             </GuardState>
           </Item>
-        )}
+        )} */}
         <Item>
           <ListItemText primary={t("Show Proxy Groups Inline")} />
           <GuardState
diff --git a/src/services/types.d.ts b/src/services/types.d.ts
index 310723a9..fcac1137 100644
--- a/src/services/types.d.ts
+++ b/src/services/types.d.ts
@@ -803,7 +803,7 @@ interface IVergeConfig {
   sysproxy_tray_icon?: boolean;
   tun_tray_icon?: boolean;
   enable_tray_speed?: boolean;
-  enable_tray_icon?: boolean;
+  // enable_tray_icon?: boolean;
   tray_inline_proxy_groups?: boolean;
   enable_tun_mode?: boolean;
   enable_auto_light_weight_mode?: boolean;