🐛 Subscription review fixes (#6628)

frontend/src/app/main/ui/dashboard/subscription.cljs

@@ -30,10 +30,11 @@
 
     [:div {:class (stl/css :cta-power-up)
            :on-click handle-click}
-     [:button {:class (stl/css :cta-top-section)}
+     [:button {:class (stl/css-case :cta-top-section true
+                                    :cta-without-dropdown (not has-dropdown))}
       [:div {:class (stl/css :content)}
-       [:span {:class (stl/css :cta-title :cta-text)} top-title]
+       [:span {:class (stl/css :cta-title)} top-title]
-       [:span {:class (stl/css :cta-text-m)} top-description]]
+       [:span {:class (stl/css :cta-text)} top-description]]
       (when has-dropdown [:span {:class (stl/css :icon-dropdown)}  i/arrow])]
 
      (when (and has-dropdown show-data)
@@ -138,7 +139,7 @@
         subscription-is-trial (= "trialing" (:status subscription))
         is-owner              (:is-owner (:permissions team))
 
-        email-owner           (:email (some #(when (:is-admin %) %) (:members team)))
+        email-owner           (:email (some #(when (:is-owner %) %) (:members team)))
         mail-to-owner         (str "<a href=\"" "mailto:" email-owner "\">" email-owner "</a>")
         go-to-subscription    (dm/str (u/join cf/public-uri "#/settings/subscriptions"))
 

frontend/src/app/main/ui/dashboard/subscription.scss

@@ -18,6 +18,11 @@
   display: grid;
   color: var(--color-foreground-secondary);
   grid-template-columns: 1fr auto;
+  padding: 0;
+}
+
+.cta-top-section.cta-without-dropdown {
+  cursor: default;
 }
 
 .cta-top-section .content {
@@ -52,12 +57,12 @@
 }
 
 .cta-text,
-.cta-text-m,
 .cta-title {
   text-align: left;
 }
 
 .cta-title {
+  @include t.use-typography("title-small");
   margin-block-end: var(--sp-xs);
 }
 
@@ -65,10 +70,6 @@
   @include t.use-typography("body-small");
 }
 
-.cta-text-m {
-  @include t.use-typography("body-medium");
-}
-
 .cta-bottom-section .content a {
   @include t.use-typography("body-small");
   color: var(--color-accent-tertiary);

frontend/src/app/main/ui/dashboard/team.scss

@@ -293,8 +293,8 @@
   scrollbar-gutter: stable;
 }
 
-.dashboard-team-invitations .dashboard-top-cta {
+.dashboard-team-invitations.dashboard-top-cta {
-  flex-direction: flex;
+  flex-direction: column;
   justify-content: flex-start;
 }
 

frontend/src/app/main/ui/settings/subscription.cljs

@@ -55,7 +55,7 @@
                                         "professional" (tr "subscription.settings.professional")
                                         "unlimited" (tr "subscription.settings.unlimited")
                                         "enterprise" (tr "subscription.settings.enterprise")))
-        handle-subscription-trial   (if "unlimited"
+        handle-subscription-trial   (if (= subscription-name "unlimited")
                                       (mf/use-fn
                                        (mf/deps min-members)
                                        (fn []
@@ -222,7 +222,6 @@
       (dom/set-html-title (tr "subscription.labels")))
 
     (when show-subscription-success-modal
-       ;; add name subscription from params
       (st/emit! (modal/show :subscription-success
                             {:subscription-name (if (= (:subscription (:query params)) "subscribed-to-penpot-unlimited")
                                                   (tr "subscription.settings.unlimited-trial-modal")

frontend/src/app/util/time.cljs

@@ -281,8 +281,11 @@
   ([v] (format-date-locale-short v nil))
   ([v {:keys [locale] :or {locale "en"}}]
    (when v
-     (let [locale-obj (obj/get locales locale)
+     (let [v (if (datetime? v) (format v :date) v)
-           format-str "MMMM do, yyyy"]
+           locale-obj (obj/get locales locale)
+           format-str (case locale
+                        ("es" "es_es" "es-ES") "d MMMM, yyyy"
+                        "MMMM do, yyyy")]
        (dfn-format (js/Date. v) format-str #js {:locale locale-obj})))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

frontend/translations/es.po

@@ -1099,6 +1099,9 @@ msgstr "Mejora tu plan"
 msgid "subscription.dashboard.team-plan"
 msgstr "Plan de equipo"
 
+msgid "subscription.dashboard.power-up.your-subscription"
+msgstr "Tu suscripción:"
+
 msgid "subscription.dashboard.power-up.professional.top-title"
 msgstr "Plan Professional"
 
@@ -4384,13 +4387,6 @@ msgstr "Plan Enterprise"
 msgid "subscription.dashboard.power-up.enterprise.description"
 msgstr "Seguridad avanzada, registros de actividad, asistencia dedicada y mucho más."
 
-#: src/app/main/ui/dashboard/subscription.cljs:53
-#, markdown
-msgid "subscription.dashboard.power-up.professional.bottom-description"
-msgstr ""
-"Consigue editores y almacenamiento adicionales, copias de seguridad de "
-"archivos y mucho más con el **Plan ilimitado**"
-
 #: src/app/main/ui/dashboard/subscription.cljs:51
 msgid "subscription.dashboard.power-up.professional.top-title"
 msgstr "Plan Professional"
@@ -4399,10 +4395,6 @@ msgstr "Plan Professional"
 msgid "subscription.dashboard.power-up.subscribe"
 msgstr "Suscríbete"
 
-#: src/app/main/ui/dashboard/subscription.cljs:63
-msgid "subscription.dashboard.power-up.trial.bottom-description"
-msgstr "¿Disfrutas de la prueba? Desbloquea el acceso completo para siempre."
-
 #: src/app/main/ui/dashboard/subscription.cljs:62
 msgid "subscription.dashboard.power-up.trial.top-description"
 msgstr ""
@@ -4417,13 +4409,6 @@ msgstr "Plan Unlimited (Prueba)"
 msgid "subscription.dashboard.power-up.unlimited-plan"
 msgstr "Plan ilimitado"
 
-#: src/app/main/ui/dashboard/subscription.cljs:69
-#, markdown
-msgid "subscription.dashboard.power-up.unlimited.bottom-description"
-msgstr ""
-"Obtenga seguridad avanzada, registros de actividad, asistencia dedicada y "
-"mucho más con el **Plan de empresa**"
-
 #: src/app/main/ui/dashboard/subscription.cljs:70
 msgid "subscription.dashboard.power-up.unlimited.cta"
 msgstr "Echa un vistazo"
@@ -4622,6 +4607,12 @@ msgstr "organización por mes"
 msgid "subscription.settings.try-it-free"
 msgstr "Pruébalo gratis durante 14 días"
 
+msgid "subscription.settings.subscribe"
+msgstr "Suscríbete"
+
+msgid "subscription.settings.start-trial"
+msgstr "Comenzar prueba gratuita"
+
 msgid "subscription.settings.professional.projects-files"
 msgstr "Proyectos, archivos y borradores ilimitados"