From 237fa568e86e948449d34504572b7e0157ae4787 Mon Sep 17 00:00:00 2001 From: Eva Marco Date: Fri, 29 May 2026 11:01:16 +0200 Subject: [PATCH] :bug: Fix comments --- .../management/forms/controls/color_input.cljs | 4 ++-- .../management/forms/controls/fonts_combobox.cljs | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs b/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs index 312c2f452f..5f3c44c52a 100644 --- a/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs @@ -457,8 +457,8 @@ (some? error) (let [error' (:message error)] - (if (csu/group-name-conflict-error? error token-name) - (swap! form assoc-in [:extra-errors ""] {:message error}) + (if (csu/group-name-conflict-error? error' token-name) + (swap! form assoc-in [:extra-errors ""] {:message error'}) (do (swap! form assoc-in [:extra-errors :value value-subfield index input-name] {:message error'}) (swap! form assoc-in [:data :value value-subfield index :color-result] "") 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 9319f8bc40..2fa9d473ba 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 @@ -172,15 +172,16 @@ (rx/debounce 300) (rx/mapcat (partial resolve-value tokens token token-name)) (rx/map (fn [result] - (d/update-when result :error wte/resolve-error-message))) + (d/update-when result :error wte/resolve-error-assoc-message))) (rx/subs! (fn [{:keys [error value]}] (when touched? (if error - (if (csu/group-name-conflict-error? error token-name) - (swap! form assoc-in [:extra-errors ""] {:message error}) - (do - (swap! form assoc-in [:extra-errors input-name] {:message error}) - (reset! hint* {:message error :type "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"})))))))]