Bump to v0.1.0-alpha.7

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,11 +7,6 @@ assignees: ''
 
 ---
 
-**Where did this bug occur?**
-
-- [ ] Local development
-- [ ] Self hosted app (i.e. Docker)
-
 **Describe the bug**
 A clear and concise description of what the bug is.
 

Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 
 GIT
   remote: https://github.com/rails/rails.git
-  revision: f9c847fac102039d9174106f44b59144da267751
+  revision: 5d34172ff44ec0c88ac03a979679b31e1ed78745
   branch: 7-2-stable
   specs:
     actioncable (7.2.0.beta2)
@@ -109,16 +109,16 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.941.0)
+    aws-partitions (1.944.0)
     aws-sdk-core (3.197.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.83.0)
+    aws-sdk-kms (1.84.0)
       aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.0)
+    aws-sdk-s3 (1.152.3)
       aws-sdk-core (~> 3, >= 3.197.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
@@ -175,7 +175,7 @@ GEM
       rainbow
       rubocop
       smart_properties
-    erubi (1.12.0)
+    erubi (1.13.0)
     et-orbi (1.2.11)
       tzinfo
     faraday (2.9.1)
@@ -226,7 +226,7 @@ GEM
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.7.2)
-    irb (1.13.1)
+    irb (1.13.2)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
@@ -254,12 +254,12 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     minitest (5.23.1)
-    mocha (2.3.0)
+    mocha (2.4.0)
       ruby2_keywords (>= 0.0.5)
     msgpack (1.7.2)
     net-http (0.4.1)
       uri
-    net-imap (0.4.12)
+    net-imap (0.4.13)
       date
       net-protocol
     net-pop (0.1.2)
@@ -269,20 +269,19 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.5-aarch64-linux)
+    nokogiri (1.16.6-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.16.5-arm-linux)
+    nokogiri (1.16.6-arm-linux)
       racc (~> 1.4)
-    nokogiri (1.16.5-arm64-darwin)
+    nokogiri (1.16.6-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86-linux)
+    nokogiri (1.16.6-x86-linux)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-darwin)
+    nokogiri (1.16.6-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
-    octokit (8.1.0)
-      base64
+    octokit (9.1.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     pagy (8.4.4)
@@ -299,12 +298,12 @@ GEM
       railties (>= 7.0.0)
     psych (5.1.2)
       stringio
-    public_suffix (5.0.5)
+    public_suffix (5.1.0)
     puma (6.4.2)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.0)
-    rack (3.0.11)
+    rack (3.1.3)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -333,7 +332,7 @@ GEM
     rdoc (6.7.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
-    reline (0.5.8)
+    reline (0.5.9)
       io-console (~> 0.5)
     rexml (3.2.8)
       strscan (>= 3.0.9)
@@ -402,7 +401,7 @@ GEM
     stackprof (0.2.26)
     stimulus-rails (1.3.3)
       railties (>= 6.0.0)
-    stringio (3.1.0)
+    stringio (3.1.1)
     strscan (3.1.0)
     tailwindcss-rails (2.6.1)
       railties (>= 7.0.0)
@@ -446,7 +445,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   aarch64-linux

app/assets/stylesheets/application.tailwind.css

@@ -7,6 +7,10 @@
   details > summary::-webkit-details-marker {
     @apply hidden;
   }
+
+  details > summary {
+    @apply list-none;
+  }
 }
 
 @layer components {

app/controllers/account/logos_controller.rb

@@ -1,4 +1,4 @@
-class Accounts::LogosController < ApplicationController
+class Account::LogosController < ApplicationController
   def show
     @account = Current.family.accounts.find(params[:account_id])
     render_placeholder

app/controllers/account/transfers_controller.rb

@@ -0,0 +1,44 @@
+class Account::TransfersController < ApplicationController
+  layout "with_sidebar"
+
+  before_action :set_transfer, only: :destroy
+
+  def new
+    @transfer = Account::Transfer.new
+  end
+
+  def create
+    from_account = Current.family.accounts.find(transfer_params[:from_account_id])
+    to_account = Current.family.accounts.find(transfer_params[:to_account_id])
+
+    @transfer = Account::Transfer.build_from_accounts from_account, to_account, \
+                                             date: transfer_params[:date],
+                                             amount: transfer_params[:amount].to_d,
+                                             currency: transfer_params[:currency],
+                                             name: transfer_params[:name]
+
+    if @transfer.save
+      redirect_to transactions_path, notice: t(".success")
+    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[:error] = @transfer.errors.full_messages.to_sentence
+      redirect_to transactions_path
+    end
+  end
+
+  def destroy
+    @transfer.destroy_and_remove_marks!
+    redirect_back_or_to transactions_url, notice: t(".success")
+  end
+
+  private
+
+    def set_transfer
+      @transfer = Account::Transfer.find(params[:id])
+    end
+
+    def transfer_params
+      params.require(:account_transfer).permit(:from_account_id, :to_account_id, :amount, :currency, :date, :name)
+    end
+end

app/controllers/account/valuations_controller.rb

@@ -0,0 +1,61 @@
+class Account::ValuationsController < ApplicationController
+  before_action :set_account
+  before_action :set_valuation, only: %i[ show edit update destroy ]
+
+  def new
+    @valuation = @account.valuations.new
+  end
+
+  def show
+  end
+
+  def create
+    @valuation = @account.valuations.build(valuation_params)
+
+    if @valuation.save
+      @valuation.sync_account_later
+      redirect_to account_path(@account), notice: "Valuation created"
+    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[:error] = @valuation.errors.full_messages.to_sentence
+      redirect_to account_path(@account)
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    if @valuation.update(valuation_params)
+      @valuation.sync_account_later
+      redirect_to account_path(@account), notice: t(".success")
+    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[:error] = @valuation.errors.full_messages.to_sentence
+      redirect_to account_path(@account)
+    end
+  end
+
+  def destroy
+    @valuation.destroy!
+    @valuation.sync_account_later
+
+    redirect_to account_path(@account), notice: t(".success")
+  end
+
+  private
+
+    def set_account
+      @account = Current.family.accounts.find(params[:account_id])
+    end
+
+    def set_valuation
+      @valuation = @account.valuations.find(params[:id])
+    end
+
+    def valuation_params
+      params.require(:account_valuation).permit(:date, :value, :currency)
+    end
+end

app/controllers/accounts_controller.rb

@@ -35,7 +35,6 @@ class AccountsController < ApplicationController
 
   def show
     @balance_series = @account.series(period: @period)
-    @valuation_series = @account.valuations.to_series
   end
 
   def edit

app/controllers/categories_controller.rb

@@ -1,20 +1,20 @@
-class Transactions::CategoriesController < ApplicationController
+class CategoriesController < ApplicationController
   layout "with_sidebar"
 
   before_action :set_category, only: %i[ edit update ]
   before_action :set_transaction, only: :create
 
   def index
-    @categories = Current.family.transaction_categories.alphabetically
+    @categories = Current.family.categories.alphabetically
   end
 
   def new
-    @category = Current.family.transaction_categories.new color: Transaction::Category::COLORS.sample
+    @category = Current.family.categories.new color: Category::COLORS.sample
   end
 
   def create
-    Transaction::Category.transaction do
-      category = Current.family.transaction_categories.create!(category_params)
+    Category.transaction do
+      category = Current.family.categories.create!(category_params)
       @transaction.update!(category_id: category.id) if @transaction
     end
 
@@ -32,7 +32,7 @@ class Transactions::CategoriesController < ApplicationController
 
   private
     def set_category
-      @category = Current.family.transaction_categories.find(params[:id])
+      @category = Current.family.categories.find(params[:id])
     end
 
     def set_transaction
@@ -42,6 +42,6 @@ class Transactions::CategoriesController < ApplicationController
     end
 
     def category_params
-      params.require(:transaction_category).permit(:name, :color)
+      params.require(:category).permit(:name, :color)
     end
 end

app/controllers/category/deletions_controller.rb

@@ -1,4 +1,4 @@
-class Transactions::Categories::DeletionsController < ApplicationController
+class Category::DeletionsController < ApplicationController
   layout "with_sidebar"
 
   before_action :set_category
@@ -15,12 +15,12 @@ class Transactions::Categories::DeletionsController < ApplicationController
 
   private
     def set_category
-      @category = Current.family.transaction_categories.find(params[:category_id])
+      @category = Current.family.categories.find(params[:category_id])
     end
 
     def set_replacement_category
       if params[:replacement_category_id].present?
-        @replacement_category = Current.family.transaction_categories.find(params[:replacement_category_id])
+        @replacement_category = Current.family.categories.find(params[:replacement_category_id])
       end
     end
 end

app/controllers/category/dropdowns_controller.rb

@@ -1,4 +1,4 @@
-class Transactions::Categories::DropdownsController < ApplicationController
+class Category::DropdownsController < ApplicationController
   before_action :set_from_params
 
   def show
@@ -17,6 +17,6 @@ class Transactions::Categories::DropdownsController < ApplicationController
   end
 
   def categories_scope
-    Current.family.transaction_categories.alphabetically
+    Current.family.categories.alphabetically
   end
 end

app/controllers/merchants_controller.rb

@@ -0,0 +1,41 @@
+class MerchantsController < ApplicationController
+  layout "with_sidebar"
+
+  before_action :set_merchant, only: %i[ edit update destroy ]
+
+  def index
+    @merchants = Current.family.merchants.alphabetically
+  end
+
+  def new
+    @merchant = Merchant.new
+  end
+
+  def create
+    Current.family.merchants.create!(merchant_params)
+    redirect_to merchants_path, notice: t(".success")
+  end
+
+  def edit
+  end
+
+  def update
+    @merchant.update!(merchant_params)
+    redirect_to merchants_path, notice: t(".success")
+  end
+
+  def destroy
+    @merchant.destroy!
+    redirect_to merchants_path, notice: t(".success")
+  end
+
+  private
+
+  def set_merchant
+    @merchant = Current.family.merchants.find(params[:id])
+  end
+
+  def merchant_params
+    params.require(:merchant).permit(:name, :color)
+  end
+end

app/controllers/registrations_controller.rb

@@ -16,7 +16,7 @@ class RegistrationsController < ApplicationController
     @user.role = :admin
 
     if @user.save
-      Transaction::Category.create_default_categories(@user.family)
+      Category.create_default_categories(@user.family)
       login @user
       flash[:notice] = t(".success")
       redirect_to root_path

app/controllers/tag/deletions_controller.rb

@@ -1,4 +1,4 @@
-class Tags::DeletionsController < ApplicationController
+class Tag::DeletionsController < ApplicationController
   layout "with_sidebar"
 
   before_action :set_tag

app/controllers/transaction/rows_controller.rb

@@ -1,4 +1,4 @@
-class Transactions::RowsController < ApplicationController
+class Transaction::RowsController < ApplicationController
   before_action :set_transaction, only: %i[ show update ]
 
   def show

app/controllers/transaction/rules_controller.rb

@@ -0,0 +1,6 @@
+class Transaction::RulesController < ApplicationController
+  layout "with_sidebar"
+
+  def index
+  end
+end

app/controllers/transactions/merchants_controller.rb

@@ -1,41 +0,0 @@
-class Transactions::MerchantsController < ApplicationController
-  layout "with_sidebar"
-
-  before_action :set_merchant, only: %i[ edit update destroy ]
-
-  def index
-    @merchants = Current.family.transaction_merchants.alphabetically
-  end
-
-  def new
-    @merchant = Transaction::Merchant.new
-  end
-
-  def create
-    Current.family.transaction_merchants.create!(merchant_params)
-    redirect_to transaction_merchants_path, notice: t(".success")
-  end
-
-  def edit
-  end
-
-  def update
-    @merchant.update!(merchant_params)
-    redirect_to transaction_merchants_path, notice: t(".success")
-  end
-
-  def destroy
-    @merchant.destroy!
-    redirect_to transaction_merchants_path, notice: t(".success")
-  end
-
-  private
-
-  def set_merchant
-    @merchant = Current.family.transaction_merchants.find(params[:id])
-  end
-
-  def merchant_params
-    params.require(:transaction_merchant).permit(:name, :color)
-  end
-end

app/controllers/transactions/rules_controller.rb

@@ -1,6 +0,0 @@
-class Transactions::RulesController < ApplicationController
-  layout "with_sidebar"
-
-  def index
-  end
-end

app/controllers/transactions_controller.rb

@@ -6,12 +6,12 @@ class TransactionsController < ApplicationController
   def index
     @q = search_params
     result = Current.family.transactions.search(@q).ordered
-    @pagy, @transactions = pagy(result, items: 50)
+    @pagy, @transactions = pagy(result, items: params[:per_page] || "10")
 
     @totals = {
-      count: result.count,
-      income: result.inflows.sum(&:amount_money).abs,
-      expense: result.outflows.sum(&:amount_money).abs
+      count: result.select { |t| t.currency == Current.family.currency }.count,
+      income: result.income_total(Current.family.currency).abs,
+      expense: result.expense_total(Current.family.currency)
     }
   end
 
@@ -54,7 +54,7 @@ class TransactionsController < ApplicationController
 
   def bulk_delete
     destroyed = Current.family.transactions.destroy_by(id: bulk_delete_params[:transaction_ids])
-    redirect_to transactions_url, notice: t(".success", count: destroyed.count)
+    redirect_back_or_to transactions_url, notice: t(".success", count: destroyed.count)
   end
 
   def bulk_edit
@@ -63,13 +63,31 @@ class TransactionsController < ApplicationController
   def bulk_update
     transactions = Current.family.transactions.where(id: bulk_update_params[:transaction_ids])
     if transactions.update_all(bulk_update_params.except(:transaction_ids).to_h.compact_blank!)
-      redirect_to transactions_url, notice: t(".success", count: transactions.count)
+      redirect_back_or_to transactions_url, notice: t(".success", count: transactions.count)
     else
       flash.now[:error] = t(".failure")
       render :index, status: :unprocessable_entity
     end
   end
 
+  def mark_transfers
+    Current.family
+           .transactions
+           .where(id: bulk_update_params[:transaction_ids])
+           .mark_transfers!
+
+    redirect_back_or_to transactions_url, notice: t(".success")
+  end
+
+  def unmark_transfers
+    Current.family
+           .transactions
+           .where(id: bulk_update_params[:transaction_ids])
+           .update_all marked_as_transfer: false
+
+    redirect_back_or_to transactions_url, notice: t(".success")
+  end
+
   private
 
     def set_transaction

app/controllers/valuations_controller.rb

@@ -1,70 +0,0 @@
-class ValuationsController < ApplicationController
-  before_action :set_valuation, only: %i[ edit update destroy ]
-  def create
-    @account = Current.family.accounts.find(params[:account_id])
-
-    # TODO: placeholder logic until we have a better abstraction for trends
-    @valuation = @account.valuations.new(valuation_params.merge(currency: @account.currency))
-    if @valuation.save
-      @valuation.account.sync_later(@valuation.date)
-
-      respond_to do |format|
-        format.html { redirect_to account_path(@account), notice: "Valuation created" }
-        format.turbo_stream
-      end
-    else
-      render :new, status: :unprocessable_entity
-    end
-  rescue ActiveRecord::RecordNotUnique
-    flash.now[:error] = "Valuation already exists for this date"
-    render :new, status: :unprocessable_entity
-  end
-
-  def show
-    @valuation = Current.family.accounts.find(params[:account_id]).valuations.find(params[:id])
-  end
-
-  def edit
-  end
-
-  def update
-    sync_start_date = [ @valuation.date, Date.parse(valuation_params[:date]) ].compact.min
-    if @valuation.update(valuation_params)
-      @valuation.account.sync_later(sync_start_date)
-
-      redirect_to account_path(@valuation.account), notice: "Valuation updated"
-    else
-      render :edit, status: :unprocessable_entity
-    end
-  rescue ActiveRecord::RecordNotUnique
-    flash.now[:error] = "Valuation already exists for this date"
-    render :edit, status: :unprocessable_entity
-  end
-
-  def destroy
-    @account = @valuation.account
-    sync_start_date = @account.valuations.where("date < ?", @valuation.date).order(date: :desc).first&.date
-    @valuation.destroy!
-    @account.sync_later(sync_start_date)
-
-    respond_to do |format|
-      format.html { redirect_to account_path(@account), notice: "Valuation deleted" }
-      format.turbo_stream
-    end
-  end
-
-  def new
-    @account = Current.family.accounts.find(params[:account_id])
-    @valuation = @account.valuations.new
-  end
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_valuation
-      @valuation = Valuation.find(params[:id])
-    end
-
-    def valuation_params
-      params.require(:valuation).permit(:date, :value)
-    end
-end

app/helpers/account/transfers_helper.rb

@@ -0,0 +1,2 @@
+module Account::TransfersHelper
+end

app/helpers/account/valuations_helper.rb

@@ -0,0 +1,23 @@
+module Account::ValuationsHelper
+  def valuation_icon(valuation)
+    if valuation.first_of_series?
+      "keyboard"
+    elsif valuation.trend.direction.up?
+      "arrow-up"
+    elsif valuation.trend.direction.down?
+      "arrow-down"
+    else
+      "minus"
+    end
+  end
+
+  def valuation_style(valuation)
+    color = valuation.first_of_series? ? "#D444F1" : valuation.trend.color
+
+    <<-STYLE.strip
+      background-color: color-mix(in srgb, #{color} 5%, white);
+      border-color: color-mix(in srgb, #{color} 10%, white);
+      color: #{color};
+    STYLE
+  end
+end

app/helpers/accounts_helper.rb

@@ -27,14 +27,14 @@ module AccountsHelper
 
   def class_mapping(accountable_type)
     {
-      "Account::Credit" => { text: "text-red-500", bg: "bg-red-500", bg_transparent: "bg-red-500/10", fill: "fill-red-500", hex: "#F13636" },
-      "Account::Loan" => { text: "text-fuchsia-500", bg: "bg-fuchsia-500", bg_transparent: "bg-fuchsia-500/10", fill: "fill-fuchsia-500", hex: "#D444F1" },
-      "Account::OtherLiability" => { text: "text-gray-500", bg: "bg-gray-500", bg_transparent: "bg-gray-500/10", fill: "fill-gray-500", hex: "#737373" },
-      "Account::Depository" => { text: "text-violet-500", bg: "bg-violet-500", bg_transparent: "bg-violet-500/10", fill: "fill-violet-500", hex: "#875BF7" },
-      "Account::Investment" => { text: "text-blue-600", bg: "bg-blue-600", bg_transparent: "bg-blue-600/10", fill: "fill-blue-600", hex: "#1570EF" },
-      "Account::OtherAsset" => { text: "text-green-500", bg: "bg-green-500", bg_transparent: "bg-green-500/10", fill: "fill-green-500", hex: "#12B76A" },
-      "Account::Property" => { text: "text-cyan-500", bg: "bg-cyan-500", bg_transparent: "bg-cyan-500/10", fill: "fill-cyan-500", hex: "#06AED4" },
-      "Account::Vehicle" => { text: "text-pink-500", bg: "bg-pink-500", bg_transparent: "bg-pink-500/10", fill: "fill-pink-500", hex: "#F23E94" }
+      "CreditCard" => { text: "text-red-500", bg: "bg-red-500", bg_transparent: "bg-red-500/10", fill: "fill-red-500", hex: "#F13636" },
+      "Loan" => { text: "text-fuchsia-500", bg: "bg-fuchsia-500", bg_transparent: "bg-fuchsia-500/10", fill: "fill-fuchsia-500", hex: "#D444F1" },
+      "OtherLiability" => { text: "text-gray-500", bg: "bg-gray-500", bg_transparent: "bg-gray-500/10", fill: "fill-gray-500", hex: "#737373" },
+      "Depository" => { text: "text-violet-500", bg: "bg-violet-500", bg_transparent: "bg-violet-500/10", fill: "fill-violet-500", hex: "#875BF7" },
+      "Investment" => { text: "text-blue-600", bg: "bg-blue-600", bg_transparent: "bg-blue-600/10", fill: "fill-blue-600", hex: "#1570EF" },
+      "OtherAsset" => { text: "text-green-500", bg: "bg-green-500", bg_transparent: "bg-green-500/10", fill: "fill-green-500", hex: "#12B76A" },
+      "Property" => { text: "text-cyan-500", bg: "bg-cyan-500", bg_transparent: "bg-cyan-500/10", fill: "fill-cyan-500", hex: "#06AED4" },
+      "Vehicle" => { text: "text-pink-500", bg: "bg-pink-500", bg_transparent: "bg-pink-500/10", fill: "fill-pink-500", hex: "#F23E94" }
     }.fetch(accountable_type, { text: "text-gray-500", bg: "bg-gray-500", bg_transparent: "bg-gray-500/10", fill: "fill-gray-500", hex: "#737373" })
   end
 end

app/helpers/application_form_builder.rb

@@ -25,7 +25,7 @@ class ApplicationFormBuilder < ActionView::Helpers::FormBuilder
   # See `Monetizable` concern, which adds a _money suffix to the attribute name
   # For a monetized field, the setter will always be the attribute name without the _money suffix
   def money_field(method, options = {})
-    money = @object.send(method)
+    money = @object && @object.respond_to?(method) ? @object.send(method) : nil
     raise ArgumentError, "The value of #{method} is not a Money object" unless money.is_a?(Money) || money.nil?
 
     money_amount_method = method.to_s.chomp("_money").to_sym

app/helpers/categories_helper.rb

@@ -0,0 +1,7 @@
+module CategoriesHelper
+  def null_category
+    Category.new \
+      name: "Uncategorized",
+      color: Category::UNCATEGORIZED_COLOR
+  end
+end

app/helpers/menus_helper.rb

@@ -6,6 +6,23 @@ module MenusHelper
     end
   end
 
+  def contextual_menu_modal_action_item(label, url, icon: "pencil-line", turbo_frame: nil)
+    link_to url, class: "flex items-center rounded-lg text-gray-900 hover:bg-gray-50 py-2 px-3 gap-2", data: { turbo_frame: } do
+      concat(lucide_icon(icon, class: "shrink-0 w-5 h-5 text-gray-500"))
+      concat(tag.span(label, class: "text-sm"))
+    end
+  end
+
+  def contextual_menu_destructive_item(label, url, turbo_confirm: true, turbo_frame: nil)
+    button_to url,
+              method: :delete,
+              class: "flex items-center w-full rounded-lg text-red-500 hover:bg-red-500/5 py-2 px-3 gap-2",
+              data: { turbo_confirm: turbo_confirm, turbo_frame: } do
+      concat(lucide_icon("trash-2", class: "shrink-0 w-5 h-5"))
+      concat(tag.span(label, class: "text-sm"))
+    end
+  end
+
   private
     def contextual_menu_icon
       tag.button class: "flex hover:bg-gray-100 p-2 rounded", data: { menu_target: "button" } do

app/helpers/transactions/categories_helper.rb

@@ -1,7 +0,0 @@
-module Transactions::CategoriesHelper
-  def null_category
-    Transaction::Category.new \
-      name: "Uncategorized",
-      color: Transaction::Category::UNCATEGORIZED_COLOR
-  end
-end

app/helpers/transactions_helper.rb

@@ -17,4 +17,27 @@ module TransactionsHelper
       content: content
     }
   end
+
+  def unconfirmed_transfer?(transaction)
+    transaction.marked_as_transfer && transaction.transfer.nil?
+  end
+
+  def group_transactions_by_date(transactions)
+    grouped_by_date = {}
+
+    transactions.each do |transaction|
+      if transaction.transfer
+        transfer_date = transaction.transfer.inflow_transaction.date
+        grouped_by_date[transfer_date] ||= { transactions: [], transfers: [] }
+        unless grouped_by_date[transfer_date][:transfers].include?(transaction.transfer)
+          grouped_by_date[transfer_date][:transfers] << transaction.transfer
+        end
+      else
+        grouped_by_date[transaction.date] ||= { transactions: [], transfers: [] }
+        grouped_by_date[transaction.date][:transactions] << transaction
+      end
+    end
+
+    grouped_by_date
+  end
 end

app/helpers/valuations_helper.rb

@@ -1,2 +0,0 @@
-module ValuationsHelper
-end

app/javascript/controllers/bulk_select_controller.js

@@ -66,6 +66,8 @@ export default class extends Controller {
   }
 
   #addHiddenFormInputsForSelectedIds(form, paramName, transactionIds) {
+    this.#resetFormInputs(form, paramName);
+
     transactionIds.forEach(id => {
       const input = document.createElement("input");
       input.type = 'hidden'
@@ -75,6 +77,11 @@ export default class extends Controller {
     })
   }
 
+  #resetFormInputs(form, paramName) {
+    const existingInputs = form.querySelectorAll(`input[name='${paramName}']`);
+    existingInputs.forEach((input) => input.remove());
+  }
+
   #rowsForGroup(group) {
     return this.rowTargets.filter(row => group.contains(row))
   }
@@ -113,7 +120,7 @@ export default class extends Controller {
   #updateGroups() {
     this.groupTargets.forEach(group => {
       const rows = this.rowTargets.filter(row => group.contains(row))
-      const groupSelected = rows.every(row => this.selectedIdsValue.includes(row.dataset.id))
+      const groupSelected = rows.length > 0 && rows.every(row => this.selectedIdsValue.includes(row.dataset.id))
       group.querySelector("input[type='checkbox']").checked = groupSelected
     })
   }

app/models/account.rb

@@ -29,6 +29,10 @@ class Account < ApplicationRecord
     balances.where("date <= ?", date).order(date: :desc).first&.balance
   end
 
+  def favorable_direction
+    classification == "asset" ? "up" : "down"
+  end
+
   # e.g. Wise, Revolut accounts that have transactions in multiple currencies
   def multi_currency?
     currencies = [ valuations.pluck(:currency), transactions.pluck(:currency) ].flatten.uniq

app/models/account/credit.rb

@@ -1,3 +0,0 @@
-class Account::Credit < ApplicationRecord
-  include Accountable
-end

app/models/account/crypto.rb

@@ -1,3 +0,0 @@
-class Account::Crypto < ApplicationRecord
-  include Accountable
-end

app/models/account/depository.rb

@@ -1,3 +0,0 @@
-class Account::Depository < ApplicationRecord
-  include Accountable
-end

app/models/account/loan.rb

@@ -1,3 +0,0 @@
-class Account::Loan < ApplicationRecord
-  include Accountable
-end

app/models/account/other_asset.rb

@@ -1,3 +0,0 @@
-class Account::OtherAsset < ApplicationRecord
-  include Accountable
-end

app/models/account/other_liability.rb

@@ -1,3 +0,0 @@
-class Account::OtherLiability < ApplicationRecord
-  include Accountable
-end

app/models/account/property.rb

@@ -1,3 +0,0 @@
-class Account::Property < ApplicationRecord
-  include Accountable
-end

app/models/account/transfer.rb

@@ -0,0 +1,62 @@
+class Account::Transfer < ApplicationRecord
+  has_many :transactions, dependent: :nullify
+
+  validate :net_zero_flows, if: :single_currency_transfer?
+  validate :transaction_count, :from_different_accounts, :all_transactions_marked
+
+  def inflow_transaction
+    transactions.find { |t| t.inflow? }
+  end
+
+  def outflow_transaction
+    transactions.find { |t| t.outflow? }
+  end
+
+  def destroy_and_remove_marks!
+    transaction do
+      transactions.each do |t|
+        t.update! marked_as_transfer: false
+      end
+
+      destroy!
+    end
+  end
+
+  class << self
+    def build_from_accounts(from_account, to_account, date:, amount:, currency:, name:)
+      outflow = from_account.transactions.build(amount: amount.abs, currency: currency, date: date, name: name, marked_as_transfer: true)
+      inflow = to_account.transactions.build(amount: -amount.abs, currency: currency, date: date, name: name, marked_as_transfer: true)
+
+      new transactions: [ outflow, inflow ]
+    end
+  end
+
+  private
+
+    def single_currency_transfer?
+      transactions.map(&:currency).uniq.size == 1
+    end
+
+    def transaction_count
+      unless transactions.size == 2
+        errors.add :transactions, "must have exactly 2 transactions"
+      end
+    end
+
+    def from_different_accounts
+      accounts = transactions.map(&:account_id).uniq
+      errors.add :transactions, "must be from different accounts" if accounts.size < transactions.size
+    end
+
+    def net_zero_flows
+      unless transactions.sum(&:amount).zero?
+        errors.add :transactions, "must have an inflow and outflow that net to zero"
+      end
+    end
+
+    def all_transactions_marked
+      unless transactions.all?(&:marked_as_transfer)
+        errors.add :transactions, "must be marked as transfer"
+      end
+    end
+end

app/models/account/valuation.rb

@@ -0,0 +1,52 @@
+class Account::Valuation < ApplicationRecord
+  include Monetizable
+
+  monetize :value
+
+  belongs_to :account
+
+  validates :account, :date, :value, presence: true
+  validates :date, uniqueness: { scope: :account_id }
+
+  scope :chronological, -> { order(:date) }
+  scope :reverse_chronological, -> { order(date: :desc) }
+
+  def trend
+    @trend ||= create_trend
+  end
+
+  def first_of_series?
+    account.valuations.chronological.limit(1).pluck(:date).first == self.date
+  end
+
+  def last_of_series?
+    account.valuations.reverse_chronological.limit(1).pluck(:date).first == self.date
+  end
+
+  def sync_account_later
+    if destroyed?
+      sync_start_date = previous_valuation&.date
+    else
+      sync_start_date = [ date_previously_was, date ].compact.min
+    end
+
+    account.sync_later(sync_start_date)
+  end
+
+  private
+
+    def previous_valuation
+      @previous_valuation ||= self.account
+                                .valuations
+                                .where("date < ?", date)
+                                .order(date: :desc)
+                                  .first
+    end
+
+    def create_trend
+      TimeSeries::Trend.new \
+        current: self.value,
+        previous: previous_valuation&.value,
+        favorable_direction: account.favorable_direction
+    end
+end

app/models/account/vehicle.rb

@@ -1,3 +0,0 @@
-class Account::Vehicle < ApplicationRecord
-  include Accountable
-end

app/models/category.rb

@@ -1,4 +1,4 @@
-class Transaction::Category < ApplicationRecord
+class Category < ApplicationRecord
   has_many :transactions, dependent: :nullify
   belongs_to :family
 
@@ -24,7 +24,7 @@ class Transaction::Category < ApplicationRecord
   ]
 
   def self.create_default_categories(family)
-    if family.transaction_categories.size > 0
+    if family.categories.size > 0
       raise ArgumentError, "Family already has some categories"
     end
 

app/models/concerns/accountable.rb

@@ -1,28 +1,19 @@
 module Accountable
   extend ActiveSupport::Concern
 
-  ASSET_TYPES = %w[ Account::Depository Account::Investment Account::Crypto Account::OtherAsset Account::Property Account::Vehicle ]
-  LIABILITY_TYPES = %w[ Account::Credit Account::Loan Account::OtherLiability ]
+  ASSET_TYPES = %w[ Depository Investment Crypto Property Vehicle OtherAsset ]
+  LIABILITY_TYPES = %w[ CreditCard Loan OtherLiability ]
   TYPES = ASSET_TYPES + LIABILITY_TYPES
 
   def self.from_type(type)
-    return nil unless types.include?(type) || TYPES.include?(type)
-    "Account::#{type.demodulize}".constantize
+    return nil unless TYPES.include?(type)
+    type.constantize
   end
 
   def self.by_classification
     { assets: ASSET_TYPES, liabilities: LIABILITY_TYPES }
   end
 
-  def self.types(classification = nil)
-    types = classification ? (classification.to_sym == :asset ? ASSET_TYPES : LIABILITY_TYPES) : TYPES
-    types.map { |type| type.demodulize }
-  end
-
-  def self.classification(type)
-    ASSET_TYPES.include?(type) ? :asset : :liability
-  end
-
   included do
     has_one :account, as: :accountable, touch: true
   end

app/models/credit_card.rb

@@ -0,0 +1,3 @@
+class CreditCard < ApplicationRecord
+  include Accountable
+end

app/models/crypto.rb

@@ -0,0 +1,3 @@
+class Crypto < ApplicationRecord
+  include Accountable
+end

app/models/depository.rb

@@ -0,0 +1,3 @@
+class Depository < ApplicationRecord
+  include Accountable
+end

app/models/family.rb

@@ -5,21 +5,21 @@ class Family < ApplicationRecord
   has_many :institutions, dependent: :destroy
   has_many :transactions, through: :accounts
   has_many :imports, through: :accounts
-  has_many :transaction_categories, dependent: :destroy, class_name: "Transaction::Category"
-  has_many :transaction_merchants, dependent: :destroy, class_name: "Transaction::Merchant"
+  has_many :categories, dependent: :destroy
+  has_many :merchants, dependent: :destroy
 
   def snapshot(period = Period.all)
     query = accounts.active.joins(:balances)
-      .where("account_balances.currency = ?", self.currency)
-      .select(
-        "account_balances.currency",
-        "account_balances.date",
-        "SUM(CASE WHEN accounts.classification = 'liability' THEN account_balances.balance ELSE 0 END) AS liabilities",
-        "SUM(CASE WHEN accounts.classification = 'asset' THEN account_balances.balance ELSE 0 END) AS assets",
-        "SUM(CASE WHEN accounts.classification = 'asset' THEN account_balances.balance WHEN accounts.classification = 'liability' THEN -account_balances.balance ELSE 0 END) AS net_worth",
-      )
-      .group("account_balances.date, account_balances.currency")
-      .order("account_balances.date")
+              .where("account_balances.currency = ?", self.currency)
+              .select(
+                "account_balances.currency",
+                "account_balances.date",
+                "SUM(CASE WHEN accounts.classification = 'liability' THEN account_balances.balance ELSE 0 END) AS liabilities",
+                "SUM(CASE WHEN accounts.classification = 'asset' THEN account_balances.balance ELSE 0 END) AS assets",
+                "SUM(CASE WHEN accounts.classification = 'asset' THEN account_balances.balance WHEN accounts.classification = 'liability' THEN -account_balances.balance ELSE 0 END) AS net_worth",
+              )
+              .group("account_balances.date, account_balances.currency")
+              .order("account_balances.date")
 
     query = query.where("account_balances.date >= ?", period.date_range.begin) if period.date_range.begin
     query = query.where("account_balances.date <= ?", period.date_range.end) if period.date_range.end
@@ -35,15 +35,16 @@ class Family < ApplicationRecord
   def snapshot_account_transactions
     period = Period.last_30_days
     results = accounts.active.joins(:transactions)
-      .select(
-        "accounts.*",
-        "COALESCE(SUM(amount) FILTER (WHERE amount > 0), 0) AS spending",
-        "COALESCE(SUM(-amount) FILTER (WHERE amount < 0), 0) AS income"
-      )
-      .where("transactions.date >= ?", period.date_range.begin)
-      .where("transactions.date <= ?", period.date_range.end)
-      .group("id")
-      .to_a
+                .select(
+                  "accounts.*",
+                  "COALESCE(SUM(amount) FILTER (WHERE amount > 0), 0) AS spending",
+                  "COALESCE(SUM(-amount) FILTER (WHERE amount < 0), 0) AS income"
+                )
+                .where("transactions.date >= ?", period.date_range.begin)
+                .where("transactions.date <= ?", period.date_range.end)
+                .where("transactions.marked_as_transfer = ?", false)
+                .group("id")
+                .to_a
 
     results.each do |r|
       r.define_singleton_method(:savings_rate) do

app/models/import.rb

@@ -124,7 +124,7 @@ class Import < ApplicationRecord
           tags << tag_cache[tag_string] ||= account.family.tags.find_or_initialize_by(name: tag_string)
         end
 
-        category = category_cache[category_name] ||= account.family.transaction_categories.find_or_initialize_by(name: category_name) if category_name.present?
+        category = category_cache[category_name] ||= account.family.categories.find_or_initialize_by(name: category_name) if category_name.present?
 
         txn = account.transactions.build \
           name: row["name"].presence || FALLBACK_TRANSACTION_NAME,

app/models/investment.rb

@@ -1,4 +1,4 @@
-class Account::Investment < ApplicationRecord
+class Investment < ApplicationRecord
   include Accountable
 
   SUBTYPES = [

app/models/loan.rb

@@ -0,0 +1,3 @@
+class Loan < ApplicationRecord
+  include Accountable
+end

app/models/merchant.rb

@@ -1,4 +1,4 @@
-class Transaction::Merchant < ApplicationRecord
+class Merchant < ApplicationRecord
   has_many :transactions, dependent: :nullify
   belongs_to :family
 

app/models/other_asset.rb

@@ -0,0 +1,3 @@
+class OtherAsset < ApplicationRecord
+  include Accountable
+end

app/models/other_liability.rb

@@ -0,0 +1,3 @@
+class OtherLiability < ApplicationRecord
+  include Accountable
+end

app/models/property.rb

@@ -0,0 +1,3 @@
+class Property < ApplicationRecord
+  include Accountable
+end

app/models/time_series/trend.rb

@@ -1,16 +1,15 @@
 class TimeSeries::Trend
   include ActiveModel::Validations
 
-  attr_reader :current, :previous
-
-  delegate :favorable_direction, to: :series
+  attr_reader :current, :previous, :favorable_direction
 
   validate :values_must_be_of_same_type, :values_must_be_of_known_type
 
-  def initialize(current:, previous:, series: nil)
+  def initialize(current:, previous:, series: nil, favorable_direction: nil)
     @current = current
     @previous = previous
     @series = series
+    @favorable_direction = get_favorable_direction(favorable_direction)
 
     validate!
   end
@@ -25,6 +24,17 @@ class TimeSeries::Trend
     end.inquiry
   end
 
+  def color
+    case direction
+    when "up"
+      favorable_direction.down? ? red_hex : green_hex
+    when "down"
+      favorable_direction.down? ? green_hex : red_hex
+    else
+      gray_hex
+    end
+  end
+
   def value
     if previous.nil?
       current.is_a?(Money) ? Money.new(0) : 0
@@ -56,8 +66,21 @@ class TimeSeries::Trend
   end
 
   private
+
     attr_reader :series
 
+    def red_hex
+      "#F13636" # red-500
+    end
+
+    def green_hex
+      "#10A861" # green-600
+    end
+
+    def gray_hex
+      "#737373" # gray-500
+    end
+
     def values_must_be_of_same_type
       unless current.class == previous.class || [ previous, current ].any?(&:nil?)
         errors.add :current, "must be of the same type as previous"
@@ -90,4 +113,9 @@ class TimeSeries::Trend
         obj
       end
     end
+
+    def get_favorable_direction(favorable_direction)
+      direction = favorable_direction.presence || series&.favorable_direction
+      (direction.presence_in(TimeSeries::DIRECTIONS) || "up").inquiry
+    end
 end

app/models/transaction.rb

@@ -4,6 +4,7 @@ class Transaction < ApplicationRecord
   monetize :amount
 
   belongs_to :account
+  belongs_to :transfer, optional: true, class_name: "Account::Transfer"
   belongs_to :category, optional: true
   belongs_to :merchant, optional: true
   has_many :taggings, as: :taggable, dependent: :destroy
@@ -17,10 +18,10 @@ class Transaction < ApplicationRecord
   scope :inflows, -> { where("amount <= 0") }
   scope :outflows, -> { where("amount > 0") }
   scope :by_name, ->(name) { where("transactions.name ILIKE ?", "%#{name}%") }
-  scope :with_categories, ->(categories) { joins(:category).where(transaction_categories: { name: categories }) }
+  scope :with_categories, ->(categories) { joins(:category).where(categories: { name: categories }) }
   scope :with_accounts, ->(accounts) { joins(:account).where(accounts: { name: accounts }) }
   scope :with_account_ids, ->(account_ids) { joins(:account).where(accounts: { id: account_ids }) }
-  scope :with_merchants, ->(merchants) { joins(:merchant).where(transaction_merchants: { name: merchants }) }
+  scope :with_merchants, ->(merchants) { joins(:merchant).where(merchants: { name: merchants }) }
   scope :on_or_after_date, ->(date) { where("transactions.date >= ?", date) }
   scope :on_or_before_date, ->(date) { where("transactions.date <= ?", date) }
   scope :with_converted_amount, ->(currency = Current.family.currency) {
@@ -42,6 +43,10 @@ class Transaction < ApplicationRecord
     amount > 0
   end
 
+  def transfer?
+    marked_as_transfer
+  end
+
   def sync_account_later
     if destroyed?
       sync_start_date = previous_transaction_date
@@ -53,6 +58,21 @@ class Transaction < ApplicationRecord
   end
 
   class << self
+    def income_total(currency = "USD")
+      inflows.reject(&:transfer?).select { |t| t.currency == currency }.sum(&:amount_money)
+    end
+
+    def expense_total(currency = "USD")
+      outflows.reject(&:transfer?).select { |t| t.currency == currency }.sum(&:amount_money)
+    end
+
+    def mark_transfers!
+      update_all marked_as_transfer: true
+
+      # Attempt to "auto match" and save a transfer if 2 transactions selected
+      Account::Transfer.new(transactions: all).save if all.count == 2
+    end
+
     def daily_totals(transactions, period: Period.last_30_days, currency: Current.family.currency)
       # Sum spending and income for each day in the period with the given currency
       select(
@@ -60,7 +80,7 @@ class Transaction < ApplicationRecord
         "COALESCE(SUM(converted_amount) FILTER (WHERE converted_amount > 0), 0) AS spending",
         "COALESCE(SUM(-converted_amount) FILTER (WHERE converted_amount < 0), 0) AS income"
       )
-        .from(transactions.with_converted_amount(currency), :t)
+        .from(transactions.with_converted_amount(currency).where(marked_as_transfer: false), :t)
         .joins(sanitize_sql([ "RIGHT JOIN generate_series(?, ?, interval '1 day') AS gs(date) ON t.date = gs.date", period.date_range.first, period.date_range.last ]))
         .group("gs.date")
     end
@@ -83,7 +103,7 @@ class Transaction < ApplicationRecord
     end
 
     def search(params)
-      query = all
+      query = all.includes(:transfer)
       query = query.by_name(params[:search]) if params[:search].present?
       query = query.with_categories(params[:categories]) if params[:categories].present?
       query = query.with_accounts(params[:accounts]) if params[:accounts].present?
@@ -96,7 +116,6 @@ class Transaction < ApplicationRecord
   end
 
   private
-
     def previous_transaction_date
       self.account
           .transactions

app/models/valuation.rb

@@ -1,13 +0,0 @@
-class Valuation < ApplicationRecord
-  include Monetizable
-
-  belongs_to :account
-  validates :account, :date, :value, presence: true
-  monetize :value
-
-  scope :in_period, ->(period) { period.date_range.nil? ? all : where(date: period.date_range) }
-
-  def self.to_series
-    TimeSeries.from_collection all, :value_money
-  end
-end

app/models/vehicle.rb

@@ -0,0 +1,3 @@
+class Vehicle < ApplicationRecord
+  include Accountable
+end

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

@@ -0,0 +1,32 @@
+<%= form_with model: transfer, data: { turbo_frame: "_top" } do |f| %>
+  <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 %>
+        <%= lucide_icon "minus-circle", class: "w-5 h-5" %>
+        <%= tag.span t(".expense") %>
+      <% end %>
+
+      <%= link_to new_transaction_path(nature: "income"), data: { turbo_frame: :modal }, class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-gray-400" do %>
+        <%= lucide_icon "plus-circle", class: "w-5 h-5" %>
+        <%= tag.span t(".income") %>
+      <% end %>
+
+      <%= tag.div class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-gray-400 bg-white text-gray-800 shadow-sm" do %>
+        <%= lucide_icon "arrow-right-left", class: "w-5 h-5" %>
+        <%= tag.span t(".transfer") %>
+      <% end %>
+    </fieldset>
+  </section>
+
+  <section class="space-y-2">
+    <%= f.text_field :name, value: transfer.transactions.first&.name, label: t(".description"), placeholder: t(".description_placeholder"), required: true %>
+    <%= f.collection_select :from_account_id, Current.family.accounts.alphabetically, :id, :name, { prompt: t(".select_account"), label: t(".from") }, required: true %>
+    <%= f.collection_select :to_account_id, Current.family.accounts.alphabetically, :id, :name, { prompt: t(".select_account"), label: t(".to") }, required: true %>
+    <%= f.money_field :amount_money, label: t(".amount"), required: true %>
+    <%= f.date_field :date, value: transfer.transactions.first&.date, label: t(".date"), required: true, max: Date.current %>
+  </section>
+
+  <section>
+    <%= f.submit t(".submit") %>
+  </section>
+<% end %>

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

@@ -0,0 +1,41 @@
+<%= turbo_frame_tag dom_id(transfer), class: "block" do %>
+  <details class="group flex items-center text-gray-900 p-4 text-sm font-medium">
+    <summary class="flex items-center justify-between">
+      <div class="flex items-center gap-4">
+        <%= button_to account_transfer_path(transfer),
+                      method: :delete,
+                      class: "flex items-center group/transfer",
+                      data: {
+                        turbo_frame: "_top",
+                        turbo_confirm: {
+                          title: t(".remove_title"),
+                          body: t(".remove_body"),
+                          confirm: t(".remove_confirm")
+                        }
+                      } do %>
+          <%= lucide_icon "arrow-left-right", class: "group-hover/transfer:hidden w-5 h-5 text-gray-500" %>
+          <%= lucide_icon "unlink", class: "group-hover/transfer:inline-block hidden w-5 h-5 text-gray-500" %>
+        <% end %>
+
+        <div class="max-w-full pr-10 select-none">
+          <%= tag.p t(".transfer_name", from_account: transfer.outflow_transaction&.account&.name, to_account: transfer.inflow_transaction&.account&.name) %>
+        </div>
+      </div>
+
+      <%= lucide_icon "chevron-down", class: "group-open:transform group-open:rotate-180 text-gray-500 w-5" %>
+    </summary>
+
+    <div class="pt-2 divide-y divide-alpha-black-200">
+      <% transfer.transactions.each do |transaction| %>
+        <div class="py-3 grid grid-cols-12 items-center">
+          <div class="col-span-10">
+            <%= render "transactions/name", transaction: transaction %>
+          </div>
+          <div class="col-span-2 ml-auto">
+            <%= render "transactions/amount", transaction: transaction %>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  </details>
+<% end %>

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

@@ -0,0 +1,17 @@
+<%= 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>
+<% end %>

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

@@ -0,0 +1,23 @@
+<%# locals: (valuation:) %>
+<%= form_with model: valuation,
+              data: { turbo_frame: "_top" },
+              url: valuation.new_record? ? account_valuations_path(valuation.account) : account_valuation_path(valuation.account, valuation),
+              builder: ActionView::Helpers::FormBuilder 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">
+        <%= lucide_icon("pencil-line", class: "w-4 h-4 text-gray-500") %>
+      </div>
+      <div class="w-full flex items-center justify-between gap-2">
+        <%= f.date_field :date, required: "required", max: Date.today, 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 :value, 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: valuation.account.currency %>
+      </div>
+    </div>
+
+    <div class="col-span-3 flex gap-2 justify-end items-center">
+      <%= link_to t(".cancel"), account_valuations_path(valuation.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>
+<% end %>

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

@@ -0,0 +1,50 @@
+<%# locals: (valuation:) %>
+
+<%= turbo_frame_tag dom_id(valuation) do %>
+  <div class="p-4 grid grid-cols-10 items-center">
+    <div class="col-span-5 flex items-center gap-4">
+      <%= tag.div class: "w-8 h-8 rounded-full p-1.5 flex items-center justify-center", style: valuation_style(valuation).html_safe do %>
+        <%= lucide_icon valuation_icon(valuation), class: "w-4 h-4" %>
+      <% end %>
+
+      <div class="text-sm">
+        <%= tag.p valuation.date, class: "text-gray-900 font-medium" %>
+        <%= tag.p valuation.first_of_series? ? t(".start_balance") : t(".value_update"), class: "text-gray-500" %>
+      </div>
+    </div>
+
+    <div class="col-span-2 justify-self-end">
+      <%= tag.p format_money(valuation.value_money), class: "font-medium text-sm text-gray-900" %>
+    </div>
+
+    <div class="col-span-2 justify-self-end font-medium text-sm" style="color: <%= valuation.trend.color %>">
+      <% if valuation.trend.direction.flat? %>
+        <%= tag.span t(".no_change"), class: "text-gray-500" %>
+      <% else %>
+        <%= tag.span format_money(valuation.trend.value) %>
+        <%= tag.span "(#{valuation.trend.percent}%)" %>
+      <% end %>
+    </div>
+
+    <div class="col-span-1 justify-self-end">
+      <%= contextual_menu do %>
+        <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
+          <%= contextual_menu_modal_action_item t(".edit_entry"), edit_account_valuation_path(valuation.account, valuation) %>
+
+          <%= contextual_menu_destructive_item t(".delete_entry"),
+                                               account_valuation_path(valuation.account, valuation),
+                                               turbo_frame: "_top",
+                                               turbo_confirm: {
+                                                 title: t(".confirm_title"),
+                                                 body: t(".confirm_body_html"),
+                                                 accept: t(".confirm_accept")
+                                               } %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+
+  <% unless valuation.last_of_series? %>
+    <div class="h-px bg-alpha-black-50 ml-16 mr-4"></div>
+  <% end %>
+<% end %>

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

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

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

@@ -0,0 +1,15 @@
+<%= turbo_frame_tag dom_id(@account, "valuations") do %>
+  <div class="grid grid-cols-10 items-center uppercase text-xs font-medium text-gray-500 px-4 py-2">
+    <%= tag.p t(".date"), class: "col-span-5" %>
+    <%= tag.p t(".value"), class: "col-span-2 justify-self-end" %>
+    <%= tag.p t(".change"), class: "col-span-2 justify-self-end" %>
+    <%= tag.div class: "col-span-1" %>
+  </div>
+
+  <div class="rounded-lg bg-white border-alpha-black-25 shadow-xs">
+    <%= turbo_frame_tag dom_id(Account::Valuation.new) %>
+    <% @account.valuations.reverse_chronological.each do |valuation| %>
+      <%= render valuation %>
+    <% end %>
+  </div>
+<% end %>

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

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

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

@@ -0,0 +1 @@
+<%= render "valuation", valuation: @valuation %>

app/views/accounts/_account_history.html.erb

@@ -1,29 +0,0 @@
-<%# locals: (account:, valuations:) %>
-<div 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">History</h3>
-    <%= link_to new_account_valuation_path(account), data: { turbo_frame: dom_id(Valuation.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") %>
-      <span class="text-sm">New entry</span>
-    <% end %>
-  </div>
-  <div class="rounded-xl bg-gray-25 p-1">
-    <div class="flex flex-col rounded-lg space-y-1">
-      <div class="text-xs font-medium text-gray-500 uppercase flex items-center px-4 py-2">
-        <div class="w-16">date</div>
-        <div class="flex items-center justify-between grow">
-          <div></div>
-          <div>value</div>
-        </div>
-        <div class="w-56 text-right">change</div>
-        <div class="w-[72px]"></div>
-      </div>
-      <div class="rounded-lg bg-white border-alpha-black-25 shadow-xs">
-        <%= turbo_frame_tag dom_id(Valuation.new) %>
-        <%= turbo_frame_tag "valuations_list" do %>
-          <%= render partial: "accounts/account_valuation_list", locals: { valuation_series: valuations } %>
-        <% end %>
-      </div>
-    </div>
-  </div>
-</div>

app/views/accounts/_account_valuation_list.html.erb

@@ -1,57 +0,0 @@
-<%# locals: (valuation_series:) %>
-<% valuation_series.values.reverse_each.with_index do |valuation, index| %>
-  <% valuation_styles = trend_styles(valuation.trend) %>
-  <%= turbo_frame_tag dom_id(valuation.original) do %>
-    <div class="p-4 flex items-center">
-      <div class="w-16">
-        <div class="w-8 h-8 rounded-full p-1.5 flex items-center justify-center <%= valuation_styles[:bg_class] %>">
-          <%= lucide_icon(valuation_styles[:icon], class: "w-4 h-4 #{valuation_styles[:text_class]}") %>
-        </div>
-      </div>
-      <div class="flex items-center justify-between grow">
-        <div class="text-sm">
-          <p><%= valuation.date %></p>
-          <%# TODO: Add descriptive name of valuation %>
-          <p class="text-gray-500">Manually entered</p>
-        </div>
-        <div class="flex text-sm font-medium text-right"><%= format_money valuation.value %></div>
-      </div>
-      <div class="flex w-56 justify-end text-right text-sm font-medium">
-        <% if valuation.trend.value == 0 %>
-          <span class="text-gray-500">No change</span>
-        <% else %>
-          <span class="<%= valuation_styles[:text_class] %>"><%= valuation_styles[:symbol] %><%= format_money valuation.trend.value.abs %></span>
-          <span class="<%= valuation_styles[:text_class] %>">(<%= lucide_icon(valuation_styles[:icon], class: "w-4 h-4 align-text-bottom inline") %> <%= valuation.trend.percent %>%)</span>
-        <% end %>
-      </div>
-      <div class="relative w-[72px]" data-controller="menu">
-        <button
-          data-menu-target="button"
-          class="ml-auto flex items-center justify-center hover:bg-gray-50 w-8 h-8 rounded-lg">
-          <%= lucide_icon("more-horizontal", class: "w-5 h-5 text-gray-500") %>
-        </button>
-        <div
-          data-menu-target="content"
-          class="absolute min-w-[200px] z-10 top-10 right-0 bg-white p-1 rounded-sm shadow-xs border border-alpha-black-25 w-fit">
-          <%= link_to edit_valuation_path(valuation.original),
-              class: "flex gap-1 items-center hover:bg-gray-50 rounded-md p-2" do %>
-            <%= lucide_icon("pencil-line", class: "w-5 h-5 text-gray-500 shrink-0") %>
-            <span class="text-gray-900 text-sm">Edit entry</span>
-          <% end %>
-          <%= link_to valuation_path(valuation.original),
-              data: { turbo_method: :delete,
-                      turbo_confirm: { title: t(".confirm_title"),
-                                       body: t(".confirm_body_html"),
-                                       accept: t(".confirm_accept") } },
-              class: "text-red-600 flex gap-1 items-center hover:bg-gray-50 rounded-md p-2" do %>
-            <%= lucide_icon("trash-2", class: "w-5 h-5 shrink-0") %>
-            <span class="text-sm">Delete entry</span>
-          <% end %>
-        </div>
-      </div>
-    </div>
-    <% unless index == valuation_series.values.size - 1 %>
-      <div class="h-px bg-alpha-black-50 ml-20 mr-4"></div>
-    <% end %>
-  <% end %>
-<% end %>

app/views/accounts/account/_investment.html.erb

@@ -1 +0,0 @@
-<%= f.select :subtype, options_for_select(Account::Investment::SUBTYPES, selected: ""), { label: true } %>

app/views/accounts/accountables/_investment.html.erb

@@ -0,0 +1 @@
+<%= f.select :subtype, options_for_select(Investment::SUBTYPES, selected: ""), { label: true } %>

app/views/accounts/new.html.erb

@@ -8,14 +8,15 @@
       <div class="flex flex-col p-2 text-sm grow">
         <button hidden data-controller="hotkey" data-hotkey="k,K,ArrowUp,ArrowLeft" data-action="list-keyboard-navigation#focusPrevious">Previous</button>
         <button hidden data-controller="hotkey" data-hotkey="j,J,ArrowDown,ArrowRight" data-action="list-keyboard-navigation#focusNext">Next</button>
-        <%= render "account_type", type: Account::Depository.new, bg_color: "bg-blue-50", text_color: "text-blue-500", icon: "landmark" %>
-        <%= render "account_type", type: Account::Investment.new, bg_color: "bg-green-50", text_color: "text-green-500", icon: "line-chart" %>
-        <%= render "account_type", type: Account::Property.new, bg_color: "bg-pink-50", text_color: "text-pink-500", icon: "home" %>
-        <%= render "account_type", type: Account::Vehicle.new, bg_color: "bg-indigo-50", text_color: "text-indigo-500", icon: "car-front" %>
-        <%= render "account_type", type: Account::Credit.new, bg_color: "bg-violet-50", text_color: "text-violet-500", icon: "credit-card" %>
-        <%= render "account_type", type: Account::Loan.new, bg_color: "bg-yellow-50", text_color: "text-yellow-500", icon: "hand-coins" %>
-        <%= render "account_type", type: Account::OtherAsset.new, bg_color: "bg-green-50", text_color: "text-green-500", icon: "plus" %>
-        <%= render "account_type", type: Account::OtherLiability.new, bg_color: "bg-red-50", text_color: "text-red-500", icon: "minus" %>
+        <%= render "account_type", type: Depository.new, bg_color: "bg-blue-50", text_color: "text-blue-500", icon: "landmark" %>
+        <%= render "account_type", type: Investment.new, bg_color: "bg-green-50", text_color: "text-green-500", icon: "line-chart" %>
+        <%= render "account_type", type: Crypto.new, bg_color: "bg-green-50", text_color: "text-green-500", icon: "bitcoin" %>
+        <%= render "account_type", type: Property.new, bg_color: "bg-pink-50", text_color: "text-pink-500", icon: "home" %>
+        <%= render "account_type", type: Vehicle.new, bg_color: "bg-indigo-50", text_color: "text-indigo-500", icon: "car-front" %>
+        <%= render "account_type", type: CreditCard.new, bg_color: "bg-violet-50", text_color: "text-violet-500", icon: "credit-card" %>
+        <%= render "account_type", type: Loan.new, bg_color: "bg-yellow-50", text_color: "text-yellow-500", icon: "hand-coins" %>
+        <%= render "account_type", type: OtherAsset.new, bg_color: "bg-green-50", text_color: "text-green-500", icon: "plus" %>
+        <%= render "account_type", type: OtherLiability.new, bg_color: "bg-red-50", text_color: "text-red-500", icon: "minus" %>
       </div>
       <div class="border-t border-alpha-black-25 p-4 text-gray-500 text-sm flex justify-between">
         <div class="flex space-x-5">
@@ -77,7 +78,7 @@
           <%= f.hidden_field :accountable_type %>
           <%= f.text_field :name, placeholder: t(".name.placeholder"), required: "required", label: t(".name.label"), autofocus: true %>
           <%= f.collection_select :institution_id, Current.family.institutions.alphabetically, :id, :name, { include_blank: t(".ungrouped"), label: t(".institution") } %>
-          <%= render "accounts/#{permitted_accountable_partial(@account.accountable_type)}", f: f %>
+          <%= render "accounts/accountables/#{permitted_accountable_partial(@account.accountable_type)}", f: f %>
           <%= f.money_field :balance_money, label: t(".balance"), required: "required" %>
 
           <div>

app/views/accounts/show.html.erb

@@ -56,11 +56,11 @@
     <div class="p-4 flex justify-between">
       <div class="space-y-2">
         <%= render partial: "shared/value_heading", locals: {
-            label: "Total Value",
-            period: @period,
-            value: @account.balance_money,
-            trend: @balance_series.trend
-          } %>
+          label: "Total Value",
+          period: @period,
+          value: @account.balance_money,
+          trend: @balance_series.trend
+        } %>
       </div>
       <%= form_with url: account_path(@account), method: :get, class: "flex items-center gap-4", data: { controller: "auto-submit-form" } do %>
         <%= render partial: "shared/period_select", locals: { value: @period.name } %>
@@ -77,7 +77,23 @@
     </div>
     <div class="min-h-[800px]">
       <div data-tabs-target="tab" id="account-history-tab">
-        <%= render partial: "accounts/account_history", locals: { account: @account, valuations: @valuation_series } %>
+        <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_valuation_path(@account), data: { turbo_frame: dom_id(Account::Valuation.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" %>
+            <% end %>
+          </div>
+
+          <div class="rounded-xl bg-gray-25 p-1">
+            <%= turbo_frame_tag dom_id(@account, "valuations"), src: account_valuations_path(@account) do %>
+              <div class="p-5 flex justify-center items-center">
+                <%= tag.p t(".loading_history"), class: "text-gray-500 animate-pulse text-sm" %>
+              </div>
+            <% end %>
+          </div>
+        </div>
       </div>
       <div data-tabs-target="tab" id="account-transactions-tab" class="hidden">
         <%= render partial: "accounts/transactions", locals: { account: @account, transactions: @account.transactions.order(date: :desc) } %>

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

@@ -4,7 +4,14 @@
   </div>
 
   <div class="col-span-3">
-    <%= render "transactions/categories/badge", category: transaction.category %>
+    <% if transaction.marked_as_transfer %>
+      <div class="flex items-center gap-1 text-gray-500 pl-5">
+        <%= lucide_icon "arrow-right-left", class: "w-4 h-4 text-gray-500" %>
+        <p>Transfer</p>
+      </div>
+    <% else %>
+      <%= render "categories/badge", category: transaction.category %>
+    <% end %>
   </div>
 
   <%= link_to transaction.account.name,

app/views/categories/_form.html.erb

@@ -14,7 +14,7 @@
       <%= form.hidden_field :color, data: { color_select_target: "input" } %>
 
       <ul role="radiogroup" class="flex justify-between items-center py-2">
-        <% Transaction::Category::COLORS.each do |color| %>
+        <% Category::COLORS.each do |color| %>
           <li tabindex="0"
               role="radio"
               data-action="click->color-select#select keydown.enter->color-select#select keydown.space->color-select#select"

app/views/categories/_menu.html.erb

@@ -1,11 +1,11 @@
 <%# locals: (transaction:) %>
 <div class="relative" data-controller="menu">
   <button data-menu-target="button" class="flex cursor-pointer">
-    <%= render partial: "transactions/categories/badge", locals: { category: transaction.category } %>
+    <%= render partial: "categories/badge", locals: { category: transaction.category } %>
   </button>
   <div data-menu-target="content" class="absolute z-10 hidden w-screen mt-2 max-w-min cursor-default">
     <div class="w-64 text-sm font-semibold leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-      <%= turbo_frame_tag "category_dropdown", src: transaction_category_dropdown_path(category_id: transaction.category_id, transaction_id: transaction.id), loading: :lazy do %>
+      <%= turbo_frame_tag "category_dropdown", src: category_dropdown_path(category_id: transaction.category_id, transaction_id: transaction.id), loading: :lazy do %>
         <div class="p-6 flex items-center justify-center">
           <p class="text-sm text-gray-500 animate-pulse"><%= t(".loading") %></p>
         </div>

app/views/categories/_row.html.erb

@@ -1,9 +1,9 @@
 <div class="flex justify-between mx-4 py-5 border-b last:border-b-0 border-alpha-black-50">
-  <%= render partial: "transactions/categories/badge", locals: { category: row } %>
+  <%= render partial: "categories/badge", locals: { category: row } %>
 
   <%= contextual_menu do %>
     <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-      <%= link_to edit_transaction_category_path(row),
+      <%= link_to edit_category_path(row),
             class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg",
             data: { turbo_frame: :modal } do %>
         <%= lucide_icon "pencil-line", class: "w-5 h-5 text-gray-500" %>
@@ -11,7 +11,7 @@
         <span><%= t(".edit") %></span>
       <% end %>
 
-      <%= link_to new_transaction_category_deletion_path(row),
+      <%= link_to new_category_deletion_path(row),
             class: "block w-full py-2 px-3 space-x-2 text-red-600 hover:bg-red-50 flex items-center rounded-lg",
             data: { turbo_frame: :modal } do %>
         <%= lucide_icon "trash-2", class: "w-5 h-5" %>

app/views/categories/index.html.erb

@@ -5,7 +5,7 @@
   <header class="flex items-center justify-between">
     <h1 class="text-gray-900 text-xl font-medium"><%= t(".categories") %></h1>
 
-    <%= link_to new_transaction_category_path, class: "rounded-lg bg-gray-900 text-white flex items-center gap-1 justify-center hover:bg-gray-700 px-3 py-2", data: { turbo_frame: :modal } do %>
+    <%= link_to new_category_path, class: "rounded-lg bg-gray-900 text-white flex items-center gap-1 justify-center hover:bg-gray-700 px-3 py-2", data: { turbo_frame: :modal } do %>
       <%= lucide_icon "plus", class: "w-5 h-5" %>
       <p><%= t(".new") %></p>
     <% end %>
@@ -16,13 +16,13 @@
       <h2 class="uppercase px-4 py-2 text-gray-500 text-xs"><%= t(".categories") %> · <%= @categories.size %></h2>
 
       <div class="border border-alpha-gray-100 rounded-lg bg-white shadow-xs">
-        <%= render collection: @categories, partial: "transactions/categories/row" %>
+        <%= render collection: @categories, partial: "categories/row" %>
       </div>
     </div>
   </div>
 
   <footer class="flex justify-between gap-4">
     <%= previous_setting("Tags", tags_path) %>
-    <%= next_setting("Merchants", transaction_merchants_path) %>
+    <%= next_setting("Merchants", merchants_path) %>
   </footer>
 </section>

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

@@ -11,7 +11,7 @@
       </p>
     </div>
 
-    <%= form_with url: transaction_category_deletions_path(@category),
+    <%= form_with url: category_deletions_path(@category),
           data: {
             turbo: false,
             controller: "deletion",
@@ -20,7 +20,7 @@
             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.transaction_categories.alphabetically.without(@category),
+                              Current.family.categories.alphabetically.without(@category),
             :id, :name,
             { prompt: t(".replacement_category_prompt"), label: t(".category") },
                               { data: { deletion_target: "replacementField", action: "deletion#updateSubmitButton" } } %>

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

@@ -6,12 +6,12 @@
     <span class="w-5 h-5">
       <%= lucide_icon("check", class: "w-5 h-5 text-gray-500") if is_selected %>
     </span>
-    <%= render partial: "transactions/categories/badge", locals: { category: category } %>
+    <%= render partial: "categories/badge", locals: { category: category } %>
   <% end %>
 
   <%= contextual_menu do %>
     <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-      <%= link_to edit_transaction_category_path(category),
+      <%= link_to edit_category_path(category),
             class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg",
             data: { turbo_frame: :modal } do %>
         <%= lucide_icon "pencil-line", class: "w-5 h-5 text-gray-500" %>
@@ -19,7 +19,7 @@
         <span><%= t(".edit") %></span>
       <% end %>
 
-      <%= link_to new_transaction_category_deletion_path(category),
+      <%= link_to new_category_deletion_path(category),
             class: "block w-full py-2 px-3 space-x-2 text-red-600 hover:bg-red-50 flex items-center rounded-lg",
             data: { turbo_frame: :modal } do %>
         <%= lucide_icon "trash-2", class: "w-5 h-5" %>

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

@@ -11,12 +11,12 @@
         <%= t(".no_categories") %>
       </div>
       <% @categories.each do |category| %>
-        <%= render partial: "transactions/categories/dropdowns/row", locals: { category: } %>
+        <%= render partial: "category/dropdowns/row", locals: { category: } %>
       <% end %>
     </div>
     <hr>
     <div class="relative p-1.5 w-full">
-      <%= link_to new_transaction_category_path(transaction_id: @transaction),
+      <%= link_to new_category_path(transaction_id: @transaction),
                   class: "flex text-sm font-medium items-center gap-2 text-gray-500 w-full rounded-lg p-2 hover:bg-gray-100",
                   data: { turbo_frame: "modal" } do %>
         <%= lucide_icon "plus", class: "w-5 h-5" %>

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

@@ -5,7 +5,7 @@
   </div>
 
   <div class="col-span-2">
-    <%= render partial: "transactions/categories/badge", locals: { category: transaction.category } %>
+    <%= render partial: "categories/badge", locals: { category: transaction.category } %>
   </div>
 
   <div class="col-span-2 flex items-center gap-1">

app/views/layouts/_sidebar.html.erb

@@ -95,7 +95,7 @@
         <%= render partial: "shared/period_select", locals: { button_class: "flex items-center gap-1 w-full cursor-pointer font-bold tracking-wide" } %>
       <% end %>
     </div>
-    <%= link_to new_account_path, class: "block hover:bg-gray-100 p-2 text-sm font-semibold text-gray-900 flex items-center rounded", title: t(".new_account"), data: { turbo_frame: "modal" } do %>
+    <%= link_to new_account_path, id: "sidebar-new-account", class: "block hover:bg-gray-100 p-2 text-sm font-semibold text-gray-900 flex items-center rounded", title: t(".new_account"), data: { turbo_frame: "modal" } do %>
       <%= lucide_icon("plus", class: "w-5 h-5 text-gray-500") %>
     <% end %>
   </div>

app/views/layouts/with_sidebar.html.erb

@@ -7,7 +7,7 @@
         <%= render "layouts/sidebar" %>
       <% end %>
     </div>
-    <main class="grow px-20 pt-6 pb-32 h-full overflow-y-auto">
+    <main class="grow px-20 py-6 h-full overflow-y-auto">
       <%= yield %>
     </main>
   </div>

app/views/merchants/_form.html.erb

@@ -1,14 +1,14 @@
 <% is_editing = @merchant.id.present? %>
 <div data-controller="merchant-avatar">
-  <%= form_with model: @merchant, url: is_editing ? transaction_merchant_path(@merchant) : transaction_merchants_path, method: is_editing ? :patch : :post, scope: :transaction_merchant, data: { turbo: false } do |f| %>
+  <%= form_with model: @merchant, url: is_editing ? merchant_path(@merchant) : merchants_path, method: is_editing ? :patch : :post, scope: :merchant, data: { turbo: false } do |f| %>
     <section class="space-y-4">
       <div class="w-fit m-auto">
-        <%= render partial: "transactions/merchants/avatar", locals: { merchant: } %>
+        <%= render partial: "merchants/avatar", locals: { merchant: } %>
       </div>
-      <div data-controller="select" data-select-active-class="bg-gray-200" data-select-selected-value="<%= @merchant&.color || Transaction::Merchant::COLORS[0] %>">
+      <div data-controller="select" data-select-active-class="bg-gray-200" data-select-selected-value="<%= @merchant&.color || Merchant::COLORS[0] %>">
         <%= f.hidden_field :color, data: { select_target: "input", merchant_avatar_target: "color" } %>
         <ul data-select-target="list" class="flex gap-2 items-center">
-          <% Transaction::Merchant::COLORS.each do |color| %>
+          <% Merchant::COLORS.each do |color| %>
             <li tabindex="0" data-select-target="option" data-action="click->select#selectOption" data-value="<%= color %>" class="flex shrink-0 justify-center items-center w-6 h-6 cursor-pointer hover:bg-gray-200 rounded-full">
               <div style="background-color: <%= color %>" class="shrink-0 w-4 h-4 rounded-full"></div>
             </li>

app/views/merchants/_list.html.erb

@@ -2,7 +2,7 @@
 <% merchants.each.with_index do |merchant, index| %>
   <div class="flex justify-between items-center p-4 bg-white">
     <div class="flex w-full items-center gap-2.5">
-      <%= render partial: "transactions/merchants/avatar", locals: { merchant: } %>
+      <%= render partial: "merchants/avatar", locals: { merchant: } %>
       <p class="text-gray-900 text-sm truncate">
         <%= merchant.name %>
       </p>
@@ -13,13 +13,13 @@
       </button>
       <div data-menu-target="content" class="absolute z-10 top-10 right-0 border border-alpha-black-25 bg-white rounded-lg shadow-xs w-48 hidden">
         <div class="border-t border-b border-alpha-black-100 p-1">
-          <%= button_to edit_transaction_merchant_path(merchant),
+          <%= button_to edit_merchant_path(merchant),
                         method: :get,
                         class: "flex w-full gap-1 items-center text-sm hover:bg-gray-50 rounded-lg px-3 py-2",
                         data: { turbo_frame: "modal" } do %>
             <%= lucide_icon("pencil-line", class: "w-5 h-5 mr-2") %> <%= t(".edit") %>
           <% end %>
-          <%= button_to transaction_merchant_path(merchant),
+          <%= button_to merchant_path(merchant),
                         method: :delete,
                         class: "flex w-full gap-1 items-center text-sm text-red-600 hover:text-red-800 hover:bg-gray-50 rounded-lg px-3 py-2",
                         data: {

app/views/merchants/index.html.erb

@@ -4,7 +4,7 @@
 <div class="space-y-4">
   <div class="flex items-center justify-between">
     <h1 class="text-xl font-medium text-gray-900"><%= t(".title") %></h1>
-    <%= link_to new_transaction_merchant_path, class: "flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>
+    <%= link_to new_merchant_path, class: "flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>
       <%= lucide_icon("plus", class: "w-5 h-5") %>
       <span><%= t(".new_short") %></span>
     <% end %>
@@ -14,7 +14,7 @@
       <div class="flex justify-center items-center py-20">
         <div class="text-center flex flex-col items-center max-w-[300px]">
           <p class="text-gray-900 mb-1 font-medium text-sm"><%= t(".empty") %></p>
-          <%= link_to new_transaction_merchant_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>
+          <%= link_to new_merchant_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>
             <%= lucide_icon("plus", class: "w-5 h-5") %>
             <span><%= t(".new_long") %></span>
           <% end %>
@@ -27,12 +27,12 @@
           <span class="text-gray-400 mx-2">&middot;</span>
           <p><%= @merchants.count %></p>
         </div>
-        <%= render partial: "transactions/merchants/list", locals: { merchants: @merchants } %>
+        <%= render partial: "merchants/list", locals: { merchants: @merchants } %>
       </div>
     <% end %>
   </div>
   <div class="flex justify-between gap-4">
-    <%= previous_setting("Categories", transaction_categories_path) %>
+    <%= previous_setting("Categories", categories_path) %>
     <%= next_setting("Rules", transaction_rules_path) %>
   </div>
 </div>