Update version.rb

Bump to v0.1.0-alpha.14

Signed-off-by: Zach Gollwitzer <zach@maybe.co>

.env.test.example

@@ -0,0 +1,17 @@
+# ================
+# Data Providers
+# ---------------------------------------------------------------------------------
+# Uncomment and fill in live keys when you need to generate a VCR cassette fixture
+# ================
+
+# SYNTH_API_KEY=<add live key here>
+
+# ================
+# Miscellaneous
+# ================
+
+# Set to true if you want SimpleCov reports generated
+COVERAGE=false
+
+# Set to true to run test suite serially
+DISABLE_PARALLELIZATION=false

.gitignore

@@ -11,6 +11,7 @@
 /.env*
 !/.env*.erb
 !.env.example
+!.env.test.example
 
 # Ignore all logfiles and tempfiles.
 /log/*

.rubocop.yml

@@ -6,3 +6,7 @@ inherit_gem: { rubocop-rails-omakase: rubocop.yml }
 # # Use `[a, [b, c]]` not `[ a, [ b, c ] ]`
 # Layout/SpaceInsideArrayLiteralBrackets:
 #   Enabled: false
+Layout/ElseAlignment:
+  Enabled: false
+Layout/EndAlignment:
+  Enabled: false

Gemfile

@@ -52,10 +52,10 @@ group :development, :test do
   gem "rubocop-rails-omakase", require: false
   gem "i18n-tasks"
   gem "erb_lint"
+  gem "dotenv-rails"
 end
 
 group :development do
-  gem "dotenv-rails"
   gem "hotwire-livereload"
   gem "letter_opener"
   gem "ruby-lsp-rails"

Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 
 GIT
   remote: https://github.com/rails/rails.git
-  revision: 1b8903346000e1848e62e09429d325499af03b3f
+  revision: 43530b4ac911b8722b8a7ac8025eb9298e1292b4
   branch: 7-2-stable
   specs:
     actioncable (7.2.0.beta3)
@@ -35,7 +35,7 @@ GIT
       activesupport (= 7.2.0.beta3)
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4)
+      rack (>= 2.2.4, < 3.2)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
@@ -78,6 +78,7 @@ GIT
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
       minitest (>= 5.1)
+      securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
     rails (7.2.0.beta3)
       actioncable (= 7.2.0.beta3)
@@ -109,8 +110,8 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.952.0)
-    aws-sdk-core (3.201.1)
+    aws-partitions (1.961.0)
+    aws-sdk-core (3.201.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
@@ -118,11 +119,11 @@ GEM
     aws-sdk-kms (1.88.0)
       aws-sdk-core (~> 3, >= 3.201.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.156.0)
+    aws-sdk-s3 (1.157.0)
       aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.8.0)
+    aws-sigv4 (1.9.1)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
     bcrypt (3.1.20)
@@ -168,32 +169,37 @@ GEM
       dotenv (= 3.1.2)
       railties (>= 6.1)
     drb (2.2.1)
-    erb_lint (0.5.0)
+    erb_lint (0.6.0)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
       rainbow
-      rubocop
+      rubocop (>= 1)
       smart_properties
     erubi (1.13.0)
     et-orbi (1.2.11)
       tzinfo
     faker (3.4.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.10.0)
+    faraday (2.10.1)
       faraday-net_http (>= 2.0, < 3.2)
       logger
-    faraday-net_http (3.1.0)
+    faraday-net_http (3.1.1)
       net-http
     faraday-retry (2.2.1)
       faraday (~> 2.0)
-    ffi (1.16.3)
+    ffi (1.17.0-aarch64-linux-gnu)
+    ffi (1.17.0-arm-linux-gnu)
+    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0-x86-linux-gnu)
+    ffi (1.17.0-x86_64-darwin)
+    ffi (1.17.0-x86_64-linux-gnu)
     fugit (1.11.0)
       et-orbi (~> 1, >= 1.2.11)
       raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    good_job (4.1.0)
+    good_job (4.1.1)
       activejob (>= 6.1.0)
       activerecord (>= 6.1.0)
       concurrent-ruby (>= 1.3.1)
@@ -218,7 +224,7 @@ GEM
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
-    image_processing (1.12.2)
+    image_processing (1.13.0)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     importmap-rails (2.0.1)
@@ -254,10 +260,10 @@ GEM
       net-smtp
     marcel (1.0.4)
     matrix (0.4.2)
-    mini_magick (4.12.0)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
     minitest (5.24.1)
-    mocha (2.4.2)
+    mocha (2.4.5)
       ruby2_keywords (>= 0.0.5)
     msgpack (1.7.2)
     net-http (0.4.1)
@@ -272,27 +278,27 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.6-aarch64-linux)
+    nokogiri (1.16.7-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.16.6-arm-linux)
+    nokogiri (1.16.7-arm-linux)
       racc (~> 1.4)
-    nokogiri (1.16.6-arm64-darwin)
+    nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.6-x86-linux)
+    nokogiri (1.16.7-x86-linux)
       racc (~> 1.4)
-    nokogiri (1.16.6-x86_64-darwin)
+    nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.6-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     octokit (9.1.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    pagy (9.0.2)
-    parallel (1.24.0)
-    parser (3.3.1.0)
+    pagy (9.0.5)
+    parallel (1.25.1)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
-    pg (1.5.6)
+    pg (1.5.7)
     prism (0.30.0)
     propshaft (0.9.0)
       actionpack (>= 7.0.0)
@@ -305,7 +311,7 @@ GEM
     puma (6.4.2)
       nio4r (~> 2.0)
     raabro (1.4.0)
-    racc (1.8.0)
+    racc (1.8.1)
     rack (3.1.7)
     rack-session (2.0.0)
       rack (>= 3.0.0)
@@ -340,15 +346,15 @@ GEM
     regexp_parser (2.9.2)
     reline (0.5.9)
       io-console (~> 0.5)
-    rexml (3.3.2)
+    rexml (3.3.4)
       strscan
-    rubocop (1.63.5)
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
@@ -379,23 +385,25 @@ GEM
     ruby-lsp-rails (0.3.11)
       ruby-lsp (>= 0.17.2, < 0.18.0)
     ruby-progressbar (1.13.0)
-    ruby-vips (2.2.1)
+    ruby-vips (2.2.2)
       ffi (~> 1.12)
+      logger
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
+    securerandom (0.3.1)
     selenium-webdriver (4.23.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sentry-rails (5.18.1)
+    sentry-rails (5.18.2)
       railties (>= 5.0)
-      sentry-ruby (~> 5.18.1)
-    sentry-ruby (5.18.1)
+      sentry-ruby (~> 5.18.2)
+    sentry-ruby (5.18.2)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     simplecov (0.22.0)
@@ -411,17 +419,17 @@ GEM
       railties (>= 6.0.0)
     stringio (3.1.1)
     strscan (3.1.0)
-    tailwindcss-rails (2.6.3)
+    tailwindcss-rails (2.6.5)
       railties (>= 7.0.0)
-    tailwindcss-rails (2.6.3-aarch64-linux)
+    tailwindcss-rails (2.6.5-aarch64-linux)
       railties (>= 7.0.0)
-    tailwindcss-rails (2.6.3-arm-linux)
+    tailwindcss-rails (2.6.5-arm-linux)
       railties (>= 7.0.0)
-    tailwindcss-rails (2.6.3-arm64-darwin)
+    tailwindcss-rails (2.6.5-arm64-darwin)
       railties (>= 7.0.0)
-    tailwindcss-rails (2.6.3-x86_64-darwin)
+    tailwindcss-rails (2.6.5-x86_64-darwin)
       railties (>= 7.0.0)
-    tailwindcss-rails (2.6.3-x86_64-linux)
+    tailwindcss-rails (2.6.5-x86_64-linux)
       railties (>= 7.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -453,7 +461,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.16)
+    zeitwerk (2.6.17)
 
 PLATFORMS
   aarch64-linux

app/assets/stylesheets/application.tailwind.css

@@ -4,11 +4,11 @@
 
 /* Reset rules, default styles applied to plain HTML */
 @layer base {
-  details > summary::-webkit-details-marker {
+  details>summary::-webkit-details-marker {
     @apply hidden;
   }
 
-  details > summary {
+  details>summary {
     @apply list-none;
   }
 }
@@ -38,7 +38,7 @@
     @apply w-full cursor-pointer rounded-lg bg-black p-3 text-center text-white hover:bg-gray-700;
   }
 
-  input:checked + label + .toggle-switch-dot {
+  input:checked+label+.toggle-switch-dot {
     transform: translateX(100%);
   }
 
@@ -90,6 +90,10 @@
       @apply font-bold;
     }
   }
+
+  .tooltip {
+    @apply hidden absolute;
+  }
 }
 
 /* Small, single purpose classes that should take precedence over other styles */

app/controllers/account/cashes_controller.rb

@@ -0,0 +1,14 @@
+class Account::CashesController < ApplicationController
+  layout :with_sidebar
+
+  before_action :set_account
+
+  def index
+  end
+
+  private
+
+    def set_account
+      @account = Current.family.accounts.find(params[:account_id])
+    end
+end

app/controllers/account/entries_controller.rb

@@ -1,52 +1,15 @@
 class Account::EntriesController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
   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.account_trades.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/holdings_controller.rb

@@ -1,5 +1,5 @@
 class Account::HoldingsController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
   before_action :set_account
   before_action :set_holding, only: :show

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/transfers_controller.rb

@@ -1,5 +1,5 @@
 class Account::TransfersController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
   before_action :set_transfer, only: :destroy
 

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/controllers/accounts_controller.rb

@@ -1,5 +1,5 @@
 class AccountsController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
   include Filterable
   before_action :set_account, only: %i[ edit show destroy sync update ]
@@ -31,7 +31,8 @@ class AccountsController < ApplicationController
   end
 
   def show
-    @balance_series = @account.series(period: @period)
+    @series = @account.series(period: @period)
+    @trend = @series.trend
   end
 
   def edit

app/controllers/application_controller.rb

@@ -4,4 +4,12 @@ class ApplicationController < ActionController::Base
 
   # Only allow modern browsers supporting webp images, web push, badges, import maps, CSS nesting, and CSS :has.
   allow_browser versions: :modern
+
+  private
+
+    def with_sidebar
+      return "turbo_rails/frame" if turbo_frame_request?
+
+      "with_sidebar"
+    end
 end

app/controllers/categories_controller.rb

@@ -1,5 +1,5 @@
 class CategoriesController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
   before_action :set_category, only: %i[ edit update ]
   before_action :set_transaction, only: :create

app/controllers/category/deletions_controller.rb

@@ -1,5 +1,5 @@
 class Category::DeletionsController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
   before_action :set_category
   before_action :set_replacement_category, only: :create

app/controllers/help/articles_controller.rb

@@ -1,5 +1,5 @@
 class Help::ArticlesController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
   def show
     @article = Help::Article.find(params[:id])

app/controllers/merchants_controller.rb

@@ -1,5 +1,5 @@
 class MerchantsController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
   before_action :set_merchant, only: %i[ edit update destroy ]
 

app/controllers/pages_controller.rb

@@ -1,5 +1,5 @@
 class PagesController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
   include Filterable
 

app/controllers/settings_controller.rb

@@ -1,3 +1,3 @@
 class SettingsController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 end

app/controllers/tag/deletions_controller.rb

@@ -1,5 +1,5 @@
 class Tag::DeletionsController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
   before_action :set_tag
   before_action :set_replacement_tag, only: :create

app/controllers/tags_controller.rb

@@ -1,5 +1,5 @@
 class TagsController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
   before_action :set_tag, only: %i[ edit update ]
 

app/controllers/transactions_controller.rb

@@ -1,5 +1,5 @@
 class TransactionsController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
   def index
     @q = search_params

app/helpers/account/cashes_helper.rb

@@ -0,0 +1,13 @@
+module Account::CashesHelper
+  def brokerage_cash(account)
+    currency = Money::Currency.new(account.currency)
+
+    account.holdings.build \
+      date: Date.current,
+      qty: account.balance,
+      price: 1,
+      amount: account.balance,
+      currency: account.currency,
+      security: Security.new(ticker: currency.iso_code, name: currency.name)
+  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

@@ -25,11 +25,12 @@ 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) }
-    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) }
+    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: 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, trades_tab ] if account.investment?
+    return [ holdings_tab, cash_tab, trades_tab ] if account.investment?
 
     [ value_tab, transactions_tab ]
   end

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/javascript/controllers/tooltip_controller.js

@@ -0,0 +1,74 @@
+import { Controller } from '@hotwired/stimulus'
+import {
+  computePosition,
+  flip,
+  shift,
+  offset,
+  arrow
+} from '@floating-ui/dom';
+
+export default class extends Controller {
+  static targets = ["arrow", "tooltip"];
+  static values = {
+    placement: { type: String, default: "top" },
+    offset: { type: Number, default: 10 },
+    crossAxis: { type: Number, default: 0 },
+    alignmentAxis: { type: Number, default: null },
+  };
+
+  connect() {
+    this.element.addEventListener("mouseenter", this.showTooltip);
+    this.element.addEventListener("mouseleave", this.hideTooltip);
+    this.element.addEventListener("focus", this.showTooltip);
+    this.element.addEventListener("blur", this.hideTooltip);
+  };
+
+  showTooltip = () => {
+    this.tooltipTarget.style.display = 'block';
+    this.#update();
+  };
+
+  hideTooltip = () => {
+    this.tooltipTarget.style.display = '';
+  };
+
+  disconnect() {
+    this.element.removeEventListener("mouseenter", this.showTooltip);
+    this.element.removeEventListener("mouseleave", this.hideTooltip);
+    this.element.removeEventListener("focus", this.showTooltip);
+    this.element.removeEventListener("blur", this.hideTooltip);
+  };
+
+  #update() {
+    computePosition(this.element, this.tooltipTarget, {
+      placement: this.placementValue,
+      middleware: [
+        offset({ mainAxis: this.offsetValue, crossAxis: this.crossAxisValue, alignmentAxis: this.alignmentAxisValue }),
+        flip(),
+        shift({ padding: 5 }),
+        arrow({ element: this.arrowTarget }),
+      ],
+    }).then(({ x, y, placement, middlewareData }) => {
+      Object.assign(this.tooltipTarget.style, {
+        left: `${x}px`,
+        top: `${y}px`,
+      });
+
+      const { x: arrowX, y: arrowY } = middlewareData.arrow;
+      const staticSide = {
+        top: 'bottom',
+        right: 'left',
+        bottom: 'top',
+        left: 'right',
+      }[placement.split('-')[0]];
+
+      Object.assign(this.arrowTarget.style, {
+        left: arrowX != null ? `${arrowX}px` : '',
+        top: arrowY != null ? `${arrowY}px` : '',
+        right: '',
+        bottom: '',
+        [staticSide]: '-4px',
+      });
+    });
+  };
+}

app/models/account.rb

@@ -29,7 +29,7 @@ class Account < ApplicationRecord
   delegated_type :accountable, types: Accountable::TYPES, dependent: :destroy
 
   class << self
-    def by_group(period: Period.all, currency: Money.default_currency)
+    def by_group(period: Period.all, currency: Money.default_currency.iso_code)
       grouped_accounts = { assets: ValueGroup.new("Assets", currency), liabilities: ValueGroup.new("Liabilities", currency) }
 
       Accountable.by_classification.each do |classification, types|
@@ -73,6 +73,31 @@ class Account < ApplicationRecord
     end
   end
 
+  # Start of temporary fix for #1068
+  # ==========================================================================
+
+  # TODO: Both `series` and `value` methods are a temporary fix for #1068, which appears to be a data corruption issue.
+  # Every account should have an accountable no matter what, but some self hosted instances seem to have missing accountables.
+  # When this is fixed, we can add this back to `delegate :value, :series, to: :accountable`
+  def series(period: Period.all, currency: self.currency)
+    if accountable.present?
+      accountable.series(period: period, currency: currency)
+    else
+      TimeSeries.new([])
+    end
+  end
+
+  def value
+    if accountable.present?
+      accountable.value
+    else
+      balance_money
+    end
+  end
+
+  # ==========================================================================
+  # End of temporary fix for #1068
+
   def alert
     latest_sync = syncs.latest
     [ latest_sync&.error, *latest_sync&.warnings ].compact.first
@@ -82,18 +107,6 @@ class Account < ApplicationRecord
     classification == "asset" ? "up" : "down"
   end
 
-  def series(period: Period.all, currency: self.currency)
-    balance_series = balances.in_period(period).where(currency: Money::Currency.new(currency).iso_code)
-
-    if balance_series.empty? && period.date_range.end == Date.current
-      TimeSeries.new([ { date: Date.current, value: balance_money.exchange_to(currency) } ])
-    else
-      TimeSeries.from_collection(balance_series, :balance_money)
-    end
-  rescue Money::ConversionError
-    TimeSeries.new([])
-  end
-
   def update_balance!(balance)
     valuation = entries.account_valuations.find_by(date: Date.current)
 

app/models/account/entry.rb

@@ -204,7 +204,7 @@ class Account::Entry < ApplicationRecord
         current_qty = account.holding_qty(account_trade.security)
 
         if current_qty < account_trade.qty.abs
-          errors.add(:base, "cannot sell #{account_trade.qty.abs} shares of #{account_trade.security.symbol} because you only own #{current_qty} shares")
+          errors.add(:base, "cannot sell #{account_trade.qty.abs} shares of #{account_trade.security.ticker} because you only own #{current_qty} shares")
         end
       end
     end

app/models/account/holding.rb

@@ -10,15 +10,17 @@ class Account::Holding < ApplicationRecord
 
   scope :chronological, -> { order(:date) }
   scope :current, -> { where(date: Date.current).order(amount: :desc) }
+  scope :in_period, ->(period) { period.date_range.nil? ? all : where(date: period.date_range) }
+  scope :known_value, -> { where.not(amount: nil) }
   scope :for, ->(security) { where(security_id: security).order(:date) }
 
   delegate :name, to: :security
-  delegate :symbol, to: :security
+  delegate :ticker, to: :security
 
   def weight
     return nil unless amount
 
-    portfolio_value = account.holdings.current.where.not(amount: nil).sum(&:amount)
+    portfolio_value = account.holdings.current.known_value.sum(&:amount)
     portfolio_value.zero? ? 1 : amount / portfolio_value * 100
   end
 

app/models/account/holding/syncer.rb

@@ -32,16 +32,42 @@ class Account::Holding::Syncer
                                .order(:date)
     end
 
+    def get_cached_price(ticker, date)
+      return nil unless security_prices.key?(ticker)
+
+      price = security_prices[ticker].find { |p| p.date == date }
+      price ? price[:price] : nil
+    end
+
+    def security_prices
+      @security_prices ||= begin
+                             prices = {}
+                             ticker_start_dates = {}
+
+                             sync_entries.each do |entry|
+                               unless ticker_start_dates[entry.account_trade.security.ticker]
+                                 ticker_start_dates[entry.account_trade.security.ticker] = entry.date
+                               end
+                             end
+
+                             ticker_start_dates.each do |ticker, date|
+                               prices[ticker] = Security::Price.find_prices(ticker: ticker, start_date: date, end_date: Date.current)
+                             end
+
+                             prices
+                           end
+    end
+
     def build_holdings_for_date(date)
       trades = sync_entries.select { |trade| trade.date == date }
 
       @portfolio = generate_next_portfolio(@portfolio, trades)
 
-      @portfolio.map do |isin, holding|
+      @portfolio.map do |ticker, holding|
         trade = trades.find { |trade| trade.account_trade.security_id == holding[:security_id] }
         trade_price = trade&.account_trade&.price
 
-        price = Security::Price.find_by(date: date, isin: isin)&.price || trade_price
+        price = get_cached_price(ticker, date) || trade_price
 
         account.holdings.build \
           date: date,
@@ -58,10 +84,10 @@ class Account::Holding::Syncer
         trade = entry.account_trade
 
         price = trade.price
-        prior_qty = prior_portfolio.dig(trade.security.isin, :qty) || 0
+        prior_qty = prior_portfolio.dig(trade.security.ticker, :qty) || 0
         new_qty = prior_qty + trade.qty
 
-        new_portfolio[trade.security.isin] = {
+        new_portfolio[trade.security.ticker] = {
           qty: new_qty,
           price: price,
           amount: new_qty * price,
@@ -86,7 +112,7 @@ class Account::Holding::Syncer
       prior_day_holdings = account.holdings.where(date: sync_date_range.begin - 1.day)
 
       prior_day_holdings.each do |holding|
-        @portfolio[holding.security.isin] = {
+        @portfolio[holding.security.ticker] = {
           qty: holding.qty,
           price: holding.price,
           amount: holding.amount,

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/account/transfer.rb

@@ -9,19 +9,18 @@ class Account::Transfer < ApplicationRecord
   end
 
   def amount_money
-    entries.first&.amount_money&.abs
+    entries.first&.amount_money&.abs || Money.new(0)
   end
 
   def from_name
-    outflow_transaction&.account&.name
+    outflow_transaction&.account&.name || I18n.t("account.transfer.from_fallback_name")
   end
 
   def to_name
-    inflow_transaction&.account&.name
+    inflow_transaction&.account&.name || I18n.t("account.transfer.to_fallback_name")
   end
 
   def name
-    return nil unless from_name && to_name
     I18n.t("account.transfer.name", from_account: from_name, to_account: to_name)
   end
 

app/models/concerns/accountable.rb

@@ -17,4 +17,20 @@ module Accountable
   included do
     has_one :account, as: :accountable, touch: true
   end
+
+  def value
+    account.balance_money
+  end
+
+  def series(period: Period.all, currency: account.currency)
+    balance_series = account.balances.in_period(period).where(currency: currency)
+
+    if balance_series.empty? && period.date_range.end == Date.current
+      TimeSeries.new([ { date: Date.current, value: account.balance_money.exchange_to(currency) } ])
+    else
+      TimeSeries.from_collection(balance_series, :balance_money)
+    end
+  rescue Money::ConversionError
+    TimeSeries.new([])
+  end
 end

app/models/concerns/providable.rb

@@ -6,18 +6,25 @@ module Providable
   extend ActiveSupport::Concern
 
   class_methods do
-    def exchange_rates_provider
-      api_key = ENV["SYNTH_API_KEY"]
+    def security_prices_provider
+      synth_provider
+    end
 
-      if api_key.present?
-        Provider::Synth.new api_key
-      else
-        nil
-      end
+    def exchange_rates_provider
+      synth_provider
     end
 
     def git_repository_provider
       Provider::Github.new
     end
+
+    private
+
+      def synth_provider
+        @synth_provider ||= begin
+                              api_key = ENV["SYNTH_API_KEY"]
+                              api_key.present? ? Provider::Synth.new(api_key) : nil
+                            end
+      end
   end
 end

app/models/demo/generator.rb

@@ -52,6 +52,7 @@ class Demo::Generator
     end
 
     def clear_data!
+      User.find_by_email("user@maybe.local")&.destroy
       ExchangeRate.destroy_all
       Security.destroy_all
       Security::Price.destroy_all
@@ -166,12 +167,12 @@ class Demo::Generator
 
     def load_securities!
       # Create an unknown security to simulate edge cases
-      Security.create! isin: "unknown", symbol: "UNKNOWN", name: "Unknown Demo Stock"
+      Security.create! ticker: "UNKNOWN", name: "Unknown Demo Stock"
 
       securities = [
-        { isin: "US0378331005", symbol: "AAPL", name: "Apple Inc.", reference_price: 210 },
-        { isin: "JP3633400001", symbol: "TM", name: "Toyota Motor Corporation", reference_price: 202 },
-        { isin: "US5949181045", symbol: "MSFT", name: "Microsoft Corporation", reference_price: 455 }
+        { ticker: "AAPL", name: "Apple Inc.", reference_price: 210 },
+        { ticker: "TM", name: "Toyota Motor Corporation", reference_price: 202 },
+        { ticker: "MSFT", name: "Microsoft Corporation", reference_price: 455 }
       ]
 
       securities.each do |security_attributes|
@@ -183,7 +184,7 @@ class Demo::Generator
           low_price = reference - 20
           high_price = reference + 20
           Security::Price.create! \
-            isin: security.isin,
+            ticker: security.ticker,
             date: date,
             price: Faker::Number.positive(from: low_price, to: high_price)
         end
@@ -200,13 +201,13 @@ class Demo::Generator
         currency: "USD",
         institution: family.institutions.find_or_create_by(name: "Robinhood")
 
-      aapl = Security.find_by(symbol: "AAPL")
-      tm = Security.find_by(symbol: "TM")
-      msft = Security.find_by(symbol: "MSFT")
-      unknown = Security.find_by(symbol: "UNKNOWN")
+      aapl = Security.find_by(ticker: "AAPL")
+      tm = Security.find_by(ticker: "TM")
+      msft = Security.find_by(ticker: "MSFT")
+      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 },
@@ -219,15 +220,15 @@ class Demo::Generator
         date = Faker::Number.positive(to: 730).days.ago.to_date
         security = trade[:security]
         qty = trade[:qty]
-        price = Security::Price.find_by(isin: security.isin, date: date)&.price || 1
+        price = Security::Price.find_by(ticker: security.ticker, date: date)&.price || 1
         name_prefix = qty < 0 ? "Sell " : "Buy "
 
         account.entries.create! \
           date: date,
           amount: qty * price,
           currency: "USD",
-          name: name_prefix + "#{qty} shares of #{security.symbol}",
-          entryable: Account::Trade.new(qty: qty, price: price, security: security)
+          name: name_prefix + "#{qty} shares of #{security.ticker}",
+          entryable: Account::Trade.new(qty: qty, price: price, currency: "USD", security: security)
       end
     end
 

app/models/exchange_rate.rb

@@ -15,12 +15,11 @@ class ExchangeRate < ApplicationRecord
 
     def find_rates(from:, to:, start_date:, end_date: Date.current, cache: true)
       rates = self.where(from_currency: from, to_currency: to, date: start_date..end_date).to_a
-      all_dates = (start_date..end_date).to_a.to_set
-      existing_dates = rates.map(&:date).to_set
+      all_dates = (start_date..end_date).to_a
+      existing_dates = rates.map(&:date)
       missing_dates = all_dates - existing_dates
-
       if missing_dates.any?
-        rates += fetch_rates_from_provider(from:, to:, dates: missing_dates, cache:)
+        rates += fetch_rates_from_provider(from:, to:, start_date: missing_dates.first, end_date: missing_dates.last, cache:)
       end
 
       rates

app/models/exchange_rate/provided.rb

@@ -6,12 +6,31 @@ module ExchangeRate::Provided
   class_methods do
     private
 
-      def fetch_rates_from_provider(from:, to:, dates:, cache: false)
+      def fetch_rates_from_provider(from:, to:, start_date:, end_date: Date.current, cache: false)
         return [] unless exchange_rates_provider.present?
 
-        dates.map do |date|
-          fetch_rate_from_provider from:, to:, date:, cache:
-        end.compact
+        response = exchange_rates_provider.fetch_exchange_rates \
+          from: from,
+          to: to,
+          start_date: start_date,
+          end_date: end_date
+
+        if response.success?
+          response.rates.map do |exchange_rate|
+            rate = ExchangeRate.new \
+              from_currency: from,
+              to_currency: to,
+              date: exchange_rate.dig(:date).to_date,
+              rate: exchange_rate.dig(:rate)
+
+            rate.save! if cache
+            rate
+          rescue ActiveRecord::RecordNotUnique
+            next
+          end
+        else
+          []
+        end
       end
 
       def fetch_rate_from_provider(from:, to:, date:, cache: false)

app/models/investment.rb

@@ -13,4 +13,35 @@ class Investment < ApplicationRecord
     [ "Roth 401k", "roth_401k" ],
     [ "Angel", "angel" ]
   ].freeze
+
+  def value
+    account.balance_money + holdings_value
+  end
+
+  def holdings_value
+    account.holdings.current.known_value.sum(&:amount) || Money.new(0, account.currency)
+  end
+
+  def series(period: Period.all, currency: account.currency)
+    balance_series = account.balances.in_period(period).where(currency: currency)
+    holding_series = account.holdings.known_value.in_period(period).where(currency: currency)
+
+    holdings_by_date = holding_series.group_by(&:date).transform_values do |holdings|
+      holdings.sum(&:amount)
+    end
+
+    combined_series = balance_series.map do |balance|
+      holding_amount = holdings_by_date[balance.date] || 0
+
+      { date: balance.date, value: Money.new(balance.balance + holding_amount, currency) }
+    end
+
+    if combined_series.empty? && period.date_range.end == Date.current
+      TimeSeries.new([ { date: Date.current, value: self.value.exchange_to(currency) } ])
+    else
+      TimeSeries.new(combined_series)
+    end
+  rescue Money::ConversionError
+    TimeSeries.new([])
+  end
 end

app/models/provider/synth.rb

@@ -5,10 +5,35 @@ class Provider::Synth
     @api_key = api_key
   end
 
+  def fetch_security_prices(ticker:, start_date:, end_date:)
+    prices = paginate(
+      "#{base_url}/tickers/#{ticker}/open-close",
+      start_date: start_date,
+      end_date: end_date
+    ) do |body|
+      body.dig("prices").map do |price|
+        {
+          date: price.dig("date"),
+          price: price.dig("close")&.to_f || price.dig("open")&.to_f,
+          currency: "USD"
+        }
+      end
+    end
+
+    SecurityPriceResponse.new \
+      prices: prices,
+      success?: true,
+      raw_response: prices.to_json
+  rescue StandardError => error
+    SecurityPriceResponse.new \
+      success?: false,
+      error: error,
+      raw_response: error
+  end
+
   def fetch_exchange_rate(from:, to:, date:)
     retrying Provider::Base.known_transient_errors do |on_last_attempt|
-      response = Faraday.get("#{base_url}/rates/historical") do |req|
-        req.headers["Authorization"] = "Bearer #{api_key}"
+      response = client.get("#{base_url}/rates/historical") do |req|
         req.params["date"] = date.to_s
         req.params["from"] = from
         req.params["to"] = to
@@ -32,20 +57,100 @@ class Provider::Synth
     end
   end
 
+  def fetch_exchange_rates(from:, to:, start_date:, end_date:)
+    exchange_rates = paginate(
+      "#{base_url}/rates/historical-range",
+      from: from,
+      to: to,
+      date_start: start_date.to_s,
+      date_end: end_date.to_s
+    ) do |body|
+      body.dig("data").map do |exchange_rate|
+        {
+          date: exchange_rate.dig("date"),
+          rate: exchange_rate.dig("rates", to)
+        }
+      end
+    end
+
+    ExchangeRatesResponse.new \
+      rates: exchange_rates,
+      success?: true,
+      raw_response: exchange_rates.to_json
+  rescue StandardError => error
+    ExchangeRatesResponse.new \
+      success?: false,
+      error: error,
+      raw_response: error
+  end
+
   private
+
     attr_reader :api_key
 
     ExchangeRateResponse = Struct.new :rate, :success?, :error, :raw_response, keyword_init: true
+    SecurityPriceResponse = Struct.new :prices, :success?, :error, :raw_response, keyword_init: true
+    ExchangeRatesResponse = Struct.new :rates, :success?, :error, :raw_response, keyword_init: true
 
     def base_url
       "https://api.synthfinance.com"
     end
 
+    def app_name
+      "maybe_app"
+    end
+
+    def app_type
+      Rails.application.config.app_mode
+    end
+
+    def client
+      @client ||= Faraday.new(url: base_url) do |faraday|
+        faraday.headers["Authorization"] = "Bearer #{api_key}"
+        faraday.headers["X-Source"] = app_name
+        faraday.headers["X-Source-Type"] = app_type
+      end
+    end
+
     def build_error(response)
       Provider::Base::ProviderError.new(<<~ERROR)
-        Failed to fetch exchange rate from #{self.class}
+        Failed to fetch data from #{self.class}
           Status: #{response.status}
           Body: #{response.body.inspect}
       ERROR
     end
+
+    def fetch_page(url, page, params = {})
+      client.get(url) do |req|
+        req.headers["Authorization"] = "Bearer #{api_key}"
+        params.each { |k, v| req.params[k.to_s] = v.to_s }
+        req.params["page"] = page
+      end
+    end
+
+    def paginate(url, params = {})
+      results = []
+      page = 1
+      current_page = 0
+      total_pages = 1
+
+      while current_page < total_pages
+        response = fetch_page(url, page, params)
+
+        if response.success?
+          body = JSON.parse(response.body)
+          page_results = yield(body)
+          results.concat(page_results)
+
+          current_page = body.dig("paging", "current_page")
+          total_pages = body.dig("paging", "total_pages")
+
+          page += 1
+        else
+          raise build_error(response)
+        end
+      end
+
+      results
+    end
 end

app/models/security.rb

@@ -1,14 +1,13 @@
 class Security < ApplicationRecord
-  before_save :normalize_identifiers
+  before_save :upcase_ticker
 
   has_many :trades, dependent: :nullify, class_name: "Account::Trade"
 
-  validates :isin, presence: true, uniqueness: { case_sensitive: false }
+  validates :ticker, presence: true, uniqueness: { case_sensitive: false }
 
   private
 
-    def normalize_identifiers
-      self.isin = isin.upcase
-      self.symbol = symbol.upcase
+    def upcase_ticker
+      self.ticker = ticker.upcase
     end
 end

app/models/security/price.rb

@@ -1,2 +1,34 @@
 class Security::Price < ApplicationRecord
+  include Provided
+
+  before_save :upcase_ticker
+
+  validates :ticker, presence: true, uniqueness: { scope: :date, case_sensitive: false }
+
+  class << self
+    def find_price(ticker:, date:, cache: true)
+      result = find_by(ticker:, date:)
+
+      result || fetch_price_from_provider(ticker:, date:, cache:)
+    end
+
+    def find_prices(ticker:, start_date:, end_date: Date.current, cache: true)
+      prices = where(ticker:, date: start_date..end_date).to_a
+      all_dates = (start_date..end_date).to_a.to_set
+      existing_dates = prices.map(&:date).to_set
+      missing_dates = (all_dates - existing_dates).sort
+
+      if missing_dates.any?
+        prices += fetch_prices_from_provider(ticker:, start_date: missing_dates.first, end_date: missing_dates.last, cache:)
+      end
+
+      prices
+    end
+  end
+
+  private
+
+    def upcase_ticker
+      self.ticker = ticker.upcase
+    end
 end

app/models/security/price/provided.rb

@@ -0,0 +1,55 @@
+module Security::Price::Provided
+  extend ActiveSupport::Concern
+
+  include Providable
+
+  class_methods do
+    private
+
+      def fetch_price_from_provider(ticker:, date:, cache: false)
+        return nil unless security_prices_provider.present?
+
+        response = security_prices_provider.fetch_security_prices \
+          ticker: ticker,
+          start_date: date,
+          end_date: date
+
+        if response.success? && response.prices.size > 0
+          price = Security::Price.new \
+            ticker: ticker,
+            date: response.prices.first[:date],
+            price: response.prices.first[:price],
+            currency: response.prices.first[:currency]
+
+          price.save! if cache
+          price
+        else
+          nil
+        end
+      end
+
+      def fetch_prices_from_provider(ticker:, start_date:, end_date:, cache: false)
+        return [] unless security_prices_provider.present?
+
+        response = security_prices_provider.fetch_security_prices \
+          ticker: ticker,
+          start_date: start_date,
+          end_date: end_date
+
+        if response.success?
+          response.prices.map do |price|
+            new_price = Security::Price.new \
+              ticker: ticker,
+              date: price[:date],
+              price: price[:price],
+              currency: price[:currency]
+
+            new_price.save! if cache
+            new_price
+          end
+        else
+          []
+        end
+      end
+  end
+end

app/views/account/cashes/_cash.html.erb

@@ -0,0 +1,21 @@
+<%# locals: (holding:) %>
+
+<%= 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-9 flex items-center gap-4">
+      <%= render "shared/circle_logo", name: holding.name %>
+      <div>
+        <%= tag.p holding.name %>
+        <%= tag.p holding.ticker, class: "text-gray-500 text-xs uppercase" %>
+      </div>
+    </div>
+
+    <div class="col-span-3 text-right">
+      <% if holding.amount_money %>
+        <%= tag.p format_money holding.amount_money %>
+      <% else %>
+        <%= tag.p "?", class: "text-gray-500" %>
+      <% end %>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,18 @@
+<%= turbo_frame_tag dom_id(@account, "cash") do %>
+  <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(".cash"), class: "font-medium text-lg" %>
+    </div>
+
+    <div class="rounded-xl bg-gray-25 p-1">
+      <div class="grid grid-cols-12 items-center uppercase text-xs font-medium text-gray-500 px-4 py-2">
+        <%= tag.p t(".name"), class: "col-span-9" %>
+        <%= tag.p t(".value"), class: "col-span-3 justify-self-end" %>
+      </div>
+
+      <div class="rounded-lg bg-white border-alpha-black-25 shadow-xs">
+        <%= render partial: "account/cashes/cash", collection: [brokerage_cash(@account)], as: :holding %>
+      </div>
+    </div>
+  </div>
+<% 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, **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,7 +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">
-    <%= render entries.reject { |e| e.transfer_id.present? }, selectable:, **opts %>
-    <%= render transfer_entries(entries), selectable:, **opts %>
+    <%= 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,10 +3,10 @@
 <%= 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" %>
-        <%= tag.p holding.symbol, class: "text-gray-500 text-xs uppercase" %>
+        <%= 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/holdings/show.html.erb

@@ -3,7 +3,7 @@
     <header class="flex justify-between">
       <div>
         <%= tag.h3 @holding.name, class: "text-2xl font-medium text-gray-900" %>
-        <%= tag.p @holding.symbol.upcase, class: "text-sm text-gray-500" %>
+        <%= tag.p @holding.ticker, class: "text-sm text-gray-500" %>
       </div>
 
       <%= render "shared/circle_logo", name: @holding.name %>

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

@@ -2,7 +2,7 @@
 <% transaction, account = entry.account_transaction, entry.account %>
 
 <div class="grid grid-cols-12 items-center text-gray-900 text-sm font-medium p-4">
-  <% name_col_span = entry.marked_as_transfer? ? "col-span-10" : short ? "col-span-6" : "col-span-4" %>
+  <% name_col_span = unconfirmed_transfer?(entry) ? "col-span-10" : short ? "col-span-6" : "col-span-4" %>
   <div class="pr-10 flex items-center gap-4 <%= name_col_span %>">
     <% if selectable %>
       <%= check_box_tag dom_id(entry, "selection"),

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/_transfer.html.erb

@@ -11,7 +11,7 @@
 
       <%= tag.div class: short ? "max-w-[250px]" : "max-w-[325px]" do %>
         <div class="flex items-center gap-2">
-          <%= circle_logo("T") %>
+          <%= circle_logo(transfer.from_name[0].upcase) %>
 
           <%= tag.p transfer.name, class: "truncate text-gray-900" %>
         </div>

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/_tooltip.html.erb

@@ -0,0 +1,26 @@
+<%# locals: (account:) -%>
+<div data-controller="tooltip" data-tooltip-target="element" data-tooltip-placement-value="right" data-tooltip-offset-value=10 data-tooltip-cross-axis-value=50>
+  <%= lucide_icon("info", class: "w-4 h-4 shrink-0 text-gray-500") %>
+  <div id="tooltip" role="tooltip" data-tooltip-target="tooltip" class="tooltip bg-gray-700 text-sm p-2 rounded w-64">
+    <div class="text-white">
+      <%= t(".total_value_tooltip") %>
+    </div>
+    <div class="flex pt-3">
+      <div class="text-gray-300">
+        <%= t(".holdings") %>
+      </div>
+      <div class="text-white ml-auto">
+        <%= tag.p format_money(account.investment.holdings_value, precision: 0) %>
+      </div>
+    </div>
+    <div class="flex">
+      <div class="text-gray-300">
+        <%= t(".cash") %>
+      </div>
+      <div class="text-white ml-auto">
+        <%= tag.p format_money(account.balance_money, precision: 0) %>
+      </div>
+    </div>
+  </div>
+  <div data-tooltip-target="arrow"></div>
+</div>

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/accounts/show.html.erb

@@ -52,14 +52,19 @@
   <div class="bg-white shadow-xs rounded-xl border border-alpha-black-25 rounded-lg">
     <div class="p-4 flex justify-between">
       <div class="space-y-2">
-        <%= tag.p t(".total_value"), class: "text-sm font-medium text-gray-500" %>
-        <%= tag.p format_money(@account.balance_money, precision: 0), class: "text-gray-900 text-3xl font-medium" %>
+        <div class="flex items-center gap-1">
+          <div>
+            <%= tag.p t(".total_value"), class: "text-sm font-medium text-gray-500" %>
+          </div>
+          <%= render "tooltip", account: @account if @account.investment? %>
+        </div>
+        <%= tag.p format_money(@account.value, precision: 0), class: "text-gray-900 text-3xl font-medium" %>
         <div>
-          <% if @balance_series.trend.direction.flat? %>
+          <% if @series.trend.direction.flat? %>
             <%= tag.span t(".no_change"), class: "text-gray-500" %>
           <% else %>
-            <%= tag.span format_money(@balance_series.trend.value), style: "color: #{@balance_series.trend.color}" %>
-            <%= tag.span "(#{@balance_series.trend.percent}%)", style: "color: #{@balance_series.trend.color}" %>
+            <%= tag.span format_money(@series.trend.value), style: "color: #{@trend.color}" %>
+            <%= tag.span "(#{@trend.percent}%)", style: "color: #{@trend.color}" %>
           <% end %>
 
           <%= tag.span period_label(@period), class: "text-gray-500" %>
@@ -70,7 +75,7 @@
       <% end %>
     </div>
     <div class="h-96 flex items-center justify-center text-2xl font-bold">
-      <%= render partial: "shared/line_chart", locals: { series: @balance_series } %>
+      <%= render partial: "shared/line_chart", locals: { series: @series } %>
     </div>
   </div>
 

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/layouts/_sidebar.html.erb

@@ -22,7 +22,7 @@
         <% else %>
           <div class="text-white shrink-0 w-9 h-9 bg-gray-400 rounded-full flex items-center justify-center text-lg uppercase"><%= Current.user.initial %></div>
         <% end %>
-        <div>
+        <div class="overflow-hidden text-ellipsis">
           <span class="text-gray-900 font-medium text-sm"><%= Current.user.display_name %></span>
           <% if Current.user.display_name != Current.user.email %>
             <span class="text-gray-500 text-sm"><%= Current.user.email %></span>

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:, 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 %>