From de5276d6388b64ab66f3272ae88a69ff425a1ce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mar=C3=ADa=20Valderrama?= <mavalroot@gmail.com>
Date: Tue, 3 Mar 2026 14:33:42 +0100
Subject: [PATCH] :lipstick: Add missing nitrate banner

---
 .../src/app/main/ui/dashboard/sidebar.cljs    |  6 +--
 .../app/main/ui/dashboard/subscription.cljs   | 53 ++++++++++++++-----
 .../app/main/ui/dashboard/subscription.scss   |  1 +
 3 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/frontend/src/app/main/ui/dashboard/sidebar.cljs b/frontend/src/app/main/ui/dashboard/sidebar.cljs
index dbf5fedcbc..efb0c241f0 100644
--- a/frontend/src/app/main/ui/dashboard/sidebar.cljs
+++ b/frontend/src/app/main/ui/dashboard/sidebar.cljs
@@ -1009,7 +1009,8 @@
 
 (mf/defc profile-section*
   [{:keys [profile team]}]
-  (let [show-profile-menu* (mf/use-state false)
+  (let [teams            (mf/deref refs/teams)
+        show-profile-menu* (mf/use-state false)
         show-profile-menu? (deref show-profile-menu*)
         sub-menu*      (mf/use-state false)
         sub-menu       (deref sub-menu*)
@@ -1086,8 +1087,7 @@
 
     [:*
      (if (contains? cf/flags :nitrate)
-       (when-not (dm/get-in profile [:props :nitrate-license :valid])
-         [:> nitrate-sidebar* {:profile profile}])
+       [:> nitrate-sidebar* {:profile profile :teams teams}]
        (when (contains? cf/flags :subscriptions)
          (if (show-subscription-dashboard-banner? profile)
            [:> dashboard-cta* {:profile profile}]
diff --git a/frontend/src/app/main/ui/dashboard/subscription.cljs b/frontend/src/app/main/ui/dashboard/subscription.cljs
index 84630e1bbd..00536d48ad 100644
--- a/frontend/src/app/main/ui/dashboard/subscription.cljs
+++ b/frontend/src/app/main/ui/dashboard/subscription.cljs
@@ -3,6 +3,7 @@
 (ns app.main.ui.dashboard.subscription
   (:require-macros [app.main.style :as stl])
   (:require
+   [app.common.data :as d]
    [app.common.data.macros :as dm]
    [app.config :as cf]
    [app.main.data.event :as ev]
@@ -117,24 +118,52 @@
           :is-highlighted false}]))))
 
 (mf/defc nitrate-sidebar*
-  []
-  (let [handle-click
+  {::mf/props :obj}
+  [{:keys [profile teams]}]
+  (let [nitrate-license (dm/get-in profile [:props :nitrate-license])
+        nitrate? (and (contains? cf/flags :nitrate)
+                      (:valid nitrate-license))
+
+        orgs (mf/with-memo [teams]
+               (let [orgs (->> teams
+                               vals
+                               (group-by :organization-id)
+                               (map (fn [[_group entries]] (first entries)))
+                               vec
+                               (d/index-by :id))]
+                 orgs))
+
+        no-orgs-created? (= (count orgs) 1)
+
+        handle-click
         (mf/use-fn
          (fn []
            (st/emit! (dnt/show-nitrate-popup :nitrate-form))))]
 
     ;; TODO add translations for this texts when we have the definitive ones
-    [:div {:class (stl/css :nitrate-banner :highlighted)}
+    (if (and nitrate? no-orgs-created?)
+      ;; Banner for users with active nitrate license but no organizations created
+      [:div {:class (stl/css :nitrate-banner :highlighted)}
+       [:div {:class (stl/css :nitrate-content)}
+        [:span {:class (stl/css :nitrate-title)} "Create your first org"]]
+       [:div {:class (stl/css :nitrate-content)}
+        [:span {:class (stl/css :nitrate-info)} "Some further information and explanation."]
+        [:> button* {:variant "primary"
+                     :type "button"
+                     :class (stl/css :nitrate-bottom-button)
+                     :on-click dnt/go-to-nitrate-cc} "CREATE ORGANIZATION"]]]
 
-     [:div {:class (stl/css :nitrate-content)}
-      [:span {:class (stl/css :nitrate-title)} "Unlock Nitrate features"]]
-     [:div {:class (stl/css :nitrate-content)}
-
-      [:span {:class (stl/css :nitrate-info)} "Some further information and explanation."]
-      [:> button* {:variant "primary"
-                   :type "button"
-                   :class (stl/css :cta-bottom-button :nitrate-bottom-button)
-                   :on-click handle-click} "UPGRADE TO NITRATE"]]]))
+      ;; Banner for users without nitrate license
+      (when (not nitrate?)
+        [:div {:class (stl/css :nitrate-banner :highlighted)}
+         [:div {:class (stl/css :nitrate-content)}
+          [:span {:class (stl/css :nitrate-title)} "Unlock Nitrate features"]]
+         [:div {:class (stl/css :nitrate-content)}
+          [:span {:class (stl/css :nitrate-info)} "Some further information and explanation."]
+          [:> button* {:variant "primary"
+                       :type "button"
+                       :class (stl/css :nitrate-bottom-button)
+                       :on-click handle-click} "UPGRADE TO NITRATE"]]]))))
 
 (mf/defc team*
   [{:keys [is-owner team]}]
diff --git a/frontend/src/app/main/ui/dashboard/subscription.scss b/frontend/src/app/main/ui/dashboard/subscription.scss
index b27fb7a610..e9439558f1 100644
--- a/frontend/src/app/main/ui/dashboard/subscription.scss
+++ b/frontend/src/app/main/ui/dashboard/subscription.scss
@@ -224,6 +224,7 @@
 .nitrate-info {
   @include t.use-typography("body-medium");
   color: var(--color-foreground-secondary);
+  margin-block: var(--sp-s) var(--sp-xxl);
 }
 
 .nitrate-content {