From 122701ee7bf3c0f56cf84f738ecbfcb6e165c55b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marina=20L=C3=B3pez?= Date: Thu, 24 Jul 2025 08:41:39 +0200 Subject: [PATCH] :bug: Fix modal submit button for unpaid or canceled subscriptions (#6947) --- frontend/src/app/main/ui/settings/subscription.cljs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/main/ui/settings/subscription.cljs b/frontend/src/app/main/ui/settings/subscription.cljs index 650e20e0df..e72c4f9b86 100644 --- a/frontend/src/app/main/ui/settings/subscription.cljs +++ b/frontend/src/app/main/ui/settings/subscription.cljs @@ -179,7 +179,9 @@ :type "button" :value (if subscribe-to-trial (tr "subscription.settings.start-trial") (tr "labels.continue")) - :on-click (if subscribe-to-trial subscribe-to-enterprise handle-accept-dialog)}]]])]]])) + :on-click (if (or subscribe-to-trial + (contains? #{"unpaid" "canceled"} (:status current-subscription))) + subscribe-to-enterprise handle-accept-dialog)}]]])]]])) (mf/defc subscription-success-dialog {::mf/register modal/components @@ -413,7 +415,7 @@ (tr "subscription.settings.unlimited.bill"), (tr "subscription.settings.unlimited.storage-autosave")] :cta-text (if subscription (tr "subscription.settings.subscribe") (tr "subscription.settings.try-it-free")) - :cta-link #(open-subscription-modal "unlimited" subscription-type) + :cta-link #(open-subscription-modal "unlimited" subscription) :cta-text-with-icon (tr "subscription.settings.more-information") :cta-link-with-icon go-to-pricing-page}]) @@ -427,6 +429,6 @@ (tr "subscription.settings.enterprise.capped-bill"), (tr "subscription.settings.enterprise.unlimited-storage")] :cta-text (if subscription (tr "subscription.settings.subscribe") (tr "subscription.settings.try-it-free")) - :cta-link #(open-subscription-modal "enterprise") + :cta-link #(open-subscription-modal "enterprise" subscription) :cta-text-with-icon (tr "subscription.settings.more-information") :cta-link-with-icon go-to-pricing-page}])]]]))