diff --git a/frontend/src/app/main/ui/dashboard/subscription.cljs b/frontend/src/app/main/ui/dashboard/subscription.cljs index 743de20347..ba07f40e25 100644 --- a/frontend/src/app/main/ui/dashboard/subscription.cljs +++ b/frontend/src/app/main/ui/dashboard/subscription.cljs @@ -121,6 +121,8 @@ {::mf/props :obj} [{:keys [profile teams]}] (let [nitrate? (dnt/is-valid-license? profile) + nitrate-license (:subscription profile) + subscription-type (if nitrate? (:type nitrate-license) (get-subscription-type (-> profile :props :subscription))) orgs (mf/with-memo [teams] (let [orgs (->> teams vals @@ -134,8 +136,11 @@ handle-click (mf/use-fn + (mf/deps nitrate-license subscription-type) (fn [] - (st/emit! (dnt/show-nitrate-popup :nitrate-form)))) + (if (= subscription-type "unlimited") + (st/emit! (dnt/show-nitrate-popup :nitrate-dialog {:nitrate-license nitrate-license :show-contact-sales-option true})) + (st/emit! (dnt/show-nitrate-popup :nitrate-form))))) handle-go-to-cc (mf/use-fn dnt/go-to-nitrate-cc-create-org)] diff --git a/frontend/src/app/main/ui/settings/subscription.cljs b/frontend/src/app/main/ui/settings/subscription.cljs index e22a65ff01..687329cbf0 100644 --- a/frontend/src/app/main/ui/settings/subscription.cljs +++ b/frontend/src/app/main/ui/settings/subscription.cljs @@ -468,8 +468,11 @@ open-contact-sales-modal (mf/use-fn - (fn [subscription-type] - (st/emit! (modal/show :nitrate-contact-sales-dialog {:subscription-type subscription-type}))))] + (mf/deps nitrate-license) + (fn [current-subscription subscription-type] + (if (= current-subscription "unlimited") + (st/emit! (dnt/show-nitrate-popup :nitrate-dialog {:nitrate-license nitrate-license :show-contact-sales-option true})) + (st/emit! (modal/show :nitrate-contact-sales-dialog {:subscription-type subscription-type})))))] (mf/with-effect [] (dom/set-html-title (tr "subscription.labels"))) @@ -623,7 +626,7 @@ (tr "subscription.settings.unlimited.autosave-benefit"), (tr "subscription.settings.unlimited.bill")] :cta-text (if (:type subscription) (tr "subscription.settings.subscribe") (tr "subscription.settings.try-it-free")) - :cta-link (if (and (contains? cf/flags :nitrate) nitrate?) #(open-contact-sales-modal "Unlimited") #(open-subscription-modal "unlimited" subscription)) + :cta-link (if (and (contains? cf/flags :nitrate) nitrate?) #(open-contact-sales-modal subscription-type "Unlimited") #(open-subscription-modal "unlimited" subscription)) :cta-text-with-icon (tr "subscription.settings.more-information") :cta-link-with-icon go-to-pricing-page :recommended (= subscription-type "professional") @@ -655,7 +658,7 @@ "Acceso exclusivo al Control Center" "Lorem ipsum"] :cta-text (if nitrate-license (tr "subscription.settings.subscribe") "Try 14 days for free") - :cta-link #(open-subscription-modal "nitrate" subscription) + :cta-link (if (= subscription-type "unlimited") #(open-contact-sales-modal subscription-type "Nitrate") #(open-subscription-modal "nitrate" subscription)) :cta-text-with-icon (tr "subscription.settings.more-information") :cta-link-with-icon go-to-pricing-page :show-button-cta (not nitrate-license)}])]]])) @@ -668,7 +671,7 @@ (mf/defc subscribe-nitrate-dialog {::mf/register modal/components ::mf/register-as :nitrate-dialog} - [{:keys [nitrate-license] :as connectivity}] + [{:keys [nitrate-license show-contact-sales-option] :as connectivity}] ;; TODO add translations for this texts when we have the definitive ones (let [online? (:licenses connectivity) initial (mf/with-memo [] @@ -701,7 +704,7 @@ [:div {:class (stl/css :modal-title :subscription-title)} "Subcribe to the Business Nitrate plan"] - (if online? + (if (and online? (not show-contact-sales-option)) [:div {:class (stl/css :modal-content)}