From 04b43303933088cbc162c93b3a64dbef38288501 Mon Sep 17 00:00:00 2001
From: Zoltan Papp <zoltan.pmail@gmail.com>
Date: Tue, 12 May 2026 20:01:35 +0200
Subject: [PATCH] [client/ui] Add coloured status dot to tray menu

Show a small dot next to the first menu entry that reflects the
daemon state: green for Connected, yellow for Connecting, blue for
NeedsLogin/SessionExpired, red for LoginFailed/Error, grey for
Idle/Disconnected and dark grey for DaemonUnavailable. PNGs are 24x24
with a pHYs chunk declaring 144 DPI so NSImage renders them at 12 pt
while keeping retina-sharp pixel data; circles are supersampled 8x for
smooth edges.

Idle now surfaces as "Disconnected" in the menu label, daemon-status
literals moved to status* constants, and Exit Node / Resources are
gated on the Connected state instead of just daemon availability.
---
 .../ui/assets/netbird-menu-dot-connected.png  | Bin 0 -> 452 bytes
 .../ui/assets/netbird-menu-dot-connecting.png | Bin 0 -> 452 bytes
 client/ui/assets/netbird-menu-dot-error.png   | Bin 0 -> 433 bytes
 client/ui/assets/netbird-menu-dot-idle.png    | Bin 0 -> 483 bytes
 client/ui/assets/netbird-menu-dot-login.png   | Bin 0 -> 475 bytes
 client/ui/assets/netbird-menu-dot-offline.png | Bin 0 -> 456 bytes
 client/ui/icons.go                            |  22 +++++
 client/ui/tray.go                             |  93 +++++++++++++-----
 8 files changed, 88 insertions(+), 27 deletions(-)
 create mode 100644 client/ui/assets/netbird-menu-dot-connected.png
 create mode 100644 client/ui/assets/netbird-menu-dot-connecting.png
 create mode 100644 client/ui/assets/netbird-menu-dot-error.png
 create mode 100644 client/ui/assets/netbird-menu-dot-idle.png
 create mode 100644 client/ui/assets/netbird-menu-dot-login.png
 create mode 100644 client/ui/assets/netbird-menu-dot-offline.png

diff --git a/client/ui/assets/netbird-menu-dot-connected.png b/client/ui/assets/netbird-menu-dot-connected.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc8ce4d857b68466807de884b622b0d22ec2c6b2
GIT binary patch
literal 452
zcmV;#0XzPQP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000&x
z000&x0ZCFM@Bjb-c1c7*RCt_XVxTc#Ax6<xQ7eOn2iHxWO*$e2;!EY(JZVtSJj4C^
z*abp*8F5Km4SmJaY5%F<s^^^a-_JkGU{k{?$@@fmd&<o6gM1UTSBrfi+JdzYC%Lr!
zc{U%H!PqRSVv$M=me1RRF2{^6&=cwwGD(MV{l8B?1&A>m1pa;b#dq-Q`>4`S0@rt4
zyL%0%4?r$&e0F;~!{2{I#SI2vX8KbvrRs_76L=~Dg*hl#$Tl1V{{CYDnE^5j!vau*
z5*z0D0LToGSuj34h>Y)6Jf?;P4A4kFtK1>W0P_JTom0zj2B<GUX2LB1Wg==B4g)YV
z!4|-BC^Z4hOq!QPU<*KH3$+b~nF)yl1<f<mwg6@(*aA?g2ufPiG8|+UtfYm<0jN}@
zmIcUW!7Tt4xzz9l$PAEK7#4uab5M~BDzL~lotfzm$PDDV0VSD&O2N3kn~`K$!p!ss
uq!+zTpm~KeFjXcxprq2LIRFFz0RR8#A;-(FjPt_)0000<MNUMnLSTZ}Ik>3+

literal 0
HcmV?d00001

diff --git a/client/ui/assets/netbird-menu-dot-connecting.png b/client/ui/assets/netbird-menu-dot-connecting.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f8bc29d816138baefd75c584999ff4d01660e89
GIT binary patch
literal 452
zcmV;#0XzPQP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000&x
z000&x0ZCFM@Bjb-c1c7*RCt_XVxTc#CPopfsJ}tl>;FD$dAa-wUHBb-Y?4s9INRpm
zzi&5R5Yo$tOF}f%p68DJ{Q^19Pw9`I|Chn0MoyCP$)oLjGgS^MPI$fg;1{AT=zeJ7
z((>oVd|U=&v#5qeBe7Ke#2$hc+zZtW5ifeQ{Lfzo7GeyC0TyP4KQH^_B9&HOUW3yD
zkjt~4UEfZs;mDRulhX7=_6a-{fx;XVEaVyv0wBF0GeBlxSOAJpV#6FC0GR<Y3&w{B
z5&vC*$JDTZ0UGHal|RTbz<dBo=hQNs0qP5onQ#k|A6z$~mf<h}GZSn<<)rUab3F{e
z%%pi)1h$|(kMjw&4ThNswqUM;<{4^R05g+5$rJ=Yr6M&9M>h*@0jS6Y*-WY7ATvN_
zVORhv&p|~lsK6rEaFAY*8OU`5&5LV{d;n4aDso8)E|6M~9(2R8`Tz!KT4kaGP{9Q%
uTVUBAl!-v;{P*jP7l_eMQve760RR7Xh`~Y9fk(0c0000<MNUMnLSTZXN4R_d

literal 0
HcmV?d00001

diff --git a/client/ui/assets/netbird-menu-dot-error.png b/client/ui/assets/netbird-menu-dot-error.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce5d0e8efc17d814a17ed7a901441033f75dd302
GIT binary patch
literal 433
zcmV;i0Z#sjP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000&x
z000&x0ZCFM@Bjb-V@X6oRCt_XVxTc#Ax6=!tSo~}7Z;PNn>S@Z{5Ey<C)4-rIm0$>
z+66*-8F5LxTD6LY`O%{Sg#!oDAN}|tgH4Sb2gj2K4h}Q_%E?U-3k&-~v<1!o|GRYg
z`p(B?FgA<IHg8U>Wn|n#(1IK1&xc5tl`a4C|36W|2LmjOjDMbXbwz3z8m_@<0m$VA
zZf@I2H5}QJ3A=WABKrhx0VvFs7cII@Y_Q-0py0Y27pDn}6L>NOMJT0)g8;}3kXbN3
z+yYQ)q113}W`QjLrE_Yy9tJ>Wfy{(k0LnzvG8_hAW`Zq%<xpw@n3*&$i@+9u$`)!H
z3^NmK0jS`jwgoUV;TetB$LBG%QW7Y$ecrM~mH{~qK&2uz3`aK$ZULys1=&og;UF_W
zX2JM0FYHi~DM$iT<bo8EV>n1JdYyog4?yKP$Q7gn7f3Bg4|-j|Fkn?CI-sP|r#S!w
b00960)gi!0=-XYW00000NkvXXu0mjfUTLV+

literal 0
HcmV?d00001

diff --git a/client/ui/assets/netbird-menu-dot-idle.png b/client/ui/assets/netbird-menu-dot-idle.png
new file mode 100644
index 0000000000000000000000000000000000000000..79e7bbbf8cf94aaea503fc2ce2162a6b774ddbcf
GIT binary patch
literal 483
zcmV<90UZ8`P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000&x
z000&x0ZCFM@Bjb-l}SWFRCt_XVxTc#Ax4pX>QaLM8!3|&OXkUd_z^KlPc|HRcIM#h
z=nI7OGUAf>KXodP^X@AJx#=<KZ{NI<!KOx7MC{4rnM-Ewb=8@`n4SFvn;K?pg5If<
zT)3=^cB?2z1bqMYl@FIAKytcT%1)1@mE*o}8C<@7Zu>ogKDhlsG~~#(xy%3l{YzBv
z!ClJC{Kv*CIZ{>N^%|T$0J)s!PyBjP4F`e$|Nk>Rxf>AlN67LxvQOYX0EPJmC4=j@
z!kbtCikE<U7c^mU0#Bx(2&L3;5CEA0G7H9s`(XX{qmQX!0Rz+*fu7c~3@{&n(mAyZ
zXMp+wWG37KP$r_5;V=L*6Knx2hf)*3%%pi)1hxQFwouz(n3-S;Km`}IEr6LxpJWOG
zpi+?<hNGJWw*XY+f^4SLaF7`wvoI_Gl^t`|olOLlisTv&(hD*Jxo)6&agC7=Knm9E
zf8a?<aDmi<^q?D#)dCRMIy-L<sK{Nmc2_Mvi$HQ9H6XPhJ=oOXtdo%eC6zwS0U!VX
Z|NpJ2(b<_D`!xUn002ovPDHLkV1i?1(4znV

literal 0
HcmV?d00001

diff --git a/client/ui/assets/netbird-menu-dot-login.png b/client/ui/assets/netbird-menu-dot-login.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ddc8f0aebd93208432aebafbe655cf98491b80c
GIT binary patch
literal 475
zcmV<10VMv3P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000&x
z000&x0ZCFM@Bjb-jY&j7RCt_XVxTc#CPtCfR(XS}Pia0{cQ^W3GnF~SdNZiJ?|=I5
z@v@IE2<c_SCGqNNJx{-RO~J`Fsq~*89?D=-!!98I#JuX+%)*l`6U4L|zYuM~y_fS`
zQdXAF$7L`!i{^xPCMt<1?ICEv=AO49oj-V&|Nr-gg&4!(1~IYxDd+ec>02Va23ed5
z-R0yM4gw%OAiW?nu=)TL<`H|RT_-kJZ~;(ot#HoLgvANm2cQV0)Nl|0nE^5j#)n$~
zN-dNcj?FBv1)y|J4cEf}$SjbVa0_CmhnY~za2SA@3AW(g_A;uu9tL1$(!4AJTcG6G
z^@Q36!^{L*usCzo8ERVqGZSpVG4F>LKpBKuhJ(xknaO}02cS}sS{5Li1-AfH<Wj>I
zATvN_!T2bpDX5@|n;o;AoWhO)TB0sWUE+ycY@;MokOZj61t}!QaFAZ~I)UaD4%UnY
zQV1$??YdZN@x=>B4x|R87MtNXeSi)?1sAAnfn|SCCIY2%SW+BN00;m8|Np)Uz<-L6
R{<#1E002ovPDHLkV1k+L#jgMW

literal 0
HcmV?d00001

diff --git a/client/ui/assets/netbird-menu-dot-offline.png b/client/ui/assets/netbird-menu-dot-offline.png
new file mode 100644
index 0000000000000000000000000000000000000000..7aec5d01da5b9697291400ae9b341a6f3292102e
GIT binary patch
literal 456
zcmV;(0XP1MP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000&x
z000&x0ZCFM@Bjb-dPzh<RCt_XVxTb~$^xtSRR)5}?kQIv|8D?c5E~>$j9x}u60ho4
z@qEgOE0{C2BmMKI4>H))@bU>fNy)C5$v0)u1hK}jFGO1~Y3)OoXP4K{$7L`!i==b|
z6Z3-Q_YkzeExIj4UGmTJfB*im5MwwDFflRxx%r$Wa@W$TH7MffE+@xu5CG``=>?gA
z)d!$3?_+#+o!DT(1wg@7^j}I77AJ5YfFhJq!$AOK2FNTJpBcvB;_g}c>*o(XN-Y3^
ztCxJ#jvUz0&j9lQC{0tt^)LW33zkp77F<6v*MwSz!vM@oumwjB?4X+KVE|?(eaa#m
z2ahMzHW+3m*aA(P<TKQ^0A?oGf@2HAE`Tx!wG0QD1u~NXISxRjBDE|)HVbY6sK}*;
zFF<C1%)+n$RCa)hTu`Y<uHhiPATyBb29#t9D$hYhE;*LKifi;bf#wws){F*H2r6<5
yD?4iO#S2Idqz0rGo8d$QN-BMt13&-(0RR7_8NY-reY}bQ0000<MNUMnLSTZ#ptZjM

literal 0
HcmV?d00001

diff --git a/client/ui/icons.go b/client/ui/icons.go
index 3fe3ea9ef..3e8215b73 100644
--- a/client/ui/icons.go
+++ b/client/ui/icons.go
@@ -58,3 +58,25 @@ var iconUpdateDisconnectedMacOS []byte
 
 //go:embed assets/netbird.png
 var iconWindow []byte
+
+// Small colored dots shown next to the status menu entry. Rendered as
+// regular NSImage/HBITMAP/GTK menu-item icons (not template), so the
+// colours stay intact on every platform.
+
+//go:embed assets/netbird-menu-dot-connected.png
+var iconMenuDotConnected []byte
+
+//go:embed assets/netbird-menu-dot-connecting.png
+var iconMenuDotConnecting []byte
+
+//go:embed assets/netbird-menu-dot-login.png
+var iconMenuDotLogin []byte
+
+//go:embed assets/netbird-menu-dot-error.png
+var iconMenuDotError []byte
+
+//go:embed assets/netbird-menu-dot-idle.png
+var iconMenuDotIdle []byte
+
+//go:embed assets/netbird-menu-dot-offline.png
+var iconMenuDotOffline []byte
diff --git a/client/ui/tray.go b/client/ui/tray.go
index 7fb8b65c1..099f33f23 100644
--- a/client/ui/tray.go
+++ b/client/ui/tray.go
@@ -26,14 +26,14 @@ const (
 	trayTooltip = "NetBird"
 
 	// Top-level menu entries.
-	menuStatusDisconnected     = "Disconnected"
+	menuStatusDisconnected      = "Disconnected"
 	menuStatusDaemonUnavailable = "Not running"
-	menuOpenNetBird            = "Open NetBird"
-	menuConnect            = "Connect"
-	menuDisconnect         = "Disconnect"
-	menuExitNode           = "Exit Node"
-	menuNetworks           = "Networks"
-	menuQuit               = "Quit"
+	menuOpenNetBird             = "Open NetBird"
+	menuConnect                 = "Connect"
+	menuDisconnect              = "Disconnect"
+	menuExitNode                = "Exit Node"
+	menuNetworks                = "Resources"
+	menuQuit                    = "Quit"
 
 	// Settings + diagnostics. The settings page replaces the Fyne tray's
 	// Settings submenu (per-toggle checkboxes for SSH, auto-connect,
@@ -68,11 +68,17 @@ const (
 	notifySessionExpiredBody   = "Your NetBird session has expired. Please log in again."
 
 	// Notification IDs (used to coalesce duplicate toasts).
-	notifyIDUpdatePrefix    = "netbird-update-"
-	notifyIDEvent           = "netbird-event-"
-	notifyIDTrayError       = "netbird-tray-error"
-	notifyIDSessionExpired  = "netbird-session-expired"
+	notifyIDUpdatePrefix   = "netbird-update-"
+	notifyIDEvent          = "netbird-event-"
+	notifyIDTrayError      = "netbird-tray-error"
+	notifyIDSessionExpired = "netbird-session-expired"
 
+	// Daemon status strings mirroring internal.Status* — kept in sync
+	// with client/internal/state.go.
+	statusConnected  = "Connected"
+	statusConnecting = "Connecting"
+	statusIdle       = "Idle"
+	statusError      = "Error"
 	// Daemon status string for an SSO session that has expired and needs
 	// re-authentication. Mirrors internal.StatusSessionExpired.
 	statusSessionExpired = "SessionExpired"
@@ -189,7 +195,8 @@ func (t *Tray) buildMenu() *application.Menu {
 	// up unconditionally rather than swapping items at runtime.
 	t.statusItem = menu.Add(menuStatusDisconnected).
 		OnClick(func(*application.Context) { t.openRoute("/login") }).
-		SetEnabled(false)
+		SetEnabled(false).
+		SetBitmap(iconMenuDotIdle)
 
 	menu.AddSeparator()
 	// The tray icon's left-click handler is intentionally unbound (see
@@ -430,7 +437,7 @@ func (t *Tray) onUpdateProgress(ev *application.CustomEvent) {
 // otherwise spam Shell_NotifyIcon and the log.
 func (t *Tray) applyStatus(st services.Status) {
 	t.mu.Lock()
-	connected := strings.EqualFold(st.Status, "Connected")
+	connected := strings.EqualFold(st.Status, statusConnected)
 	iconChanged := connected != t.connected || st.Status != t.lastStatus
 	// Detect the transition into SessionExpired: the daemon emits the
 	// state on every Status snapshot for as long as the session stays
@@ -463,11 +470,15 @@ func (t *Tray) applyStatus(st services.Status) {
 			// When the daemon socket is unreachable, swap the label to make
 			// the cause obvious; Connect/Disconnect would just fail.
 			label := st.Status
-			if daemonUnavailable {
+			switch {
+			case daemonUnavailable:
 				label = menuStatusDaemonUnavailable
+			case strings.EqualFold(st.Status, statusIdle):
+				label = menuStatusDisconnected
 			}
 			t.statusItem.SetLabel(label)
 			t.statusItem.SetEnabled(needsLogin)
+			t.applyStatusIndicator(st.Status)
 		}
 		if t.upItem != nil {
 			t.upItem.SetHidden(connected || needsLogin || daemonUnavailable)
@@ -477,12 +488,14 @@ func (t *Tray) applyStatus(st services.Status) {
 			t.downItem.SetHidden(!connected)
 			t.downItem.SetEnabled(connected)
 		}
-		// Settings, Networks and Debug Bundle all drive daemon RPCs from
-		// their respective frontend routes — disable them while the daemon
-		// socket is unreachable so the user doesn't land on a page that
-		// would only fail to load.
+		// Exit Node and Resources surface tunnel-routed state, so only
+		// expose them while the tunnel is up. Settings/Debug-Bundle just
+		// need the daemon socket reachable.
+		if t.exitNodeItem != nil {
+			t.exitNodeItem.SetEnabled(connected)
+		}
 		if t.networksItem != nil {
-			t.networksItem.SetEnabled(!daemonUnavailable)
+			t.networksItem.SetEnabled(connected)
 		}
 		if t.settingsItem != nil {
 			t.settingsItem.SetEnabled(!daemonUnavailable)
@@ -519,18 +532,44 @@ func (t *Tray) handleSessionExpired() {
 }
 
 func (t *Tray) rebuildExitNodes(nodes []string) {
-	if t.exitNodeItem == nil {
-		return
-	}
-	if len(nodes) == 0 {
-		t.exitNodeItem.SetEnabled(false)
+	if t.exitNodeItem == nil || len(nodes) == 0 {
 		return
 	}
 	sub := application.NewMenu()
 	for _, fqdn := range nodes {
 		sub.AddCheckbox(fqdn, false)
 	}
-	t.exitNodeItem.SetEnabled(true)
+}
+
+// applyStatusIndicator sets the small coloured dot shown on the status
+// menu entry. The dot mirrors the tray icon's state through a fixed
+// palette: green for Connected, yellow for Connecting, blue for the
+// login states, red for hard errors, grey for the idle/disconnected
+// pair and a darker grey when the daemon socket is unreachable.
+func (t *Tray) applyStatusIndicator(status string) {
+	if t.statusItem == nil {
+		return
+	}
+	t.statusItem.SetBitmap(statusIndicatorBitmap(status))
+}
+
+func statusIndicatorBitmap(status string) []byte {
+	switch {
+	case strings.EqualFold(status, statusConnected):
+		return iconMenuDotConnected
+	case strings.EqualFold(status, statusConnecting):
+		return iconMenuDotConnecting
+	case strings.EqualFold(status, statusNeedsLogin),
+		strings.EqualFold(status, statusSessionExpired):
+		return iconMenuDotLogin
+	case strings.EqualFold(status, statusLoginFailed),
+		strings.EqualFold(status, statusError):
+		return iconMenuDotError
+	case strings.EqualFold(status, services.StatusDaemonUnavailable):
+		return iconMenuDotOffline
+	default:
+		return iconMenuDotIdle
+	}
 }
 
 func (t *Tray) applyIcon() {
@@ -561,8 +600,8 @@ func (t *Tray) iconForState() (icon, dark []byte) {
 	statusLabel := t.lastStatus
 	t.mu.Unlock()
 
-	connecting := strings.EqualFold(statusLabel, "Connecting")
-	errored := strings.EqualFold(statusLabel, "Error") ||
+	connecting := strings.EqualFold(statusLabel, statusConnecting)
+	errored := strings.EqualFold(statusLabel, statusError) ||
 		strings.EqualFold(statusLabel, services.StatusDaemonUnavailable)
 	needsLogin := strings.EqualFold(statusLabel, statusNeedsLogin) ||
 		strings.EqualFold(statusLabel, statusSessionExpired) ||