github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-05-27 19:03:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix date issue in nitrate activation success modal

Browse Source
This commit is contained in:
María Valderrama 2026-05-06 11:17:07 +02:00
parent ed935e533f
commit e65ce8bdeb
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
frontend/src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs
View File

@ -7,7 +7,6 @@
(ns app.main.ui.nitrate.nitrate-activation-success-modal (ns app.main.ui.nitrate.nitrate-activation-success-modal
(:require-macros [app.main.style :as stl]) (:require-macros [app.main.style :as stl])
(:require (:require
[app.common.data.macros :as dm]
[app.common.time :as ct] [app.common.time :as ct]
[app.main.data.modal :as modal] [app.main.data.modal :as modal]
[app.main.data.nitrate :as dnt] [app.main.data.nitrate :as dnt]
@ -20,17 +19,18 @@
(mf/defc nitrate-activation-success-modal* (mf/defc nitrate-activation-success-modal*
{::mf/register modal/components {::mf/register modal/components
::mf/register-as :nitrate-activation-success ::mf/register-as :nitrate-activation-success}
::mf/wrap-props true} []
[props]
(let [profile (mf/deref refs/profile) (let [profile (mf/deref refs/profile)
light? (= "light" (:theme profile)) light? (= "light" (:theme profile))
svg-id (if light? "logo-subscription-light" "logo-subscription") svg-id (if light? "logo-subscription-light" "logo-subscription")
cancel-at (dm/get-in props [:subscription :cancel-at]) nitrate-license (:subscription profile)
date-str (when cancel-at cancel-at (:cancel-at nitrate-license)
(ct/format-inst cancel-at "d MMMM, yyyy")) manual? (:manual nitrate-license)
date-str (when cancel-at
(ct/format-inst cancel-at "d MMMM, yyyy"))
on-create-org on-create-org
(mf/use-fn (mf/use-fn
@ -52,8 +52,9 @@
[:div {:class (stl/css :modal-title)} [:div {:class (stl/css :modal-title)}
(tr "nitrate.activation-success.title")] (tr "nitrate.activation-success.title")]
[:p {:class (stl/css :modal-text-primary)} (when (and manual? date-str)
(tr "nitrate.activation-success.active-until" date-str)] [:p {:class (stl/css :modal-text-primary)}
(tr "nitrate.activation-success.active-until" date-str)])
[:p {:class (stl/css :modal-text)} [:p {:class (stl/css :modal-text)}
(tr "nitrate.activation-success.manage-info")] (tr "nitrate.activation-success.manage-info")]

4
frontend/src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs
View File

@ -41,10 +41,10 @@
(when (seq code) (when (seq code)
(->> (rp/cmd! ::redeem-nitrate-activation-code {:activation-code code}) (->> (rp/cmd! ::redeem-nitrate-activation-code {:activation-code code})
(rx/subs! (rx/subs!
(fn [result] (fn [_]
(modal/hide!) (modal/hide!)
(st/emit! (st/emit!
(modal/show {:type :nitrate-activation-success :subscription result}) (modal/show {:type :nitrate-activation-success})
(dprof/refresh-profile))) (dprof/refresh-profile)))
(fn [error] (fn [error]
;; TODO: "Already used" is not yet detectable (CC upserts on reuse). ;; TODO: "Already used" is not yet detectable (CC upserts on reuse).

2
frontend/src/app/main/ui/settings/subscription.cljs
View File

@ -499,7 +499,7 @@
^boolean show-subscription-success-modal? ^boolean show-subscription-success-modal?
(st/emit! (st/emit!
(if (= params-subscription "subscribed-to-penpot-nitrate") (if (= params-subscription "subscribed-to-penpot-nitrate")
(modal/show :nitrate-activation-success {}) (modal/show :nitrate-activation-success)
(modal/show :subscription-success (modal/show :subscription-success
{:subscription-name (if (= params-subscription "subscribed-to-penpot-unlimited") {:subscription-name (if (= params-subscription "subscribed-to-penpot-unlimited")
(if (= success-modal-is-trial? "true") (if (= success-modal-is-trial? "true")