From 3c12074db6ebd8ea8eca1a0eafff7337a54cf2c5 Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Tue, 3 Mar 2026 06:50:25 -0800 Subject: [PATCH] Mention CLI in main dropdown --- crates-tauri/yaak-app/src/lib.rs | 6 +---- .../components/Settings/SettingsLicense.tsx | 22 +++---------------- src-web/components/SettingsDropdown.tsx | 22 +++++++++++++------ 3 files changed, 19 insertions(+), 31 deletions(-) diff --git a/crates-tauri/yaak-app/src/lib.rs b/crates-tauri/yaak-app/src/lib.rs index 97227784..480995dd 100644 --- a/crates-tauri/yaak-app/src/lib.rs +++ b/crates-tauri/yaak-app/src/lib.rs @@ -131,11 +131,7 @@ async fn cmd_metadata(app_handle: AppHandle) -> YaakResult { } async fn detect_cli_version() -> Option { - // Prefer `yaak`, but support the legacy `yaakcli` alias if present. - if let Some(version) = detect_cli_version_for_binary("yaak").await { - return Some(version); - } - detect_cli_version_for_binary("yaakcli").await + detect_cli_version_for_binary("yaak").await } async fn detect_cli_version_for_binary(program: &str) -> Option { diff --git a/src-web/components/Settings/SettingsLicense.tsx b/src-web/components/Settings/SettingsLicense.tsx index 19ec89d5..b398cdf3 100644 --- a/src-web/components/Settings/SettingsLicense.tsx +++ b/src-web/components/Settings/SettingsLicense.tsx @@ -41,11 +41,7 @@ function SettingsLicenseCmp() { case 'trialing': return ( - - +

{pluralizeCount('day', differenceInDays(check.data.data.end, new Date()))} @@ -55,10 +51,6 @@ function SettingsLicenseCmp() { Personal use is always free, forever.

- - Contact Support - - Learn More @@ -69,24 +61,16 @@ function SettingsLicenseCmp() { case 'personal_use': return ( - - +

Your commercial-use trial has ended.
- You may continue using Yaak for personal use free, forever. + You may continue using Yaak for personal use only.
A license is required for commercial use.

- - Contact Support - - Learn More diff --git a/src-web/components/SettingsDropdown.tsx b/src-web/components/SettingsDropdown.tsx index 7e623309..45d5951a 100644 --- a/src-web/components/SettingsDropdown.tsx +++ b/src-web/components/SettingsDropdown.tsx @@ -64,19 +64,27 @@ export function SettingsDropdown() { onSelect: () => openUrl('https://yaak.app/button/new'), }, { type: 'separator', label: `Yaak v${appInfo.version}` }, - { - label: 'Purchase License', - color: 'success', - hidden: check.data == null || check.data.status === 'active', - leftSlot: , - onSelect: () => openSettings.mutate('license'), - }, { label: 'Check for Updates', leftSlot: , hidden: !appInfo.featureUpdater, onSelect: () => checkForUpdates.mutate(), }, + { + label: 'Purchase License', + color: 'success', + hidden: check.data == null || check.data.status === 'active', + leftSlot: , + rightSlot: , + onSelect: () => openUrl('https://yaak.app/pricing'), + }, + { + label: 'Install CLI', + hidden: appInfo.cliVersion != null, + leftSlot: , + rightSlot: , + onSelect: () => openUrl('https://yaak.app/docs/cli'), + }, { label: 'Feedback', leftSlot: ,