[PR #6810] [MERGED] [client] Use menu bar wording on macOS welcome screen #27146

Closed
opened 2026-08-05 07:08:16 -04:00 by saavagebueno · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/netbirdio/netbird/pull/6810
Author: @heisbrot
Created: 7/17/2026
Status: Merged
Merged: 7/21/2026
Merged by: @heisbrot

Base: mainHead: net-1411-macos-menu-bar-welcome


📝 Commits (4)

  • 3cb901f [client] Use menu bar wording on macOS welcome screen
  • 3f17d9e Merge branch 'main' into net-1411-macos-menu-bar-welcome
  • 21a7de7 Merge branch 'main' into net-1411-macos-menu-bar-welcome
  • 5f736d7 [client] Add macOS welcome strings to Japanese bundle

📊 Changes

11 files changed (+69 additions, -4 deletions)

View changed files

📝 client/ui/frontend/src/modules/welcome/WelcomeStepTray.tsx (+5 -2)
📝 client/ui/i18n/locales/de/common.json (+6 -0)
📝 client/ui/i18n/locales/en/common.json (+10 -2)
📝 client/ui/i18n/locales/es/common.json (+6 -0)
📝 client/ui/i18n/locales/fr/common.json (+6 -0)
📝 client/ui/i18n/locales/hu/common.json (+6 -0)
📝 client/ui/i18n/locales/it/common.json (+6 -0)
📝 client/ui/i18n/locales/ja/common.json (+6 -0)
📝 client/ui/i18n/locales/pt/common.json (+6 -0)
📝 client/ui/i18n/locales/ru/common.json (+6 -0)
📝 client/ui/i18n/locales/zh-CN/common.json (+6 -0)

📄 Description

Describe your changes

The post-install welcome step said "Look for NetBird in your tray" on every OS, but macOS has no system tray — the icon sits in the menu bar. The tray wording stays correct on Windows and Linux.

  • Add welcome.titleMac and welcome.descriptionMac (following the existing settings.advanced.interfaceName.errorMac key convention) to en and all nine translated bundles (de, es, fr, hu, it, ja, pt, ru, zh-CN), each using that language's Apple term for the menu bar (Menüleiste, barra de menús, barre des menus, menüsor, barra dei menu, メニューバー, barra de menus, строка меню, 菜单栏). The ja bundle landed on main (#6790) after the initial commit and was covered after merging main back in.
  • WelcomeStepTray.tsx picks the key via isMacOS(), which it already uses to choose the per-OS screenshot.

Verified: go test ./client/ui/i18n/..., tsc --noEmit, eslint, and prettier --check all pass; key set and placement verified identical across all ten bundles. Not visually verified in the running app (headless session) — the welcome dialog only shows on first launch.

Fixes NET-1411

Stack

Checklist

  • Is it a bug fix
  • Is a typo/documentation fix
  • Is a feature enhancement
  • It is a refactor
  • Created tests that fail without the change (if possible)
  • This change does not modify the public API, gRPC protocols, functionality behavior, CLI / service flags, or introduce a new feature — OR I have discussed it with the NetBird team beforehand (link the issue / Slack thread in the description). See CONTRIBUTING.md.

By submitting this pull request, you confirm that you have read and agree to the terms of the Contributor License Agreement.

Documentation

Select exactly one:

  • I added/updated documentation for this change
  • Documentation is not needed for this change (UI copy fix only; no behavior, API, or configuration change)

Docs PR URL (required if "docs added" is checked)

🤖 Generated with Claude Code


View with Codesmith Autofix with Codesmith
Need help on this PR? Tag /codesmith with what you need. Autofix is disabled.

Summary by CodeRabbit

  • New Features
    • Added macOS-specific onboarding text that directs users to find NetBird in the menu bar.
    • Updated localized welcome content across supported languages, while retaining platform-specific tray guidance where applicable.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/netbirdio/netbird/pull/6810 **Author:** [@heisbrot](https://github.com/heisbrot) **Created:** 7/17/2026 **Status:** ✅ Merged **Merged:** 7/21/2026 **Merged by:** [@heisbrot](https://github.com/heisbrot) **Base:** `main` ← **Head:** `net-1411-macos-menu-bar-welcome` --- ### 📝 Commits (4) - [`3cb901f`](https://github.com/netbirdio/netbird/commit/3cb901f41bececd3520b60f3498fa4c5c6bff172) [client] Use menu bar wording on macOS welcome screen - [`3f17d9e`](https://github.com/netbirdio/netbird/commit/3f17d9e12aeaefdb24c8465c8be7c1813dd887bd) Merge branch 'main' into net-1411-macos-menu-bar-welcome - [`21a7de7`](https://github.com/netbirdio/netbird/commit/21a7de75ea724e0aebb6bba334ac3fd72c9bd203) Merge branch 'main' into net-1411-macos-menu-bar-welcome - [`5f736d7`](https://github.com/netbirdio/netbird/commit/5f736d7c016925fddd3e694702d0f0b6484caa69) [client] Add macOS welcome strings to Japanese bundle ### 📊 Changes **11 files changed** (+69 additions, -4 deletions) <details> <summary>View changed files</summary> 📝 `client/ui/frontend/src/modules/welcome/WelcomeStepTray.tsx` (+5 -2) 📝 `client/ui/i18n/locales/de/common.json` (+6 -0) 📝 `client/ui/i18n/locales/en/common.json` (+10 -2) 📝 `client/ui/i18n/locales/es/common.json` (+6 -0) 📝 `client/ui/i18n/locales/fr/common.json` (+6 -0) 📝 `client/ui/i18n/locales/hu/common.json` (+6 -0) 📝 `client/ui/i18n/locales/it/common.json` (+6 -0) 📝 `client/ui/i18n/locales/ja/common.json` (+6 -0) 📝 `client/ui/i18n/locales/pt/common.json` (+6 -0) 📝 `client/ui/i18n/locales/ru/common.json` (+6 -0) 📝 `client/ui/i18n/locales/zh-CN/common.json` (+6 -0) </details> ### 📄 Description ## Describe your changes The post-install welcome step said "Look for NetBird in your tray" on every OS, but macOS has no system tray — the icon sits in the menu bar. The tray wording stays correct on Windows and Linux. - Add `welcome.titleMac` and `welcome.descriptionMac` (following the existing `settings.advanced.interfaceName.errorMac` key convention) to `en` and all nine translated bundles (`de`, `es`, `fr`, `hu`, `it`, `ja`, `pt`, `ru`, `zh-CN`), each using that language's Apple term for the menu bar (Menüleiste, barra de menús, barre des menus, menüsor, barra dei menu, メニューバー, barra de menus, строка меню, 菜单栏). The `ja` bundle landed on main (#6790) after the initial commit and was covered after merging main back in. - `WelcomeStepTray.tsx` picks the key via `isMacOS()`, which it already uses to choose the per-OS screenshot. Verified: `go test ./client/ui/i18n/...`, `tsc --noEmit`, `eslint`, and `prettier --check` all pass; key set and placement verified identical across all ten bundles. Not visually verified in the running app (headless session) — the welcome dialog only shows on first launch. ## Issue ticket number and link Fixes NET-1411 ## Stack <!-- branch-stack --> ### Checklist - [x] Is it a bug fix - [ ] Is a typo/documentation fix - [ ] Is a feature enhancement - [ ] It is a refactor - [ ] Created tests that fail without the change (if possible) - [x] This change does **not** modify the public API, gRPC protocols, functionality behavior, CLI / service flags, or introduce a new feature — **OR** I have discussed it with the NetBird team beforehand (link the issue / Slack thread in the description). See [CONTRIBUTING.md](https://github.com/netbirdio/netbird/blob/main/CONTRIBUTING.md#discuss-changes-with-the-netbird-team-first). > By submitting this pull request, you confirm that you have read and agree to the terms of the [Contributor License Agreement](https://github.com/netbirdio/netbird/blob/main/CONTRIBUTOR_LICENSE_AGREEMENT.md). ## Documentation Select exactly one: - [ ] I added/updated documentation for this change - [x] Documentation is **not needed** for this change (UI copy fix only; no behavior, API, or configuration change) ### Docs PR URL (required if "docs added" is checked) 🤖 Generated with [Claude Code](https://claude.com/claude-code) <!-- codesmith:footer --> --- <a href="https://app.blacksmith.sh/netbirdio/codesmith/netbird/pr/6810"><picture><source media="(prefers-color-scheme: dark)" srcset="https://pr-comments-assets.blacksmith.sh/codesmith/view-with-codesmith-dark-v2.svg"><source media="(prefers-color-scheme: light)" srcset="https://pr-comments-assets.blacksmith.sh/codesmith/view-with-codesmith-light-v2.svg"><img alt="View with Codesmith" src="https://pr-comments-assets.blacksmith.sh/codesmith/view-with-codesmith-dark-v2.svg"></picture></a> <a href="https://backend.blacksmith.sh/track/enable-autofix?expires=1786865844&installation_id=146802194&pr_number=6810&repository=netbirdio%2Fnetbird&return_to=https%3A%2F%2Fgithub.com%2Fnetbirdio%2Fnetbird%2Fpull%2F6810&signature=c18b58a9624d319bff3010aeb92c7b11cc7e99f82ffa5e15a32053500d620af4"><picture><source media="(prefers-color-scheme: dark)" srcset="https://pr-comments-assets.blacksmith.sh/codesmith/autofix-with-codesmith-dark.svg"><source media="(prefers-color-scheme: light)" srcset="https://pr-comments-assets.blacksmith.sh/codesmith/autofix-with-codesmith-light.svg"><img alt="Autofix with Codesmith" src="https://pr-comments-assets.blacksmith.sh/codesmith/autofix-with-codesmith-dark.svg"></picture></a> <sup>Need help on this PR? Tag <code>/codesmith</code> with what you need. Autofix is disabled.</sup> <!-- codesmith:autofix:disabled --> <!-- /codesmith:footer --> <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Added macOS-specific onboarding text that directs users to find NetBird in the menu bar. * Updated localized welcome content across supported languages, while retaining platform-specific tray guidance where applicable. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
saavagebueno added the pull-request label 2026-08-05 07:08:16 -04:00
Sign in to join this conversation.
No Label pull-request
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: DYNR/netbird#27146