From 810f1721c8521681b2af29cd37af579b08b07569 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 10 Dec 2025 07:54:52 +0100 Subject: [PATCH 1/5] :bug: Fix recursion render on subscription modal --- .../app/main/ui/settings/subscription.cljs | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/frontend/src/app/main/ui/settings/subscription.cljs b/frontend/src/app/main/ui/settings/subscription.cljs index 07c55f22ae..8b1d0422b6 100644 --- a/frontend/src/app/main/ui/settings/subscription.cljs +++ b/frontend/src/app/main/ui/settings/subscription.cljs @@ -77,7 +77,7 @@ [:button {:class (stl/css :cta-button :bottom-link) :on-click cta-link-trial} cta-text-trial])]) -(defn schema:seats-form [min-editors] +(defn- make-management-form-schema [min-editors] [:map {:title "SeatsForm"} [:min-members [::sm/number {:min min-editors :max 9999}]] @@ -87,7 +87,6 @@ {::mf/register modal/components ::mf/register-as :management-dialog} [{:keys [subscription-type current-subscription editors subscribe-to-trial]}] - (let [unlimited-modal-step* (mf/use-state 1) @@ -112,9 +111,12 @@ {:min-members min-editors :redirect-to-payment-details false}) + schema + (mf/with-memo [min-editors] + (make-management-form-schema min-editors)) + form - (fm/use-form :schema (schema:seats-form min-editors) - :initial initial) + (fm/use-form :schema schema :initial initial) submit-in-progress (mf/use-ref false) @@ -334,11 +336,15 @@ [:> raw-svg* {:id (if (= "light" (:theme profile)) "logo-subscription-light" "logo-subscription")}]] [:div {:class (stl/css :modal-end)} - [:div {:class (stl/css :modal-title)} (tr "subscription.settings.sucess.dialog.title" subscription-name)] + [:div {:class (stl/css :modal-title)} + (tr "subscription.settings.sucess.dialog.title" subscription-name)] (when (not= subscription-name "professional") - [:p {:class (stl/css :modal-text-large)} (tr "subscription.settings.success.dialog.thanks" subscription-name)]) - [:p {:class (stl/css :modal-text-large)} (tr "subscription.settings.success.dialog.description")] - [:p {:class (stl/css :modal-text-large)} (tr "subscription.settings.sucess.dialog.footer")] + [:p {:class (stl/css :modal-text-large)} + (tr "subscription.settings.success.dialog.thanks" subscription-name)]) + [:p {:class (stl/css :modal-text-large)} + (tr "subscription.settings.success.dialog.description")] + [:p {:class (stl/css :modal-text-large)} + (tr "subscription.settings.sucess.dialog.footer")] [:div {:class (stl/css :success-action-buttons)} [:input @@ -418,7 +424,11 @@ (mf/with-effect [] (dom/set-html-title (tr "subscription.labels"))) - (mf/with-effect [authenticated? show-subscription-success-modal? show-trial-subscription-modal? success-modal-is-trial? subscription] + (mf/with-effect [authenticated? + show-subscription-success-modal? + show-trial-subscription-modal? + success-modal-is-trial? + subscription] (when ^boolean authenticated? (cond ^boolean show-trial-subscription-modal? From b75b999903a51a453f475418591a0507336c6188 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 10 Dec 2025 08:22:05 +0100 Subject: [PATCH 2/5] :paperclip: Fix devenv jvm warning --- frontend/deps.edn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/deps.edn b/frontend/deps.edn index 3d4ff15c09..e023e302d8 100644 --- a/frontend/deps.edn +++ b/frontend/deps.edn @@ -50,5 +50,8 @@ :shadow-cljs {:main-opts ["-m" "shadow.cljs.devtools.cli"] - :jvm-opts ["--sun-misc-unsafe-memory-access=allow" "-Dpenpot.wasm.profile-marks=true"]} + :jvm-opts ["--sun-misc-unsafe-memory-access=allow" + "-Dpenpot.wasm.profile-marks=true" + "-XX:+UnlockExperimentalVMOptions" + "-XX:CompileCommand=blackhole,criterium.blackhole.Blackhole::consume"]} }} From 50bead7c56b6eb66b214c1c4a884bd589a2a8af4 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 10 Dec 2025 08:22:41 +0100 Subject: [PATCH 3/5] :bug: Fix react warning on having p inside p on assets export progress --- frontend/src/app/main/ui/exports/assets.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/main/ui/exports/assets.cljs b/frontend/src/app/main/ui/exports/assets.cljs index d444b56139..376856ebce 100644 --- a/frontend/src/app/main/ui/exports/assets.cljs +++ b/frontend/src/app/main/ui/exports/assets.cljs @@ -284,7 +284,7 @@ :on-click retry-last-export} (tr "workspace.options.retry")] - [:p {:class (stl/css :progress)} + [:span {:class (stl/css :progress)} (dm/str progress " / " total)])] [:button {:class (stl/css :progress-close-button) From 91d20a46d100fd7773225032e00bc4c15f9a8407 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 10 Dec 2025 08:23:05 +0100 Subject: [PATCH 4/5] :lipstick: Add cosmetic changes to exports assets progress component --- frontend/src/app/main/ui/exports/assets.cljs | 40 +++++++++++--------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/frontend/src/app/main/ui/exports/assets.cljs b/frontend/src/app/main/ui/exports/assets.cljs index 376856ebce..cf97f6e498 100644 --- a/frontend/src/app/main/ui/exports/assets.cljs +++ b/frontend/src/app/main/ui/exports/assets.cljs @@ -223,24 +223,30 @@ circ (* 2 Math/PI 12) pct (- circ (* circ (/ progress total))) - pwidth (if error? - 280 - (/ (* progress 280) total)) - color (cond - error? clr/new-danger - healthy? (if is-default-theme? - clr/new-primary - clr/new-primary-light) - (not healthy?) clr/new-warning) + pwidth + (if error? + 280 + (/ (* progress 280) total)) - background-clr (if is-default-theme? - clr/background-quaternary - clr/background-quaternary-light) - title (cond - error? (tr "workspace.options.exporting-object-error") - complete? (tr "workspace.options.exporting-complete") - healthy? (tr "workspace.options.exporting-object") - (not healthy?) (tr "workspace.options.exporting-object-slow")) + color + (cond + error? clr/new-danger + healthy? (if is-default-theme? + clr/new-primary + clr/new-primary-light) + (not healthy?) clr/new-warning) + + background-clr + (if is-default-theme? + clr/background-quaternary + clr/background-quaternary-light) + + title + (cond + error? (tr "workspace.options.exporting-object-error") + complete? (tr "workspace.options.exporting-complete") + healthy? (tr "workspace.options.exporting-object") + (not healthy?) (tr "workspace.options.exporting-object-slow")) retry-last-export (mf/use-fn #(st/emit! (de/retry-last-export))) From 98039f13d84faeb46527e638aed0ce80cd98521c Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 10 Dec 2025 09:47:40 +0100 Subject: [PATCH 5/5] :bug: Fix main toolbar z-index --- frontend/src/app/main/ui/workspace/top_toolbar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/main/ui/workspace/top_toolbar.scss b/frontend/src/app/main/ui/workspace/top_toolbar.scss index 53b534569e..d005682878 100644 --- a/frontend/src/app/main/ui/workspace/top_toolbar.scss +++ b/frontend/src/app/main/ui/workspace/top_toolbar.scss @@ -18,7 +18,7 @@ padding: deprecated.$s-8 deprecated.$s-16; border-radius: deprecated.$s-8; border: deprecated.$s-2 solid var(--panel-border-color); - z-index: deprecated.$z-index-3; + z-index: deprecated.$z-index-1; background-color: var(--color-background-primary); transition: top 0.3s,