From 1c8d26faafbc4b8fee91fd017d11110a36487e01 Mon Sep 17 00:00:00 2001 From: 0xRapzz <86567519+FlipZ3ro@users.noreply.github.com> Date: Fri, 19 Jun 2026 13:18:25 +0700 Subject: [PATCH] :bug: Fix swapped tooltip messages for token deletion states (#10316) The tooltip messages for 'not-active' and 'has-errors' conditions were swapped in both the typography row and color row components. When a token is deleted (not-active), the tooltip should show the 'deleted-token' message, and when a referenced token has errors (has-errors), it should show the 'not-active-token' message. Fixes #10296 Fixes #10299 Signed-off-by: 0xRapzz Co-authored-by: 0xRapzz --- .../sidebar/options/menus/token_typography_row.cljs | 4 ++-- .../main/ui/workspace/sidebar/options/rows/color_row.cljs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs index 1b3015afab..645ccb5c8c 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs @@ -39,9 +39,9 @@ tooltip-content (cond not-active - (tr "not-active-token.no-name") - has-errors (tr "options.deleted-token") + has-errors + (tr "not-active-token.no-name") :else (mf/html [:> to/resolved-value-tooltip* {:token-name token-name :resolved-value resolved-value}]))] diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs index 701ba4d134..1dcfa53306 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs @@ -98,16 +98,16 @@ token-name-ref (mf/use-ref nil) swatch-tooltip-content (cond not-active - (tr "not-active-token.no-name") - has-errors (tr "options.deleted-token") + has-errors + (tr "not-active-token.no-name") :else (tr "workspace.tokens.resolved-value" resolved)) name-tooltip-content (cond not-active - (tr "not-active-token.no-name") - has-errors (tr "options.deleted-token") + has-errors + (tr "not-active-token.no-name") :else #(mf/html [:div