From 5ad04e0f4c8a5adf808147923d0228fc27db0ce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Moya?= <andres.moya@kaleidos.net>
Date: Thu, 16 Oct 2025 14:29:30 +0200
Subject: [PATCH] :bug: Fix error when selecting set in theme

---
 CHANGES.md                                                  | 1 +
 frontend/playwright/ui/specs/tokens.spec.js                 | 6 ++++++
 .../app/main/ui/workspace/tokens/themes/create_modal.cljs   | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 92c5cf4224..9433a7af38 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -58,6 +58,7 @@
 - Fix adding/removing identical text fills [Taiga #12287](https://tree.taiga.io/project/penpot/issue/12287)
 - Fix scroll on the inspect tab [Taiga #12293](https://tree.taiga.io/project/penpot/issue/12293)
 - Fix lock proportion tooltip [Taiga #12326](https://tree.taiga.io/project/penpot/issue/12326)
+- Fix internal Error when selecting a set by name in the token theme editor [Taiga #12310](https://tree.taiga.io/project/penpot/issue/12310)
 
 
 ## 2.10.1
diff --git a/frontend/playwright/ui/specs/tokens.spec.js b/frontend/playwright/ui/specs/tokens.spec.js
index f371b0cb7a..077f46b9f0 100644
--- a/frontend/playwright/ui/specs/tokens.spec.js
+++ b/frontend/playwright/ui/specs/tokens.spec.js
@@ -864,6 +864,12 @@ test.describe("Tokens: Themes modal", () => {
       }
     }
 
+    const firstButton = await tokenThemeUpdateCreateModal
+      .getByTestId('tokens-set-item')
+      .first();
+    
+    await firstButton.click();
+
     await tokenThemeUpdateCreateModal
       .getByRole("button", {
         name: "Save theme",
diff --git a/frontend/src/app/main/ui/workspace/tokens/themes/create_modal.cljs b/frontend/src/app/main/ui/workspace/tokens/themes/create_modal.cljs
index 1224efcfbc..dfbacfa370 100644
--- a/frontend/src/app/main/ui/workspace/tokens/themes/create_modal.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/themes/create_modal.cljs
@@ -319,7 +319,8 @@
         (mf/use-fn
          (mf/deps on-toggle-token-set)
          (fn [set-id]
-           (on-toggle-token-set set-id)))]
+           (let [set (ctob/get-set lib set-id)]
+             (on-toggle-token-set (ctob/get-name set)))))]
 
     [:div {:class (stl/css :themes-modal-wrapper)}
      [:> heading* {:level 2 :typography "headline-medium" :class (stl/css :themes-modal-title)}