From 567fdd96195b329dabff8931c311559cfb37ccb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Moya?= <andres.moya@kaleidos.net>
Date: Mon, 17 Mar 2025 17:24:49 +0100
Subject: [PATCH] :bug: Fix initial value of color bullet in form

---
 common/src/app/common/types/tokens_lib.cljc         | 3 ++-
 frontend/src/app/main/ui/workspace/tokens/form.cljs | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/common/src/app/common/types/tokens_lib.cljc b/common/src/app/common/types/tokens_lib.cljc
index 796be13a75..08485d5adf 100644
--- a/common/src/app/common/types/tokens_lib.cljc
+++ b/common/src/app/common/types/tokens_lib.cljc
@@ -1233,7 +1233,8 @@ Will return a value that matches this schema:
           (fn [tokens' cur]
             (merge tokens' (:tokens (get-set this cur))))
           tokens (order-theme-set theme)))
-       (d/ordered-map) active-themes)))
+       (d/ordered-map)
+       active-themes)))
 
   (encode-dtcg [this]
     (let [themes-xform
diff --git a/frontend/src/app/main/ui/workspace/tokens/form.cljs b/frontend/src/app/main/ui/workspace/tokens/form.cljs
index 12385a27d9..a4039a3dcd 100644
--- a/frontend/src/app/main/ui/workspace/tokens/form.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/form.cljs
@@ -312,6 +312,7 @@
 
         token-resolve-result* (mf/use-state (get resolved-tokens (wtt/token-identifier token)))
         token-resolve-result (deref token-resolve-result*)
+
         set-resolve-value
         (mf/use-fn
          (fn [token-or-err]
@@ -320,12 +321,15 @@
                  v (cond
                      error?
                      token-or-err
+
                      warnings?
                      (:warnings {:warnings token-or-err})
+
                      :else
                      (:resolved-value token-or-err))]
              (when color? (reset! color (if error? nil v)))
              (reset! token-resolve-result* v))))
+
         on-update-value-debounced (use-debonced-resolve-callback name-ref token active-theme-tokens set-resolve-value)
         on-update-value (mf/use-fn
                          (mf/deps on-update-value-debounced)
@@ -459,10 +463,10 @@
            (when (k/enter? e)
              (on-submit e))))]
 
-    ;; Clear form token cache on mount
+    ;; Clear form token cache on unmount
     (mf/use-effect
      (fn []
-       (reset! form-token-cache-atom nil)))
+       #(reset! form-token-cache-atom nil)))
 
     ;; Update the value when editing an existing token
     ;; so the user doesn't have to interact with the form to validate the token