From 895c9cb8da4e76d37e437d10303fcb78bbeb2462 Mon Sep 17 00:00:00 2001
From: Eva Marco <evamarcod@gmail.com>
Date: Tue, 16 Jun 2026 09:40:41 +0200
Subject: [PATCH] :bug: Fix tokens fonts combobox to show resolved value

---
 .../forms/controls/fonts_combobox.cljs        | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs b/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs
index cd52d1bcd0..cde4c74f42 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs
@@ -167,24 +167,25 @@
                                   :hint-message (:message error)})
           props)]
 
-    (mf/with-effect [resolve-stream tokens token input-name touched? token-name]
+    (mf/with-effect [resolve-stream tokens token input-name token-name]
       (let [subs (->> resolve-stream
                       (rx/debounce 300)
                       (rx/mapcat (partial resolve-value tokens token token-name))
                       (rx/map (fn [result]
                                 (d/update-when result :error wte/resolve-error-assoc-message)))
                       (rx/subs! (fn [{:keys [error value]}]
-                                  (when touched?
-                                    (if error
-                                      (let [error' (:message error)]
-                                        (if (csu/group-name-conflict-error? error' token-name)
-                                          (swap! form assoc-in [:extra-errors ""] error')
-                                          (do
-                                            (swap! form assoc-in [:extra-errors input-name] error')
-                                            (reset! hint* {:message error' :type "error"}))))
-                                      (let [message (tr "workspace.tokens.resolved-value" value)]
-                                        (swap! form update :extra-errors dissoc input-name)
-                                        (reset! hint* {:message message :type "hint"})))))))]
+                                  (let [touched? (get-in @form [:touched input-name])]
+                                    (when touched?
+                                      (if error
+                                        (let [error' (:message error)]
+                                          (if (csu/group-name-conflict-error? error' token-name)
+                                            (swap! form assoc-in [:extra-errors ""] error')
+                                            (do
+                                              (swap! form assoc-in [:extra-errors input-name] error')
+                                              (reset! hint* {:message error' :type "error"}))))
+                                        (let [message (tr "workspace.tokens.resolved-value" value)]
+                                          (swap! form update :extra-errors dissoc input-name)
+                                          (reset! hint* {:message message :type "hint"}))))))))]
         (fn []
           (rx/dispose! subs))))