From d9ce1577c05bf54a03792a2ff37c176e455ad28b Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@hey.com>
Date: Thu, 18 Dec 2025 09:47:06 +0100
Subject: [PATCH] Fix upgrade/downgrade buttons

- Remove old buttons I had added before the UI work.
- Fix: make new upgrade button use the dedicated action.
- Add symmetric downgrade button.
---
 .../account/settings/_paid_plan.html.erb      | 10 +---------
 .../account/settings/_subscription.html.erb   | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/saas/app/views/account/settings/_paid_plan.html.erb b/saas/app/views/account/settings/_paid_plan.html.erb
index c2e09221b..426568eae 100644
--- a/saas/app/views/account/settings/_paid_plan.html.erb
+++ b/saas/app/views/account/settings/_paid_plan.html.erb
@@ -16,12 +16,4 @@
 
 <% if Current.account.subscription %>
   <%= render "account/settings/subscription", subscription: Current.account.subscription %>
-  <div class="settings-subscription__footer txt-small margin-block">
-    Right now you’re on the <strong><%= Current.account.plan.name %></strong> plan which includes unlimited cards, unlimited users, and <%= storage_to_human_size(Plan.paid.storage_limit) %> of storage.
-
-    <% unless Current.account.exceeding_storage_limit? || Current.account.nearing_plan_storage_limit? %>
-      <%= button_to "Upgrade", account_subscription_path(plan_key: Plan.paid_with_extra_storage.key), class: "btn btn--plain settings-subscription__link txt-link", form: { class: "flex-inline flex-wrap", data: { turbo: false } } %>
-      to <%= storage_to_human_size(Plan.paid_with_extra_storage.storage_limit) %> storage for <%= number_to_currency(Plan.paid_with_extra_storage.price - Plan.paid.price, strip_insignificant_zeros: true) %>/month more.
-    <% end %>
-  </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/saas/app/views/account/settings/_subscription.html.erb b/saas/app/views/account/settings/_subscription.html.erb
index 68e3acd65..5ea251c8d 100644
--- a/saas/app/views/account/settings/_subscription.html.erb
+++ b/saas/app/views/account/settings/_subscription.html.erb
@@ -2,16 +2,19 @@
   <p class="margin-block-start-half"><%= subscription_period_end_action(subscription) %> <strong><%= subscription.current_period_end.to_date.to_fs(:long) %></strong></p>
 <% end %>
 
-<p>
-  <% if subscription.plan == Plan.paid && (Current.account.nearing_plan_storage_limit? || Current.account.exceeding_storage_limit?) %>
-    <%= button_to "Upgrade to #{Plan.paid_with_extra_storage.name } for #{ number_to_currency(Plan.paid_with_extra_storage.price, strip_insignificant_zeros: true) }/month", account_subscription_upgrade_path, class: "btn settings-subscription__button", form: { data: { turbo: false } } %>
-  <% elsif subscription.plan == Plan.paid_with_extra_storage && !Current.account.exceeding_storage_limit? %>
-    <%= button_to "Downgrade to Regular", account_subscription_downgrade_path, class: "btn", form: { data: { turbo: false } } %>
-  <% end %>
-</p>
-
 <p>
   <%= link_to "Manage your subscription", account_billing_portal_path, class: "btn btn--plain settings-subscription__link txt-link", data: { turbo_prefetch: false } %>
 </p>
 
+<div class="settings-subscription__footer txt-small margin-block">
+  Right now you’re on the <strong><%= Current.account.plan.name %></strong> plan which includes unlimited cards, unlimited users, and <%= storage_to_human_size(Plan.paid.storage_limit) %> of storage.
+
+  <% if subscription.plan == Plan.paid %>
+    <%= button_to "Upgrade", account_subscription_upgrade_path, class: "btn btn--plain settings-subscription__link txt-link", form: { class: "flex-inline flex-wrap", data: { turbo: false } } %>
+    to <%= storage_to_human_size(Plan.paid_with_extra_storage.storage_limit) %> storage for <%= number_to_currency(Plan.paid_with_extra_storage.price - Plan.paid.price, strip_insignificant_zeros: true) %>/month more.
+  <% elsif subscription.plan == Plan.paid_with_extra_storage && !Current.account.exceeding_storage_limit? %>
+    <%= button_to "Downgrade", account_subscription_downgrade_path, class: "btn btn--plain settings-subscription__link txt-link", form: { class: "flex-inline flex-wrap", data: { turbo: false } } %>
+    to <%= storage_to_human_size(Plan.paid.storage_limit) %> storage.
+  <% end %>
+</div>