From 152967bea69589550f5338fe618fd5f9b070d754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mar=C3=ADa=20Valderrama?= <maria.valderrama@kaleidos.net>
Date: Mon, 4 May 2026 09:55:06 +0200
Subject: [PATCH] :bug: Fix sidebar overflow

---
 frontend/src/app/main/ui/dashboard/sidebar.cljs      |  5 +++--
 frontend/src/app/main/ui/dashboard/sidebar.scss      | 11 ++++++++++-
 frontend/src/app/main/ui/dashboard/subscription.scss |  4 ++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/frontend/src/app/main/ui/dashboard/sidebar.cljs b/frontend/src/app/main/ui/dashboard/sidebar.cljs
index e9a8ac3be1..84509976a4 100644
--- a/frontend/src/app/main/ui/dashboard/sidebar.cljs
+++ b/frontend/src/app/main/ui/dashboard/sidebar.cljs
@@ -1057,11 +1057,12 @@
         (reset! overflow* (> scroll-height client-height))))
 
     [:*
-     [:div {:ref container}
+     [:div {:class (stl/css :sidebar-content-wrapper)}
       (when nitrate?
         [:div {:class (stl/css :orgs-container)}
          [:> sidebar-org-switch* {:team team :profile profile}]])
-      [:div {:class (stl/css-case :sidebar-content true :sidebar-content-nitrate nitrate?)}
+      [:div {:ref container
+             :class (stl/css-case :sidebar-content true :sidebar-content-nitrate nitrate?)}
        [:> sidebar-team-switch* {:team team :profile profile}]
 
        [:> sidebar-search* {:search-term search-term
diff --git a/frontend/src/app/main/ui/dashboard/sidebar.scss b/frontend/src/app/main/ui/dashboard/sidebar.scss
index 73e56d497a..51b3b929a2 100644
--- a/frontend/src/app/main/ui/dashboard/sidebar.scss
+++ b/frontend/src/app/main/ui/dashboard/sidebar.scss
@@ -29,11 +29,20 @@
 }
 
 // SIDEBAR CONTENT COMPONENT
+.sidebar-content-wrapper {
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+  height: 100%;
+  overflow: hidden;
+}
+
 .sidebar-content {
   display: grid;
   grid-template-rows: auto auto auto auto 1fr;
   gap: var(--sp-xxl);
-  height: 100%;
+  flex: 1;
+  min-height: 0;
   padding: 0;
   overflow: hidden auto;
 }
diff --git a/frontend/src/app/main/ui/dashboard/subscription.scss b/frontend/src/app/main/ui/dashboard/subscription.scss
index 2a580fd2b1..b37cff4658 100644
--- a/frontend/src/app/main/ui/dashboard/subscription.scss
+++ b/frontend/src/app/main/ui/dashboard/subscription.scss
@@ -224,7 +224,7 @@
   display: flex;
   border-radius: var(--sp-s);
   flex-direction: column;
-  margin: var(--sp-m);
+  margin: var(--sp-m) var(--sp-m) 0;
   background: var(--color-background-quaternary);
   border: $b-1 solid var(--color-accent-primary-muted);
   padding: var(--sp-l);
@@ -254,7 +254,7 @@
 
 .nitrate-current-plan {
   border-radius: var(--sp-s);
-  margin: 0 var(--sp-m) var(--sp-m) var(--sp-m);
+  margin: var(--sp-m);
   background: var(--color-background-tertiary);
   border: $b-1 solid var(--color-background-quaternary);
   padding: var(--sp-m) var(--sp-l);