From e65ce8bdeb2cf3092b4e7d59440448f3d5a11633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Valderrama?= Date: Wed, 6 May 2026 11:17:07 +0200 Subject: [PATCH] :bug: Fix date issue in nitrate activation success modal --- .../nitrate_activation_success_modal.cljs | 25 ++++++++++--------- .../nitrate_code_activation_modal.cljs | 4 +-- .../app/main/ui/settings/subscription.cljs | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/frontend/src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs b/frontend/src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs index 0f68a5b5f7..d4bd9e482f 100644 --- a/frontend/src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs +++ b/frontend/src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs @@ -7,7 +7,6 @@ (ns app.main.ui.nitrate.nitrate-activation-success-modal (:require-macros [app.main.style :as stl]) (:require - [app.common.data.macros :as dm] [app.common.time :as ct] [app.main.data.modal :as modal] [app.main.data.nitrate :as dnt] @@ -20,17 +19,18 @@ (mf/defc nitrate-activation-success-modal* {::mf/register modal/components - ::mf/register-as :nitrate-activation-success - ::mf/wrap-props true} - [props] + ::mf/register-as :nitrate-activation-success} + [] - (let [profile (mf/deref refs/profile) - light? (= "light" (:theme profile)) - svg-id (if light? "logo-subscription-light" "logo-subscription") + (let [profile (mf/deref refs/profile) + light? (= "light" (:theme profile)) + svg-id (if light? "logo-subscription-light" "logo-subscription") - cancel-at (dm/get-in props [:subscription :cancel-at]) - date-str (when cancel-at - (ct/format-inst cancel-at "d MMMM, yyyy")) + nitrate-license (:subscription profile) + cancel-at (:cancel-at nitrate-license) + manual? (:manual nitrate-license) + date-str (when cancel-at + (ct/format-inst cancel-at "d MMMM, yyyy")) on-create-org (mf/use-fn @@ -52,8 +52,9 @@ [:div {:class (stl/css :modal-title)} (tr "nitrate.activation-success.title")] - [:p {:class (stl/css :modal-text-primary)} - (tr "nitrate.activation-success.active-until" date-str)] + (when (and manual? date-str) + [:p {:class (stl/css :modal-text-primary)} + (tr "nitrate.activation-success.active-until" date-str)]) [:p {:class (stl/css :modal-text)} (tr "nitrate.activation-success.manage-info")] diff --git a/frontend/src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs b/frontend/src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs index 131dfc257c..8f0223cf85 100644 --- a/frontend/src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs +++ b/frontend/src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs @@ -41,10 +41,10 @@ (when (seq code) (->> (rp/cmd! ::redeem-nitrate-activation-code {:activation-code code}) (rx/subs! - (fn [result] + (fn [_] (modal/hide!) (st/emit! - (modal/show {:type :nitrate-activation-success :subscription result}) + (modal/show {:type :nitrate-activation-success}) (dprof/refresh-profile))) (fn [error] ;; TODO: "Already used" is not yet detectable (CC upserts on reuse). diff --git a/frontend/src/app/main/ui/settings/subscription.cljs b/frontend/src/app/main/ui/settings/subscription.cljs index 18aaca3e5c..e86fedab32 100644 --- a/frontend/src/app/main/ui/settings/subscription.cljs +++ b/frontend/src/app/main/ui/settings/subscription.cljs @@ -499,7 +499,7 @@ ^boolean show-subscription-success-modal? (st/emit! (if (= params-subscription "subscribed-to-penpot-nitrate") - (modal/show :nitrate-activation-success {}) + (modal/show :nitrate-activation-success) (modal/show :subscription-success {:subscription-name (if (= params-subscription "subscribed-to-penpot-unlimited") (if (= success-modal-is-trial? "true")