From 4884a1110272fe06c670039d2a7ca7a68702d511 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Thu, 20 Jun 2024 09:21:59 +0200
Subject: [PATCH] :bug: Penpot crashes when a new colorpicker is created while
 uploading an image to another instance

---
 CHANGES.md                                       | 1 +
 frontend/src/app/main/data/workspace/colors.cljs | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index bfc39fe4e..a4e36f19b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -47,6 +47,7 @@
 - Fix SVG attrs are not handled correctly when exporting/importing in .zip [Taiga #7920](https://tree.taiga.io/project/penpot/issue/7920)
 - Fix validation error when detaching with two nested copies and a swap [Taiga #8095](https://tree.taiga.io/project/penpot/issue/8095)
 - Export shapes that are rotated act a bit strange when reimported [Taiga #7585](https://tree.taiga.io/project/penpot/issue/7585)
+- Penpot crashes when a new colorpicker is created while uploading an image to another instance [Taiga #8119](https://tree.taiga.io/project/penpot/issue/8119)
 
 ## 2.0.3
 
diff --git a/frontend/src/app/main/data/workspace/colors.cljs b/frontend/src/app/main/data/workspace/colors.cljs
index 71a3903b8..081ec5339 100644
--- a/frontend/src/app/main/data/workspace/colors.cljs
+++ b/frontend/src/app/main/data/workspace/colors.cljs
@@ -590,7 +590,7 @@
     (update [_ state]
       (update state :colorpicker
               (fn [state]
-                (let [type  (:type state)
+                (let [type (:type state)
                       state (-> state
                                 (update :current-color merge changes)
                                 (update :current-color materialize-color-components)
@@ -605,11 +605,12 @@
 
                     (-> state
                         (dissoc :gradient :stops :editing-stop)
-                        (cond-> (not= :image (:type state))
+                        (cond-> (not= :image type)
                           (assoc :type :color))))))))
     ptk/WatchEvent
     (watch [_ state _]
-      (when add-recent?
+      ;; Type can be null, because the colorpicker can be closed while a color image finish its upload
+      (when (and add-recent? (some? (:type state)))
         (let [formated-color  (get-color-from-colorpicker-state (:colorpicker state))]
           (rx/of (dwl/add-recent-color formated-color)))))))