From 321a343df4c9f2dc64da8c3bfeaddeb429d718a9 Mon Sep 17 00:00:00 2001
From: Zach Gollwitzer <zach.gollwitzer@gmail.com>
Date: Sat, 19 Jul 2025 13:22:56 -0400
Subject: [PATCH 1/2] Fix title for activity feed

---
 app/components/UI/account/activity_feed.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/UI/account/activity_feed.html.erb b/app/components/UI/account/activity_feed.html.erb
index c6740a0a..14753b82 100644
--- a/app/components/UI/account/activity_feed.html.erb
+++ b/app/components/UI/account/activity_feed.html.erb
@@ -1,7 +1,7 @@
 <%= turbo_frame_tag dom_id(account, "entries") do %>
   <div class="bg-container p-5 shadow-border-xs rounded-xl">
     <div class="flex items-center justify-between mb-4" data-testid="activity-menu">
-      <%= tag.h2 t(".title"), class: "font-medium text-lg" %>
+      <%= tag.h2 "Activity", class: "font-medium text-lg" %>
 
       <% if account.manual? %>
         <%= render DS::Menu.new(variant: "button") do |menu| %>

From 347c0a790693031fdd3b32792b5b6792693d1805 Mon Sep 17 00:00:00 2001
From: Akshay Birajdar <akshaybirajdar05@gmail.com>
Date: Tue, 22 Jul 2025 15:51:00 +0530
Subject: [PATCH 2/2] feat: Only show active accounts for transaction form
 (#2484)

---
 app/views/transactions/_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/transactions/_form.html.erb b/app/views/transactions/_form.html.erb
index 46fd4ac1..3760f7dd 100644
--- a/app/views/transactions/_form.html.erb
+++ b/app/views/transactions/_form.html.erb
@@ -18,7 +18,7 @@
     <% if @entry.account_id %>
       <%= f.hidden_field :account_id %>
     <% else %>
-      <%= f.collection_select :account_id, Current.family.accounts.manual.alphabetically, :id, :name, { prompt: t(".account_prompt"), label: t(".account") }, required: true, class: "form-field__input text-ellipsis" %>
+      <%= f.collection_select :account_id, Current.family.accounts.manual.active.alphabetically, :id, :name, { prompt: t(".account_prompt"), label: t(".account") }, required: true, class: "form-field__input text-ellipsis" %>
     <% end %>
 
     <%= f.money_field :amount, label: t(".amount"), required: true %>