Allow user to add buy and sell trade transactions for investment accounts (#1066)

* Consolidate modal form structure into partial + helper

* Scaffold out trade transaction form

* Normalize translations

* Add buy and sell trade form with tests

* Move entryable lists to dedicated controllers

* Delegate entry group contents rendering

* More cleanup

* Extract transaction and valuation update logic from entries controller

* Delegate edit and show actions to entryables

* Trade builder

* Update paths for transaction updates

app/controllers/account/entries_controller.rb

@@ -4,49 +4,12 @@ class Account::EntriesController < ApplicationController
   before_action :set_account
   before_action :set_entry, only: %i[ edit update show destroy ]
 
-  def transactions
-    @transaction_entries = @account.entries.account_transactions.reverse_chronological
-  end
-
-  def valuations
-    @valuation_entries = @account.entries.account_valuations.reverse_chronological
-  end
-
-  def trades
-    @trades = @account.entries.where(entryable_type: [ "Account::Transaction", "Account::Trade" ]).reverse_chronological
-  end
-
-  def new
-    @entry = @account.entries.build.tap do |entry|
-      if params[:entryable_type]
-        entry.entryable = Account::Entryable.from_type(params[:entryable_type]).new
-      else
-        entry.entryable = Account::Valuation.new
-      end
-    end
-  end
-
-  def create
-    @entry = @account.entries.build(entry_params_with_defaults(entry_params))
-
-    if @entry.save
-      @entry.sync_account_later
-      redirect_to account_path(@account), notice: t(".success", name: @entry.entryable_name_short.upcase_first)
-    else
-      # TODO: this is not an ideal way to handle errors and should eventually be improved.
-      # See: https://github.com/hotwired/turbo-rails/pull/367
-      flash[:alert] = @entry.errors.full_messages.to_sentence
-      redirect_to account_path(@account)
-    end
-  end
-
   def edit
+    render entryable_view_path(:edit)
   end
 
   def update
-    @entry.assign_attributes entry_params
-    @entry.amount = amount if nature.present?
-    @entry.save!
+    @entry.update!(entry_params)
     @entry.sync_account_later
 
     respond_to do |format|
@@ -56,6 +19,7 @@ class Account::EntriesController < ApplicationController
   end
 
   def show
+    render entryable_view_path(:show)
   end
 
   def destroy
@@ -66,6 +30,10 @@ class Account::EntriesController < ApplicationController
 
   private
 
+    def entryable_view_path(action)
+      @entry.entryable_type.underscore.pluralize + "/" + action.to_s
+    end
+
     def set_account
       @account = Current.family.accounts.find(params[:account_id])
     end
@@ -74,36 +42,7 @@ class Account::EntriesController < ApplicationController
       @entry = @account.entries.find(params[:id])
     end
 
-    def permitted_entryable_attributes
-      entryable_type = @entry ? @entry.entryable_class.to_s : params[:account_entry][:entryable_type]
-
-      case entryable_type
-      when "Account::Transaction"
-        [ :id, :notes, :excluded, :category_id, :merchant_id, tag_ids: [] ]
-      else
-        [ :id ]
-      end
-    end
-
     def entry_params
-      params.require(:account_entry)
-            .permit(:name, :date, :amount, :currency, :entryable_type, entryable_attributes: permitted_entryable_attributes)
-    end
-
-    def amount
-      if nature.income?
-        entry_params[:amount].to_d.abs * -1
-      else
-        entry_params[:amount].to_d.abs
-      end
-    end
-
-    def nature
-      params[:account_entry][:nature].to_s.inquiry
-    end
-
-    # entryable_type is required here because Rails expects both of these params in this exact order (potential upstream bug)
-    def entry_params_with_defaults(params)
-      params.with_defaults(entryable_type: params[:entryable_type], entryable_attributes: {})
+      params.require(:account_entry).permit(:name, :date, :amount, :currency)
     end
 end

app/controllers/account/trades_controller.rb

@@ -0,0 +1,34 @@
+class Account::TradesController < ApplicationController
+  layout :with_sidebar
+
+  before_action :set_account
+
+  def new
+    @entry = @account.entries.account_trades.new(entryable_attributes: {})
+  end
+
+  def index
+    @entries = @account.entries.reverse_chronological.where(entryable_type: %w[ Account::Trade Account::Transaction ])
+  end
+
+  def create
+    @builder = Account::TradeBuilder.new(entry_params)
+
+    if entry = @builder.save
+      entry.sync_account_later
+      redirect_to account_path(@account), notice: t(".success")
+    else
+      render :new, status: :unprocessable_entity
+    end
+  end
+
+  private
+
+    def set_account
+      @account = Current.family.accounts.find(params[:account_id])
+    end
+
+    def entry_params
+      params.require(:account_entry).permit(:type, :date, :qty, :ticker, :price).merge(account: @account)
+    end
+end

app/controllers/account/transactions_controller.rb

@@ -0,0 +1,53 @@
+class Account::TransactionsController < ApplicationController
+  layout :with_sidebar
+
+  before_action :set_account
+  before_action :set_entry, only: :update
+
+  def index
+    @entries = @account.entries.account_transactions.reverse_chronological
+  end
+
+  def update
+    @entry.update!(entry_params.merge(amount: amount))
+    @entry.sync_account_later
+
+    respond_to do |format|
+      format.html { redirect_to account_entry_path(@account, @entry), notice: t(".success") }
+      format.turbo_stream { render turbo_stream: turbo_stream.replace(@entry) }
+    end
+  end
+
+  private
+
+    def set_account
+      @account = Current.family.accounts.find(params[:account_id])
+    end
+
+    def set_entry
+      @entry = @account.entries.find(params[:id])
+    end
+
+    def entry_params
+      params.require(:account_entry)
+            .permit(
+              :name, :date, :amount, :currency, :entryable_type,
+              entryable_attributes: [
+                :id,
+                :notes,
+                :excluded,
+                :category_id,
+                :merchant_id,
+                { tag_ids: [] }
+              ]
+            )
+    end
+
+    def amount
+      if params[:account_entry][:nature] == "income"
+        entry_params[:amount].to_d * -1
+      else
+        entry_params[:amount].to_d
+      end
+    end
+end

app/controllers/account/valuations_controller.rb

@@ -0,0 +1,35 @@
+class Account::ValuationsController < ApplicationController
+  layout :with_sidebar
+
+  before_action :set_account
+
+  def new
+    @entry = @account.entries.account_valuations.new(entryable_attributes: {})
+  end
+
+  def create
+    @entry = @account.entries.account_valuations.new(entry_params.merge(entryable_attributes: {}))
+
+    if @entry.save
+      @entry.sync_account_later
+      redirect_to account_valuations_path(@account), notice: t(".success")
+    else
+      flash[:alert] = @entry.errors.full_messages.to_sentence
+      redirect_to account_path(@account)
+    end
+  end
+
+  def index
+    @entries = @account.entries.account_valuations.reverse_chronological
+  end
+
+  private
+
+    def set_account
+      @account = Current.family.accounts.find(params[:account_id])
+    end
+
+    def entry_params
+      params.require(:account_entry).permit(:name, :date, :amount, :currency)
+    end
+end

app/helpers/account/entries_helper.rb

@@ -30,6 +30,28 @@ module Account::EntriesHelper
     mixed_hex_styles(color)
   end
 
+  def entry_name(entry)
+    if entry.account_trade?
+      trade     = entry.account_trade
+      prefix    = trade.sell? ? "Sell " : "Buy "
+      generated = prefix + "#{trade.qty.abs} shares of #{trade.security.ticker}"
+      name      = entry.name || generated
+      name
+    else
+      entry.name
+    end
+  end
+
+  def entries_by_date(entries, selectable: true)
+    entries.group_by(&:date).map do |date, grouped_entries|
+      content = capture do
+        yield grouped_entries
+      end
+
+      render partial: "account/entries/entry_group", locals: { date:, entries: grouped_entries, content:, selectable: }
+    end.join.html_safe
+  end
+
   private
 
     def permitted_entryable_key(entry)

app/helpers/accounts_helper.rb

@@ -26,9 +26,9 @@ module AccountsHelper
   def account_tabs(account)
     holdings_tab = { key: "holdings", label: t("accounts.show.holdings"), path: account_path(account, tab: "holdings"), content_path: account_holdings_path(account) }
     cash_tab = { key: "cash", label: t("accounts.show.cash"), path: account_path(account, tab: "cash"), content_path: account_cashes_path(account) }
-    value_tab = { key: "valuations", label: t("accounts.show.value"), path: account_path(account, tab: "valuations"), content_path: valuation_account_entries_path(account) }
-    transactions_tab = { key: "transactions", label: t("accounts.show.transactions"), path: account_path(account, tab: "transactions"), content_path: transaction_account_entries_path(account) }
-    trades_tab = { key: "trades", label: t("accounts.show.trades"), path: account_path(account, tab: "trades"), content_path: trade_account_entries_path(account) }
+    value_tab        = { key: "valuations", label: t("accounts.show.value"), path: account_path(account, tab: "valuations"), content_path: account_valuations_path(account) }
+    transactions_tab = { key: "transactions", label: t("accounts.show.transactions"), path: account_path(account, tab: "transactions"), content_path: account_transactions_path(account) }
+    trades_tab       = { key: "trades", label: t("accounts.show.trades"), path: account_path(account, tab: "trades"), content_path: account_trades_path(account) }
 
     return [ holdings_tab, cash_tab, trades_tab ] if account.investment?
 

app/helpers/forms_helper.rb

@@ -4,6 +4,12 @@ module FormsHelper
     form_with(**options, &block)
   end
 
+  def modal_form_wrapper(title:, subtitle: nil, &block)
+    content = capture &block
+
+    render partial: "shared/modal_form", locals: { title:, subtitle:, content: }
+  end
+
   def form_field_tag(options = {}, &block)
     options[:class] = [ "form-field", options[:class] ].compact.join(" ")
     tag.div(**options, &block)
@@ -23,17 +29,17 @@ module FormsHelper
 
   def money_with_currency_field(form, money_method, options = {})
     render partial: "shared/money_field", locals: {
-      form: form,
-      money_method: money_method,
+      form:          form,
+      money_method:  money_method,
       default_currency: options[:default_currency] || "USD",
       disable_currency: options[:disable_currency] || false,
       hide_currency: options[:hide_currency] || false,
-      label: options[:label] || "Amount"
+      label:         options[:label] || "Amount"
     }
   end
 
   def money_field(form, method, options = {})
-    value = form.object.send(method)
+    value = form.object ? form.object.send(method) : nil
 
     currency = value&.currency || Money::Currency.new(options[:default_currency] || "USD")
 
@@ -42,10 +48,10 @@ module FormsHelper
 
     money_options = {
       value: value&.amount,
-      placeholder: 100,
-      min: -99999999999999,
-      max: 99999999999999,
-      step: currency.step
+      placeholder: "100",
+      min:   -99999999999999,
+      max:   99999999999999,
+      step:  currency.step
     }
 
     merged_options = options.merge(money_options)

app/models/account/trade.rb

@@ -1,10 +1,12 @@
 class Account::Trade < ApplicationRecord
-  include Account::Entryable
+  include Account::Entryable, Monetizable
+
+  monetize :price
 
   belongs_to :security
 
   validates :qty, presence: true, numericality: { other_than: 0 }
-  validates :price, presence: true
+  validates :price, :currency, presence: true
 
   class << self
     def search(_params)

app/models/account/trade_builder.rb

@@ -0,0 +1,46 @@
+class Account::TradeBuilder
+  TYPES = %w[ buy sell ].freeze
+
+  include ActiveModel::Model
+
+  attr_accessor :type, :qty, :price, :ticker, :date, :account
+
+  validates :type, :qty, :price, :ticker, :date, presence: true
+  validates :price, numericality: { greater_than: 0 }
+  validates :type, inclusion: { in: TYPES }
+
+  def save
+    if valid?
+      create_entry
+    end
+  end
+
+  private
+
+    def create_entry
+      account.entries.account_trades.create! \
+        date: date,
+        amount: amount,
+        currency: account.currency,
+        entryable: Account::Trade.new(
+          security: security,
+          qty: signed_qty,
+          price: price.to_d,
+          currency: account.currency
+        )
+    end
+
+    def security
+      Security.find_or_create_by(ticker: ticker)
+    end
+
+    def amount
+      price.to_d * signed_qty
+    end
+
+    def signed_qty
+      _qty = qty.to_d
+      _qty = _qty * -1 if type == "sell"
+      _qty
+    end
+end

app/models/demo/generator.rb

@@ -207,7 +207,7 @@ class Demo::Generator
       unknown = Security.find_by(ticker: "UNKNOWN")
 
       # Buy 20 shares of the unknown stock to simulate a stock where we can't fetch security prices
-      account.entries.create! date: 10.days.ago.to_date, amount: 100, currency: "USD", name: "Buy unknown stock", entryable: Account::Trade.new(qty: 20, price: 5, security: unknown)
+      account.entries.create! date: 10.days.ago.to_date, amount: 100, currency: "USD", name: "Buy unknown stock", entryable: Account::Trade.new(qty: 20, price: 5, security: unknown, currency: "USD")
 
       trades = [
         { security: aapl, qty: 20 }, { security: msft, qty: 10 }, { security: aapl, qty: -5 },
@@ -228,7 +228,7 @@ class Demo::Generator
           amount: qty * price,
           currency: "USD",
           name: name_prefix + "#{qty} shares of #{security.ticker}",
-          entryable: Account::Trade.new(qty: qty, price: price, security: security)
+          entryable: Account::Trade.new(qty: qty, price: price, currency: "USD", security: security)
       end
     end
 

app/views/account/entries/_entry.html.erb

@@ -1,4 +1,5 @@
 <%# locals: (entry:, **opts) %>
+
 <%= turbo_frame_tag dom_id(entry) do %>
-  <%= render permitted_entryable_partial_path(entry, entry.entryable_name_short), entry: entry, **opts %>
+  <%= render partial: entry.entryable.to_partial_path, locals: { entry: entry, **opts } %>
 <% end %>

app/views/account/entries/_entry_group.html.erb

@@ -1,4 +1,4 @@
-<%# locals: (date:, entries:, selectable: true, combine_transfers: false, **opts) %>
+<%# locals: (date:, entries:, content:, selectable:) %>
 <div id="entry-group-<%= date %>" class="bg-gray-25 rounded-xl p-1 w-full" data-bulk-select-target="group">
   <div class="py-2 px-4 flex items-center justify-between font-medium text-xs text-gray-500">
     <div class="flex pl-0.5 items-center gap-4">
@@ -15,11 +15,6 @@
     <%= totals_by_currency(collection: entries, money_method: :amount_money, negate: true) %>
   </div>
   <div class="bg-white shadow-xs rounded-md border border-alpha-black-25 divide-y divide-alpha-black-50">
-    <% if combine_transfers %>
-      <%= render entries.reject { |e| e.transfer_id.present? }, selectable:, **opts %>
-      <%= render transfer_entries(entries), selectable: false, **opts %>
-    <% else %>
-      <%= render entries, selectable:, **opts %>
-    <% end %>
+    <%= content %>
   </div>
 </div>

app/views/account/entries/edit.html.erb

@@ -1,3 +0,0 @@
-<%= turbo_frame_tag dom_id(@entry) do %>
-  <%= render permitted_entryable_partial_path(@entry, "edit"), entry: @entry %>
-<% end %>

app/views/account/entries/entryables/valuation/_edit.html.erb

@@ -1 +0,0 @@
-<%= render permitted_entryable_partial_path(entry, "form"), entry: entry %>

app/views/account/entries/entryables/valuation/_new.html.erb

@@ -1,2 +0,0 @@
-<%= render permitted_entryable_partial_path(entry, "form"), entry: entry %>
-<div class="h-px bg-alpha-black-50 ml-20 mr-4"></div>

app/views/account/entries/entryables/valuation/_show.html.erb

@@ -1 +0,0 @@
-<%= render permitted_entryable_partial_path(@entry, "valuation"), entry: @entry %>

app/views/account/entries/new.html.erb

@@ -1,3 +0,0 @@
-<%= turbo_frame_tag dom_id(@entry) do %>
-  <%= render permitted_entryable_partial_path(@entry, "new"), entry: @entry %>
-<% end %>

app/views/account/entries/show.html.erb

@@ -1 +0,0 @@
-<%= render partial: permitted_entryable_partial_path(@entry, "show"), locals: { entry: @entry } %>

app/views/account/holdings/_holding.html.erb

@@ -3,9 +3,9 @@
 <%= turbo_frame_tag dom_id(holding) do %>
   <div class="grid grid-cols-12 items-center text-gray-900 text-sm font-medium p-4">
     <div class="col-span-4 flex items-center gap-4">
-      <%= render "shared/circle_logo", name: holding.name %>
+      <%= render "shared/circle_logo", name: holding.name || "H" %>
       <div>
-        <%= link_to holding.name, account_holding_path(holding.account, holding), data: { turbo_frame: :drawer }, class: "hover:underline" %>
+        <%= link_to holding.name || holding.ticker, account_holding_path(holding.account, holding), data: { turbo_frame: :drawer }, class: "hover:underline" %>
         <%= tag.p holding.ticker, class: "text-gray-500 text-xs uppercase" %>
       </div>
     </div>

app/views/account/holdings/index.html.erb

@@ -2,10 +2,10 @@
   <div class="bg-white space-y-4 p-5 border border-alpha-black-25 rounded-xl shadow-xs">
     <div class="flex items-center justify-between">
       <%= tag.h2 t(".holdings"), class: "font-medium text-lg" %>
-      <%= link_to new_account_holding_path(@account),
-                  disabled: true,
+      <%= link_to new_account_trade_path(@account),
+                  id: dom_id(@account, "new_trade"),
                   data: { turbo_frame: :modal },
-                  class: "cursor-not-allowed flex gap-1 font-medium items-center bg-gray-50 text-gray-900 p-2 rounded-lg" do %>
+                  class: "flex gap-1 font-medium items-center bg-gray-50 text-gray-900 p-2 rounded-lg" do %>
         <%= lucide_icon("plus", class: "w-5 h-5 text-gray-900") %>
         <%= tag.span t(".new_holding"), class: "text-sm" %>
       <% end %>

app/views/account/trades/_form.html.erb

@@ -0,0 +1,19 @@
+<%# locals: (entry:) %>
+
+<%= styled_form_with data: { turbo_frame: "_top" },
+                     scope: :account_entry,
+                     url: entry.new_record? ? account_trades_path(entry.account) : account_entry_path(entry.account, entry) do |form| %>
+  <div class="space-y-4">
+    <div class="space-y-2">
+      <%= form.select :type, options_for_select([%w[Buy buy], %w[Sell sell]], "buy"), label: t(".type") %>
+      <%= form.text_field :ticker, value: nil, label: t(".holding"), placeholder: t(".ticker_placeholder") %>
+      <%= form.date_field :date, label: true %>
+      <%= form.hidden_field :currency, value: entry.account.currency %>
+      <%= form.number_field :qty, label: t(".qty"), placeholder: "10", min: 0 %>
+      <%= money_with_currency_field form, :price_money, label: t(".price"), disable_currency: true %>
+      <%= form.hidden_field :currency, value: entry.account.currency %>
+    </div>
+
+    <%= form.submit t(".submit") %>
+  </div>
+<% end %>

app/views/account/trades/_trade.html.erb

@@ -13,14 +13,14 @@
     <div class="max-w-full">
       <%= tag.div class: ["flex items-center gap-2"] do %>
         <div class="flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-gray-600/5 text-gray-600">
-          <%= entry.name[0].upcase %>
+          <%= entry_name(entry).first.upcase %>
         </div>
 
         <div class="truncate text-gray-900">
           <% if entry.new_record? %>
-            <%= content_tag :p, entry.name %>
+            <%= content_tag :p, entry_name(entry) %>
           <% else %>
-            <%= link_to entry.name,
+            <%= link_to entry_name(entry),
                         account_entry_path(account, entry),
                         data: { turbo_frame: "drawer", turbo_prefetch: false },
                         class: "hover:underline hover:text-gray-800" %>
@@ -31,11 +31,20 @@
   </div>
 
   <div class="flex items-center justify-end gap-1 col-span-3">
-    <%= tag.p trade.buy? ? t(".buy") : t(".sell") %>
+    <% if entry.account_transaction? && entry.marked_as_transfer? %>
+      <%= tag.p entry.inflow? ? t(".deposit") : t(".withdrawal") %>
+    <% elsif entry.account_transaction? %>
+      <%= tag.p entry.inflow? ? t(".inflow") : t(".outflow") %>
+    <% else %>
+      <%= tag.p trade.buy? ? t(".buy") : t(".sell") %>
+    <% end %>
   </div>
 
   <div class="col-span-3 flex items-center justify-end">
-    <%= tag.p format_money(entry.amount_money * -1), class: { "text-green-500": trade.sell? } %>
+    <% if entry.account_transaction? %>
+      <%= tag.p format_money(entry.amount_money), class: { "text-green-500": entry.inflow? } %>
+    <% else %>
+      <%= tag.p format_money(entry.amount_money * -1), class: { "text-green-500": trade.sell? } %>
+    <% end %>
   </div>
-
 </div>

app/views/account/trades/index.html.erb

@@ -2,10 +2,10 @@
   <div id="trades" data-controller="bulk-select" data-bulk-select-resource-value="<%= t(".trade") %>" class="bg-white space-y-4 p-5 border border-alpha-black-25 rounded-xl shadow-xs">
     <div class="flex justify-between items-center">
       <h3 class="font-medium text-lg"><%= t(".trades") %></h3>
-      <%= link_to new_account_entry_path(@account),
-                  disabled: true,
-                  class: "cursor-not-allowed flex gap-1 font-medium items-center bg-gray-50 text-gray-900 p-2 rounded-lg",
-                  data: { turbo_frame: :modal } do %>
+      <%= link_to new_account_trade_path(@account),
+                  id:    dom_id(@account, "new_trade"),
+                  class: "flex gap-1 font-medium items-center bg-gray-50 text-gray-900 p-2 rounded-lg",
+                  data:  { turbo_frame: :modal } do %>
         <%= lucide_icon("plus", class: "w-5 h-5 text-gray-900") %>
         <span class="text-sm"><%= t(".new") %></span>
       <% end %>
@@ -15,7 +15,7 @@
       <div class="pl-0.5 col-span-6 flex items-center gap-4">
         <%= check_box_tag "selection_entry",
                           class: "maybe-checkbox maybe-checkbox--light",
-                          data: { action: "bulk-select#togglePageSelection" } %>
+                          data:  { action: "bulk-select#togglePageSelection" } %>
         <%= tag.p t(".trade") %>
       </div>
 
@@ -25,15 +25,15 @@
 
     <div>
       <div hidden id="transaction-selection-bar" data-bulk-select-target="selectionBar">
-        <%= render "account/entries/entryables/trade/selection_bar" %>
+        <%= render "selection_bar" %>
       </div>
 
-      <% if @trades.empty? %>
+      <% if @entries.empty? %>
         <p class="text-gray-500 py-4"><%= t(".no_trades") %></p>
       <% else %>
         <div class="space-y-6">
-          <% @trades.group_by(&:date).each do |date, entries| %>
-            <%= render "entry_group", date:, entries: entries %>
+          <%= entries_by_date(@entries) do |entries| %>
+            <%= render partial: "account/trades/trade", collection: entries, as: :entry %>
           <% end %>
         </div>
       <% end %>

app/views/account/trades/new.html.erb

@@ -0,0 +1,3 @@
+<%= modal_form_wrapper title: t(".title") do %>
+  <%= render "account/trades/form", entry: @entry %>
+<% end %>

app/views/account/trades/show.html.erb

@@ -1,6 +1,4 @@
-<%# locals: (entry:) %>
-
-<% trade, account = entry.account_trade, entry.account %>
+<% entry = @entry %>
 
 <%= drawer do %>
   <div>

app/views/account/transactions/_transaction.html.erb

@@ -1,6 +1,5 @@
 <%# locals: (entry:, selectable: true, editable: true, short: false, show_tags: false, **opts) %>
 <% transaction, account = entry.account_transaction, entry.account %>
-<% is_investment_transfer = entry.account.investment? && entry.transfer.present? %>
 
 <div class="grid grid-cols-12 items-center text-gray-900 text-sm font-medium p-4">
   <% name_col_span = unconfirmed_transfer?(entry) ? "col-span-10" : short ? "col-span-6" : "col-span-4" %>
@@ -52,12 +51,6 @@
     <% end %>
   </div>
 
-  <% if is_investment_transfer %>
-    <div class="col-span-5 text-right">
-      <%= tag.p entry.inflow? ? t(".deposit") : t(".withdrawal") %>
-    </div>
-  <% end %>
-
   <% unless entry.marked_as_transfer? %>
     <% unless short %>
       <div class="flex items-center gap-1 <%= show_tags ? "col-span-6" : "col-span-3" %>">
@@ -89,7 +82,7 @@
     <% end %>
   <% end %>
 
-  <div class="<%= is_investment_transfer ? "col-span-3" : "col-span-2" %> ml-auto">
+  <div class="col-span-2 ml-auto">
     <%= content_tag :p,
                     format_money(-entry.amount_money),
                     class: ["text-green-600": entry.inflow?] %>

app/views/account/transactions/index.html.erb

@@ -4,7 +4,7 @@
       <h3 class="font-medium text-lg"><%= t(".transactions") %></h3>
       <%= link_to new_transaction_path(account_id: @account),
                   class: "flex gap-1 font-medium items-center bg-gray-50 text-gray-900 p-2 rounded-lg",
-                  data: { turbo_frame: :modal } do %>
+                  data:  { turbo_frame: :modal } do %>
         <%= lucide_icon("plus", class: "w-5 h-5 text-gray-900") %>
         <span class="text-sm"><%= t(".new") %></span>
       <% end %>
@@ -12,15 +12,15 @@
 
     <div id="transactions" data-controller="bulk-select" data-bulk-select-resource-value="<%= t(".transaction") %>">
       <div hidden id="transaction-selection-bar" data-bulk-select-target="selectionBar">
-        <%= render "account/entries/entryables/transaction/selection_bar" %>
+        <%= render "selection_bar" %>
       </div>
 
-      <% if @transaction_entries.empty? %>
+      <% if @entries.empty? %>
         <p class="text-gray-500 py-4"><%= t(".no_transactions") %></p>
       <% else %>
         <div class="space-y-6">
-          <% @transaction_entries.group_by(&:date).each do |date, entries| %>
-            <%= render "entry_group", date:, entries: entries %>
+          <%= entries_by_date(@entries) do |entries| %>
+            <%= render entries %>
           <% end %>
         </div>
       <% end %>

app/views/account/transactions/show.html.erb

@@ -1,6 +1,4 @@
-<%# locals: (entry:) %>
-
-<% transaction, account = entry.account_transaction, entry.account %>
+<% entry, transaction, account = @entry, @entry.account_transaction, @entry.account %>
 
 <%= drawer do %>
   <div>
@@ -27,7 +25,7 @@
         </summary>
 
         <div class="pb-6">
-          <%= styled_form_with model: [account, entry], url: account_entry_path(account, entry), class: "space-y-2", data: { controller: "auto-submit-form" } do |f| %>
+          <%= styled_form_with model: [account, entry], url: account_transaction_path(account, entry), class: "space-y-2", data: { controller: "auto-submit-form" } do |f| %>
             <%= f.text_field :name, label: t(".name_label"), "data-auto-submit-form-target": "auto" %>
             <% unless entry.marked_as_transfer? %>
               <div class="flex space-x-2">
@@ -60,15 +58,15 @@
         </summary>
 
         <div class="pb-6">
-          <%= styled_form_with model: [account, entry], url: account_entry_path(account, entry), class: "space-y-2", data: { controller: "auto-submit-form" } do |f| %>
+          <%= styled_form_with model: [account, entry], url: account_transaction_path(account, entry), class: "space-y-2", data: { controller: "auto-submit-form" } do |f| %>
 
             <%= f.fields_for :entryable do |ef| %>
               <%= ef.select :tag_ids,
                             options_for_select(Current.family.tags.alphabetically.pluck(:name, :id), transaction.tag_ids),
                             {
                               multiple: true,
-                              label: t(".tags_label"),
-                              class: "placeholder:text-gray-500"
+                              label:    t(".tags_label"),
+                              class:    "placeholder:text-gray-500"
                             },
                             "data-auto-submit-form-target": "auto" %>
               <%= ef.text_area :notes, label: t(".note_label"), placeholder: t(".note_placeholder"), "data-auto-submit-form-target": "auto" %>
@@ -84,7 +82,7 @@
         </summary>
 
         <div class="pb-6">
-          <%= styled_form_with model: [account, entry], url: account_entry_path(account, entry), class: "p-3 space-y-3", data: { controller: "auto-submit-form" } do |f| %>
+          <%= styled_form_with model: [account, entry], url: account_transaction_path(account, entry), class: "p-3 space-y-3", data: { controller: "auto-submit-form" } do |f| %>
             <%= f.fields_for :entryable do |ef| %>
               <div class="flex cursor-pointer items-center gap-2 justify-between">
                 <div class="text-sm space-y-1">
@@ -110,8 +108,8 @@
               <%= button_to t(".delete"),
                             account_entry_path(account, entry),
                             method: :delete,
-                            class: "rounded-lg px-3 py-2 text-red-500 text-sm font-medium border border-alpha-black-200",
-                            data: { turbo_confirm: true, turbo_frame: "_top" } %>
+                            class:  "rounded-lg px-3 py-2 text-red-500 text-sm font-medium border border-alpha-black-200",
+                            data:   { turbo_confirm: true, turbo_frame: "_top" } %>
             </div>
           <% end %>
         </div>

app/views/account/transfers/_form.html.erb

@@ -1,4 +1,11 @@
 <%= styled_form_with model: transfer, class: "space-y-4", data: { turbo_frame: "_top" } do |f| %>
+  <% if transfer.errors.present? %>
+    <div class="text-red-600 flex items-center gap-2">
+      <%= lucide_icon "circle-alert", class: "w-5 h-5" %>
+      <p class="text-sm"><%= @transfer.errors.full_messages.to_sentence %></p>
+    </div>
+  <% end %>
+
   <section>
     <fieldset class="bg-gray-50 rounded-lg p-1 grid grid-flow-col justify-stretch gap-x-2">
       <%= link_to new_transaction_path(nature: "expense"), data: { turbo_frame: :modal }, class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-gray-400" do %>

app/views/account/transfers/new.html.erb

@@ -1,17 +1,3 @@
-<%= modal do %>
-  <article class="mx-auto p-4 space-y-4 w-screen max-w-xl">
-    <header class="flex justify-between">
-      <%= tag.h2 t(".title"), class: "font-medium text-xl" %>
-      <%= lucide_icon "x", class: "w-5 h-5 text-gray-500", data: { action: "click->modal#close" } %>
-    </header>
-
-    <% if @transfer.errors.present? %>
-      <div class="text-red-600 flex items-center gap-2">
-        <%= lucide_icon "circle-alert", class: "w-5 h-5" %>
-        <p class="text-sm"><%= @transfer.errors.full_messages.to_sentence %></p>
-      </div>
-    <% end %>
-
-    <%= render "form", transfer: @transfer %>
-  </article>
+<%= modal_form_wrapper title: t(".title") do %>
+  <%= render "form", transfer: @transfer %>
 <% end %>

app/views/account/valuations/_form.html.erb

@@ -1,7 +1,8 @@
 <%# locals: (entry:) %>
+
 <%= form_with model: [entry.account, entry],
               data: { turbo_frame: "_top" },
-              url: entry.new_record? ? account_entries_path(entry.account) : account_entry_path(entry.account, entry) do |f| %>
+              url: entry.new_record? ? account_valuations_path(entry.account) : account_entry_path(entry.account, entry) do |f| %>
   <div class="grid grid-cols-10 p-4 items-center">
     <div class="col-span-7 flex items-center gap-4">
       <div class="w-8 h-8 rounded-full p-1.5 flex items-center justify-center bg-gray-500/5">
@@ -11,12 +12,11 @@
         <%= f.date_field :date, required: "required", min: Account::Entry.min_supported_date, max: Date.current, class: "border border-alpha-black-200 bg-white rounded-lg shadow-xs min-w-[200px] px-3 py-1.5 text-gray-900 text-sm" %>
         <%= f.number_field :amount, required: "required", placeholder: "0.00", step: "0.01", class: "bg-white border border-alpha-black-200 rounded-lg shadow-xs text-gray-900 text-sm px-3 py-1.5 text-right" %>
         <%= f.hidden_field :currency, value: entry.account.currency %>
-        <%= f.hidden_field :entryable_type, value: entry.entryable_type %>
       </div>
     </div>
 
     <div class="col-span-3 flex gap-2 justify-end items-center">
-      <%= link_to t(".cancel"), valuation_account_entries_path(entry.account), class: "text-sm text-gray-900 hover:text-gray-800 font-medium px-3 py-1.5" %>
+      <%= link_to t(".cancel"), account_valuations_path(entry.account), class: "text-sm text-gray-900 hover:text-gray-800 font-medium px-3 py-1.5" %>
       <%= f.submit class: "bg-gray-50 rounded-lg font-medium px-3 py-1.5 cursor-pointer hover:bg-gray-100 text-sm" %>
     </div>
   </div>

app/views/account/valuations/edit.html.erb

@@ -0,0 +1,3 @@
+<%= turbo_frame_tag dom_id(@entry) do %>
+  <%= render "account/valuations/form", entry: @entry %>
+<% end %>

app/views/account/valuations/index.html.erb

@@ -2,8 +2,8 @@
   <div class="bg-white space-y-4 p-5 border border-alpha-black-25 rounded-xl shadow-xs">
     <div class="flex items-center justify-between">
       <%= tag.h2 t(".valuations"), class: "font-medium text-lg" %>
-      <%= link_to new_account_entry_path(@account, entryable_type: "Account::Valuation"),
-                  data: { turbo_frame: dom_id(@account.entries.account_valuations.new) },
+      <%= link_to new_account_valuation_path(@account),
+                  data:  { turbo_frame: dom_id(@account.entries.account_valuations.new) },
                   class: "flex gap-1 font-medium items-center bg-gray-50 text-gray-900 p-2 rounded-lg" do %>
         <%= lucide_icon("plus", class: "w-5 h-5 text-gray-900") %>
         <%= tag.span t(".new_entry"), class: "text-sm" %>
@@ -21,11 +21,11 @@
       <div class="rounded-lg bg-white border-alpha-black-25 shadow-xs">
         <%= turbo_frame_tag dom_id(@account.entries.account_valuations.new) %>
 
-        <% if @valuation_entries.any? %>
-          <%= render partial: "account/entries/entryables/valuation/valuation",
-                     collection: @valuation_entries,
-                     as: :entry,
-                     spacer_template: "ruler" %>
+        <% if @entries.any? %>
+          <%= render partial: "account/valuations/valuation",
+                     collection:      @entries,
+                     as:              :entry,
+                     spacer_template: "account/entries/ruler" %>
         <% else %>
           <p class="text-gray-500 text-sm p-4"><%= t(".no_valuations") %></p>
         <% end %>

app/views/account/valuations/new.html.erb

@@ -0,0 +1,4 @@
+<%= turbo_frame_tag dom_id(@entry) do %>
+  <%= render "account/valuations/form", entry: @entry %>
+  <div class="h-px bg-alpha-black-50 ml-20 mr-4"></div>
+<% end %>

app/views/account/valuations/show.html.erb

@@ -0,0 +1,3 @@
+<% entry = @entry %>
+
+<%= render "account/valuations/valuation", entry: entry %>

app/views/accounts/edit.html.erb

@@ -1,22 +1,15 @@
-<%= modal do %>
-  <article class="mx-auto w-full p-4 space-y-4 min-w-[350px]">
-    <header class="flex justify-between">
-      <h2 class="font-medium text-xl"><%= t(".edit", account: @account.name) %></h2>
-      <%= lucide_icon "x", class: "w-5 h-5 text-gray-500", data: { action: "click->modal#close" } %>
-    </header>
+<%= modal_form_wrapper title: t(".edit", account: @account.name) do %>
+  <%= styled_form_with model: @account, class: "space-y-4", data: { turbo_frame: "_top" } do |f| %>
+    <%= f.text_field :name, label: t(".name") %>
+    <%= money_with_currency_field f, :balance_money, label: t(".balance"), default_currency: @account.currency, disable_currency: true %>
 
-    <%= styled_form_with model: @account, class: "space-y-4", data: { turbo_frame: "_top" } do |f| %>
-      <%= f.text_field :name, label: t(".name") %>
-      <%= money_with_currency_field f, :balance_money, label: t(".balance"), default_currency: @account.currency, disable_currency: true %>
+    <div class="relative">
+      <%= f.collection_select :institution_id, Current.family.institutions.alphabetically, :id, :name, { include_blank: t(".ungrouped"), label: t(".institution") } %>
+      <%= link_to new_institution_path do %>
+        <%= lucide_icon "plus", class: "text-gray-700 hover:text-gray-500 w-4 h-4 absolute right-3 top-2" %>
+      <% end %>
+    </div>
 
-      <div class="relative">
-        <%= f.collection_select :institution_id, Current.family.institutions.alphabetically, :id, :name, { include_blank: t(".ungrouped"), label: t(".institution") } %>
-        <%= link_to new_institution_path do %>
-          <%= lucide_icon "plus", class: "text-gray-700 hover:text-gray-500 w-4 h-4 absolute right-3 top-2" %>
-        <% end %>
-      </div>
-
-      <%= f.submit %>
-    <% end %>
-  </article>
+    <%= f.submit %>
+  <% end %>
 <% end %>

app/views/categories/edit.html.erb

@@ -1,10 +1,3 @@
-<%= modal do %>
-  <article class="mx-auto w-full p-4 space-y-4">
-    <header class="flex justify-between">
-      <h2 class="font-medium text-xl"><%= t(".edit") %></h2>
-      <%= lucide_icon "x", class: "w-5 h-5 text-gray-500", data: { action: "click->modal#close" } %>
-    </header>
-
-    <%= render "form", category: @category %>
-  </article>
+<%= modal_form_wrapper title: t(".edit") do %>
+  <%= render "form", category: @category %>
 <% end %>

app/views/categories/new.html.erb

@@ -1,10 +1,3 @@
-<%= modal do %>
-  <article class="mx-auto w-full p-4 space-y-4">
-    <header class="flex justify-between">
-      <h2 class="font-medium text-xl"><%= t(".new_category") %></h2>
-      <%= lucide_icon "x", class: "w-5 h-5 text-gray-500", data: { action: "click->modal#close" } %>
-    </header>
-
-    <%= render "form", category: @category %>
-  </article>
+<%= modal_form_wrapper title: t(".new_category") do %>
+  <%= render "form", category: @category %>
 <% end %>

app/views/category/deletions/new.html.erb

@@ -1,34 +1,21 @@
-<%= modal do %>
-  <article class="mx-auto p-4 w-screen max-w-md">
-    <div class="space-y-2">
-      <header class="flex justify-between">
-        <h2 class="font-medium text-xl"><%= t(".delete_category") %></h2>
-        <%= lucide_icon "x", class: "w-5 h-5 text-gray-500", data: { action: "click->modal#close" } %>
-      </header>
+<%= modal_form_wrapper title: t(".delete_category"), subtitle: t(".explanation", category_name: @category.name) do %>
+  <%= styled_form_with url: category_deletions_path(@category),
+                       class: "space-y-4",
+                       data: {
+                         turbo: false,
+                         controller: "deletion",
+                         deletion_dangerous_action_class: "form-field__submit bg-white text-red-600 border hover:bg-red-50",
+                         deletion_safe_action_class: "form-field__submit border border-transparent",
+                         deletion_submit_text_when_not_replacing_value: t(".delete_and_leave_uncategorized", category_name: @category.name),
+                         deletion_submit_text_when_replacing_value: t(".delete_and_recategorize", category_name: @category.name) } do |f| %>
+    <%= f.collection_select :replacement_category_id,
+                            Current.family.categories.alphabetically.without(@category),
+                            :id, :name,
+                            { prompt: t(".replacement_category_prompt"), label: t(".category") },
+                            { data: { deletion_target: "replacementField", action: "deletion#updateSubmitButton" } } %>
 
-      <p class="text-gray-500 font-light">
-        <%= t(".explanation", category_name: @category.name) %>
-      </p>
-    </div>
-
-    <%= styled_form_with url: category_deletions_path(@category),
-                         class: "space-y-4",
-                         data: {
-                           turbo: false,
-                           controller: "deletion",
-                           deletion_dangerous_action_class: "form-field__submit bg-white text-red-600 border hover:bg-red-50",
-                           deletion_safe_action_class: "form-field__submit border border-transparent",
-                           deletion_submit_text_when_not_replacing_value: t(".delete_and_leave_uncategorized", category_name: @category.name),
-                           deletion_submit_text_when_replacing_value: t(".delete_and_recategorize", category_name: @category.name) } do |f| %>
-      <%= f.collection_select :replacement_category_id,
-                              Current.family.categories.alphabetically.without(@category),
-                              :id, :name,
-                              { prompt: t(".replacement_category_prompt"), label: t(".category") },
-                              { data: { deletion_target: "replacementField", action: "deletion#updateSubmitButton" } } %>
-
-      <%= f.submit t(".delete_and_leave_uncategorized", category_name: @category.name),
-                   class: "form-field__submit bg-white text-red-600 border hover:bg-red-50",
-                   data: { deletion_target: "submitButton" } %>
-    <% end %>
-  </article>
+    <%= f.submit t(".delete_and_leave_uncategorized", category_name: @category.name),
+                 class: "form-field__submit bg-white text-red-600 border hover:bg-red-50",
+                 data: { deletion_target: "submitButton" } %>
+  <% end %>
 <% end %>

app/views/category/dropdowns/_row.html.erb

@@ -2,7 +2,7 @@
 <% is_selected = category.id === @selected_category&.id %>
 
 <%= content_tag :div, class: ["filterable-item flex justify-between items-center border-none rounded-lg px-2 py-1 group w-full", { "bg-gray-25": is_selected }], data: { filter_name: category.name } do %>
-  <%= button_to account_entry_path(@transaction.entry.account, @transaction.entry, account_entry: { entryable_type: "Account::Transaction", entryable_attributes: { id: @transaction.id, category_id: category.id } }), method: :patch, data: { turbo_frame: dom_id(@transaction.entry) }, class: "flex w-full items-center gap-1.5 cursor-pointer" do %>
+  <%= button_to account_transaction_path(@transaction.entry.account, @transaction.entry, account_entry: { entryable_type: "Account::Transaction", entryable_attributes: { id: @transaction.id, category_id: category.id } }), method: :patch, data: { turbo_frame: dom_id(@transaction.entry) }, class: "flex w-full items-center gap-1.5 cursor-pointer" do %>
     <span class="w-5 h-5">
       <%= lucide_icon("check", class: "w-5 h-5 text-gray-500") if is_selected %>
     </span>

app/views/category/dropdowns/show.html.erb

@@ -25,7 +25,7 @@
       <% end %>
 
       <% if @transaction.category %>
-        <%= button_to account_entry_path(@transaction.entry.account, @transaction.entry),
+        <%= button_to account_transaction_path(@transaction.entry.account, @transaction.entry),
                       method: :patch,
                       data: { turbo_frame: dom_id(@transaction.entry) },
                       params: { account_entry: { entryable_type: "Account::Transaction", entryable_attributes: { id: @transaction.id, category_id: nil } } },

app/views/imports/confirm.html.erb

@@ -9,14 +9,8 @@
   </div>
 
   <div class="mb-8 space-y-4">
-    <% transaction_entries = @import.dry_run %>
-    <% transaction_entries.group_by(&:date).each do |date, transactions| %>
-      <%= render "account/entries/entry_group",
-                 date: date,
-                 entries: transactions,
-                 show_tags: true,
-                 selectable: false,
-                 editable: false %>
+    <%= entries_by_date(@import.dry_run, selectable: false) do |entries| %>
+      <%= render entries, show_tags: true, selectable: false, editable: false %>
     <% end %>
   </div>
 

app/views/institutions/edit.html.erb

@@ -1,10 +1,3 @@
-<%= modal do %>
-  <article class="mx-auto w-full p-4 space-y-4 min-w-[350px]">
-    <header class="flex justify-between">
-      <h2 class="font-medium text-xl"><%= t(".edit", institution: @institution.name) %></h2>
-      <%= lucide_icon "x", class: "w-5 h-5 text-gray-500", data: { action: "click->modal#close" } %>
-    </header>
-
-    <%= render "form", institution: @institution %>
-  </article>
+<%= modal_form_wrapper title: t(".edit", institution: @institution.name) do %>
+  <%= render "form", institution: @institution %>
 <% end %>

app/views/institutions/new.html.erb

@@ -1,10 +1,3 @@
-<%= modal do %>
-  <article class="mx-auto w-full p-4 space-y-4 min-w-[350px]">
-    <header class="flex justify-between">
-      <h2 class="font-medium text-xl"><%= t(".new_institution") %></h2>
-      <%= lucide_icon "x", class: "w-5 h-5 text-gray-500", data: { action: "click->modal#close" } %>
-    </header>
-
-    <%= render "form", institution: @institution %>
-  </article>
+<%= modal_form_wrapper title: t(".new_institution") do %>
+  <%= render "form", institution: @institution %>
 <% end %>

app/views/merchants/edit.html.erb

@@ -1,10 +1,3 @@
-<%= modal classes: "max-w-fit" do %>
-  <article class="mx-auto w-full p-4 space-y-4">
-    <header class="flex justify-between">
-      <h2 class="font-medium text-xl"><%= t(".title") %></h2>
-      <%= lucide_icon "x", class: "w-5 h-5 text-gray-500", data: { action: "click->modal#close" } %>
-    </header>
-
-    <%= render "form", merchant: @merchant %>
-  </article>
+<%= modal_form_wrapper title: t(".title") do %>
+  <%= render "form", merchant: @merchant %>
 <% end %>

app/views/merchants/new.html.erb

@@ -1,10 +1,3 @@
-<%= modal classes: "max-w-fit" do %>
-  <article class="mx-auto w-full p-4 space-y-4">
-    <header class="flex justify-between">
-      <h2 class="font-medium text-xl"><%= t(".title") %></h2>
-      <%= lucide_icon "x", class: "w-5 h-5 text-gray-500", data: { action: "click->modal#close" } %>
-    </header>
-
-    <%= render "form", merchant: @merchant %>
-  </article>
+<%= modal_form_wrapper title: t(".title") do %>
+  <%= render "form", merchant: @merchant %>
 <% end %>

app/views/pages/dashboard.html.erb

@@ -162,13 +162,8 @@
         </div>
       <% else %>
         <div class="text-gray-500 p-1 space-y-1 bg-gray-25 rounded-xl">
-          <% @transaction_entries.group_by(&:date).each do |date, transactions| %>
-            <%= render "account/entries/entry_group",
-                       date: date,
-                       entries: transactions,
-                       selectable: false,
-                       editable: false,
-                       short: true %>
+          <%= entries_by_date(@transaction_entries, selectable: false) do |entries| %>
+            <%= render entries, selectable: false, editable: false, short: true %>
           <% end %>
 
           <p class="py-2 text-sm text-center"><%= link_to t(".view_all"), transactions_path %></p>

app/views/shared/_modal_form.html.erb

@@ -0,0 +1,18 @@
+<%# locals: (title:, content:, subtitle: nil) %>
+
+<%= modal do %>
+  <article class="mx-auto w-full p-4 space-y-4 min-w-[450px] max-w-xl">
+    <div class="space-y-2">
+      <header class="flex justify-between">
+        <h2 class="font-medium text-xl"><%= title %></h2>
+        <%= lucide_icon("x", class: "w-5 h-5 text-gray-500", data: { action: "click->modal#close" }) %>
+      </header>
+
+      <% if subtitle.present? %>
+        <%= tag.p subtitle, class: "text-gray-500 font-light" %>
+      <% end %>
+    </div>
+
+    <%= content %>
+  </article>
+<% end %>

app/views/shared/_money_field.html.erb

@@ -1,7 +1,7 @@
 <%# locals: (form:, money_method:, default_currency:, disable_currency: false, hide_currency: false, label: nil) %>
 
 <% fallback_label = t(".money-label") %>
-<% currency = form.object.send(money_method)&.currency || Money::Currency.new(default_currency) %>
+<% currency = form.object ? (form.object.send(money_method)&.currency || Money::Currency.new(default_currency)) : Money::Currency.new(default_currency) %>
 
 <div class="form-field pr-0" data-controller="money-field">
   <%= form.label label || fallback_label, { class: "form-field__label" } %>

app/views/tag/deletions/new.html.erb

@@ -1,34 +1,21 @@
-<%= modal do %>
-  <article class="mx-auto p-4 w-screen max-w-md">
-    <div class="space-y-2">
-      <header class="flex justify-between">
-        <h2 class="font-medium text-xl"><%= t(".delete_tag") %></h2>
-        <%= lucide_icon "x", class: "w-5 h-5 text-gray-500", data: { action: "click->modal#close" } %>
-      </header>
+<%= modal_form_wrapper title: t(".delete_tag"), subtitle: t(".explanation", tag_name: @tag.name) do %>
+  <%= styled_form_with url: tag_deletions_path(@tag),
+                       class: "space-y-4",
+                       data: {
+                         turbo: false,
+                         controller: "deletion",
+                         deletion_dangerous_action_class: "form-field__submit bg-white text-red-600 border hover:bg-red-50",
+                         deletion_safe_action_class: "form-field__submit border border-transparent",
+                         deletion_submit_text_when_not_replacing_value: t(".delete_and_leave_uncategorized", tag_name: @tag.name),
+                         deletion_submit_text_when_replacing_value: t(".delete_and_recategorize", tag_name: @tag.name) } do |f| %>
+    <%= f.collection_select :replacement_tag_id,
+                            Current.family.tags.alphabetically.without(@tag),
+                            :id, :name,
+                            { prompt: t(".replacement_tag_prompt"), label: t(".tag") },
+                            { data: { deletion_target: "replacementField", action: "deletion#updateSubmitButton" } } %>
 
-      <p class="text-gray-500 font-light">
-        <%= t(".explanation", tag_name: @tag.name) %>
-      </p>
-    </div>
-
-    <%= styled_form_with url: tag_deletions_path(@tag),
-                         class: "space-y-4",
-                         data: {
-                           turbo: false,
-                           controller: "deletion",
-                           deletion_dangerous_action_class: "form-field__submit bg-white text-red-600 border hover:bg-red-50",
-                           deletion_safe_action_class: "form-field__submit border border-transparent",
-                           deletion_submit_text_when_not_replacing_value: t(".delete_and_leave_uncategorized", tag_name: @tag.name),
-                           deletion_submit_text_when_replacing_value: t(".delete_and_recategorize", tag_name: @tag.name) } do |f| %>
-      <%= f.collection_select :replacement_tag_id,
-                              Current.family.tags.alphabetically.without(@tag),
-                              :id, :name,
-                              { prompt: t(".replacement_tag_prompt"), label: t(".tag") },
-                              { data: { deletion_target: "replacementField", action: "deletion#updateSubmitButton" } } %>
-
-      <%= f.submit t(".delete_and_leave_uncategorized", tag_name: @tag.name),
-                   class: "form-field__submit bg-white text-red-600 border hover:bg-red-50",
-                   data: { deletion_target: "submitButton" } %>
-    <% end %>
-  </article>
+    <%= f.submit t(".delete_and_leave_uncategorized", tag_name: @tag.name),
+                 class: "form-field__submit bg-white text-red-600 border hover:bg-red-50",
+                 data: { deletion_target: "submitButton" } %>
+  <% end %>
 <% end %>

app/views/tags/edit.html.erb

@@ -1,10 +1,3 @@
-<%= modal do %>
-  <article class="mx-auto w-full p-4 space-y-4">
-    <header class="flex justify-between">
-      <h2 class="font-medium text-xl"><%= t(".edit") %></h2>
-      <%= lucide_icon "x", class: "w-5 h-5 text-gray-500", data: { action: "click->modal#close" } %>
-    </header>
-
-    <%= render "form", tag: @tag %>
-  </article>
+<%= modal_form_wrapper title: t(".edit") do %>
+  <%= render "form", tag: @tag %>
 <% end %>

app/views/tags/new.html.erb

@@ -1,10 +1,3 @@
-<%= modal do %>
-  <article class="mx-auto w-full p-4 space-y-4">
-    <header class="flex justify-between">
-      <h2 class="font-medium text-xl"><%= t(".new") %></h2>
-      <%= lucide_icon "x", class: "w-5 h-5 text-gray-500", data: { action: "click->modal#close" } %>
-    </header>
-
-    <%= render "form", tag: @tag %>
-  </article>
+<%= modal_form_wrapper title: t(".new") do %>
+  <%= render "form", tag: @tag %>
 <% end %>

app/views/transactions/index.html.erb

@@ -11,7 +11,7 @@
 
     <% if @transaction_entries.present? %>
       <div hidden id="entry-selection-bar" data-bulk-select-target="selectionBar">
-        <%= render "account/entries/entryables/transaction/selection_bar" %>
+        <%= render "account/transactions/selection_bar" %>
       </div>
       <div class="grow overflow-y-auto">
         <div class="grid grid-cols-12 bg-gray-25 rounded-xl px-5 py-3 text-xs uppercase font-medium text-gray-500 items-center mb-4">
@@ -27,8 +27,9 @@
           <p class="col-span-2 justify-self-end">amount</p>
         </div>
         <div class="space-y-6">
-          <% @transaction_entries.group_by(&:date).each do |date, entries| %>
-            <%= render "account/entries/entry_group", date:, combine_transfers: true, entries: %>
+          <%= entries_by_date(@transaction_entries) do |entries| %>
+            <%= render entries.reject { |e| e.transfer_id.present? }, selectable: true %>
+            <%= render transfer_entries(entries), selectable: false %>
           <% end %>
         </div>
       </div>

app/views/transactions/new.html.erb

@@ -1,10 +1,3 @@
-<%= modal do %>
-  <article class="mx-auto p-4 space-y-4 w-screen max-w-xl">
-    <header class="flex justify-between">
-      <h2 class="font-medium text-xl"><%= t(".new_transaction") %></h2>
-      <%= lucide_icon "x", class: "w-5 h-5 text-gray-500", data: { action: "click->modal#close" } %>
-    </header>
-
-    <%= render "form", transaction: @transaction, entry: @entry %>
-  </article>
+<%= modal_form_wrapper title: t(".new_transaction") do %>
+  <%= render "form", transaction: @transaction, entry: @entry %>
 <% end %>