From 5cb3b7fc75e667c26656c72a993d40b38378babd Mon Sep 17 00:00:00 2001
From: Zach Gollwitzer <zach.gollwitzer@gmail.com>
Date: Tue, 28 Jan 2025 19:47:20 -0500
Subject: [PATCH 1/9] Preserve transaction filters across page visits

---
 app/controllers/transactions_controller.rb    | 78 ++++++++++++++++++-
 app/helpers/transactions_helper.rb            | 19 +----
 .../transactions/searches/_menu.html.erb      |  2 +-
 .../searches/filters/_badge.html.erb          |  2 +-
 config/routes.rb                              |  7 +-
 ...03_store_transaction_filters_in_session.rb |  5 ++
 db/schema.rb                                  |  3 +-
 7 files changed, 91 insertions(+), 25 deletions(-)
 create mode 100644 db/migrate/20250128203303_store_transaction_filters_in_session.rb

diff --git a/app/controllers/transactions_controller.rb b/app/controllers/transactions_controller.rb
index 80248ef2..1628f358 100644
--- a/app/controllers/transactions_controller.rb
+++ b/app/controllers/transactions_controller.rb
@@ -1,10 +1,17 @@
 class TransactionsController < ApplicationController
   layout :with_sidebar
 
+  before_action :restore_params_and_redirect!, only: :index, if: :should_restore_params?
+
   def index
-    @q = search_params
+    @q = search_params || {}
+    @page = (params[:page] || 1).to_i
+    @per_page = (params[:per_page] || 50).to_i
+
+    store_params!(@q, @page, @per_page) if @q.present? || @page > 1 || @per_page != 50 
+
     search_query = Current.family.transactions.search(@q).reverse_chronological
-    @pagy, @transaction_entries = pagy(search_query, limit: params[:per_page] || "50")
+    @pagy, @transaction_entries = pagy(search_query, limit: @per_page)
 
     totals_query = search_query.incomes_and_expenses
     family_currency = Current.family.currency
@@ -18,13 +25,78 @@ class TransactionsController < ApplicationController
     }
   end
 
+  def clear_filters
+    Current.session.update!(prev_transaction_page_params: {})
+    redirect_to transactions_path
+  end
+
+  def clear_filter_params
+    params.permit(:param_key, :param_value)
+  end
+
+  def clear_filter
+    updated_params = stored_params.deep_dup
+
+    q_params = updated_params["q"] || {}
+
+    param_key = params[:param_key]
+    param_value = params[:param_value]
+    
+    if q_params[param_key].is_a?(Array)
+      q_params[param_key].delete(param_value)
+      q_params.delete(param_key) if q_params[param_key].empty?
+    else
+      q_params.delete(param_key)
+    end
+
+    updated_params["q"] = q_params.presence
+    Current.session.update!(prev_transaction_page_params: updated_params)
+
+    redirect_to transactions_path(updated_params)
+  end
+
   private
     def search_params
-      params.fetch(:q, {})
+      cleaned_params = params.fetch(:q, {})
             .permit(
               :start_date, :end_date, :search, :amount,
               :amount_operator, accounts: [], account_ids: [],
               categories: [], merchants: [], types: [], tags: []
             )
+            .to_h
+            .compact_blank
+       
+      cleaned_params.delete(:amount_operator) unless cleaned_params[:amount].present?
+
+      cleaned_params
+    end
+
+    def store_params!(q, page, per_page)
+      Current.session.update!(
+        prev_transaction_page_params: {
+          q: q,
+          page: page,
+          per_page: per_page
+        }
+      )
+    end
+
+    def stored_params
+      Current.session.prev_transaction_page_params
+    end
+
+    def should_restore_params?
+      request.query_parameters.blank? && (stored_params["q"].present? || stored_params["page"].to_i > 1 || stored_params["per_page"].to_i != 50)
+    end
+
+    def restore_params_and_redirect!
+      page_value = stored_params["page"].to_i == 1 ? nil : stored_params["page"]
+      per_page_value = stored_params["per_page"].to_i == 50 ? nil : stored_params["per_page"]
+
+      redirect_to transactions_path(
+        q: stored_params["q"],
+        page: page_value,
+        per_page: per_page_value
+      )
     end
 end
diff --git a/app/helpers/transactions_helper.rb b/app/helpers/transactions_helper.rb
index 5c6f4d7b..08e0004f 100644
--- a/app/helpers/transactions_helper.rb
+++ b/app/helpers/transactions_helper.rb
@@ -17,22 +17,5 @@ module TransactionsHelper
 
   def get_default_transaction_search_filter
     transaction_search_filters[0]
-  end
-
-  def transactions_path_without_param(param_key, param_value)
-    updated_params = request.query_parameters.deep_dup
-
-    q_params = updated_params[:q] || {}
-
-    current_value = q_params[param_key]
-    if current_value.is_a?(Array)
-      q_params[param_key] = current_value - [ param_value ]
-    else
-      q_params.delete(param_key)
-    end
-
-    updated_params[:q] = q_params
-
-    transactions_path(updated_params)
-  end
+  end 
 end
diff --git a/app/views/transactions/searches/_menu.html.erb b/app/views/transactions/searches/_menu.html.erb
index a42840ef..72ff96c9 100644
--- a/app/views/transactions/searches/_menu.html.erb
+++ b/app/views/transactions/searches/_menu.html.erb
@@ -33,7 +33,7 @@
     <div class="flex justify-between items-center gap-2 bg-white p-3">
       <div>
         <% if @q.present? %>
-          <%= link_to t(".clear_filters"), transactions_path, class: "btn btn--ghost" %>
+          <%= button_to t(".clear_filters"), clear_filters_transactions_path, method: :delete, class: "btn btn--ghost" %>
         <% end %>
       </div>
 
diff --git a/app/views/transactions/searches/filters/_badge.html.erb b/app/views/transactions/searches/filters/_badge.html.erb
index f0ec8b1a..1fd2da28 100644
--- a/app/views/transactions/searches/filters/_badge.html.erb
+++ b/app/views/transactions/searches/filters/_badge.html.erb
@@ -41,7 +41,7 @@
     </div>
   <% end %>
 
-  <%= link_to transactions_path_without_param(param_key, param_value), data: { id: "clear-param-btn", turbo: false }, class: "flex items-center" do %>
+  <%= button_to clear_filter_transactions_path(param_key: param_key, param_value: param_value), method: :delete, data: { turbo: false }, class: "flex items-center" do %>
     <%= lucide_icon "x", class: "w-4 h-4 text-gray-500" %>
   <% end %>
 </li>
diff --git a/config/routes.rb b/config/routes.rb
index d49ca187..dcbb00be 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -109,7 +109,12 @@ Rails.application.routes.draw do
     end
   end
 
-  resources :transactions, only: :index
+  resources :transactions, only: :index do
+    collection do
+      delete :clear_filters
+      delete :clear_filter
+    end
+  end
 
   # Convenience routes for polymorphic paths
   # Example: account_path(Account.new(accountable: Depository.new)) => /depositories/123
diff --git a/db/migrate/20250128203303_store_transaction_filters_in_session.rb b/db/migrate/20250128203303_store_transaction_filters_in_session.rb
new file mode 100644
index 00000000..00c7ee5c
--- /dev/null
+++ b/db/migrate/20250128203303_store_transaction_filters_in_session.rb
@@ -0,0 +1,5 @@
+class StoreTransactionFiltersInSession < ActiveRecord::Migration[7.2]
+  def change
+    add_column :sessions, :prev_transaction_page_params, :jsonb, default: {}
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5b0a0697..54a65580 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2025_01_24_224316) do
+ActiveRecord::Schema[7.2].define(version: 2025_01_28_203303) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -569,6 +569,7 @@ ActiveRecord::Schema[7.2].define(version: 2025_01_24_224316) do
     t.datetime "updated_at", null: false
     t.uuid "active_impersonator_session_id"
     t.datetime "subscribed_at"
+    t.jsonb "prev_transaction_page_params", default: {}
     t.index ["active_impersonator_session_id"], name: "index_sessions_on_active_impersonator_session_id"
     t.index ["user_id"], name: "index_sessions_on_user_id"
   end
-- 
2.53.0


From af6f12bb033e256455012e6116be2173f83785d1 Mon Sep 17 00:00:00 2001
From: Zach Gollwitzer <zach.gollwitzer@gmail.com>
Date: Wed, 29 Jan 2025 15:06:20 -0500
Subject: [PATCH 2/9] Preserve params when per_page is updated

---
 app/controllers/transactions_controller.rb    | 65 +++++++++----------
 app/helpers/application_helper.rb             | 20 ------
 .../controllers/selectable_link_controller.js | 20 ++++++
 app/views/account/entries/index.html.erb      |  2 +-
 app/views/application/_pagination.html.erb    | 37 ++++-------
 .../transactions/searches/_form.html.erb      |  2 +
 6 files changed, 68 insertions(+), 78 deletions(-)
 create mode 100644 app/javascript/controllers/selectable_link_controller.js

diff --git a/app/controllers/transactions_controller.rb b/app/controllers/transactions_controller.rb
index 1628f358..56bcad6c 100644
--- a/app/controllers/transactions_controller.rb
+++ b/app/controllers/transactions_controller.rb
@@ -1,17 +1,13 @@
 class TransactionsController < ApplicationController
   layout :with_sidebar
 
-  before_action :restore_params_and_redirect!, only: :index, if: :should_restore_params?
+  # before_action :store_params!, only: :index
 
   def index
-    @q = search_params || {}
-    @page = (params[:page] || 1).to_i
-    @per_page = (params[:per_page] || 50).to_i
-
-    store_params!(@q, @page, @per_page) if @q.present? || @page > 1 || @per_page != 50 
+    @q = search_params
 
     search_query = Current.family.transactions.search(@q).reverse_chronological
-    @pagy, @transaction_entries = pagy(search_query, limit: @per_page)
+    @pagy, @transaction_entries = pagy(search_query, limit: params[:per_page].presence || default_params[:per_page])
 
     totals_query = search_query.incomes_and_expenses
     family_currency = Current.family.currency
@@ -30,10 +26,6 @@ class TransactionsController < ApplicationController
     redirect_to transactions_path
   end
 
-  def clear_filter_params
-    params.permit(:param_key, :param_value)
-  end
-
   def clear_filter
     updated_params = stored_params.deep_dup
 
@@ -71,32 +63,39 @@ class TransactionsController < ApplicationController
       cleaned_params
     end
 
-    def store_params!(q, page, per_page)
-      Current.session.update!(
-        prev_transaction_page_params: {
-          q: q,
-          page: page,
-          per_page: per_page
-        }
-      )
+    def store_params!
+      if should_restore_params?
+        params_to_restore = {}
+
+        params_to_restore[:q] = stored_params["q"].presence || default_params[:q]
+        params_to_restore[:page] = stored_params["page"].presence || default_params[:page]
+        params_to_restore[:per_page] = stored_params["per_page"].presence || default_params[:per_page]
+  
+        redirect_to transactions_path(params_to_restore)
+      else
+        Current.session.update!(
+          prev_transaction_page_params: {
+            q: search_params,
+            page: params[:page],
+            per_page: params[:per_page]
+          }
+        )
+      end
+    end
+
+    def should_restore_params?
+      request.query_parameters.blank? && (stored_params["q"].present? || stored_params["page"].present? || stored_params["per_page"].present?)
     end
 
     def stored_params
       Current.session.prev_transaction_page_params
-    end
+    end 
 
-    def should_restore_params?
-      request.query_parameters.blank? && (stored_params["q"].present? || stored_params["page"].to_i > 1 || stored_params["per_page"].to_i != 50)
-    end
-
-    def restore_params_and_redirect!
-      page_value = stored_params["page"].to_i == 1 ? nil : stored_params["page"]
-      per_page_value = stored_params["per_page"].to_i == 50 ? nil : stored_params["per_page"]
-
-      redirect_to transactions_path(
-        q: stored_params["q"],
-        page: page_value,
-        per_page: per_page_value
-      )
+    def default_params
+      {
+        q: {},
+        page: 1,
+        per_page: 50
+      }
     end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4f1c9499..5d561bc1 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -176,24 +176,4 @@ module ApplicationHelper
 
     cookies[:admin] == "true"
   end
-
-  def custom_pagy_url_for(pagy, page, current_path: nil)
-    if current_path.blank?
-      pagy_url_for(pagy, page)
-    else
-      uri = URI.parse(current_path)
-      params = URI.decode_www_form(uri.query || "").to_h
-
-      # Delete existing page param if it exists
-      params.delete("page")
-      # Add new page param unless it's page 1
-      params["page"] = page unless page == 1
-
-      if params.empty?
-        uri.path
-      else
-        "#{uri.path}?#{URI.encode_www_form(params)}"
-      end
-    end
-  end
 end
diff --git a/app/javascript/controllers/selectable_link_controller.js b/app/javascript/controllers/selectable_link_controller.js
new file mode 100644
index 00000000..7d93a7ce
--- /dev/null
+++ b/app/javascript/controllers/selectable_link_controller.js
@@ -0,0 +1,20 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="selectable-link"
+export default class extends Controller {
+  connect() {
+    this.element.addEventListener("change", this.handleChange.bind(this));
+  }
+
+  disconnect() {
+    this.element.removeEventListener("change", this.handleChange.bind(this));
+  }
+
+  handleChange(event) {
+    const paramName = this.element.name;
+    const currentUrl = new URL(window.location.href);
+    currentUrl.searchParams.set(paramName, event.target.value);
+
+    Turbo.visit(currentUrl.toString());
+  }
+}
diff --git a/app/views/account/entries/index.html.erb b/app/views/account/entries/index.html.erb
index 1ac6de61..c659d97f 100644
--- a/app/views/account/entries/index.html.erb
+++ b/app/views/account/entries/index.html.erb
@@ -84,7 +84,7 @@
           </div>
 
           <div class="p-4 bg-white rounded-bl-lg rounded-br-lg">
-            <%= render "pagination", pagy: @pagy, current_path: account_path(@account, page: params[:page], tab: params[:tab]) %>
+            <%= render "pagination", pagy: @pagy %>
           </div>
         </div>
       <% end %>
diff --git a/app/views/application/_pagination.html.erb b/app/views/application/_pagination.html.erb
index 13da2cd9..32809bcb 100644
--- a/app/views/application/_pagination.html.erb
+++ b/app/views/application/_pagination.html.erb
@@ -1,11 +1,10 @@
-<%# locals: (pagy:, current_path: nil) %>
+<%# locals: (pagy:) %>
 <nav class="flex w-full items-center justify-between">
   <div class="flex items-center gap-1">
     <div>
       <% if pagy.prev %>
-        <%= link_to custom_pagy_url_for(pagy, pagy.prev, current_path: current_path),
-              class: "inline-flex items-center p-2 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700",
-              data: (current_path ? { turbo_frame: "_top" } : {}) do %>
+        <%= link_to pagy_url_for(pagy, pagy.prev),
+              class: "inline-flex items-center p-2 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700" do %>
           <%= lucide_icon("chevron-left", class: "w-5 h-5 text-gray-500") %>
         <% end %>
       <% else %>
@@ -17,15 +16,13 @@
     <div class="rounded-xl p-1 bg-gray-25">
       <% pagy.series.each do |series_item| %>
         <% if series_item.is_a?(Integer) %>
-          <%= link_to custom_pagy_url_for(pagy, series_item, current_path: current_path),
-                class: "rounded-md px-2 py-1 inline-flex items-center text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700",
-                data: (current_path ? { turbo_frame: "_top" } : {}) do %>
+          <%= link_to pagy_url_for(pagy, series_item),
+                class: "rounded-md px-2 py-1 inline-flex items-center text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700" do %>
             <%= series_item %>
           <% end %>
         <% elsif series_item.is_a?(String) %>
-          <%= link_to custom_pagy_url_for(pagy, series_item, current_path: current_path),
-                class: "rounded-md px-2 py-1 bg-white border border-alpha-black-25 shadow-xs inline-flex items-center text-sm font-medium text-gray-900",
-                data: (current_path ? { turbo_frame: "_top" } : {}) do %>
+          <%= link_to pagy_url_for(pagy, series_item),
+                class: "rounded-md px-2 py-1 bg-white border border-alpha-black-25 shadow-xs inline-flex items-center text-sm font-medium text-gray-900" do %>
             <%= series_item %>
           <% end %>
         <% elsif series_item == :gap %>
@@ -35,9 +32,8 @@
     </div>
     <div>
       <% if pagy.next %>
-        <%= link_to custom_pagy_url_for(pagy, pagy.next, current_path: current_path),
-              class: "inline-flex items-center p-2 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700",
-              data: (current_path ? { turbo_frame: "_top" } : {}) do %>
+        <%= link_to pagy_url_for(pagy, pagy.next),
+              class: "inline-flex items-center p-2 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700" do %>
           <%= lucide_icon("chevron-right", class: "w-5 h-5 text-gray-500") %>
         <% end %>
       <% else %>
@@ -48,16 +44,9 @@
     </div>
   </div>
   <div class="flex items-center gap-4">
-    <%= form_with url: custom_pagy_url_for(pagy, pagy.page, current_path: current_path),
-                method: :get,
-                class: "flex items-center gap-4",
-                data: { controller: "auto-submit-form" } do |f| %>
-      <%= f.label :per_page, t(".rows_per_page"), class: "text-sm text-gray-500" %>
-      <%= f.select :per_page,
-                 options_for_select(["10", "20", "30", "50"], pagy.limit),
-                 {},
-                 class: "py-1.5 pr-8 text-sm text-gray-900 font-medium border border-gray-200 rounded-lg focus:border-gray-900 focus:ring-gray-900 focus-visible:ring-gray-900",
-                 data: { "auto-submit-form-target": "auto" } %>
-    <% end %>
+    <%= select_tag :per_page, 
+                   options_for_select(["10", "20", "30", "50"], pagy.limit), 
+                   data: { controller: "selectable-link" },
+                   class: "py-1.5 pr-8 text-sm text-gray-900 font-medium border border-gray-200 rounded-lg focus:border-gray-900 focus:ring-gray-900 focus-visible:ring-gray-900" %>
   </div>
 </nav>
diff --git a/app/views/transactions/searches/_form.html.erb b/app/views/transactions/searches/_form.html.erb
index 84f628b3..2e6ad04c 100644
--- a/app/views/transactions/searches/_form.html.erb
+++ b/app/views/transactions/searches/_form.html.erb
@@ -3,6 +3,8 @@
               scope: :q,
               method: :get,
               data: { controller: "auto-submit-form" } do |form| %>
+  <%= hidden_field_tag :per_page, params[:per_page] %>
+
   <div class="flex gap-2 mb-4">
     <div class="grow">
       <div class="flex items-center px-3 py-2 gap-2 border border-gray-200 rounded-lg focus-within:ring-gray-100 focus-within:border-gray-900">
-- 
2.53.0


From 59ec17e6415db693b3c9053d3b3a773ac5e9d9e9 Mon Sep 17 00:00:00 2001
From: Zach Gollwitzer <zach.gollwitzer@gmail.com>
Date: Wed, 29 Jan 2025 16:26:58 -0500
Subject: [PATCH 3/9] Autofocus selected transactions

---
 app/controllers/account/entries_controller.rb | 26 -----
 .../concerns/accountable_resource.rb          | 16 ++++
 app/controllers/transactions_controller.rb    | 20 +++-
 .../controllers/focus_entry_controller.js     | 29 ++++++
 app/views/account/entries/index.html.erb      | 93 ------------------
 .../transactions/_transaction.html.erb        |  4 +-
 app/views/accounts/show/_activity.html.erb    | 94 ++++++++++++++++++-
 app/views/application/_pagination.html.erb    |  5 +
 app/views/credit_cards/show.html.erb          |  2 +-
 app/views/investments/show.html.erb           |  2 +-
 app/views/loans/show.html.erb                 |  2 +-
 app/views/properties/show.html.erb            |  2 +-
 app/views/transactions/index.html.erb         |  2 +-
 app/views/vehicles/show.html.erb              |  2 +-
 config/locales/models/transfer/en.yml         |  9 +-
 config/locales/views/account/entries/en.yml   | 11 ---
 config/locales/views/accounts/en.yml          | 11 +++
 config/locales/views/application/en.yml       |  3 -
 config/locales/views/categories/en.yml        |  4 +-
 config/locales/views/layout/en.yml            |  2 +-
 config/routes.rb                              |  2 -
 .../account/entries_controller_test.rb        | 13 ---
 22 files changed, 186 insertions(+), 168 deletions(-)
 delete mode 100644 app/controllers/account/entries_controller.rb
 create mode 100644 app/javascript/controllers/focus_entry_controller.js
 delete mode 100644 app/views/account/entries/index.html.erb
 delete mode 100644 test/controllers/account/entries_controller_test.rb

diff --git a/app/controllers/account/entries_controller.rb b/app/controllers/account/entries_controller.rb
deleted file mode 100644
index b36cdbc6..00000000
--- a/app/controllers/account/entries_controller.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-class Account::EntriesController < ApplicationController
-  layout :with_sidebar
-
-  before_action :set_account
-
-  def index
-    @q = search_params
-    @pagy, @entries = pagy(entries_scope.search(@q).reverse_chronological, limit: params[:per_page] || "10")
-  end
-
-  private
-    def set_account
-      @account = Current.family.accounts.find(params[:account_id])
-    end
-
-    def entries_scope
-      scope = Current.family.entries
-      scope = scope.where(account: @account) if @account
-      scope
-    end
-
-    def search_params
-      params.fetch(:q, {})
-            .permit(:search)
-    end
-end
diff --git a/app/controllers/concerns/accountable_resource.rb b/app/controllers/concerns/accountable_resource.rb
index 8f6a3244..0c2b554b 100644
--- a/app/controllers/concerns/accountable_resource.rb
+++ b/app/controllers/concerns/accountable_resource.rb
@@ -22,6 +22,22 @@ module AccountableResource
   end
 
   def show
+    @q = params.fetch(:q, {}).permit(:search)
+    entries = @account.entries.search(@q).reverse_chronological
+
+    if params[:focused_entry_id].present?
+      @focused_entry = entries.find_by(id: params[:focused_entry_id])
+      position = entries.pluck(:id).index(params[:focused_entry_id])
+      
+      if position.present?
+        focused_page = (position / (params[:per_page] || 10)) + 1
+        if params[:page]&.to_i != focused_page
+          return redirect_to account_path(@account, page: focused_page, focused_entry_id: params[:focused_entry_id]) 
+        end
+      end
+    end
+
+    @pagy, @entries = pagy(entries, limit: params[:per_page] || "10", params: ->(params) { params.except(:focused_entry_id) })
   end
 
   def edit
diff --git a/app/controllers/transactions_controller.rb b/app/controllers/transactions_controller.rb
index 56bcad6c..06bfe5c7 100644
--- a/app/controllers/transactions_controller.rb
+++ b/app/controllers/transactions_controller.rb
@@ -1,13 +1,27 @@
 class TransactionsController < ApplicationController
   layout :with_sidebar
 
-  # before_action :store_params!, only: :index
+  before_action :store_params!, only: :index
 
   def index
     @q = search_params
-
     search_query = Current.family.transactions.search(@q).reverse_chronological
-    @pagy, @transaction_entries = pagy(search_query, limit: params[:per_page].presence || default_params[:per_page])
+
+    if params[:focused_entry_id].present?
+      @focused_entry = search_query.find_by(id: params[:focused_entry_id])
+      position = search_query.pluck(:id).index(params[:focused_entry_id])
+      
+      if position.present?
+        focused_page = (position / (params[:per_page] || 10).to_i) + 1
+        if params[:page]&.to_i != focused_page
+          return redirect_to transactions_path(page: focused_page, focused_entry_id: params[:focused_entry_id])
+        else
+          params.delete(:focused_entry_id)
+        end
+      end
+    end
+
+    @pagy, @transaction_entries = pagy(search_query, limit: params[:per_page].presence || default_params[:per_page], params: ->(params) { params.except(:focused_entry_id) })
 
     totals_query = search_query.incomes_and_expenses
     family_currency = Current.family.currency
diff --git a/app/javascript/controllers/focus_entry_controller.js b/app/javascript/controllers/focus_entry_controller.js
new file mode 100644
index 00000000..48ed5044
--- /dev/null
+++ b/app/javascript/controllers/focus_entry_controller.js
@@ -0,0 +1,29 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="focus-entry"
+export default class extends Controller {
+  static values = {
+    id: String,
+  };
+
+  connect() {
+    if (this.idValue) {
+      // Wait for any Turbo navigation to complete
+      document.addEventListener(
+        "turbo:load",
+        () => {
+          const element = document.getElementById(this.idValue);
+          if (element) {
+            element.scrollIntoView({ behavior: "smooth" });
+
+            // Remove the focused_entry_id parameter from URL
+            const url = new URL(window.location);
+            url.searchParams.delete("focused_entry_id");
+            window.history.replaceState({}, "", url);
+          }
+        },
+        { once: true },
+      );
+    }
+  }
+}
diff --git a/app/views/account/entries/index.html.erb b/app/views/account/entries/index.html.erb
deleted file mode 100644
index c659d97f..00000000
--- a/app/views/account/entries/index.html.erb
+++ /dev/null
@@ -1,93 +0,0 @@
-<%= turbo_frame_tag dom_id(@account, "entries") do %>
-  <div class="bg-white p-5 border border-alpha-black-25 rounded-xl shadow-xs">
-    <div class="flex items-center justify-between mb-4">
-      <%= tag.h2 t(".title"), class: "font-medium text-lg" %>
-      <% unless @account.plaid_account_id.present? %>
-        <div data-controller="menu" data-testid="activity-menu">
-          <button class="btn btn--secondary flex items-center gap-2" data-menu-target="button">
-            <%= lucide_icon("plus", class: "w-4 h-4") %>
-            <%= tag.span t(".new") %>
-          </button>
-          <div data-menu-target="content" class="z-10 hidden bg-white rounded-lg border border-alpha-black-25 shadow-xs p-1">
-            <%= link_to new_account_valuation_path(account_id: @account.id), data: { turbo_frame: :modal }, class: "block p-2 rounded-lg hover:bg-gray-50 flex items-center gap-2" do %>
-              <%= lucide_icon("circle-dollar-sign", class: "text-gray-500 w-5 h-5") %>
-              <%= tag.span t(".new_balance"), class: "text-sm" %>
-            <% end %>
-
-            <% unless @account.crypto? %>
-              <%= link_to @account.investment? ? new_account_trade_path(account_id: @account.id) : new_account_transaction_path(account_id: @account.id), data: { turbo_frame: :modal }, class: "block p-2 rounded-lg hover:bg-gray-50 flex items-center gap-2" do %>
-                <%= lucide_icon("credit-card", class: "text-gray-500 w-5 h-5") %>
-                <%= tag.span t(".new_transaction"), class: "text-sm" %>
-              <% end %>
-            <% end %>
-          </div>
-        </div>
-      <% end %>
-    </div>
-
-    <div>
-      <%= form_with url: account_entries_path,
-              id: "entries-search",
-              scope: :q,
-              method: :get,
-              data: { controller: "auto-submit-form" } do |form| %>
-        <div class="flex gap-2 mb-4">
-          <div class="grow">
-            <div class="flex items-center px-3 py-2 gap-2 border border-gray-200 rounded-lg focus-within:ring-gray-100 focus-within:border-gray-900">
-              <%= lucide_icon("search", class: "w-5 h-5 text-gray-500") %>
-              <%= hidden_field_tag :account_id, @account.id %>
-              <%= form.search_field :search,
-                            placeholder: "Search entries by name",
-                            value: @q[:search],
-                            class: "form-field__input placeholder:text-sm placeholder:text-gray-500",
-                            "data-auto-submit-form-target": "auto" %>
-            </div>
-          </div>
-        </div>
-      <% end %>
-    </div>
-
-    <% if @entries.empty? %>
-      <p class="text-gray-500 text-sm p-4"><%= t(".no_entries") %></p>
-    <% else %>
-      <%= tag.div id: dom_id(@account, "entries_bulk_select"),
-                data: {
-                  controller: "bulk-select",
-                  bulk_select_singular_label_value: t(".entry"),
-                  bulk_select_plural_label_value: t(".entries")
-                } do %>
-        <div id="entry-selection-bar" data-bulk-select-target="selectionBar" class="flex justify-center hidden">
-          <%= render "account/entries/selection_bar" %>
-        </div>
-
-        <div class="grid bg-gray-25 rounded-xl grid-cols-12 items-center uppercase text-xs font-medium text-gray-500 px-5 py-3 mb-4">
-          <div class="pl-0.5 col-span-8 flex items-center gap-4">
-            <%= check_box_tag "selection_entry",
-                              class: "maybe-checkbox maybe-checkbox--light",
-                              data: { action: "bulk-select#togglePageSelection" } %>
-            <p><%= t(".date") %></p>
-          </div>
-          <%= tag.p t(".amount"), class: "col-span-2 justify-self-end" %>
-          <%= tag.p t(".balance"), class: "col-span-2 justify-self-end" %>
-        </div>
-
-        <div>
-          <div class="rounded-tl-lg rounded-tr-lg bg-white border-alpha-black-25 shadow-xs">
-            <div class="space-y-4">
-              <% calculator = Account::BalanceTrendCalculator.for(@entries) %>
-              <%= entries_by_date(@entries) do |entries| %>
-                <% entries.each do |entry| %>
-                  <%= render entry, balance_trend: calculator&.trend_for(entry) %>
-                <% end %>
-              <% end %>
-            </div>
-          </div>
-
-          <div class="p-4 bg-white rounded-bl-lg rounded-br-lg">
-            <%= render "pagination", pagy: @pagy %>
-          </div>
-        </div>
-      <% end %>
-    <% end %>
-  </div>
-<% end %>
diff --git a/app/views/account/transactions/_transaction.html.erb b/app/views/account/transactions/_transaction.html.erb
index ce6cd187..d6c0201b 100644
--- a/app/views/account/transactions/_transaction.html.erb
+++ b/app/views/account/transactions/_transaction.html.erb
@@ -1,7 +1,7 @@
 <%# locals: (entry:, selectable: true, balance_trend: nil) %>
 <% transaction, account = entry.account_transaction, entry.account %>
 
-<div class="grid grid-cols-12 items-center text-gray-900 text-sm font-medium p-4">
+<div class="grid grid-cols-12 items-center text-gray-900 text-sm font-medium p-4 <%= @focused_entry == entry ? "border border-gray-900 rounded-lg" : "" %>">
   <div class="pr-10 flex items-center gap-4 <%= balance_trend ? "col-span-6" : "col-span-8" %>">
     <% if selectable %>
       <%= check_box_tag dom_id(entry, "selection"),
@@ -45,7 +45,7 @@
               <% if entry.account_transaction.transfer? %>
                 <%= render "transfers/account_links", transfer: entry.account_transaction.transfer, is_inflow: entry.account_transaction.transfer_as_inflow.present? %>
               <% else %>
-                <%= link_to entry.account.name, account_path(entry.account, tab: "transactions"), data: { turbo_frame: "_top" }, class: "hover:underline" %>
+                <%= link_to entry.account.name, account_path(entry.account, tab: "transactions", focused_entry_id: entry.id), data: { turbo_frame: "_top" }, class: "hover:underline" %>
               <% end %>
             </div>
           </div>
diff --git a/app/views/accounts/show/_activity.html.erb b/app/views/accounts/show/_activity.html.erb
index 86dc7038..715e9dfc 100644
--- a/app/views/accounts/show/_activity.html.erb
+++ b/app/views/accounts/show/_activity.html.erb
@@ -1,5 +1,95 @@
 <%# locals: (account:) %>
 
-<%= turbo_frame_tag dom_id(account, :entries), src: account_entries_path(account_id: account.id, page: params[:page], tab: params[:tab]) do %>
-  <%= render "account/entries/loading" %>
+<%= turbo_frame_tag dom_id(account, "entries") do %>
+  <div class="bg-white p-5 border border-alpha-black-25 rounded-xl shadow-xs" data-controller="focus-entry" data-focus-entry-id-value="<%= @focused_entry ? dom_id(@focused_entry) : nil %>">
+    <div class="flex items-center justify-between mb-4">
+      <%= tag.h2 t(".title"), class: "font-medium text-lg" %>
+      <% unless @account.plaid_account_id.present? %>
+        <div data-controller="menu" data-testid="activity-menu">
+          <button class="btn btn--secondary flex items-center gap-2" data-menu-target="button">
+            <%= lucide_icon("plus", class: "w-4 h-4") %>
+            <%= tag.span t(".new") %>
+          </button>
+          <div data-menu-target="content" class="z-10 hidden bg-white rounded-lg border border-alpha-black-25 shadow-xs p-1">
+            <%= link_to new_account_valuation_path(account_id: @account.id), data: { turbo_frame: :modal }, class: "block p-2 rounded-lg hover:bg-gray-50 flex items-center gap-2" do %>
+              <%= lucide_icon("circle-dollar-sign", class: "text-gray-500 w-5 h-5") %>
+              <%= tag.span t(".new_balance"), class: "text-sm" %>
+            <% end %>
+
+            <% unless @account.crypto? %>
+              <%= link_to @account.investment? ? new_account_trade_path(account_id: @account.id) : new_account_transaction_path(account_id: @account.id), data: { turbo_frame: :modal }, class: "block p-2 rounded-lg hover:bg-gray-50 flex items-center gap-2" do %>
+                <%= lucide_icon("credit-card", class: "text-gray-500 w-5 h-5") %>
+                <%= tag.span t(".new_transaction"), class: "text-sm" %>
+              <% end %>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+    </div>
+
+    <div>
+      <%= form_with url: account_path(account),
+              id: "entries-search",
+              scope: :q,
+              method: :get,
+              data: { controller: "auto-submit-form" } do |form| %>
+        <div class="flex gap-2 mb-4">
+          <div class="grow">
+            <div class="flex items-center px-3 py-2 gap-2 border border-gray-200 rounded-lg focus-within:ring-gray-100 focus-within:border-gray-900">
+              <%= lucide_icon("search", class: "w-5 h-5 text-gray-500") %>
+              <%= hidden_field_tag :account_id, @account.id %>
+              <%= form.search_field :search,
+                            placeholder: "Search entries by name",
+                            value: @q[:search],
+                            class: "form-field__input placeholder:text-sm placeholder:text-gray-500",
+                            "data-auto-submit-form-target": "auto" %>
+            </div>
+          </div>
+        </div>
+      <% end %>
+    </div>
+
+    <% if @entries.empty? %>
+      <p class="text-gray-500 text-sm p-4"><%= t(".no_entries") %></p>
+    <% else %>
+      <%= tag.div id: dom_id(@account, "entries_bulk_select"),
+                data: {
+                  controller: "bulk-select",
+                  bulk_select_singular_label_value: t(".entry"),
+                  bulk_select_plural_label_value: t(".entries")
+                } do %>
+        <div id="entry-selection-bar" data-bulk-select-target="selectionBar" class="flex justify-center hidden">
+          <%= render "account/entries/selection_bar" %>
+        </div>
+
+        <div class="grid bg-gray-25 rounded-xl grid-cols-12 items-center uppercase text-xs font-medium text-gray-500 px-5 py-3 mb-4">
+          <div class="pl-0.5 col-span-8 flex items-center gap-4">
+            <%= check_box_tag "selection_entry",
+                              class: "maybe-checkbox maybe-checkbox--light",
+                              data: { action: "bulk-select#togglePageSelection" } %>
+            <p><%= t(".date") %></p>
+          </div>
+          <%= tag.p t(".amount"), class: "col-span-2 justify-self-end" %>
+          <%= tag.p t(".balance"), class: "col-span-2 justify-self-end" %>
+        </div>
+
+        <div>
+          <div class="rounded-tl-lg rounded-tr-lg bg-white border-alpha-black-25 shadow-xs">
+            <div class="space-y-4">
+              <% calculator = Account::BalanceTrendCalculator.for(@entries) %>
+              <%= entries_by_date(@entries) do |entries| %>
+                <% entries.each do |entry| %>
+                  <%= render entry, balance_trend: calculator&.trend_for(entry) %>
+                <% end %>
+              <% end %>
+            </div>
+          </div>
+
+          <div class="p-4 bg-white rounded-bl-lg rounded-br-lg">
+            <%= render "pagination", pagy: @pagy %>
+          </div>
+        </div>
+      <% end %>
+    <% end %>
+  </div>
 <% end %>
diff --git a/app/views/application/_pagination.html.erb b/app/views/application/_pagination.html.erb
index 32809bcb..d6d8099b 100644
--- a/app/views/application/_pagination.html.erb
+++ b/app/views/application/_pagination.html.erb
@@ -1,9 +1,11 @@
 <%# locals: (pagy:) %>
+
 <nav class="flex w-full items-center justify-between">
   <div class="flex items-center gap-1">
     <div>
       <% if pagy.prev %>
         <%= link_to pagy_url_for(pagy, pagy.prev),
+              data: { turbo_frame: :_top },
               class: "inline-flex items-center p-2 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700" do %>
           <%= lucide_icon("chevron-left", class: "w-5 h-5 text-gray-500") %>
         <% end %>
@@ -17,11 +19,13 @@
       <% pagy.series.each do |series_item| %>
         <% if series_item.is_a?(Integer) %>
           <%= link_to pagy_url_for(pagy, series_item),
+                data: { turbo_frame: :_top },
                 class: "rounded-md px-2 py-1 inline-flex items-center text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700" do %>
             <%= series_item %>
           <% end %>
         <% elsif series_item.is_a?(String) %>
           <%= link_to pagy_url_for(pagy, series_item),
+                data: { turbo_frame: :_top },
                 class: "rounded-md px-2 py-1 bg-white border border-alpha-black-25 shadow-xs inline-flex items-center text-sm font-medium text-gray-900" do %>
             <%= series_item %>
           <% end %>
@@ -33,6 +37,7 @@
     <div>
       <% if pagy.next %>
         <%= link_to pagy_url_for(pagy, pagy.next),
+              data: { turbo_frame: :_top },
               class: "inline-flex items-center p-2 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700" do %>
           <%= lucide_icon("chevron-right", class: "w-5 h-5 text-gray-500") %>
         <% end %>
diff --git a/app/views/credit_cards/show.html.erb b/app/views/credit_cards/show.html.erb
index 2135dee9..4ba5252b 100644
--- a/app/views/credit_cards/show.html.erb
+++ b/app/views/credit_cards/show.html.erb
@@ -1,6 +1,6 @@
 <%= render "accounts/show/template",
            account: @account,
            tabs: render("accounts/show/tabs", account: @account, tabs: [
+            { key: "activity", contents: render("accounts/show/activity", account: @account) },
             { key: "overview", contents: render("credit_cards/overview", account: @account) },
-            { key: "activity", contents: render("accounts/show/activity", account: @account) }
            ]) %>
diff --git a/app/views/investments/show.html.erb b/app/views/investments/show.html.erb
index bc271e68..2336282e 100644
--- a/app/views/investments/show.html.erb
+++ b/app/views/investments/show.html.erb
@@ -16,8 +16,8 @@
 
     <div class="min-h-[800px]">
       <%= render "accounts/show/tabs", account: @account, tabs: [
-        { key: "holdings", contents: render("investments/holdings_tab", account: @account) },
         { key: "activity", contents: render("accounts/show/activity", account: @account) },
+        { key: "holdings", contents: render("investments/holdings_tab", account: @account) },
       ] %>
     </div>
   <% end %>
diff --git a/app/views/loans/show.html.erb b/app/views/loans/show.html.erb
index 64e9403c..35f29f9b 100644
--- a/app/views/loans/show.html.erb
+++ b/app/views/loans/show.html.erb
@@ -1,6 +1,6 @@
 <%= render "accounts/show/template",
            account: @account,
            tabs: render("accounts/show/tabs", account: @account, tabs: [
-             { key: "overview", contents: render("loans/overview", account: @account) },
              { key: "activity", contents: render("accounts/show/activity", account: @account) }
+             { key: "overview", contents: render("loans/overview", account: @account) },
            ]) %>
diff --git a/app/views/properties/show.html.erb b/app/views/properties/show.html.erb
index 24d42147..e6f8c34f 100644
--- a/app/views/properties/show.html.erb
+++ b/app/views/properties/show.html.erb
@@ -2,6 +2,6 @@
            account: @account,
            header: render("accounts/show/header", account: @account, subtitle: @account.property.address),
            tabs: render("accounts/show/tabs", account: @account, tabs: [
+            { key: "activity", contents: render("accounts/show/activity", account: @account) },
             { key: "overview", contents: render("properties/overview", account: @account) },
-            { key: "activity", contents: render("accounts/show/activity", account: @account) }
            ]) %>
diff --git a/app/views/transactions/index.html.erb b/app/views/transactions/index.html.erb
index 37d82f29..bf4b43ee 100644
--- a/app/views/transactions/index.html.erb
+++ b/app/views/transactions/index.html.erb
@@ -1,4 +1,4 @@
-<div class="space-y-4 h-full flex flex-col overflow-y-auto">
+<div class="space-y-4 h-full flex flex-col overflow-y-auto" data-controller="focus-entry" data-focus-entry-id-value="<%= @focused_entry ? dom_id(@focused_entry) : nil %>">
   <%= render "header" %>
 
   <%= render "summary", totals: @totals %>
diff --git a/app/views/vehicles/show.html.erb b/app/views/vehicles/show.html.erb
index 097a9bab..555cd926 100644
--- a/app/views/vehicles/show.html.erb
+++ b/app/views/vehicles/show.html.erb
@@ -1,6 +1,6 @@
 <%= render "accounts/show/template",
            account: @account,
            tabs: render("accounts/show/tabs", account: @account, tabs: [
+            { key: "activity", contents: render("accounts/show/activity", account: @account) },
             { key: "overview", contents: render("vehicles/overview", account: @account) },
-            { key: "activity", contents: render("accounts/show/activity", account: @account) }
            ]) %>
diff --git a/config/locales/models/transfer/en.yml b/config/locales/models/transfer/en.yml
index b6014ba4..094194f2 100644
--- a/config/locales/models/transfer/en.yml
+++ b/config/locales/models/transfer/en.yml
@@ -6,16 +6,17 @@ en:
         transfer:
           attributes:
             base:
+              inflow_cannot_be_in_multiple_transfers: Inflow transaction cannot be
+                part of multiple transfers
               must_be_from_different_accounts: Transfer must have different accounts
+              must_be_from_same_family: Transfer must be from the same family
               must_be_within_date_range: Transfer transaction dates must be within
                 4 days of each other
               must_have_opposite_amounts: Transfer transactions must have opposite
                 amounts
               must_have_single_currency: Transfer must have a single currency
-              must_be_from_same_family: Transfer must be from the same family
-              inflow_cannot_be_in_multiple_transfers: Inflow transaction cannot be part of multiple transfers
-              outflow_cannot_be_in_multiple_transfers: Outflow transaction cannot be part of multiple transfers
+              outflow_cannot_be_in_multiple_transfers: Outflow transaction cannot
+                be part of multiple transfers
   transfer:
     name: Transfer to %{to_account}
     payment_name: Payment to %{to_account}
-
diff --git a/config/locales/views/account/entries/en.yml b/config/locales/views/account/entries/en.yml
index 395ac91f..10b2acdb 100644
--- a/config/locales/views/account/entries/en.yml
+++ b/config/locales/views/account/entries/en.yml
@@ -9,17 +9,6 @@ en:
       empty:
         description: Try adding an entry, editing filters or refining your search
         title: No entries found
-      index:
-        amount: Amount
-        balance: Balance
-        date: Date
-        entries: entries
-        entry: entry
-        new: New
-        new_balance: New balance
-        new_transaction: New transaction
-        no_entries: No entries found
-        title: Activity
       loading:
         loading: Loading entries...
       update:
diff --git a/config/locales/views/accounts/en.yml b/config/locales/views/accounts/en.yml
index 3180b37e..94aa32b2 100644
--- a/config/locales/views/accounts/en.yml
+++ b/config/locales/views/accounts/en.yml
@@ -34,6 +34,17 @@ en:
         title: How would you like to add it?
       title: What would you like to add?
     show:
+      activity:
+        amount: Amount
+        balance: Balance
+        date: Date
+        entries: entries
+        entry: entry
+        new: New
+        new_balance: New balance
+        new_transaction: New transaction
+        no_entries: No entries found
+        title: Activity
       chart:
         balance: Balance
         owed: Amount owed
diff --git a/config/locales/views/application/en.yml b/config/locales/views/application/en.yml
index dfa964f6..2ecb7a04 100644
--- a/config/locales/views/application/en.yml
+++ b/config/locales/views/application/en.yml
@@ -1,8 +1,5 @@
 ---
 en:
-  application:
-    pagination:
-      rows_per_page: Rows per page
   number:
     currency:
       format:
diff --git a/config/locales/views/categories/en.yml b/config/locales/views/categories/en.yml
index 9ff612e9..1b3ee826 100644
--- a/config/locales/views/categories/en.yml
+++ b/config/locales/views/categories/en.yml
@@ -15,10 +15,10 @@ en:
     form:
       placeholder: Category name
     index:
-      categories: Categories
       bootstrap: Use default categories
-      categories_incomes: Income categories
+      categories: Categories
       categories_expenses: Expense categories
+      categories_incomes: Income categories
       empty: No categories found
       new: New category
     menu:
diff --git a/config/locales/views/layout/en.yml b/config/locales/views/layout/en.yml
index 9054ee29..80443b74 100644
--- a/config/locales/views/layout/en.yml
+++ b/config/locales/views/layout/en.yml
@@ -15,8 +15,8 @@ en:
       description: Issue Description
     sidebar:
       accounts: Accounts
+      budgeting: Budgeting
       dashboard: Dashboard
       new_account: New account
       portfolio: Portfolio
       transactions: Transactions
-      budgeting: Budgeting
diff --git a/config/routes.rb b/config/routes.rb
index dcbb00be..39fbf331 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -82,8 +82,6 @@ Rails.application.routes.draw do
   namespace :account do
     resources :holdings, only: %i[index new show destroy]
 
-    resources :entries, only: :index
-
     resources :transactions, only: %i[show new create update destroy] do
       resource :transfer_match, only: %i[new create]
       resource :category, only: :update, controller: :transaction_categories
diff --git a/test/controllers/account/entries_controller_test.rb b/test/controllers/account/entries_controller_test.rb
deleted file mode 100644
index c0ce72c4..00000000
--- a/test/controllers/account/entries_controller_test.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require "test_helper"
-
-class Account::EntriesControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in @user = users(:family_admin)
-    @entry = account_entries(:transaction)
-  end
-
-  test "gets index" do
-    get account_entries_path(account_id: @entry.account.id)
-    assert_response :success
-  end
-end
-- 
2.53.0


From 63e9161d85246b5ca9b7026bab509990b6d17950 Mon Sep 17 00:00:00 2001
From: Zach Gollwitzer <zach.gollwitzer@gmail.com>
Date: Wed, 29 Jan 2025 16:28:27 -0500
Subject: [PATCH 4/9] Lint fixes

---
 app/controllers/concerns/accountable_resource.rb |  4 ++--
 app/controllers/transactions_controller.rb       | 10 +++++-----
 app/helpers/transactions_helper.rb               |  2 +-
 app/views/application/_pagination.html.erb       |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/concerns/accountable_resource.rb b/app/controllers/concerns/accountable_resource.rb
index 0c2b554b..050da412 100644
--- a/app/controllers/concerns/accountable_resource.rb
+++ b/app/controllers/concerns/accountable_resource.rb
@@ -28,11 +28,11 @@ module AccountableResource
     if params[:focused_entry_id].present?
       @focused_entry = entries.find_by(id: params[:focused_entry_id])
       position = entries.pluck(:id).index(params[:focused_entry_id])
-      
+
       if position.present?
         focused_page = (position / (params[:per_page] || 10)) + 1
         if params[:page]&.to_i != focused_page
-          return redirect_to account_path(@account, page: focused_page, focused_entry_id: params[:focused_entry_id]) 
+          return redirect_to account_path(@account, page: focused_page, focused_entry_id: params[:focused_entry_id])
         end
       end
     end
diff --git a/app/controllers/transactions_controller.rb b/app/controllers/transactions_controller.rb
index 06bfe5c7..ee3d3d47 100644
--- a/app/controllers/transactions_controller.rb
+++ b/app/controllers/transactions_controller.rb
@@ -10,7 +10,7 @@ class TransactionsController < ApplicationController
     if params[:focused_entry_id].present?
       @focused_entry = search_query.find_by(id: params[:focused_entry_id])
       position = search_query.pluck(:id).index(params[:focused_entry_id])
-      
+
       if position.present?
         focused_page = (position / (params[:per_page] || 10).to_i) + 1
         if params[:page]&.to_i != focused_page
@@ -47,7 +47,7 @@ class TransactionsController < ApplicationController
 
     param_key = params[:param_key]
     param_value = params[:param_value]
-    
+
     if q_params[param_key].is_a?(Array)
       q_params[param_key].delete(param_value)
       q_params.delete(param_key) if q_params[param_key].empty?
@@ -71,7 +71,7 @@ class TransactionsController < ApplicationController
             )
             .to_h
             .compact_blank
-       
+
       cleaned_params.delete(:amount_operator) unless cleaned_params[:amount].present?
 
       cleaned_params
@@ -84,7 +84,7 @@ class TransactionsController < ApplicationController
         params_to_restore[:q] = stored_params["q"].presence || default_params[:q]
         params_to_restore[:page] = stored_params["page"].presence || default_params[:page]
         params_to_restore[:per_page] = stored_params["per_page"].presence || default_params[:per_page]
-  
+
         redirect_to transactions_path(params_to_restore)
       else
         Current.session.update!(
@@ -103,7 +103,7 @@ class TransactionsController < ApplicationController
 
     def stored_params
       Current.session.prev_transaction_page_params
-    end 
+    end
 
     def default_params
       {
diff --git a/app/helpers/transactions_helper.rb b/app/helpers/transactions_helper.rb
index 08e0004f..dd729c47 100644
--- a/app/helpers/transactions_helper.rb
+++ b/app/helpers/transactions_helper.rb
@@ -17,5 +17,5 @@ module TransactionsHelper
 
   def get_default_transaction_search_filter
     transaction_search_filters[0]
-  end 
+  end
 end
diff --git a/app/views/application/_pagination.html.erb b/app/views/application/_pagination.html.erb
index d6d8099b..10b27327 100644
--- a/app/views/application/_pagination.html.erb
+++ b/app/views/application/_pagination.html.erb
@@ -49,8 +49,8 @@
     </div>
   </div>
   <div class="flex items-center gap-4">
-    <%= select_tag :per_page, 
-                   options_for_select(["10", "20", "30", "50"], pagy.limit), 
+    <%= select_tag :per_page,
+                   options_for_select(["10", "20", "30", "50"], pagy.limit),
                    data: { controller: "selectable-link" },
                    class: "py-1.5 pr-8 text-sm text-gray-900 font-medium border border-gray-200 rounded-lg focus:border-gray-900 focus:ring-gray-900 focus-visible:ring-gray-900" %>
   </div>
-- 
2.53.0


From 542d02b8c4f7d3ca89fcfb36c5f4417566d8af8a Mon Sep 17 00:00:00 2001
From: Zach Gollwitzer <zach.gollwitzer@gmail.com>
Date: Wed, 29 Jan 2025 16:37:45 -0500
Subject: [PATCH 5/9] Fix syntax error

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

diff --git a/app/views/loans/show.html.erb b/app/views/loans/show.html.erb
index 35f29f9b..55bffa52 100644
--- a/app/views/loans/show.html.erb
+++ b/app/views/loans/show.html.erb
@@ -1,6 +1,6 @@
 <%= render "accounts/show/template",
            account: @account,
            tabs: render("accounts/show/tabs", account: @account, tabs: [
-             { key: "activity", contents: render("accounts/show/activity", account: @account) }
+             { key: "activity", contents: render("accounts/show/activity", account: @account) },
              { key: "overview", contents: render("loans/overview", account: @account) },
            ]) %>
-- 
2.53.0


From 9b6b78c470c66739a635e05f653dd95009ab0798 Mon Sep 17 00:00:00 2001
From: Zach Gollwitzer <zach.gollwitzer@gmail.com>
Date: Thu, 30 Jan 2025 09:28:28 -0500
Subject: [PATCH 6/9] Fix filter clearing

---
 app/controllers/transactions_controller.rb     | 7 +------
 app/views/transactions/searches/_menu.html.erb | 2 +-
 config/routes.rb                               | 1 -
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/controllers/transactions_controller.rb b/app/controllers/transactions_controller.rb
index ee3d3d47..03845009 100644
--- a/app/controllers/transactions_controller.rb
+++ b/app/controllers/transactions_controller.rb
@@ -33,12 +33,7 @@ class TransactionsController < ApplicationController
       income: totals_query.income_total(family_currency).abs,
       expense: totals_query.expense_total(family_currency)
     }
-  end
-
-  def clear_filters
-    Current.session.update!(prev_transaction_page_params: {})
-    redirect_to transactions_path
-  end
+  end 
 
   def clear_filter
     updated_params = stored_params.deep_dup
diff --git a/app/views/transactions/searches/_menu.html.erb b/app/views/transactions/searches/_menu.html.erb
index 72ff96c9..e63029da 100644
--- a/app/views/transactions/searches/_menu.html.erb
+++ b/app/views/transactions/searches/_menu.html.erb
@@ -33,7 +33,7 @@
     <div class="flex justify-between items-center gap-2 bg-white p-3">
       <div>
         <% if @q.present? %>
-          <%= button_to t(".clear_filters"), clear_filters_transactions_path, method: :delete, class: "btn btn--ghost" %>
+          <%= link_to t(".clear_filters"), transactions_path(clear_filters: true), class: "btn btn--ghost" %>
         <% end %>
       </div>
 
diff --git a/config/routes.rb b/config/routes.rb
index 39fbf331..cec4c1fd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -109,7 +109,6 @@ Rails.application.routes.draw do
 
   resources :transactions, only: :index do
     collection do
-      delete :clear_filters
       delete :clear_filter
     end
   end
-- 
2.53.0


From b4fb722539910766e0d55bed20e02f36fcd79963 Mon Sep 17 00:00:00 2001
From: Zach Gollwitzer <zach.gollwitzer@gmail.com>
Date: Thu, 30 Jan 2025 10:06:44 -0500
Subject: [PATCH 7/9] Update e2e tests for new UI

---
 .env.test                                  |  4 +++-
 app/controllers/transactions_controller.rb |  2 +-
 test/application_system_test_case.rb       |  2 +-
 test/system/trades_test.rb                 |  2 +-
 test/system/transactions_test.rb           | 18 +++++++++---------
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.env.test b/.env.test
index f47801f1..288133a2 100644
--- a/.env.test
+++ b/.env.test
@@ -5,4 +5,6 @@ SYNTH_API_KEY=fookey
 COVERAGE=false
 
 # Set to true to run test suite serially
-DISABLE_PARALLELIZATION=false
\ No newline at end of file
+DISABLE_PARALLELIZATION=false
+
+E2E_BROWSER=headless_chrome
\ No newline at end of file
diff --git a/app/controllers/transactions_controller.rb b/app/controllers/transactions_controller.rb
index 03845009..628c460f 100644
--- a/app/controllers/transactions_controller.rb
+++ b/app/controllers/transactions_controller.rb
@@ -33,7 +33,7 @@ class TransactionsController < ApplicationController
       income: totals_query.income_total(family_currency).abs,
       expense: totals_query.expense_total(family_currency)
     }
-  end 
+  end
 
   def clear_filter
     updated_params = stored_params.deep_dup
diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index 83b45e4f..9e369a8c 100644
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -5,7 +5,7 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
     Capybara.default_max_wait_time = 5
   end
 
-  driven_by :selenium, using: ENV["CI"].present? ? :headless_chrome : :chrome, screen_size: [ 1400, 1400 ]
+  driven_by :selenium, using: ENV["CI"].present? ? :headless_chrome : ENV.fetch("E2E_BROWSER", :chrome).to_sym, screen_size: [ 1400, 1400 ]
 
   private
 
diff --git a/test/system/trades_test.rb b/test/system/trades_test.rb
index 9ca85c08..ab0c6109 100644
--- a/test/system/trades_test.rb
+++ b/test/system/trades_test.rb
@@ -79,7 +79,7 @@ class TradesTest < ApplicationSystemTestCase
     end
 
     def visit_account_portfolio
-      visit account_path(@account)
+      visit account_path(@account, tab: "holdings")
     end
 
     def select_combobox_option(text)
diff --git a/test/system/transactions_test.rb b/test/system/transactions_test.rb
index 76ab1363..3fc0b5e1 100644
--- a/test/system/transactions_test.rb
+++ b/test/system/transactions_test.rb
@@ -6,7 +6,7 @@ class TransactionsTest < ApplicationSystemTestCase
 
     Account::Entry.delete_all # clean slate
 
-    @uncategorized_transaction = create_transaction("one", 12.days.ago.to_date, 100)
+    create_transaction("one", 12.days.ago.to_date, 100)
     create_transaction("two", 10.days.ago.to_date, 100)
     create_transaction("three", 9.days.ago.to_date, 100)
     create_transaction("four", 8.days.ago.to_date, 100)
@@ -15,7 +15,7 @@ class TransactionsTest < ApplicationSystemTestCase
     create_transaction("seven", 4.days.ago.to_date, 100)
     create_transaction("eight", 3.days.ago.to_date, 100)
     create_transaction("nine", 1.days.ago.to_date, 100)
-    create_transaction("ten", 1.days.ago.to_date, 100)
+    @uncategorized_transaction = create_transaction("ten", 1.days.ago.to_date, 100)
     create_transaction("eleven", Date.current, 100, category: categories(:food_and_drink), tags: [ tags(:one) ], merchant: merchants(:amazon))
 
     @transactions = @user.family.entries
@@ -124,13 +124,13 @@ class TransactionsTest < ApplicationSystemTestCase
     assert_text "No entries found"
 
     within "ul#transaction-search-filters" do
-      find("li", text: account.name).first("a").click
-      find("li", text: "on or after #{10.days.ago.to_date}").first("a").click
-      find("li", text: "on or before #{1.day.ago.to_date}").first("a").click
-      find("li", text: "Income").first("a").click
-      find("li", text: "less than 200").first("a").click
-      find("li", text: category.name).first("a").click
-      find("li", text: merchant.name).first("a").click
+      find("li", text: account.name).first("button").click
+      find("li", text: "on or after #{10.days.ago.to_date}").first("button").click
+      find("li", text: "on or before #{1.day.ago.to_date}").first("button").click
+      find("li", text: "Income").first("button").click
+      find("li", text: "less than 200").first("button").click
+      find("li", text: category.name).first("button").click
+      find("li", text: merchant.name).first("button").click
     end
 
     assert_selector "#" + dom_id(@transaction), count: 1
-- 
2.53.0


From 49445245589cdc39a82d45b5cfbc2703ad3e80e4 Mon Sep 17 00:00:00 2001
From: Zach Gollwitzer <zach.gollwitzer@gmail.com>
Date: Thu, 30 Jan 2025 13:53:46 -0500
Subject: [PATCH 8/9] Consolidate focus behavior into concern

---
 .env.test                                     |  4 +--
 .../concerns/accountable_resource.rb          | 16 +++-------
 app/controllers/concerns/scroll_focusable.rb  | 21 ++++++++++++++
 app/controllers/transactions_controller.rb    | 22 +++++---------
 .../controllers/focus_entry_controller.js     | 29 -------------------
 .../controllers/focus_record_controller.js    | 21 ++++++++++++++
 .../transactions/_transaction.html.erb        |  4 +--
 app/views/accounts/show/_activity.html.erb    |  2 +-
 app/views/transactions/index.html.erb         |  2 +-
 9 files changed, 59 insertions(+), 62 deletions(-)
 create mode 100644 app/controllers/concerns/scroll_focusable.rb
 delete mode 100644 app/javascript/controllers/focus_entry_controller.js
 create mode 100644 app/javascript/controllers/focus_record_controller.js

diff --git a/.env.test b/.env.test
index 288133a2..f47801f1 100644
--- a/.env.test
+++ b/.env.test
@@ -5,6 +5,4 @@ SYNTH_API_KEY=fookey
 COVERAGE=false
 
 # Set to true to run test suite serially
-DISABLE_PARALLELIZATION=false
-
-E2E_BROWSER=headless_chrome
\ No newline at end of file
+DISABLE_PARALLELIZATION=false
\ No newline at end of file
diff --git a/app/controllers/concerns/accountable_resource.rb b/app/controllers/concerns/accountable_resource.rb
index 050da412..1cdf7baa 100644
--- a/app/controllers/concerns/accountable_resource.rb
+++ b/app/controllers/concerns/accountable_resource.rb
@@ -2,6 +2,8 @@ module AccountableResource
   extend ActiveSupport::Concern
 
   included do
+    include ScrollFocusable
+
     layout :with_sidebar
     before_action :set_account, only: [ :show, :edit, :update, :destroy ]
     before_action :set_link_token, only: :new
@@ -25,19 +27,9 @@ module AccountableResource
     @q = params.fetch(:q, {}).permit(:search)
     entries = @account.entries.search(@q).reverse_chronological
 
-    if params[:focused_entry_id].present?
-      @focused_entry = entries.find_by(id: params[:focused_entry_id])
-      position = entries.pluck(:id).index(params[:focused_entry_id])
+    set_focused_record(entries, params[:focused_record_id])
 
-      if position.present?
-        focused_page = (position / (params[:per_page] || 10)) + 1
-        if params[:page]&.to_i != focused_page
-          return redirect_to account_path(@account, page: focused_page, focused_entry_id: params[:focused_entry_id])
-        end
-      end
-    end
-
-    @pagy, @entries = pagy(entries, limit: params[:per_page] || "10", params: ->(params) { params.except(:focused_entry_id) })
+    @pagy, @entries = pagy(entries, limit: params[:per_page] || "10", params: ->(params) { params.except(:focused_record_id) })
   end
 
   def edit
diff --git a/app/controllers/concerns/scroll_focusable.rb b/app/controllers/concerns/scroll_focusable.rb
new file mode 100644
index 00000000..abad6c1b
--- /dev/null
+++ b/app/controllers/concerns/scroll_focusable.rb
@@ -0,0 +1,21 @@
+module ScrollFocusable
+  extend ActiveSupport::Concern
+
+  def set_focused_record(record_scope, record_id, default_per_page: 10)
+    return unless record_id.present?
+    
+    @focused_record = record_scope.find_by(id: record_id)
+
+    record_index = record_scope.pluck(:id).index(record_id)
+
+    return unless record_index
+
+    page_of_focused_record = (record_index / (params[:per_page]&.to_i || default_per_page)) + 1
+
+    if params[:page]&.to_i != page_of_focused_record
+      return (
+        redirect_to(url_for(page: page_of_focused_record, focused_record_id: record_id))
+      )
+    end
+  end
+end
diff --git a/app/controllers/transactions_controller.rb b/app/controllers/transactions_controller.rb
index 628c460f..f11183ba 100644
--- a/app/controllers/transactions_controller.rb
+++ b/app/controllers/transactions_controller.rb
@@ -1,4 +1,6 @@
 class TransactionsController < ApplicationController
+  include ScrollFocusable
+
   layout :with_sidebar
 
   before_action :store_params!, only: :index
@@ -7,21 +9,13 @@ class TransactionsController < ApplicationController
     @q = search_params
     search_query = Current.family.transactions.search(@q).reverse_chronological
 
-    if params[:focused_entry_id].present?
-      @focused_entry = search_query.find_by(id: params[:focused_entry_id])
-      position = search_query.pluck(:id).index(params[:focused_entry_id])
+    set_focused_record(search_query, params[:focused_record_id], default_per_page: 50)
 
-      if position.present?
-        focused_page = (position / (params[:per_page] || 10).to_i) + 1
-        if params[:page]&.to_i != focused_page
-          return redirect_to transactions_path(page: focused_page, focused_entry_id: params[:focused_entry_id])
-        else
-          params.delete(:focused_entry_id)
-        end
-      end
-    end
-
-    @pagy, @transaction_entries = pagy(search_query, limit: params[:per_page].presence || default_params[:per_page], params: ->(params) { params.except(:focused_entry_id) })
+    @pagy, @transaction_entries = pagy(
+      search_query, 
+      limit: params[:per_page].presence || default_params[:per_page], 
+      params: ->(params) { params.except(:focused_record_id) }
+    )
 
     totals_query = search_query.incomes_and_expenses
     family_currency = Current.family.currency
diff --git a/app/javascript/controllers/focus_entry_controller.js b/app/javascript/controllers/focus_entry_controller.js
deleted file mode 100644
index 48ed5044..00000000
--- a/app/javascript/controllers/focus_entry_controller.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Controller } from "@hotwired/stimulus";
-
-// Connects to data-controller="focus-entry"
-export default class extends Controller {
-  static values = {
-    id: String,
-  };
-
-  connect() {
-    if (this.idValue) {
-      // Wait for any Turbo navigation to complete
-      document.addEventListener(
-        "turbo:load",
-        () => {
-          const element = document.getElementById(this.idValue);
-          if (element) {
-            element.scrollIntoView({ behavior: "smooth" });
-
-            // Remove the focused_entry_id parameter from URL
-            const url = new URL(window.location);
-            url.searchParams.delete("focused_entry_id");
-            window.history.replaceState({}, "", url);
-          }
-        },
-        { once: true },
-      );
-    }
-  }
-}
diff --git a/app/javascript/controllers/focus_record_controller.js b/app/javascript/controllers/focus_record_controller.js
new file mode 100644
index 00000000..0cc3fc9a
--- /dev/null
+++ b/app/javascript/controllers/focus_record_controller.js
@@ -0,0 +1,21 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="focus-record"
+export default class extends Controller {
+  static values = {
+    id: String,
+  };
+
+  connect() {
+    const element = document.getElementById(this.idValue);
+
+    if (element) {
+      element.scrollIntoView({ behavior: "smooth" });
+
+      // Remove the focused_record_id parameter from URL
+      const url = new URL(window.location);
+      url.searchParams.delete("focused_record_id");
+      window.history.replaceState({}, "", url);
+    }
+  }
+}
diff --git a/app/views/account/transactions/_transaction.html.erb b/app/views/account/transactions/_transaction.html.erb
index d6c0201b..fcfdb29c 100644
--- a/app/views/account/transactions/_transaction.html.erb
+++ b/app/views/account/transactions/_transaction.html.erb
@@ -1,7 +1,7 @@
 <%# locals: (entry:, selectable: true, balance_trend: nil) %>
 <% transaction, account = entry.account_transaction, entry.account %>
 
-<div class="grid grid-cols-12 items-center text-gray-900 text-sm font-medium p-4 <%= @focused_entry == entry ? "border border-gray-900 rounded-lg" : "" %>">
+<div class="grid grid-cols-12 items-center text-gray-900 text-sm font-medium p-4 <%= @focused_record == entry ? "border border-gray-900 rounded-lg" : "" %>">
   <div class="pr-10 flex items-center gap-4 <%= balance_trend ? "col-span-6" : "col-span-8" %>">
     <% if selectable %>
       <%= check_box_tag dom_id(entry, "selection"),
@@ -45,7 +45,7 @@
               <% if entry.account_transaction.transfer? %>
                 <%= render "transfers/account_links", transfer: entry.account_transaction.transfer, is_inflow: entry.account_transaction.transfer_as_inflow.present? %>
               <% else %>
-                <%= link_to entry.account.name, account_path(entry.account, tab: "transactions", focused_entry_id: entry.id), data: { turbo_frame: "_top" }, class: "hover:underline" %>
+                <%= link_to entry.account.name, account_path(entry.account, tab: "transactions", focused_record_id: entry.id), data: { turbo_frame: "_top" }, class: "hover:underline" %>
               <% end %>
             </div>
           </div>
diff --git a/app/views/accounts/show/_activity.html.erb b/app/views/accounts/show/_activity.html.erb
index 715e9dfc..0b0657ed 100644
--- a/app/views/accounts/show/_activity.html.erb
+++ b/app/views/accounts/show/_activity.html.erb
@@ -1,7 +1,7 @@
 <%# locals: (account:) %>
 
 <%= turbo_frame_tag dom_id(account, "entries") do %>
-  <div class="bg-white p-5 border border-alpha-black-25 rounded-xl shadow-xs" data-controller="focus-entry" data-focus-entry-id-value="<%= @focused_entry ? dom_id(@focused_entry) : nil %>">
+  <div class="bg-white p-5 border border-alpha-black-25 rounded-xl shadow-xs" data-controller="focus-record" data-focus-record-id-value="<%= @focused_record ? dom_id(@focused_record) : nil %>">
     <div class="flex items-center justify-between mb-4">
       <%= tag.h2 t(".title"), class: "font-medium text-lg" %>
       <% unless @account.plaid_account_id.present? %>
diff --git a/app/views/transactions/index.html.erb b/app/views/transactions/index.html.erb
index bf4b43ee..ac5b9494 100644
--- a/app/views/transactions/index.html.erb
+++ b/app/views/transactions/index.html.erb
@@ -1,4 +1,4 @@
-<div class="space-y-4 h-full flex flex-col overflow-y-auto" data-controller="focus-entry" data-focus-entry-id-value="<%= @focused_entry ? dom_id(@focused_entry) : nil %>">
+<div class="space-y-4 h-full flex flex-col overflow-y-auto" data-controller="focus-record" data-focus-record-id-value="<%= @focused_record ? dom_id(@focused_record) : nil %>">
   <%= render "header" %>
 
   <%= render "summary", totals: @totals %>
-- 
2.53.0


From e56fd4a9de4c2647e9ad139a200f1807c7f3018f Mon Sep 17 00:00:00 2001
From: Zach Gollwitzer <zach.gollwitzer@gmail.com>
Date: Thu, 30 Jan 2025 13:54:12 -0500
Subject: [PATCH 9/9] Lint fixes

---
 app/controllers/concerns/scroll_focusable.rb | 4 ++--
 app/controllers/transactions_controller.rb   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/concerns/scroll_focusable.rb b/app/controllers/concerns/scroll_focusable.rb
index abad6c1b..7eb47a1b 100644
--- a/app/controllers/concerns/scroll_focusable.rb
+++ b/app/controllers/concerns/scroll_focusable.rb
@@ -3,7 +3,7 @@ module ScrollFocusable
 
   def set_focused_record(record_scope, record_id, default_per_page: 10)
     return unless record_id.present?
-    
+
     @focused_record = record_scope.find_by(id: record_id)
 
     record_index = record_scope.pluck(:id).index(record_id)
@@ -13,7 +13,7 @@ module ScrollFocusable
     page_of_focused_record = (record_index / (params[:per_page]&.to_i || default_per_page)) + 1
 
     if params[:page]&.to_i != page_of_focused_record
-      return (
+      (
         redirect_to(url_for(page: page_of_focused_record, focused_record_id: record_id))
       )
     end
diff --git a/app/controllers/transactions_controller.rb b/app/controllers/transactions_controller.rb
index f11183ba..7478894b 100644
--- a/app/controllers/transactions_controller.rb
+++ b/app/controllers/transactions_controller.rb
@@ -12,8 +12,8 @@ class TransactionsController < ApplicationController
     set_focused_record(search_query, params[:focused_record_id], default_per_page: 50)
 
     @pagy, @transaction_entries = pagy(
-      search_query, 
-      limit: params[:per_page].presence || default_params[:per_page], 
+      search_query,
+      limit: params[:per_page].presence || default_params[:per_page],
       params: ->(params) { params.except(:focused_record_id) }
     )
 
-- 
2.53.0