Merge remote-tracking branch 'origin/staging' into develop

frontend/src/app/main/data/workspace.cljs

@@ -1740,7 +1740,6 @@
 (dm/export dws/shift-select-shapes)
 
 ;; Groups
-
 (dm/export dwg/mask-group)
 (dm/export dwg/unmask-group)
 (dm/export dwg/group-selected)
@@ -1772,4 +1771,3 @@
 
 ;; Thumbnails
 (dm/export dwth/update-thumbnail)
-

frontend/src/app/main/data/workspace/svg_upload.cljs

@@ -441,15 +441,14 @@
       ;; all shapes.
       (->> (rx/from (usvg/collect-images svg-data))
            (rx/map (fn [uri]
-                     (d/merge
+                     (merge
                       {:file-id file-id
-                       :is-local true
-                       :url uri}
-
+                       :is-local true}
                       (if (str/starts-with? uri "data:")
                         {:name "image"
                          :content (uu/data-uri->blob uri)}
-                        {:name (uu/uri-name uri)}))))
+                        {:name (uu/uri-name uri)
+                         :url uri}))))
            (rx/mapcat (fn [uri-data]
                         (->> (rp/mutation! (if (contains? uri-data :content)
                                              :upload-file-media-object

frontend/src/app/main/data/workspace/transforms.cljs

@@ -632,6 +632,7 @@
                       ;; Otherwise just plain old move
                       (rx/of (start-move initial selected))))))
                 (rx/take-until stopper))))))))
+
 (defn- start-move-duplicate
   [from-position]
   (ptk/reify ::start-move-duplicate