Bump to v0.1.0-alpha.18

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

.ai/cursorrules.md

@@ -0,0 +1,64 @@
+<!-- Copy this file to .cursorrules in the root of the project on your local machine if you'd like to use these rules with Cursor. -->
+
+You are an expert in Ruby, Ruby on Rails, Postgres, Tailwind, Stimulus, Hotwire and Turbo and always use the latest stable versions of those technologies.
+
+**Code Style and Structure**
+- Write concise, technical Ruby code with accurate examples.
+- Prefer iteration and modularization over code duplication.
+- Use descriptive variable names with auxiliary verbs (e.g., is_loading, has_error).
+- Structure files: models, controllers, views, helpers, services, jobs, mailers.
+
+**Naming Conventions**
+- Use snake_case for file names and directories (e.g., app/models/user_profile.rb).
+- Use CamelCase for classes and modules (e.g., UserProfile).
+
+**Ruby on Rails Usage**
+- Use Rails conventions for MVC structure.
+- Favor scopes over class methods for queries.
+- Use strong parameters for mass assignment protection.
+- Use partials to DRY up views.
+
+**Syntax and Formatting**
+- Use two spaces for indentation.
+- Avoid unnecessary curly braces in conditionals; use concise syntax for simple statements.
+- Use descriptive method names and keep methods short.
+
+**Commenting Code**
+- Write clear, concise comments to explain the purpose of individual functions and methods.
+- Use comments to describe the intent and functionality of complex logic.
+- Avoid redundant comments that state the obvious.
+
+**UI and Styling**
+- Use Tailwind CSS for styling.
+- Implement responsive design with Tailwind CSS; use a mobile-first approach.
+- Use Stimulus for JavaScript behavior.
+- Use Turbo for asynchronous actions and updates.
+
+**Performance Optimization**
+- Use eager loading to avoid N+1 queries.
+- Cache expensive queries and partials where appropriate.
+- Use background jobs for long-running tasks.
+- Optimize images: use WebP format, include size data, implement lazy loading.
+
+**Database Querying & Data Model Creation**
+- Use ActiveRecord for data querying and model creation.
+- Favor database constraints and indexes for data integrity and performance.
+- Use migrations to manage schema changes.
+
+**Key Conventions**
+- Follow Rails best practices for RESTful routing.
+- Optimize for performance and security.
+- Use environment variables for configuration.
+- Write tests for models, controllers, and features.
+
+**AI Guidelines**
+- Follow the user’s requirements carefully & to the letter.
+- Confirm, then write code!
+- Suggest solutions that I didn't think about—anticipate my needs
+- Focus on readability over being performant.
+- Fully implement all requested functionality.
+- Leave NO todo’s, placeholders or missing pieces.
+- Don't say things like "additional logic can be added here" — instead, add the logic.
+- Be concise. Minimize any other prose.
+- Consider new technologies and contrarian ideas, not just the conventional wisdom
+- If I ask for adjustments to code, do not repeat all of my code unnecessarily. Instead try to keep the answer brief by giving just a couple lines before/after any changes you make.

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-ARG RUBY_VERSION=3.3.1
+ARG RUBY_VERSION=3.3.4
 FROM ruby:${RUBY_VERSION}-slim-bullseye
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

.editorconfig

@@ -0,0 +1,7 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 2

.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

.github/workflows/ci.yml

@@ -97,7 +97,6 @@ jobs:
 
       - name: System tests
         run: DISABLE_PARALLELIZATION=true bin/rails test:system
-        continue-on-error: true # TODO: Eventually we'll enforce for PRs
 
       - name: Keep screenshots from failed system tests
         uses: actions/upload-artifact@v4

.gitignore

@@ -11,6 +11,7 @@
 /.env*
 !/.env*.erb
 !.env.example
+!.env.test.example
 
 # Ignore all logfiles and tempfiles.
 /log/*
@@ -51,7 +52,11 @@
 # Ignore .devcontainer files
 compose-dev.yaml
 
+# Ignore asdf ruby version file
+.tool-versions
+
 # Ignore GCP keyfile
 gcp-storage-keyfile.json
 
 coverage
+.cursorrules

.rubocop.yml

@@ -1,8 +1,15 @@
-# Omakase Ruby styling for Rails
-inherit_gem: { rubocop-rails-omakase: rubocop.yml }
+inherit_gem:
+  rubocop-rails-omakase: rubocop.yml
+  
+Layout/IndentationWidth:
+  Enabled: true
 
-# Overwrite or add rules to create your own house style
-#
-# # Use `[a, [b, c]]` not `[ a, [ b, c ] ]`
-# Layout/SpaceInsideArrayLiteralBrackets:
-#   Enabled: false
+Layout/IndentationStyle:
+  EnforcedStyle: spaces
+  IndentationWidth: 2
+
+Layout/IndentationConsistency:
+  Enabled: true
+
+Layout/SpaceInsidePercentLiteralDelimiters:
+  Enabled: true

.ruby-version

@@ -1 +1 @@
-3.3.1
+3.3.4

Dockerfile

@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1
 
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=3.3.1
+ARG RUBY_VERSION=3.3.4
 FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base
 
 # Rails app lives here

Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 ruby file: ".ruby-version"
 
 # Rails
-gem "rails", github: "rails/rails", branch: "7-2-stable"
+gem "rails", "~> 7.2.1"
 
 # Drivers
 gem "pg", "~> 1.5"
@@ -42,23 +42,25 @@ gem "inline_svg"
 gem "octokit"
 gem "pagy"
 gem "rails-settings-cached"
-gem "tzinfo-data", platforms: %i[ windows jruby ]
+gem "tzinfo-data", platforms: %i[windows jruby]
 gem "csv"
+gem "redcarpet"
 
 group :development, :test do
-  gem "debug", platforms: %i[ mri windows ]
+  gem "debug", platforms: %i[mri windows]
   gem "brakeman", require: false
   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"
   gem "web-console"
+  gem "faker"
 end
 
 group :test do

Gemfile.lock

@@ -5,124 +5,97 @@ GIT
     lucide-rails (0.2.0)
       railties (>= 4.1.0)
 
-GIT
-  remote: https://github.com/rails/rails.git
-  revision: 9e370f0243870b39ea9801eeb95498f3a0d7bd83
-  branch: 7-2-stable
+GEM
+  remote: https://rubygems.org/
   specs:
-    actioncable (7.2.0.beta2)
-      actionpack (= 7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    actioncable (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.0.beta2)
-      actionpack (= 7.2.0.beta2)
-      activejob (= 7.2.0.beta2)
-      activerecord (= 7.2.0.beta2)
-      activestorage (= 7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    actionmailbox (7.2.1)
+      actionpack (= 7.2.1)
+      activejob (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
       mail (>= 2.8.0)
-    actionmailer (7.2.0.beta2)
-      actionpack (= 7.2.0.beta2)
-      actionview (= 7.2.0.beta2)
-      activejob (= 7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    actionmailer (7.2.1)
+      actionpack (= 7.2.1)
+      actionview (= 7.2.1)
+      activejob (= 7.2.1)
+      activesupport (= 7.2.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.0.beta2)
-      actionview (= 7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    actionpack (7.2.1)
+      actionview (= 7.2.1)
+      activesupport (= 7.2.1)
       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)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.0.beta2)
-      actionpack (= 7.2.0.beta2)
-      activerecord (= 7.2.0.beta2)
-      activestorage (= 7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    actiontext (7.2.1)
+      actionpack (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    actionview (7.2.1)
+      activesupport (= 7.2.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    activejob (7.2.1)
+      activesupport (= 7.2.1)
       globalid (>= 0.3.6)
-    activemodel (7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
-    activerecord (7.2.0.beta2)
-      activemodel (= 7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    activemodel (7.2.1)
+      activesupport (= 7.2.1)
+    activerecord (7.2.1)
+      activemodel (= 7.2.1)
+      activesupport (= 7.2.1)
       timeout (>= 0.4.0)
-    activestorage (7.2.0.beta2)
-      actionpack (= 7.2.0.beta2)
-      activejob (= 7.2.0.beta2)
-      activerecord (= 7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    activestorage (7.2.1)
+      actionpack (= 7.2.1)
+      activejob (= 7.2.1)
+      activerecord (= 7.2.1)
+      activesupport (= 7.2.1)
       marcel (~> 1.0)
-    activesupport (7.2.0.beta2)
+    activesupport (7.2.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
-      logger
+      logger (>= 1.4.2)
       minitest (>= 5.1)
+      securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    rails (7.2.0.beta2)
-      actioncable (= 7.2.0.beta2)
-      actionmailbox (= 7.2.0.beta2)
-      actionmailer (= 7.2.0.beta2)
-      actionpack (= 7.2.0.beta2)
-      actiontext (= 7.2.0.beta2)
-      actionview (= 7.2.0.beta2)
-      activejob (= 7.2.0.beta2)
-      activemodel (= 7.2.0.beta2)
-      activerecord (= 7.2.0.beta2)
-      activestorage (= 7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
-      bundler (>= 1.15.0)
-      railties (= 7.2.0.beta2)
-    railties (7.2.0.beta2)
-      actionpack (= 7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
-      irb (~> 1.13)
-      rackup (>= 1.0.0)
-      rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
-      zeitwerk (~> 2.6)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.944.0)
-    aws-sdk-core (3.197.0)
+    aws-partitions (1.981.0)
+    aws-sdk-core (3.209.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.84.0)
-      aws-sdk-core (~> 3, >= 3.197.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.3)
-      aws-sdk-core (~> 3, >= 3.197.0)
+    aws-sdk-kms (1.94.0)
+      aws-sdk-core (~> 3, >= 3.207.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.166.0)
+      aws-sdk-core (~> 3, >= 3.207.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sigv4 (1.8.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.10.0)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
     bcrypt (3.1.20)
@@ -135,9 +108,9 @@ GEM
       smart_properties
     bigdecimal (3.1.8)
     bindex (0.8.1)
-    bootsnap (1.18.3)
+    bootsnap (1.18.4)
       msgpack (~> 1.2)
-    brakeman (6.1.2)
+    brakeman (6.2.1)
       racc
     builder (3.3.0)
     capybara (3.40.0)
@@ -151,7 +124,7 @@ GEM
       xpath (~> 3.2)
     childprocess (5.0.0)
     climate_control (1.2.0)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crack (1.0.0)
       bigdecimal
@@ -163,47 +136,56 @@ GEM
       irb (~> 1.10)
       reline (>= 0.3.8)
     docile (1.4.0)
-    dotenv (3.1.2)
-    dotenv-rails (3.1.2)
-      dotenv (= 3.1.2)
+    dotenv (3.1.4)
+    dotenv-rails (3.1.4)
+      dotenv (= 3.1.4)
       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
-    faraday (2.9.2)
-      faraday-net_http (>= 2.0, < 3.2)
-    faraday-net_http (3.1.0)
+    faker (3.4.2)
+      i18n (>= 1.8.11, < 2)
+    faraday (2.12.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      json
+      logger
+    faraday-net_http (3.3.0)
       net-http
     faraday-retry (2.2.1)
       faraday (~> 2.0)
-    ffi (1.16.3)
-    fugit (1.11.0)
+    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.1)
       et-orbi (~> 1, >= 1.2.11)
       raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    good_job (3.29.4)
-      activejob (>= 6.0.0)
-      activerecord (>= 6.0.0)
-      concurrent-ruby (>= 1.0.2)
-      fugit (>= 1.1)
-      railties (>= 6.0.0)
-      thor (>= 0.14.1)
+    good_job (4.3.0)
+      activejob (>= 6.1.0)
+      activerecord (>= 6.1.0)
+      concurrent-ruby (>= 1.3.1)
+      fugit (>= 1.11.0)
+      railties (>= 6.1.0)
+      thor (>= 1.0.0)
     hashdiff (1.1.0)
     highline (3.0.1)
-    hotwire-livereload (1.4.0)
+    hotwire-livereload (1.4.1)
       actioncable (>= 6.0.0)
       listen (>= 3.0.0)
       railties (>= 6.0.0)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.14)
       activesupport (>= 4.0.2)
@@ -215,18 +197,18 @@ 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)
       actionpack (>= 6.0.0)
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
-    inline_svg (1.9.0)
+    inline_svg (1.10.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.7.2)
-    irb (1.13.2)
+    irb (1.14.1)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
@@ -240,7 +222,7 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.0)
+    logger (1.6.1)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -251,10 +233,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.0)
-    mocha (2.4.0)
+    minitest (5.25.1)
+    mocha (2.4.5)
       ruby2_keywords (>= 0.0.5)
     msgpack (1.7.2)
     net-http (0.4.1)
@@ -269,29 +251,29 @@ 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 (8.4.5)
-    parallel (1.24.0)
-    parser (3.3.1.0)
+    pagy (9.0.9)
+    parallel (1.25.1)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
-    pg (1.5.6)
-    prism (0.29.0)
-    propshaft (0.9.0)
+    pg (1.5.8)
+    prism (1.0.0)
+    propshaft (1.0.1)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
@@ -299,11 +281,11 @@ GEM
     psych (5.1.2)
       stringio
     public_suffix (5.1.0)
-    puma (6.4.2)
+    puma (6.4.3)
       nio4r (~> 2.0)
     raabro (1.4.0)
-    racc (1.8.0)
-    rack (3.1.4)
+    racc (1.8.1)
+    rack (3.1.7)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -311,6 +293,20 @@ GEM
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
+    rails (7.2.1)
+      actioncable (= 7.2.1)
+      actionmailbox (= 7.2.1)
+      actionmailer (= 7.2.1)
+      actionpack (= 7.2.1)
+      actiontext (= 7.2.1)
+      actionview (= 7.2.1)
+      activejob (= 7.2.1)
+      activemodel (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
+      bundler (>= 1.15.0)
+      railties (= 7.2.1)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -324,25 +320,35 @@ GEM
     rails-settings-cached (2.9.4)
       activerecord (>= 5.0.0)
       railties (>= 5.0.0)
+    railties (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
+    rbs (3.5.3)
+      logger
     rdoc (6.7.0)
       psych (>= 4.0.0)
+    redcarpet (3.6.0)
     regexp_parser (2.9.2)
-    reline (0.5.9)
+    reline (0.5.10)
       io-console (~> 0.5)
-    rexml (3.3.0)
-      strscan
-    rubocop (1.63.5)
+    rexml (3.3.7)
+    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)
@@ -365,30 +371,33 @@ GEM
       rubocop-minitest
       rubocop-performance
       rubocop-rails
-    ruby-lsp (0.17.1)
+    ruby-lsp (0.18.1)
       language_server-protocol (~> 3.17.0)
-      prism (>= 0.29.0, < 0.30)
+      prism (~> 1.0)
+      rbs (>= 3, < 4)
       sorbet-runtime (>= 0.5.10782)
-    ruby-lsp-rails (0.3.7)
-      ruby-lsp (>= 0.17.0, < 0.18.0)
+    ruby-lsp-rails (0.3.16)
+      ruby-lsp (>= 0.18.0, < 0.19.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)
-    selenium-webdriver (4.22.0)
+    securerandom (0.3.1)
+    selenium-webdriver (4.25.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.17.3)
+    sentry-rails (5.20.1)
       railties (>= 5.0)
-      sentry-ruby (~> 5.17.3)
-    sentry-ruby (5.17.3)
+      sentry-ruby (~> 5.20.1)
+    sentry-ruby (5.20.1)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     simplecov (0.22.0)
@@ -398,38 +407,37 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    sorbet-runtime (0.5.11406)
+    sorbet-runtime (0.5.11577)
     stackprof (0.2.26)
-    stimulus-rails (1.3.3)
+    stimulus-rails (1.3.4)
       railties (>= 6.0.0)
     stringio (3.1.1)
-    strscan (3.1.0)
-    tailwindcss-rails (2.6.1)
+    tailwindcss-rails (2.7.6)
       railties (>= 7.0.0)
-    tailwindcss-rails (2.6.1-aarch64-linux)
+    tailwindcss-rails (2.7.6-aarch64-linux)
       railties (>= 7.0.0)
-    tailwindcss-rails (2.6.1-arm-linux)
+    tailwindcss-rails (2.7.6-arm-linux)
       railties (>= 7.0.0)
-    tailwindcss-rails (2.6.1-arm64-darwin)
+    tailwindcss-rails (2.7.6-arm64-darwin)
       railties (>= 7.0.0)
-    tailwindcss-rails (2.6.1-x86_64-darwin)
+    tailwindcss-rails (2.7.6-x86_64-darwin)
       railties (>= 7.0.0)
-    tailwindcss-rails (2.6.1-x86_64-linux)
+    tailwindcss-rails (2.7.6-x86_64-linux)
       railties (>= 7.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.3.1)
+    thor (1.3.2)
     timeout (0.4.1)
-    turbo-rails (2.0.5)
+    turbo-rails (2.0.10)
       actionpack (>= 6.0.0)
-      activejob (>= 6.0.0)
       railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
-    uri (0.13.0)
+    uri (0.13.1)
     useragent (0.16.10)
-    vcr (6.2.0)
+    vcr (6.3.1)
+      base64
     web-console (4.2.1)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
@@ -439,14 +447,14 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.8.1)
-    websocket (1.2.10)
+    webrick (1.8.2)
+    websocket (1.2.11)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.16)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   aarch64-linux
@@ -467,6 +475,7 @@ DEPENDENCIES
   debug
   dotenv-rails
   erb_lint
+  faker
   faraday
   faraday-retry
   good_job
@@ -483,8 +492,9 @@ DEPENDENCIES
   pg (~> 1.5)
   propshaft
   puma (>= 5.0)
-  rails!
+  rails (~> 7.2.1)
   rails-settings-cached
+  redcarpet
   rubocop-rails-omakase
   ruby-lsp-rails
   selenium-webdriver
@@ -501,7 +511,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 3.3.1p55
+   ruby 3.3.4p94
 
 BUNDLED WITH
    2.5.9

Procfile.dev

@@ -1,3 +1,3 @@
-web: bin/rails server -b 0.0.0.0
+web: ${DEBUG:+rdbg -O -n -c --} bin/rails server -b 0.0.0.0
 css: bin/rails tailwindcss:watch
 worker: bundle exec good_job start

README.md

@@ -42,7 +42,7 @@ The instructions below are for developers to get started with contributing to th
 
 ### Requirements
 
-- Ruby 3.3.1
+- Ruby 3.3.4
 - PostgreSQL >9.3 (ideally, latest stable version)
 
 After cloning the repo, the basic setup commands are:

app/assets/stylesheets/application.tailwind.css

@@ -4,30 +4,30 @@
 
 /* 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;
   }
 }
 
 @layer components {
   .form-field {
-    @apply relative rounded-md border bg-white border-alpha-black-100 shadow-xs;
+    @apply flex flex-col gap-1 relative px-3 py-2 rounded-md border bg-white border-alpha-black-100 shadow-xs w-full;
     @apply focus-within:border-gray-900 focus-within:shadow-none focus-within:ring-4 focus-within:ring-gray-100;
   }
 
   .form-field__label {
-    @apply block px-3 pt-2 pb-0 text-xs text-gray-500;
+    @apply block text-xs text-gray-500 peer-disabled:text-gray-400;
   }
 
   .form-field__input {
-    @apply w-full border-none bg-transparent px-3 pt-1 pb-2 text-sm opacity-100;
+    @apply border-none bg-transparent text-sm opacity-100 w-full p-0;
     @apply focus:opacity-100 focus:outline-none focus:ring-0;
     @apply placeholder-shown:opacity-50;
-    @apply disabled:opacity-50;
+    @apply disabled:text-gray-400;
   }
 
   .form-field__radio {
@@ -35,10 +35,10 @@
   }
 
   .form-field__submit {
-    @apply w-full cursor-pointer rounded-lg bg-black p-3 text-center text-white hover:bg-gray-700;
+    @apply 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%);
   }
 
@@ -58,6 +58,23 @@
     background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='111827' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e");
   }
 
+  select[multiple="multiple"] {
+    @apply py-2 pr-2 space-y-0.5;
+  }
+
+  select[multiple="multiple"] option {
+    @apply py-2 rounded-md;
+  }
+
+  select[multiple="multiple"] option:checked {
+    @apply after:content-['\2713'] bg-white after:text-gray-500 after:ml-2;
+  }
+
+  select[multiple="multiple"] option:active,
+  select[multiple="multiple"] option:focus {
+    @apply bg-white;
+  }
+
   .maybe-switch {
     @apply block bg-gray-100 w-9 h-5 rounded-full cursor-pointer;
     @apply after:content-[''] after:block after:absolute after:top-0.5 after:left-0.5 after:bg-white after:w-4 after:h-4 after:rounded-full after:transition-transform after:duration-300 after:ease-in-out;
@@ -77,6 +94,30 @@
       @apply font-bold;
     }
   }
+
+  .tooltip {
+    @apply hidden absolute;
+  }
+
+  .btn {
+    @apply px-3 py-2 rounded-lg text-sm font-medium cursor-pointer;
+  }
+
+  .btn--primary {
+    @apply bg-gray-900 text-white hover:bg-gray-700 disabled:bg-gray-50 disabled:hover:bg-gray-50 disabled:text-gray-400;
+  }
+
+  .btn--secondary {
+    @apply bg-gray-50 hover:bg-gray-100 text-gray-900;
+  }
+
+  .btn--outline {
+    @apply border border-alpha-black-200 text-gray-900 hover:bg-gray-50;
+  }
+
+  .btn--ghost {
+    @apply border border-transparent text-gray-900 hover:bg-gray-50;
+  }
 }
 
 /* Small, single purpose classes that should take precedence over other styles */
@@ -93,4 +134,4 @@
   .scrollbar::-webkit-scrollbar-thumb:hover {
     background: #a6a6a6;
   }
-}
+}

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

@@ -0,0 +1,48 @@
+class Account::EntriesController < ApplicationController
+  layout :with_sidebar
+
+  before_action :set_account
+  before_action :set_entry, only: %i[edit update show destroy]
+
+  def edit
+    render entryable_view_path(:edit)
+  end
+
+  def update
+    @entry.update!(entry_params)
+    @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
+
+  def show
+    render entryable_view_path(:show)
+  end
+
+  def destroy
+    @entry.destroy!
+    @entry.sync_account_later
+    redirect_back_or_to account_url(@entry.account), notice: t(".success")
+  end
+
+  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
+
+    def set_entry
+      @entry = @account.entries.find(params[:id])
+    end
+
+    def entry_params
+      params.require(:account_entry).permit(:name, :date, :amount, :currency)
+    end
+end

app/controllers/account/holdings_controller.rb

@@ -0,0 +1,23 @@
+class Account::HoldingsController < ApplicationController
+  layout :with_sidebar
+
+  before_action :set_account
+  before_action :set_holding, only: :show
+
+  def index
+    @holdings = @account.holdings.current
+  end
+
+  def show
+  end
+
+  private
+
+    def set_account
+      @account = Current.family.accounts.find(params[:account_id])
+    end
+
+    def set_holding
+      @holding = @account.holdings.current.find(params[:id])
+    end
+end

app/controllers/account/trades_controller.rb

@@ -0,0 +1,37 @@
+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::EntryBuilder.new(entry_params)
+
+    if entry = @builder.save
+      entry.sync_account_later
+      redirect_to account_path(@account), notice: t(".success")
+    else
+      flash[:alert] = t(".failure")
+      redirect_back_or_to account_path(@account)
+    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, :amount, :currency, :transfer_account_id)
+            .merge(account: @account)
+    end
+end

app/controllers/account/transaction/rows_controller.rb

@@ -1,22 +0,0 @@
-class Account::Transaction::RowsController < ApplicationController
-  before_action :set_transaction, only: %i[ show update ]
-
-  def show
-  end
-
-  def update
-    @transaction.update! transaction_params
-
-    redirect_to account_transaction_row_path(@transaction.account, @transaction)
-  end
-
-  private
-
-    def transaction_params
-      params.require(:transaction).permit(:category_id)
-    end
-
-    def set_transaction
-      @transaction = Current.family.accounts.find(params[:account_id]).transactions.find(params[:transaction_id])
-    end
-end

app/controllers/account/transaction/rules_controller.rb

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

app/controllers/account/transactions_controller.rb

@@ -1,47 +1,59 @@
 class Account::TransactionsController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
   before_action :set_account
-  before_action :set_transaction, only: %i[ show update destroy ]
+  before_action :set_entry, only: :update
 
   def index
-    @transactions = @account.transactions.ordered
-  end
-
-  def show
+    @pagy, @entries = pagy(
+      @account.entries.account_transactions.reverse_chronological,
+      limit: params[:per_page] || "10"
+    )
   end
 
   def update
-    @transaction.update! transaction_params
-    @transaction.sync_account_later
+    @entry.update!(entry_params)
 
     respond_to do |format|
-      format.html { redirect_back_or_to account_transaction_path(@account, @transaction), notice: t(".success") }
-      format.turbo_stream { render turbo_stream: turbo_stream.replace(@transaction) }
+      format.html { redirect_to account_entry_path(@account, @entry), notice: t(".success") }
+      format.turbo_stream { render turbo_stream: turbo_stream.replace(@entry) }
     end
   end
 
-  def destroy
-    @transaction.destroy!
-    @transaction.sync_account_later
-    redirect_back_or_to account_url(@transaction.account), notice: t(".success")
-  end
-
   private
 
     def set_account
       @account = Current.family.accounts.find(params[:account_id])
     end
 
-    def set_transaction
-      @transaction = @account.transactions.find(params[:id])
+    def set_entry
+      @entry = @account.entries.find(params[:id])
     end
 
-    def search_params
-      params.fetch(:q, {}).permit(:start_date, :end_date, :search, accounts: [], account_ids: [], categories: [], merchants: [])
-    end
+    def entry_params
+      params.require(:account_entry)
+            .permit(
+              :name, :date, :amount, :currency, :entryable_type, :nature,
+              entryable_attributes: [
+                :id,
+                :notes,
+                :excluded,
+                :category_id,
+                :merchant_id,
+                { tag_ids: [] }
+              ]
+            ).tap do |permitted_params|
+              nature = permitted_params.delete(:nature)
 
-    def transaction_params
-      params.require(:account_transaction).permit(:name, :date, :amount, :currency, :notes, :excluded, :category_id, :merchant_id, tag_ids: [])
+              if permitted_params[:amount]
+                amount_value = permitted_params[:amount].to_d
+
+                if nature == "income"
+                  amount_value *= -1
+                end
+
+                permitted_params[:amount] = amount_value
+              end
+            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
 
@@ -18,11 +18,12 @@ class Account::TransfersController < ApplicationController
                                              name: transfer_params[:name]
 
     if @transfer.save
+      @transfer.entries.each(&:sync_account_later)
       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
+      flash[:alert] = @transfer.errors.full_messages.to_sentence
       redirect_to transactions_path
     end
   end
@@ -39,6 +40,6 @@ class Account::TransfersController < ApplicationController
     end
 
     def transfer_params
-      params.require(:account_transfer).permit(:from_account_id, :to_account_id, :amount, :currency, :date, :name)
+      params.require(:account_transfer).permit(:from_account_id, :to_account_id, :amount, :date, :name)
     end
 end

app/controllers/account/valuations_controller.rb

@@ -1,48 +1,26 @@
 class Account::ValuationsController < ApplicationController
+  layout :with_sidebar
+
   before_action :set_account
-  before_action :set_valuation, only: %i[ show edit update destroy ]
 
   def new
-    @valuation = @account.valuations.new
-  end
-
-  def show
+    @entry = @account.entries.account_valuations.new(entryable_attributes: {})
   end
 
   def create
-    @valuation = @account.valuations.build(valuation_params)
+    @entry = @account.entries.account_valuations.new(entry_params.merge(entryable_attributes: {}))
 
-    if @valuation.save
-      @valuation.sync_account_later
-      redirect_to account_path(@account), notice: "Valuation created"
+    if @entry.save
+      @entry.sync_account_later
+      redirect_back_or_to account_valuations_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
+      flash[:alert] = @entry.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")
+  def index
+    @entries = @account.entries.account_valuations.reverse_chronological
   end
 
   private
@@ -51,11 +29,7 @@ class Account::ValuationsController < ApplicationController
       @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)
+    def entry_params
+      params.require(:account_entry).permit(:name, :date, :amount, :currency)
     end
 end

app/controllers/accounts_controller.rb

@@ -1,9 +1,8 @@
 class AccountsController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
   include Filterable
-  before_action :set_account, only: %i[ edit show destroy sync update ]
-  after_action :sync_account, only: :create
+  before_action :set_account, only: %i[edit show destroy sync update]
 
   def index
     @institutions = Current.family.institutions
@@ -20,28 +19,36 @@ class AccountsController < ApplicationController
   end
 
   def list
+    render layout: false
   end
 
   def new
     @account = Account.new(
-      balance: nil,
-      accountable: Accountable.from_type(params[:type])&.new
+      accountable: Accountable.from_type(params[:type])&.new,
+      currency: Current.family.currency
     )
 
+    @account.accountable.address = Address.new if @account.accountable.is_a?(Property)
+
     if params[:institution_id]
       @account.institution = Current.family.institutions.find_by(id: params[:institution_id])
     end
   end
 
   def show
-    @balance_series = @account.series(period: @period)
+    @series = @account.series(period: @period)
+    @trend = @series.trend
   end
 
   def edit
   end
 
   def update
-    @account.update! account_params.except(:accountable_type)
+    Account.transaction do
+      @account.update! account_params.except(:accountable_type, :balance)
+      @account.update_balance!(account_params[:balance]) if account_params[:balance]
+    end
+    @account.sync_later
     redirect_back_or_to account_path(@account), notice: t(".success")
   end
 
@@ -52,7 +59,7 @@ class AccountsController < ApplicationController
                         attributes: account_params.except(:start_date, :start_balance),
                         start_date: account_params[:start_date],
                         start_balance: account_params[:start_balance]
-
+    @account.sync_later
     redirect_back_or_to account_path(@account), notice: t(".success")
   end
 
@@ -65,8 +72,11 @@ class AccountsController < ApplicationController
     unless @account.syncing?
       @account.sync_later
     end
+  end
 
-    redirect_to account_path(@account), notice: t(".success")
+  def sync_all
+    Current.family.accounts.active.sync
+    redirect_back_or_to accounts_path, notice: t(".success")
   end
 
   private
@@ -78,8 +88,4 @@ class AccountsController < ApplicationController
     def account_params
       params.require(:account).permit(:name, :accountable_type, :balance, :start_date, :start_balance, :currency, :subtype, :is_active, :institution_id)
     end
-
-    def sync_account
-      @account.sync_later
-    end
 end

app/controllers/application_controller.rb

@@ -1,9 +1,15 @@
 class ApplicationController < ActionController::Base
-  include Authentication, Invitable, SelfHostable
+  include Localize, AutoSync, Authentication, Invitable, SelfHostable, StoreLocation
   include Pagy::Backend
 
-  default_form_builder ApplicationFormBuilder
-
   # 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,7 +1,7 @@
 class CategoriesController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
-  before_action :set_category, only: %i[ edit update ]
+  before_action :set_category, only: %i[edit update]
   before_action :set_transaction, only: :create
 
   def index

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/category/dropdowns_controller.rb

@@ -6,17 +6,17 @@ class Category::DropdownsController < ApplicationController
   end
 
   private
-  def set_from_params
-    if params[:category_id]
-      @selected_category = categories_scope.find(params[:category_id])
+    def set_from_params
+      if params[:category_id]
+        @selected_category = categories_scope.find(params[:category_id])
+      end
+
+      if params[:transaction_id]
+        @transaction = Current.family.transactions.find(params[:transaction_id])
+      end
     end
 
-    if params[:transaction_id]
-      @transaction = Current.family.transactions.find(params[:transaction_id])
+    def categories_scope
+      Current.family.categories.alphabetically
     end
-  end
-
-  def categories_scope
-    Current.family.categories.alphabetically
-  end
 end

app/controllers/concerns/authentication.rb

@@ -2,39 +2,41 @@ module Authentication
   extend ActiveSupport::Concern
 
   included do
+    before_action :set_request_details
     before_action :authenticate_user!
-    after_action :set_last_login_at, if: -> { Current.user }
   end
 
   class_methods do
     def skip_authentication(**options)
       skip_before_action :authenticate_user!, **options
-      skip_after_action :set_last_login_at, **options
     end
   end
 
   private
-
-  def authenticate_user!
-    if user = User.find_by(id: session[:user_id])
-      Current.user = user
-    else
-      redirect_to new_session_url
+    def authenticate_user!
+      if session_record = Session.find_by_id(cookies.signed[:session_token])
+        Current.session = session_record
+      else
+        if self_hosted_first_login?
+          redirect_to new_registration_url
+        else
+          redirect_to new_session_url
+        end
+      end
     end
-  end
 
-  def login(user)
-    Current.user = user
-    reset_session
-    session[:user_id] = user.id
-  end
+    def create_session_for(user)
+      session = user.sessions.create!
+      cookies.signed.permanent[:session_token] = { value: session.id, httponly: true }
+      session
+    end
 
-  def logout
-    Current.user = nil
-    reset_session
-  end
+    def self_hosted_first_login?
+      Rails.application.config.app_mode.self_hosted? && User.count.zero?
+    end
 
-  def set_last_login_at
-    Current.user.update(last_login_at: DateTime.now)
-  end
+    def set_request_details
+      Current.user_agent = request.user_agent
+      Current.ip_address = request.ip
+    end
 end

app/controllers/concerns/auto_sync.rb

@@ -0,0 +1,13 @@
+module AutoSync
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :sync_family, if: -> { Current.family.present? && Current.family.needs_sync? }
+  end
+
+  private
+
+    def sync_family
+      Current.family.sync
+    end
+end

app/controllers/concerns/filterable.rb

@@ -1,9 +1,9 @@
 module Filterable
-    extend ActiveSupport::Concern
+  extend ActiveSupport::Concern
 
-    included do
-        before_action :set_period
-    end
+  included do
+    before_action :set_period
+  end
 
     private
 

app/controllers/concerns/invitable.rb

@@ -7,6 +7,10 @@ module Invitable
 
   private
     def invite_code_required?
-      ENV["REQUIRE_INVITE_CODE"] == "true"
+      self_hosted? ? Setting.require_invite_for_signup : ENV["REQUIRE_INVITE_CODE"] == "true"
+    end
+
+    def self_hosted?
+      Rails.application.config.app_mode.self_hosted?
     end
 end

app/controllers/concerns/localize.rb

@@ -0,0 +1,13 @@
+module Localize
+  extend ActiveSupport::Concern
+
+  included do
+    around_action :switch_locale
+  end
+
+  private
+    def switch_locale(&action)
+      locale = Current.family.try(:locale) || I18n.default_locale
+      I18n.with_locale(locale, &action)
+    end
+end

app/controllers/concerns/self_hostable.rb

@@ -2,11 +2,15 @@ module SelfHostable
   extend ActiveSupport::Concern
 
   included do
-    helper_method :self_hosted?
+    helper_method :self_hosted?, :self_hosted_first_login?
   end
 
   private
     def self_hosted?
       Rails.configuration.app_mode.self_hosted?
     end
+
+    def self_hosted_first_login?
+      self_hosted? && User.count.zero?
+    end
 end

app/controllers/concerns/store_location.rb

@@ -0,0 +1,31 @@
+module StoreLocation
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :previous_path
+    before_action :store_return_to
+    after_action :clear_previous_path
+  end
+
+  def previous_path
+    session[:return_to] || fallback_path
+  end
+
+private
+
+  def store_return_to
+    if params[:return_to].present?
+      session[:return_to] = params[:return_to]
+    end
+  end
+
+  def clear_previous_path
+    if request.fullpath == session[:return_to]
+      session.delete(:return_to)
+    end
+  end
+
+  def fallback_path
+    root_path
+  end
+end

app/controllers/currencies_controller.rb

@@ -1,6 +1,6 @@
 class CurrenciesController < ApplicationController
   def show
-    @currency = Money::Currency.all_instances.find { |currency| currency.iso_code == params[:id] }
-    render json: { step: @currency.step, placeholder: Money.new(0, @currency).format }
+    currency = Money::Currency.all_instances.find { |currency| currency.iso_code == params[:id] }
+    render json: currency.as_json.merge({ step: currency.step })
   end
 end

app/controllers/help/articles_controller.rb

@@ -0,0 +1,11 @@
+class Help::ArticlesController < ApplicationController
+  layout :with_sidebar
+
+  def show
+    @article = Help::Article.find(params[:id])
+
+    unless @article
+      head :not_found
+    end
+  end
+end

app/controllers/import/cleans_controller.rb

@@ -0,0 +1,22 @@
+class Import::CleansController < ApplicationController
+  layout "imports"
+
+  before_action :set_import
+
+  def show
+    redirect_to import_configuration_path(@import), alert: "Please configure your import before proceeding." unless @import.configured?
+
+    rows = @import.rows.ordered
+
+    if params[:view] == "errors"
+      rows = rows.reject { |row| row.valid? }
+    end
+
+    @pagy, @rows = pagy_array(rows, limit: params[:per_page] || "10")
+  end
+
+  private
+    def set_import
+      @import = Current.family.imports.find(params[:import_id])
+    end
+end

app/controllers/import/configurations_controller.rb

@@ -0,0 +1,25 @@
+class Import::ConfigurationsController < ApplicationController
+  layout "imports"
+
+  before_action :set_import
+
+  def show
+  end
+
+  def update
+    @import.update!(import_params)
+    @import.generate_rows_from_csv
+    @import.reload.sync_mappings
+
+    redirect_to import_clean_path(@import), notice: "Import configured successfully."
+  end
+
+  private
+    def set_import
+      @import = Current.family.imports.find(params[:import_id])
+    end
+
+    def import_params
+      params.require(:import).permit(:date_col_label, :date_format, :name_col_label, :category_col_label, :tags_col_label, :amount_col_label, :signage_convention, :account_col_label, :notes_col_label, :entity_type_col_label)
+    end
+end

app/controllers/import/confirms_controller.rb

@@ -0,0 +1,14 @@
+class Import::ConfirmsController < ApplicationController
+  layout "imports"
+
+  before_action :set_import
+
+  def show
+    redirect_to import_clean_path(@import), alert: "You have invalid data, please edit until all errors are resolved" unless @import.cleaned?
+  end
+
+  private
+    def set_import
+      @import = Current.family.imports.find(params[:import_id])
+    end
+end

app/controllers/import/mappings_controller.rb

@@ -0,0 +1,43 @@
+class Import::MappingsController < ApplicationController
+  before_action :set_import
+
+  def update
+    mapping = @import.mappings.find(params[:id])
+
+    mapping.update! \
+      create_when_empty: create_when_empty,
+      mappable: mappable,
+      value: mapping_params[:value]
+
+    redirect_back_or_to import_confirm_path(@import)
+  end
+
+  private
+    def mapping_params
+      params.require(:import_mapping).permit(:type, :key, :mappable_id, :mappable_type, :value)
+    end
+
+    def set_import
+      @import = Current.family.imports.find(params[:import_id])
+    end
+
+    def mappable
+      return nil unless mappable_class.present?
+
+      @mappable ||= mappable_class.find_by(id: mapping_params[:mappable_id], family: Current.family)
+    end
+
+    def create_when_empty
+      return false unless mapping_class.present?
+
+      mapping_params[:mappable_id] == mapping_class::CREATE_NEW_KEY
+    end
+
+    def mappable_class
+      mapping_params[:mappable_type]&.constantize
+    end
+
+    def mapping_class
+      mapping_params[:type]&.constantize
+    end
+end

app/controllers/import/rows_controller.rb

@@ -0,0 +1,24 @@
+class Import::RowsController < ApplicationController
+  before_action :set_import_row
+
+  def update
+    @row.assign_attributes(row_params)
+    @row.save!(validate: false)
+    @row.sync_mappings
+
+    redirect_to import_row_path(@row.import, @row)
+  end
+
+  def show
+  end
+
+  private
+    def row_params
+      params.require(:import_row).permit(:type, :account, :date, :qty, :ticker, :price, :amount, :currency, :name, :category, :tags, :entity_type, :notes)
+    end
+
+    def set_import_row
+      @import = Current.family.imports.find(params[:import_id])
+      @row = @import.rows.find(params[:id])
+    end
+end

app/controllers/import/uploads_controller.rb

@@ -0,0 +1,47 @@
+class Import::UploadsController < ApplicationController
+  layout "imports"
+
+  before_action :set_import
+
+  def show
+  end
+
+  def update
+    if csv_valid?(csv_str)
+      @import.assign_attributes(raw_file_str: csv_str, col_sep: upload_params[:col_sep])
+      @import.save!(validate: false)
+
+      redirect_to import_configuration_path(@import), notice: "CSV uploaded successfully."
+    else
+      flash.now[:alert] = "Must be valid CSV with headers and at least one row of data"
+
+      render :show, status: :unprocessable_entity
+    end
+  end
+
+  private
+    def set_import
+      @import = Current.family.imports.find(params[:import_id])
+    end
+
+    def csv_str
+      @csv_str ||= upload_params[:csv_file]&.read || upload_params[:raw_file_str]
+    end
+
+    def csv_valid?(str)
+      require "csv"
+
+      begin
+        csv = CSV.parse(str || "", headers: true)
+        return false if csv.headers.empty?
+        return false if csv.count == 0
+        true
+      rescue CSV::MalformedCSVError
+        false
+      end
+    end
+
+    def upload_params
+      params.require(:import).permit(:raw_file_str, :csv_file, :col_sep)
+    end
+end

app/controllers/imports_controller.rb

@@ -1,103 +1,44 @@
-require "ostruct"
-
 class ImportsController < ApplicationController
-  before_action :set_import, except: %i[ index new create ]
+  before_action :set_import, only: %i[show publish destroy]
+
+  def publish
+    @import.publish_later
+
+    redirect_to import_path(@import), notice: "Your import has started in the background."
+  end
 
   def index
     @imports = Current.family.imports
-    render layout: "with_sidebar"
+
+    render layout: with_sidebar
   end
 
   def new
-    account = Current.family.accounts.find_by(id: params[:account_id])
-    @import = Import.new account: account
-  end
-
-  def edit
-  end
-
-  def update
-    account = Current.family.accounts.find(params[:import][:account_id])
-
-    @import.update! account: account
-    redirect_to load_import_path(@import), notice: t(".import_updated")
+    @pending_import = Current.family.imports.ordered.pending.first
   end
 
   def create
-    account = Current.family.accounts.find(params[:import][:account_id])
-    @import = Import.create!(account: account)
+    import = Current.family.imports.create! import_params
 
-    redirect_to load_import_path(@import), notice: t(".import_created")
+    redirect_to import_upload_path(import)
+  end
+
+  def show
+    redirect_to import_confirm_path(@import), alert: "Please finalize your mappings before proceeding." unless @import.publishable?
   end
 
   def destroy
-    @import.destroy!
-    redirect_to imports_url, notice: t(".import_destroyed"), status: :see_other
-  end
+    @import.destroy
 
-  def load
-  end
-
-  def load_csv
-    if @import.update(import_params)
-      redirect_to configure_import_path(@import), notice: t(".import_loaded")
-    else
-      flash.now[:error] = @import.errors.full_messages.to_sentence
-      render :load, status: :unprocessable_entity
-    end
-  end
-
-  def configure
-    unless @import.loaded?
-      redirect_to load_import_path(@import), alert: t(".invalid_csv")
-    end
-  end
-
-  def update_mappings
-    @import.update! import_params(@import.expected_fields.map(&:key))
-    redirect_to clean_import_path(@import), notice: t(".column_mappings_saved")
-  end
-
-  def clean
-    unless @import.loaded?
-      redirect_to load_import_path(@import), alert: t(".invalid_csv")
-    end
-  end
-
-  def update_csv
-    update_params = import_params[:csv_update]
-
-    @import.update_csv! \
-      row_idx: update_params[:row_idx],
-      col_idx: update_params[:col_idx],
-      value: update_params[:value]
-
-    render :clean
-  end
-
-  def confirm
-    unless @import.cleaned?
-      redirect_to clean_import_path(@import), alert: t(".invalid_data")
-    end
-  end
-
-  def publish
-    if @import.valid?
-      @import.publish_later
-      redirect_to imports_path, notice: t(".import_published")
-    else
-      flash.now[:error] = t(".invalid_data")
-      render :confirm, status: :unprocessable_entity
-    end
+    redirect_to imports_path, notice: "Your import has been deleted."
   end
 
   private
-
     def set_import
       @import = Current.family.imports.find(params[:id])
     end
 
-    def import_params(permitted_mappings = nil)
-      params.require(:import).permit(:raw_csv_str, column_mappings: permitted_mappings, csv_update: [ :row_idx, :col_idx, :value ])
+    def import_params
+      params.require(:import).permit(:type)
     end
 end

app/controllers/institutions_controller.rb

@@ -1,5 +1,5 @@
 class InstitutionsController < ApplicationController
-  before_action :set_institution, except: %i[ new create ]
+  before_action :set_institution, except: %i[new create]
 
   def new
     @institution = Institution.new
@@ -23,6 +23,11 @@ class InstitutionsController < ApplicationController
     redirect_to accounts_path, notice: t(".success")
   end
 
+  def sync
+    @institution.sync
+    redirect_back_or_to accounts_path, notice: t(".success")
+  end
+
   private
 
     def institution_params

app/controllers/invite_codes_controller.rb

@@ -0,0 +1,10 @@
+class InviteCodesController < ApplicationController
+  def index
+    @invite_codes = InviteCode.all
+  end
+
+  def create
+    InviteCode.generate!
+    redirect_back_or_to invite_codes_path, notice: "Code generated"
+  end
+end

app/controllers/issue/exchange_rate_provider_missings_controller.rb

@@ -0,0 +1,19 @@
+class Issue::ExchangeRateProviderMissingsController < ApplicationController
+  before_action :set_issue, only: :update
+
+  def update
+    Setting.synth_api_key = exchange_rate_params[:synth_api_key]
+    @issue.issuable.sync_later
+    redirect_back_or_to account_path(@issue.issuable)
+  end
+
+  private
+
+    def set_issue
+      @issue = Current.family.issues.find(params[:id])
+    end
+
+    def exchange_rate_params
+      params.require(:issue_exchange_rate_provider_missing).permit(:synth_api_key)
+    end
+end

app/controllers/issues_controller.rb

@@ -0,0 +1,13 @@
+class IssuesController < ApplicationController
+  before_action :set_issue, only: :show
+
+  def show
+    render template: "#{@issue.class.name.underscore.pluralize}/show", layout: "issues"
+  end
+
+  private
+
+    def set_issue
+      @issue = Current.family.issues.find(params[:id])
+    end
+end

app/controllers/merchants_controller.rb

@@ -1,7 +1,7 @@
 class MerchantsController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
-  before_action :set_merchant, only: %i[ edit update destroy ]
+  before_action :set_merchant, only: %i[edit update destroy]
 
   def index
     @merchants = Current.family.merchants.alphabetically
@@ -31,11 +31,11 @@ class MerchantsController < ApplicationController
 
   private
 
-  def set_merchant
-    @merchant = Current.family.merchants.find(params[:id])
-  end
+    def set_merchant
+      @merchant = Current.family.merchants.find(params[:id])
+    end
 
-  def merchant_params
-    params.require(:merchant).permit(:name, :color)
-  end
+    def merchant_params
+      params.require(:merchant).permit(:name, :color)
+    end
 end

app/controllers/pages_controller.rb

@@ -1,5 +1,5 @@
 class PagesController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
   include Filterable
 
@@ -21,7 +21,7 @@ class PagesController < ApplicationController
 
     @accounts = Current.family.accounts
     @account_groups = @accounts.by_group(period: @period, currency: Current.family.currency)
-    @transactions = Current.family.transactions.limit(6).order(date: :desc)
+    @transaction_entries = Current.family.entries.account_transactions.limit(6).reverse_chronological
 
     # TODO: Placeholders for trendlines
     placeholder_series_data = 10.times.map do |i|
@@ -31,7 +31,7 @@ class PagesController < ApplicationController
   end
 
   def changelog
-    @releases_notes = Provider::Github.new.fetch_latest_releases_notes
+    @release_notes = Provider::Github.new.fetch_latest_release_notes
   end
 
   def feedback

app/controllers/password_resets_controller.rb

@@ -3,7 +3,7 @@ class PasswordResetsController < ApplicationController
 
   layout "auth"
 
-  before_action :set_user_by_token, only: %i[ edit update ]
+  before_action :set_user_by_token, only: %i[edit update]
 
   def new
   end
@@ -33,12 +33,12 @@ class PasswordResetsController < ApplicationController
 
   private
 
-  def set_user_by_token
-    @user = User.find_by_token_for(:password_reset, params[:token])
-    redirect_to new_password_reset_path, alert: t("password_resets.update.invalid_token") unless @user.present?
-  end
+    def set_user_by_token
+      @user = User.find_by_token_for(:password_reset, params[:token])
+      redirect_to new_password_reset_path, alert: t("password_resets.update.invalid_token") unless @user.present?
+    end
 
-  def password_params
-    params.require(:user).permit(:password, :password_confirmation)
-  end
+    def password_params
+      params.require(:user).permit(:password, :password_confirmation)
+    end
 end

app/controllers/passwords_controller.rb

@@ -12,7 +12,7 @@ class PasswordsController < ApplicationController
 
   private
 
-  def password_params
-    params.require(:user).permit(:password, :password_confirmation, :password_challenge).with_defaults(password_challenge: "")
-  end
+    def password_params
+      params.require(:user).permit(:password, :password_confirmation, :password_challenge).with_defaults(password_challenge: "")
+    end
 end

app/controllers/properties_controller.rb

@@ -0,0 +1,41 @@
+class PropertiesController < ApplicationController
+  before_action :set_account, only: :update
+
+  def create
+    account = Current.family
+                     .accounts
+                     .create_with_optional_start_balance! \
+                       attributes: account_params.except(:start_date, :start_balance),
+                       start_date: account_params[:start_date],
+                       start_balance: account_params[:start_balance]
+
+    account.sync_later
+    redirect_to account, notice: t(".success")
+  end
+
+  def update
+    @account.update!(account_params)
+    @account.sync_later
+    redirect_to @account, notice: t(".success")
+  end
+
+  private
+
+    def set_account
+      @account = Current.family.accounts.find(params[:id])
+    end
+
+    def account_params
+      params.require(:account)
+        .permit(
+          :name, :balance, :start_date, :start_balance, :currency, :accountable_type,
+          accountable_attributes: [
+            :id,
+            :year_built,
+            :area_unit,
+            :area_value,
+            address_attributes: [ :line1, :line2, :locality, :region, :country, :postal_code ]
+          ]
+        )
+    end
+end

app/controllers/registrations_controller.rb

@@ -17,7 +17,7 @@ class RegistrationsController < ApplicationController
 
     if @user.save
       Category.create_default_categories(@user.family)
-      login @user
+      @session = create_session_for(@user)
       flash[:notice] = t(".success")
       redirect_to root_path
     else
@@ -28,17 +28,17 @@ class RegistrationsController < ApplicationController
 
   private
 
-  def set_user
-    @user = User.new user_params.except(:invite_code)
-  end
-
-  def user_params
-    params.require(:user).permit(:name, :email, :password, :password_confirmation, :invite_code)
-  end
-
-  def claim_invite_code
-    unless InviteCode.claim! params[:user][:invite_code]
-      redirect_to new_registration_path, alert: t("registrations.create.invalid_invite_code")
+    def set_user
+      @user = User.new user_params.except(:invite_code)
+    end
+
+    def user_params
+      params.require(:user).permit(:name, :email, :password, :password_confirmation, :invite_code)
+    end
+
+    def claim_invite_code
+      unless InviteCode.claim! params[:user][:invite_code]
+        redirect_to new_registration_path, alert: t("registrations.create.invalid_invite_code")
+      end
     end
-  end
 end

app/controllers/sessions_controller.rb

@@ -1,4 +1,5 @@
 class SessionsController < ApplicationController
+  before_action :set_session, only: :destroy
   skip_authentication only: %i[new create]
 
   layout "auth"
@@ -8,7 +9,7 @@ class SessionsController < ApplicationController
 
   def create
     if user = User.authenticate_by(email: params[:email], password: params[:password])
-      login user
+      @session = create_session_for(user)
       redirect_to root_path
     else
       flash.now[:alert] = t(".invalid_credentials")
@@ -17,7 +18,12 @@ class SessionsController < ApplicationController
   end
 
   def destroy
-    logout
+    @session.destroy
     redirect_to root_path, notice: t(".logout_successful")
   end
+
+  private
+    def set_session
+      @session = Current.user.sessions.find(params[:id])
+    end
 end

app/controllers/settings/billings_controller.rb

@@ -1,7 +0,0 @@
-class Settings::BillingsController < SettingsController
-  def edit
-  end
-
-  def update
-  end
-end

app/controllers/settings/hostings_controller.rb

@@ -1,71 +1,43 @@
 class Settings::HostingsController < SettingsController
-  before_action :verify_hosting_mode
+  before_action :raise_if_not_self_hosted
 
   def show
+    @synth_usage = Current.family.synth_usage
   end
 
   def update
-    if all_updates_valid?
-      hosting_params.keys.each do |key|
-        Setting.send("#{key}=", hosting_params[key].strip)
-      end
+    if hosting_params[:upgrades_setting].present?
+      mode = hosting_params[:upgrades_setting] == "manual" ? "manual" : "auto"
+      target = hosting_params[:upgrades_setting] == "commit" ? "commit" : "release"
 
-      redirect_to settings_hosting_path, notice: t(".success")
-    else
-      flash.now[:error] = @errors.first.message
-      render :show, status: :unprocessable_entity
-    end
-  end
-
-  def send_test_email
-    unless Setting.smtp_settings_populated?
-      flash[:error] = t(".missing_smtp_setting_error")
-      render(:show, status: :unprocessable_entity)
-      return
+      Setting.upgrades_mode = mode
+      Setting.upgrades_target = target
     end
 
-    begin
-      NotificationMailer.with(user: Current.user).test_email.deliver_now
-    rescue => _e
-      flash[:error] = t(".error")
-      render :show, status: :unprocessable_entity
-      return
+    if hosting_params.key?(:render_deploy_hook)
+      Setting.render_deploy_hook = hosting_params[:render_deploy_hook]
+    end
+
+    if hosting_params.key?(:require_invite_for_signup)
+      Setting.require_invite_for_signup = hosting_params[:require_invite_for_signup]
+    end
+
+    if hosting_params.key?(:synth_api_key)
+      Setting.synth_api_key = hosting_params[:synth_api_key]
     end
 
     redirect_to settings_hosting_path, notice: t(".success")
+  rescue ActiveRecord::RecordInvalid => error
+    flash.now[:alert] = t(".failure")
+    render :show, status: :unprocessable_entity
   end
 
   private
-    def all_updates_valid?
-      @errors = ActiveModel::Errors.new(Setting)
-      hosting_params.keys.each do |key|
-        setting = Setting.new(var: key)
-        setting.value = hosting_params[key].strip
-
-        unless setting.valid?
-          @errors.merge!(setting.errors)
-        end
-      end
-
-      if hosting_params[:upgrades_mode] == "auto" && hosting_params[:render_deploy_hook].blank?
-        @errors.add(:render_deploy_hook, t("settings.hostings.update.render_deploy_hook_error"))
-      end
-
-      @errors.empty?
-    end
-
     def hosting_params
-      permitted_params = params.require(:setting).permit(:render_deploy_hook, :upgrades_mode, :email_sender, :app_domain, :smtp_host, :smtp_port, :smtp_username, :smtp_password)
-
-      result = {}
-      result[:upgrades_mode] = permitted_params[:upgrades_mode] == "manual" ? "manual" : "auto" if permitted_params.key?(:upgrades_mode)
-      result[:render_deploy_hook] = permitted_params[:render_deploy_hook] if permitted_params.key?(:render_deploy_hook)
-      result[:upgrades_target] = permitted_params[:upgrades_mode] unless permitted_params[:upgrades_mode] == "manual" if permitted_params.key?(:upgrades_mode)
-      result.merge!(permitted_params.slice(:email_sender, :app_domain, :smtp_host, :smtp_port, :smtp_username, :smtp_password))
-      result
+      params.require(:setting).permit(:render_deploy_hook, :upgrades_setting, :require_invite_for_signup, :synth_api_key)
     end
 
-    def verify_hosting_mode
-      head :not_found unless self_hosted?
+    def raise_if_not_self_hosted
+      raise "Settings not available on non-self-hosted instance" unless self_hosted?
     end
 end

app/controllers/settings/notifications_controller.rb

@@ -1,7 +0,0 @@
-class Settings::NotificationsController < SettingsController
-  def edit
-  end
-
-  def update
-  end
-end

app/controllers/settings/preferences_controller.rb

@@ -21,6 +21,6 @@ class Settings::PreferencesController < SettingsController
   private
 
     def preference_params
-      params.require(:user).permit(family_attributes: [ :id, :currency ])
+      params.require(:user).permit(family_attributes: [ :id, :currency, :locale ])
     end
 end

app/controllers/settings/profiles_controller.rb

@@ -17,13 +17,13 @@ class Settings::ProfilesController < SettingsController
     if Current.user.update(user_params_with_family)
       redirect_to settings_profile_path, notice: t(".success")
     else
-      redirect_to settings_profile_path, alert: t(".file_size_error")
+      redirect_to settings_profile_path, alert: Current.user.errors.full_messages.to_sentence
     end
   end
 
   def destroy
     if Current.user.deactivate
-      logout
+      Current.session.destroy
       redirect_to root_path, notice: t(".success")
     else
       redirect_to settings_profile_path, alert: Current.user.errors.full_messages.to_sentence
@@ -31,9 +31,8 @@ class Settings::ProfilesController < SettingsController
   end
 
   private
-
-  def user_params
-    params.require(:user).permit(:first_name, :last_name, :profile_image,
-                                 family_attributes: [ :name, :id ])
-  end
+    def user_params
+      params.require(:user).permit(:first_name, :last_name, :profile_image,
+                                   family_attributes: [ :name, :id ])
+    end
 end

app/controllers/settings/securities_controller.rb

@@ -1,7 +0,0 @@
-class Settings::SecuritiesController < SettingsController
-  def edit
-  end
-
-  def update
-  end
-end

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,7 +1,7 @@
 class TagsController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
-  before_action :set_tag, only: %i[ edit update ]
+  before_action :set_tag, only: %i[edit update]
 
   def index
     @tags = Current.family.tags.alphabetically

app/controllers/transactions_controller.rb

@@ -1,10 +1,10 @@
 class TransactionsController < ApplicationController
-  layout "with_sidebar"
+  layout :with_sidebar
 
   def index
     @q = search_params
-    result = Current.family.transactions.search(@q).ordered
-    @pagy, @transactions = pagy(result, items: params[:per_page] || "10")
+    result = Current.family.entries.account_transactions.search(@q).reverse_chronological
+    @pagy, @transaction_entries = pagy(result, limit: params[:per_page] || "50")
 
     @totals = {
       count: result.select { |t| t.currency == Current.family.currency }.count,
@@ -14,25 +14,29 @@ class TransactionsController < ApplicationController
   end
 
   def new
-    @transaction = Account::Transaction.new.tap do |txn|
+    @entry = Current.family.entries.new(entryable: Account::Transaction.new).tap do |e|
       if params[:account_id]
-        txn.account = Current.family.accounts.find(params[:account_id])
+        e.account = Current.family.accounts.find(params[:account_id])
+        e.currency = e.account.currency
+      else
+        e.currency = Current.family.currency
       end
     end
   end
 
   def create
-    @transaction = Current.family.accounts
-                          .find(params[:transaction][:account_id])
-                          .transactions
-                          .create!(transaction_params.merge(amount: amount))
+    @entry = Current.family
+                    .accounts
+                    .find(params[:account_entry][:account_id])
+                    .entries
+                    .create!(transaction_entry_params.merge(amount: amount))
 
-    @transaction.sync_account_later
-    redirect_back_or_to account_path(@transaction.account), notice: t(".success")
+    @entry.sync_account_later
+    redirect_back_or_to account_path(@entry.account), notice: t(".success")
   end
 
   def bulk_delete
-    destroyed = Current.family.transactions.destroy_by(id: bulk_delete_params[:transaction_ids])
+    destroyed = Current.family.entries.destroy_by(id: bulk_delete_params[:entry_ids])
     redirect_back_or_to transactions_url, notice: t(".success", count: destroyed.count)
   end
 
@@ -40,19 +44,18 @@ class TransactionsController < ApplicationController
   end
 
   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_back_or_to transactions_url, notice: t(".success", count: transactions.count)
-    else
-      flash.now[:error] = t(".failure")
-      render :index, status: :unprocessable_entity
-    end
+    updated = Current.family
+                     .entries
+                     .where(id: bulk_update_params[:entry_ids])
+                     .bulk_update!(bulk_update_params)
+
+    redirect_back_or_to transactions_url, notice: t(".success", count: updated)
   end
 
   def mark_transfers
     Current.family
-           .transactions
-           .where(id: bulk_update_params[:transaction_ids])
+      .entries
+      .where(id: bulk_update_params[:entry_ids])
            .mark_transfers!
 
     redirect_back_or_to transactions_url, notice: t(".success")
@@ -60,8 +63,8 @@ class TransactionsController < ApplicationController
 
   def unmark_transfers
     Current.family
-           .transactions
-           .where(id: bulk_update_params[:transaction_ids])
+      .entries
+      .where(id: bulk_update_params[:entry_ids])
            .update_all marked_as_transfer: false
 
     redirect_back_or_to transactions_url, notice: t(".success")
@@ -71,29 +74,32 @@ class TransactionsController < ApplicationController
 
     def amount
       if nature.income?
-        transaction_params[:amount].to_d * -1
+        transaction_entry_params[:amount].to_d * -1
       else
-        transaction_params[:amount].to_d
+        transaction_entry_params[:amount].to_d
       end
     end
 
     def nature
-      params[:transaction][:nature].to_s.inquiry
+      params[:account_entry][:nature].to_s.inquiry
     end
 
     def bulk_delete_params
-      params.require(:bulk_delete).permit(transaction_ids: [])
+      params.require(:bulk_delete).permit(entry_ids: [])
     end
 
     def bulk_update_params
-      params.require(:bulk_update).permit(:date, :notes, :excluded, :category_id, :merchant_id, transaction_ids: [])
+      params.require(:bulk_update).permit(:date, :notes, :category_id, :merchant_id, entry_ids: [])
     end
 
     def search_params
-      params.fetch(:q, {}).permit(:start_date, :end_date, :search, accounts: [], account_ids: [], categories: [], merchants: [])
+      params.fetch(:q, {})
+            .permit(:start_date, :end_date, :search, :amount, :amount_operator, accounts: [], account_ids: [], categories: [], merchants: [], types: [], tags: [])
     end
 
-    def transaction_params
-      params.require(:transaction).permit(:name, :date, :amount, :currency, :category_id, tag_ids: [])
+    def transaction_entry_params
+      params.require(:account_entry)
+            .permit(:name, :date, :amount, :currency, :entryable_type, entryable_attributes: [ :category_id ])
+            .with_defaults(entryable_type: "Account::Transaction", entryable_attributes: {})
     end
 end

app/controllers/vehicles_controller.rb

@@ -0,0 +1,42 @@
+class VehiclesController < ApplicationController
+  before_action :set_account, only: :update
+
+  def create
+    account = Current.family
+                     .accounts
+                     .create_with_optional_start_balance! \
+                       attributes: account_params.except(:start_date, :start_balance),
+                       start_date: account_params[:start_date],
+                       start_balance: account_params[:start_balance]
+
+    account.sync_later
+    redirect_to account, notice: t(".success")
+  end
+
+  def update
+    @account.update!(account_params)
+    @account.sync_later
+    redirect_to @account, notice: t(".success")
+  end
+
+  private
+
+    def set_account
+      @account = Current.family.accounts.find(params[:id])
+    end
+
+    def account_params
+      params.require(:account)
+        .permit(
+          :name, :balance, :start_date, :start_balance, :currency, :accountable_type,
+          accountable_attributes: [
+            :id,
+            :make,
+            :model,
+            :year,
+            :mileage_value,
+            :mileage_unit
+          ]
+        )
+    end
+end

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

@@ -0,0 +1,61 @@
+module Account::EntriesHelper
+  def permitted_entryable_partial_path(entry, relative_partial_path)
+    "account/entries/entryables/#{permitted_entryable_key(entry)}/#{relative_partial_path}"
+  end
+
+  def unconfirmed_transfer?(entry)
+    entry.marked_as_transfer? && entry.transfer.nil?
+  end
+
+  def transfer_entries(entries)
+    transfers = entries.select { |e| e.transfer_id.present? }
+    transfers.map(&:transfer).uniq
+  end
+
+  def entry_icon(entry, is_oldest: false)
+    if is_oldest
+      "keyboard"
+    elsif entry.trend.direction.up?
+      "arrow-up"
+    elsif entry.trend.direction.down?
+      "arrow-down"
+    else
+      "minus"
+    end
+  end
+
+  def entry_style(entry, is_oldest: false)
+    color = is_oldest ? "#D444F1" : entry.trend.color
+
+    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 || "Transaction"
+    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)
+      permitted_entryable_paths = %w[transaction valuation trade]
+      entry.entryable_name_short.presence_in(permitted_entryable_paths)
+    end
+end

app/helpers/account/transactions_helper.rb

@@ -1,24 +0,0 @@
-module Account::TransactionsHelper
-  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/account/valuations_helper.rb

@@ -1,23 +0,0 @@
-module Account::ValuationsHelper
-  def valuation_icon(valuation)
-    if valuation.oldest?
-      "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.oldest? ? "#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

@@ -23,18 +23,69 @@ module AccountsHelper
     class_mapping(accountable_type)[:hex]
   end
 
+  # Eventually, we'll have an accountable form for each type of accountable, so
+  # this helper is a convenience for now to reuse common logic in the accounts controller
+  def new_account_form_url(account)
+    case account.accountable_type
+    when "Property"
+      properties_path
+    when "Vehicle"
+      vehicles_path
+    else
+      accounts_path
+    end
+  end
+
+  def edit_account_form_url(account)
+    case account.accountable_type
+    when "Property"
+      property_path(account)
+    when "Vehicle"
+      vehicle_path(account)
+    else
+      account_path(account)
+    end
+  end
+
+  def account_tabs(account)
+    overview_tab = { key: "overview", label: t("accounts.show.overview"), path: account_path(account, tab: "overview"), partial_path: "accounts/overview" }
+    holdings_tab = { key: "holdings", label: t("accounts.show.holdings"), path: account_path(account, tab: "holdings"), route: account_holdings_path(account) }
+    cash_tab = { key: "cash", label: t("accounts.show.cash"), path: account_path(account, tab: "cash"), route: account_cashes_path(account) }
+    value_tab        = { key: "valuations", label: t("accounts.show.value"), path: account_path(account, tab: "valuations"), route: account_valuations_path(account) }
+    transactions_tab = { key: "transactions", label: t("accounts.show.transactions"), path: account_path(account, tab: "transactions"), route: account_transactions_path(account) }
+    trades_tab       = { key: "trades", label: t("accounts.show.trades"), path: account_path(account, tab: "trades"), route: account_trades_path(account) }
+
+    return [ overview_tab, value_tab ] if account.property? || account.vehicle?
+    return [ holdings_tab, cash_tab, trades_tab ] if account.investment?
+
+    [ value_tab, transactions_tab ]
+  end
+
+  def selected_account_tab(account)
+    available_tabs = account_tabs(account)
+
+    tab = available_tabs.find { |tab| tab[:key] == params[:tab] }
+
+    tab || available_tabs.first
+  end
+
+  def account_groups(period: nil)
+    assets, liabilities = Current.family.accounts.by_group(currency: Current.family.currency, period: period || Period.last_30_days).values_at(:assets, :liabilities)
+    [ assets.children, liabilities.children ].flatten
+  end
+
   private
 
-  def class_mapping(accountable_type)
-    {
-      "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
+    def class_mapping(accountable_type)
+      {
+        "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

@@ -1,149 +0,0 @@
-class ApplicationFormBuilder < ActionView::Helpers::FormBuilder
-  def initialize(object_name, object, template, options)
-    options[:html] ||= {}
-    options[:html][:class] ||= "space-y-4"
-
-    super(object_name, object, template, options)
-  end
-
-  (field_helpers - [ :label, :check_box, :radio_button, :fields_for, :fields, :hidden_field, :file_field ]).each do |selector|
-    class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-      def #{selector}(method, options = {})
-        default_options = { class: "form-field__input" }
-        merged_options = default_options.merge(options)
-
-        return super(method, merged_options) unless options[:label]
-
-        @template.form_field_tag do
-          label(method, *label_args(options)) +
-          super(method, merged_options.except(:label))
-        end
-      end
-    RUBY_EVAL
-  end
-
-  # 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 && @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
-    money_currency_method = :currency
-
-    readonly_currency = options[:readonly_currency] || false
-
-    currency = money&.currency || Money::Currency.new(Current.family.currency)  || Money.default_currency
-    default_options = {
-      class: "form-field__input",
-      value: money&.amount,
-      "data-money-field-target" => "amount",
-      placeholder: Money.new(0, currency).format,
-      min: -99999999999999,
-      max: 99999999999999,
-      step: currency.step
-    }
-
-    merged_options = default_options.merge(options)
-
-    grouped_options = currency_options_for_select
-    selected_currency = money&.currency&.iso_code || currency.iso_code
-
-    @template.form_field_tag data: { controller: "money-field" } do
-      (label(method, *label_args(options)).to_s if options[:label]) +
-        @template.tag.div(class: "flex items-center") do
-          number_field(money_amount_method, merged_options.except(:label)) +
-            grouped_select(money_currency_method, grouped_options, { selected: selected_currency, disabled: readonly_currency }, class: "ml-auto form-field__input w-fit pr-8", data: { "money-field-target" => "currency", action: "change->money-field#handleCurrencyChange" })
-        end
-    end
-  end
-
-  def radio_button(method, tag_value, options = {})
-    default_options = { class: "form-field__radio" }
-    merged_options = default_options.merge(options)
-    super(method, tag_value, merged_options)
-  end
-
-  def grouped_select(method, grouped_choices, options = {}, html_options = {})
-    default_options = { class: "form-field__input" }
-    merged_html_options = default_options.merge(html_options)
-
-    label_html = label(method, *label_args(options)).to_s if options[:label]
-    select_html = @template.grouped_collection_select(@object_name, method, grouped_choices, :last, :first, :last, :first, options, merged_html_options)
-
-    @template.content_tag(:div, class: "flex items-center") do
-      label_html.to_s.html_safe + select_html
-    end
-  end
-
-  def currency_select(method, options = {}, html_options = {})
-    default_options = { class: "form-field__input" }
-    merged_options = default_options.merge(html_options)
-
-    choices = currency_options_for_select
-
-    return @template.grouped_collection_select(@object_name, method, choices, :last, :first, :last, :first, options, merged_options) unless options[:label]
-
-    @template.form_field_tag do
-      label(method, *label_args(options)) +
-        @template.grouped_collection_select(@object_name, method, choices, :last, :first, :last, :first, options, merged_options.except(:label))
-    end
-  end
-
-  def select(method, choices, options = {}, html_options = {})
-    default_options = { class: "form-field__input" }
-    merged_options = default_options.merge(html_options)
-
-    return super(method, choices, options, merged_options) unless options[:label]
-
-    @template.form_field_tag do
-      label(method, *label_args(options)) +
-        super(method, choices, options, merged_options.except(:label))
-    end
-  end
-
-  def collection_select(method, collection, value_method, text_method, options = {}, html_options = {})
-    default_options = { class: "form-field__input" }
-    merged_options = default_options.merge(html_options)
-
-    return super(method, collection, value_method, text_method, options, merged_options) unless options[:label]
-
-    @template.form_field_tag do
-      label(method, *label_args(options)) +
-        super(method, collection, value_method, text_method, options, merged_options.except(:label))
-    end
-  end
-
-  def submit(value = nil, options = {})
-    value, options = nil, value if value.is_a?(Hash)
-    default_options = { class: "form-field__submit" }
-    merged_options = default_options.merge(options)
-    super(value, merged_options)
-  end
-
-  private
-
-    def currency_options_for_select
-      popular_currencies = Money::Currency.popular.map { |currency| [ currency.iso_code, currency.iso_code ] }
-      all_currencies = Money::Currency.all_instances.map { |currency| [ currency.iso_code, currency.iso_code ] }
-      all_other_currencies = all_currencies.reject { |c| popular_currencies.map(&:last).include?(c.last) }.sort_by(&:last)
-
-      {
-        I18n.t("accounts.new.currency.popular") => popular_currencies,
-        I18n.t("accounts.new.currency.all_others") => all_other_currencies
-      }
-    end
-
-    def label_args(options)
-      case options[:label]
-      when Array
-        options[:label]
-      when String
-        [ options[:label], { class: "form-field__label" } ]
-      when Hash
-        [ nil, options[:label] ]
-      else
-        [ nil, { class: "form-field__label" } ]
-      end
-    end
-end

app/helpers/application_helper.rb

@@ -13,11 +13,22 @@ module ApplicationHelper
     name.underscore
   end
 
-  def notification(text, **options, &block)
-    content = tag.p(text)
-    content = capture &block if block_given?
+  def family_notifications_stream
+    turbo_stream_from [ Current.family, :notifications ] if Current.family
+  end
 
-    render partial: "shared/notification", locals: { type: options[:type], content: { body: content } }
+  def family_stream
+    turbo_stream_from Current.family if Current.family
+  end
+
+  def render_flash_notifications
+    notifications = flash.flat_map do |type, message_or_messages|
+      Array(message_or_messages).map do |message|
+        render partial: "shared/notification", locals: { type: type, message: message }
+      end
+    end
+
+    safe_join(notifications)
   end
 
   ##
@@ -46,9 +57,9 @@ module ApplicationHelper
     render partial: "shared/drawer", locals: { content: content }
   end
 
-  def account_groups(period: nil)
-    assets, liabilities = Current.family.accounts.by_group(currency: Current.family.currency, period: period || Period.last_30_days).values_at(:assets, :liabilities)
-    [ assets.children, liabilities.children ].flatten
+  def disclosure(title, &block)
+    content = capture &block
+    render partial: "shared/disclosure", locals: { title: title, content: content }
   end
 
   def sidebar_link_to(name, path, options = {})
@@ -65,6 +76,20 @@ module ApplicationHelper
     end
   end
 
+  def mixed_hex_styles(hex)
+    color = hex || "#1570EF" # blue-600
+
+    <<-STYLE.strip
+      background-color: color-mix(in srgb, #{color} 5%, white);
+      border-color: color-mix(in srgb, #{color} 10%, white);
+      color: #{color};
+    STYLE
+  end
+
+  def circle_logo(name, hex: nil, size: "md")
+    render partial: "shared/circle_logo", locals: { name: name, hex: hex, size: size }
+  end
+
   def return_to_path(params, fallback = root_path)
     uri = URI.parse(params[:return_to] || fallback)
     uri.relative? ? uri.path : root_path
@@ -113,17 +138,17 @@ module ApplicationHelper
 
   def format_money(number_or_money, options = {})
     money = Money.new(number_or_money)
-    options.reverse_merge!(money.default_format_options)
+    options.reverse_merge!(money.format_options(I18n.locale))
     number_to_currency(money.amount, options)
   end
 
   def format_money_without_symbol(number_or_money, options = {})
     money = Money.new(number_or_money)
-    options.reverse_merge!(money.default_format_options)
+    options.reverse_merge!(money.format_options(I18n.locale))
     ActiveSupport::NumberHelper.number_to_delimited(money.amount.round(options[:precision] || 0), { delimiter: options[:delimiter], separator: options[:separator] })
   end
 
-  def totals_by_currency(collection:, money_method:, separator: " | ", negate: false, options: {})
+  def totals_by_currency(collection:, money_method:, separator: " | ", negate: false)
     collection.group_by(&:currency)
               .transform_values { |item| negate ? item.sum(&money_method) * -1 : item.sum(&money_method) }
               .map { |_currency, money| format_money(money) }

app/helpers/auth_messages_helper.rb

@@ -1,6 +0,0 @@
-module AuthMessagesHelper
-  def auth_messages(form = nil)
-    render "shared/auth_messages", flash: flash,
-      errors: form&.object&.errors&.full_messages || []
-  end
-end

app/helpers/forms_helper.rb

@@ -1,7 +1,13 @@
 module FormsHelper
-  def form_field_tag(options = {}, &block)
-    options[:class] = [ "form-field", options[:class] ].compact.join(" ")
-    tag.div **options, &block
+  def styled_form_with(**options, &block)
+    options[:builder] = StyledFormBuilder
+    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 radio_tab_tag(form:, name:, value:, label:, icon:, checked: false, disabled: false)
@@ -11,6 +17,15 @@ module FormsHelper
     end
   end
 
+  def period_select(form:, selected:, classes: "border border-alpha-black-100 shadow-xs rounded-lg text-sm pr-7 cursor-pointer text-gray-900 focus:outline-none focus:ring-0")
+    periods_for_select = [ [ "7D", "last_7_days" ], [ "1M", "last_30_days" ], [ "1Y", "last_365_days" ], [ "All", "all" ] ]
+    form.select(:period, periods_for_select, { selected: selected }, class: classes, data: { "auto-submit-form-target": "auto" })
+  end
+
+  def currencies_for_select
+    Money::Currency.all_instances.sort_by { |currency| [ currency.priority, currency.name ] }
+  end
+
   private
     def radio_tab_contents(label:, icon:)
       tag.div(class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-gray-400 group-has-[:checked]:bg-white group-has-[:checked]:text-gray-800 group-has-[:checked]:shadow-sm") do

app/helpers/imports_helper.rb

@@ -1,19 +1,63 @@
 module ImportsHelper
-  def table_corner_class(row_idx, col_idx, rows, cols)
-    return "rounded-tl-xl" if row_idx == 0 && col_idx == 0
-    return "rounded-tr-xl" if row_idx == 0 && col_idx == cols.size - 1
-    return "rounded-bl-xl" if row_idx == rows.size - 1 && col_idx == 0
-    return "rounded-br-xl" if row_idx == rows.size - 1 && col_idx == cols.size - 1
-    ""
+  def mapping_label(mapping_class)
+    {
+      "Import::AccountTypeMapping" => "Account Type",
+      "Import::AccountMapping" => "Account",
+      "Import::CategoryMapping" => "Category",
+      "Import::TagMapping" => "Tag"
+    }.fetch(mapping_class.name)
   end
 
-  def nav_steps(import = Import.new)
-    [
-      { name: "Select", complete: import.persisted?, path: import.persisted? ? edit_import_path(import) : new_import_path },
-      { name: "Import", complete: import.loaded?, path: import.persisted? ? load_import_path(import) : nil },
-      { name: "Setup", complete: import.configured?, path: import.persisted? ? configure_import_path(import) : nil },
-      { name: "Clean", complete: import.cleaned?, path: import.persisted? ? clean_import_path(import) : nil },
-      { name: "Confirm", complete: import.complete?, path: import.persisted? ? confirm_import_path(import) : nil }
-    ]
+  def import_col_label(key)
+    {
+      date: "Date",
+      amount: "Amount",
+      name: "Name",
+      currency: "Currency",
+      category: "Category",
+      tags: "Tags",
+      account: "Account",
+      notes: "Notes",
+      qty: "Quantity",
+      ticker: "Ticker",
+      price: "Price",
+      entity_type: "Type"
+    }[key]
   end
+
+  def dry_run_resource(key)
+    map = {
+      transactions: DryRunResource.new(label: "Transactions", icon: "credit-card", text_class: "text-cyan-500", bg_class: "bg-cyan-500/5"),
+      accounts: DryRunResource.new(label: "Accounts", icon: "layers", text_class: "text-orange-500", bg_class: "bg-orange-500/5"),
+      categories: DryRunResource.new(label: "Categories", icon: "shapes", text_class: "text-blue-500", bg_class: "bg-blue-500/5"),
+      tags: DryRunResource.new(label: "Tags", icon: "tags", text_class: "text-violet-500", bg_class: "bg-violet-500/5")
+    }
+
+    map[key]
+  end
+
+  def permitted_import_configuration_path(import)
+    if permitted_import_types.include?(import.type.underscore)
+      "import/configurations/#{import.type.underscore}"
+    else
+      raise "Unknown import type: #{import.type}"
+    end
+  end
+
+  def cell_class(row, field)
+    base = "text-sm focus:ring-gray-900 focus:border-gray-900 w-full max-w-full disabled:text-gray-400"
+
+    row.valid? # populate errors
+
+    border = row.errors.key?(field) ? "border-red-500" : "border-transparent"
+
+    [ base, border ].join(" ")
+  end
+
+  private
+    def permitted_import_types
+      %w[transaction_import trade_import account_import mint_import]
+    end
+
+    DryRunResource = Struct.new(:label, :icon, :text_class, :bg_class, keyword_init: true)
 end

app/helpers/menus_helper.rb

@@ -1,12 +1,12 @@
 module MenusHelper
   def contextual_menu(&block)
-    tag.div class: "relative cursor-pointer", data: { controller: "menu" } do
+    tag.div data: { controller: "menu" } do
       concat contextual_menu_icon
       concat contextual_menu_content(&block)
     end
   end
 
-  def contextual_menu_modal_action_item(label, url, icon: "pencil-line", turbo_frame: nil)
+  def contextual_menu_modal_action_item(label, url, icon: "pencil-line", turbo_frame: :modal)
     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"))
@@ -25,13 +25,14 @@ module MenusHelper
 
   private
     def contextual_menu_icon
-      tag.button class: "flex hover:bg-gray-100 p-2 rounded", data: { menu_target: "button" } do
+      tag.button class: "flex hover:bg-gray-100 p-2 rounded cursor-pointer", data: { menu_target: "button" } do
         lucide_icon "more-horizontal", class: "w-5 h-5 text-gray-500"
       end
     end
 
     def contextual_menu_content(&block)
-      tag.div class: "absolute z-10 top-10 right-0 border border-alpha-black-25 bg-white rounded-lg shadow-xs hidden", data: { menu_target: "content" } do
+      tag.div class: "z-50 border border-alpha-black-25 bg-white rounded-lg shadow-xs hidden",
+               data: { menu_target: "content" } do
         capture(&block)
       end
     end

app/helpers/properties_helper.rb

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

app/helpers/settings_helper.rb

@@ -1,14 +1,46 @@
 module SettingsHelper
-  def next_setting(title, path)
-    render partial: "settings/nav_link_large", locals: { path: path, direction: "next", title: title }
-  end
+  SETTINGS_ORDER = [
+    { name: I18n.t("settings.nav.profile_label"), path: :settings_profile_path },
+    { name: I18n.t("settings.nav.preferences_label"), path: :settings_preferences_path },
+    { name: I18n.t("settings.nav.self_hosting_label"), path: :settings_hosting_path, condition: :self_hosted? },
+    { name: I18n.t("settings.nav.accounts_label"), path: :accounts_path },
+    { name: I18n.t("settings.nav.tags_label"), path: :tags_path },
+    { name: I18n.t("settings.nav.categories_label"), path: :categories_path },
+    { name: I18n.t("settings.nav.merchants_label"), path: :merchants_path },
+    { name: I18n.t("settings.nav.imports_label"), path: :imports_path },
+    { name: I18n.t("settings.nav.whats_new_label"), path: :changelog_path },
+    { name: I18n.t("settings.nav.feedback_label"), path: :feedback_path }
+  ]
 
-  def previous_setting(title, path)
-    render partial: "settings/nav_link_large", locals: { path: path, direction: "previous", title: title }
+  def adjacent_setting(current_path, offset)
+    visible_settings = SETTINGS_ORDER.select { |setting| setting[:condition].nil? || send(setting[:condition]) }
+    current_index = visible_settings.index { |setting| send(setting[:path]) == current_path }
+    return nil unless current_index
+
+    adjacent_index = current_index + offset
+    return nil if adjacent_index < 0 || adjacent_index >= visible_settings.size
+
+    adjacent = visible_settings[adjacent_index]
+
+    render partial: "settings/nav_link_large", locals: {
+      path: send(adjacent[:path]),
+      direction: offset > 0 ? "next" : "previous",
+      title: adjacent[:name]
+    }
   end
 
   def settings_section(title:, subtitle: nil, &block)
     content = capture(&block)
     render partial: "settings/section", locals: { title: title, subtitle: subtitle, content: content }
   end
+
+  def settings_nav_footer
+    previous_setting = adjacent_setting(request.path, -1)
+    next_setting = adjacent_setting(request.path, 1)
+
+    content_tag :div, class: "flex justify-between gap-4" do
+      concat(previous_setting)
+      concat(next_setting)
+    end
+  end
 end

app/helpers/styled_form_builder.rb

@@ -0,0 +1,74 @@
+class StyledFormBuilder < ActionView::Helpers::FormBuilder
+  # Fields that visually inherit from "text field"
+  class_attribute :text_field_helpers, default: field_helpers - [ :label, :check_box, :radio_button, :fields_for, :fields, :hidden_field, :file_field ]
+
+  # Wraps "text" inputs with custom structure + base styles
+  text_field_helpers.each do |selector|
+    class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+      def #{selector}(method, options = {})
+        merged_options = { class: "form-field__input" }.merge(options)
+        label = build_label(method, options)
+        field = super(method, merged_options)
+
+        build_styled_field(label, field, merged_options)
+      end
+    RUBY_EVAL
+  end
+
+  def radio_button(method, tag_value, options = {})
+    merged_options = { class: "form-field__radio" }.merge(options)
+
+    super(method, tag_value, merged_options)
+  end
+
+  def select(method, choices, options = {}, html_options = {})
+    merged_html_options = { class: "form-field__input" }.merge(html_options)
+
+    label = build_label(method, options)
+    field = super(method, choices, options, merged_html_options)
+
+    build_styled_field(label, field, options, remove_padding_right: true)
+  end
+
+  def collection_select(method, collection, value_method, text_method, options = {}, html_options = {})
+    merged_html_options = { class: "form-field__input" }.merge(html_options)
+
+    label = build_label(method, options)
+    field = super(method, collection, value_method, text_method, options, merged_html_options)
+
+    build_styled_field(label, field, options, remove_padding_right: true)
+  end
+
+  def money_field(amount_method, currency_method, options = {})
+    @template.render partial: "shared/money_field", locals: {
+      form: self,
+      amount_method:,
+      currency_method:,
+      **options
+    }
+  end
+
+  def submit(value = nil, options = {})
+    merged_options = { class: "btn btn--primary w-full" }.merge(options)
+    value, options = nil, value if value.is_a?(Hash)
+    super(value, merged_options)
+  end
+
+  private
+
+    def build_styled_field(label, field, options, remove_padding_right: false)
+      if options[:inline]
+        label + field
+      else
+        @template.tag.div class: [ "form-field", options[:container_class], ("pr-0" if remove_padding_right) ] do
+          label + field
+        end
+      end
+    end
+
+    def build_label(method, options)
+      return "".html_safe unless options[:label]
+      return label(method, class: "form-field__label") if options[:label] == true
+      label(method, options[:label], class: "form-field__label")
+    end
+end

app/helpers/transactions_helper.rb

@@ -1,12 +1,13 @@
-module Account::Transaction::SearchesHelper
+module TransactionsHelper
   def transaction_search_filters
     [
-      { key: "account_filter", name: "Account", icon: "layers" },
-      { key: "date_filter", name: "Date", icon: "calendar" },
-      { key: "type_filter", name: "Type", icon: "shapes" },
-      { key: "amount_filter", name: "Amount", icon: "hash" },
-      { key: "category_filter", name: "Category", icon: "tag" },
-      { key: "merchant_filter", name: "Merchant", icon: "store" }
+      { key: "account_filter", icon: "layers" },
+      { key: "date_filter", icon: "calendar" },
+      { key: "type_filter", icon: "tag" },
+      { key: "amount_filter", icon: "hash" },
+      { key: "category_filter", icon: "shapes" },
+      { key: "tag_filter", icon: "tags" },
+      { key: "merchant_filter", icon: "store" }
     ]
   end
 

app/helpers/value_groups_helper.rb

@@ -1,17 +1,13 @@
 module ValueGroupsHelper
   def value_group_pie_data(value_group)
-    value_group.children
-      .map do |child|
-        {
-          label: to_accountable_title(Accountable.from_type(child.name)),
-          percent_of_total: child.percent_of_total.round(1).to_f,
-          value: child.sum.amount.to_f,
-          currency: child.sum.currency.iso_code,
-          bg_color: accountable_bg_class(child.name),
-          fill_color: accountable_fill_class(child.name)
-        }
-      end
-      .filter { |child| child[:value] > 0 }
-      .to_json
+    value_group.children.filter { |c| c.sum > 0 }.map do |child|
+      {
+        label: to_accountable_title(Accountable.from_type(child.name)),
+        percent_of_total: child.percent_of_total.round(1).to_f,
+        formatted_value: format_money(child.sum, precision: 0),
+        bg_color: accountable_bg_class(child.name),
+        fill_color: accountable_fill_class(child.name)
+      }
+    end.to_json
   end
 end

app/helpers/vehicles_helper.rb

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

app/javascript/controllers/bulk_select_controller.js

@@ -25,7 +25,7 @@ export default class extends Controller {
   submitBulkRequest(e) {
     const form = e.target.closest("form");
     const scope = e.params.scope
-    this.#addHiddenFormInputsForSelectedIds(form, `${scope}[transaction_ids][]`, this.selectedIdsValue)
+    this.#addHiddenFormInputsForSelectedIds(form, `${scope}[entry_ids][]`, this.selectedIdsValue)
     form.requestSubmit()
   }
 
@@ -59,6 +59,7 @@ export default class extends Controller {
 
   deselectAll() {
     this.selectedIdsValue = []
+    this.element.querySelectorAll('input[type="checkbox"]').forEach(el => el.checked = false)
   }
 
   selectedIdsValueChanged() {

app/javascript/controllers/clipboard_controller.js

@@ -0,0 +1,28 @@
+import { Controller } from "@hotwired/stimulus"
+
+
+export default class extends Controller {
+  static targets = ["source", "iconDefault", "iconSuccess"]
+
+  copy(event) {
+    event.preventDefault();
+    if (this.sourceTarget && this.sourceTarget.textContent) {
+      navigator.clipboard.writeText(this.sourceTarget.textContent)
+        .then(() => {
+          this.showSuccess();
+        })
+        .catch((error) => {
+          console.error('Failed to copy text: ', error);
+        });
+    }
+  }
+
+  showSuccess() {
+    this.iconDefaultTarget.classList.add('hidden');
+    this.iconSuccessTarget.classList.remove('hidden');
+    setTimeout(() => {
+      this.iconDefaultTarget.classList.remove('hidden');
+      this.iconSuccessTarget.classList.add('hidden');
+    }, 3000);
+  }
+}

app/javascript/controllers/color_avatar_controller.js

@@ -1,32 +1,29 @@
-import {Controller} from "@hotwired/stimulus";
+import { Controller } from "@hotwired/stimulus";
 
-// Connects to data-controller="merchant-avatar"
+// Connects to data-controller="color-avatar"
 // Used by the transaction merchant form to show a preview of what the avatar will look like
 export default class extends Controller {
   static targets = [
     "name",
-    "color",
     "avatar"
   ];
 
   connect() {
     this.nameTarget.addEventListener("input", this.handleNameChange);
-    this.colorTarget.addEventListener("input", this.handleColorChange);
   }
 
   disconnect() {
     this.nameTarget.removeEventListener("input", this.handleNameChange);
-    this.colorTarget.removeEventListener("input", this.handleColorChange);
   }
 
   handleNameChange = (e) => {
     this.avatarTarget.textContent = (e.currentTarget.value?.[0] || "?").toUpperCase();
   }
 
-  handleColorChange = (e) => {
+  handleColorChange(e) {
     const color = e.currentTarget.value;
     this.avatarTarget.style.backgroundColor = `color-mix(in srgb, ${color} 5%, white)`;
     this.avatarTarget.style.borderColor = `color-mix(in srgb, ${color} 10%, white)`;
     this.avatarTarget.style.color = color;
   }
-}
+}

app/javascript/controllers/menu_controller.js

@@ -1,61 +1,57 @@
 import { Controller } from "@hotwired/stimulus";
+import { computePosition, flip, shift, offset, autoUpdate } from '@floating-ui/dom';
 
 /**
  * A "menu" can contain arbitrary content including non-clickable items, links, buttons, and forms.
- *
- * - If you need a form-enabled "select" element, use the "listbox" controller instead.
  */
 export default class extends Controller {
-  static targets = [
-    "button",
-    "content",
-    "submenu",
-    "submenuButton",
-    "submenuContent",
-  ];
+  static targets = ["button", "content"];
 
   static values = {
-    show: { type: Boolean, default: false },
-    showSubmenu: { type: Boolean, default: false },
+    show: Boolean,
+    placement: { type: String, default: "bottom-end" },
+    offset: { type: Number, default: 6 },
   };
 
-  initialize() {
+  connect() {
     this.show = this.showValue;
-    this.showSubmenu = this.showSubmenuValue;
+    this.boundUpdate = this.update.bind(this);
+    this.addEventListeners();
+    this.startAutoUpdate();
   }
 
-  connect() {
+  disconnect() {
+    this.removeEventListeners();
+    this.stopAutoUpdate();
+    this.close();
+  }
+
+  addEventListeners() {
     this.buttonTarget.addEventListener("click", this.toggle);
     this.element.addEventListener("keydown", this.handleKeydown);
     document.addEventListener("click", this.handleOutsideClick);
     document.addEventListener("turbo:load", this.handleTurboLoad);
   }
 
-  disconnect() {
-    this.element.removeEventListener("keydown", this.handleKeydown);
+  removeEventListeners() {
     this.buttonTarget.removeEventListener("click", this.toggle);
+    this.element.removeEventListener("keydown", this.handleKeydown);
     document.removeEventListener("click", this.handleOutsideClick);
     document.removeEventListener("turbo:load", this.handleTurboLoad);
-    this.close();
   }
 
-  // If turbo reloads, we maintain the state of the menu
   handleTurboLoad = () => {
     if (!this.show) this.close();
   };
 
   handleOutsideClick = (event) => {
-    if (this.show && !this.element.contains(event.target)) {
-      this.close();
-    }
+    if (this.show && !this.element.contains(event.target)) this.close();
   };
 
   handleKeydown = (event) => {
-    switch (event.key) {
-      case "Escape":
-        this.close();
-        this.buttonTarget.focus(); // Bring focus back to the button
-        break;
+    if (event.key === "Escape") {
+      this.close();
+      this.buttonTarget.focus();
     }
   };
 
@@ -63,6 +59,7 @@ export default class extends Controller {
     this.show = !this.show;
     this.contentTarget.classList.toggle("hidden", !this.show);
     if (this.show) {
+      this.update();
       this.focusFirstElement();
     }
   };
@@ -73,12 +70,40 @@ export default class extends Controller {
   }
 
   focusFirstElement() {
-    const focusableElements =
-      'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])';
-    const firstFocusableElement =
-      this.contentTarget.querySelectorAll(focusableElements)[0];
+    const focusableElements = 'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])';
+    const firstFocusableElement = this.contentTarget.querySelectorAll(focusableElements)[0];
     if (firstFocusableElement) {
       firstFocusableElement.focus();
     }
   }
+
+  startAutoUpdate() {
+    if (!this._cleanup) {
+      this._cleanup = autoUpdate(this.buttonTarget, this.contentTarget, this.boundUpdate);
+    }
+  }
+
+  stopAutoUpdate() {
+    if (this._cleanup) {
+      this._cleanup();
+      this._cleanup = null;
+    }
+  }
+
+  update() {
+    computePosition(this.buttonTarget, this.contentTarget, {
+      placement: this.placementValue,
+      middleware: [
+        offset(this.offsetValue),
+        flip(),
+        shift({ padding: 5 })
+      ],
+    }).then(({ x, y }) => {
+      Object.assign(this.contentTarget.style, {
+        position: 'fixed',
+        left: `${x}px`,
+        top: `${y}px`,
+      });
+    });
+  }
 }

app/javascript/controllers/money_field_controller.js

@@ -4,17 +4,22 @@ import { CurrenciesService } from "services/currencies_service";
 // Connects to data-controller="money-field"
 // when currency select change, update the input value with the correct placeholder and step
 export default class extends Controller {
-  static targets = ["amount", "currency"];
+  static targets = ["amount", "currency", "symbol"];
 
-  handleCurrencyChange() {
-    const selectedCurrency = event.target.value;
+  handleCurrencyChange(e) {
+    const selectedCurrency = e.target.value;
     this.updateAmount(selectedCurrency);
   }
 
   updateAmount(currency) {
-    (new CurrenciesService).get(currency).then((data) => {
-      this.amountTarget.placeholder = data.placeholder;
-      this.amountTarget.step = data.step;
+    (new CurrenciesService).get(currency).then((currency) => {
+      this.amountTarget.step = currency.step;
+
+      if (isFinite(this.amountTarget.value)) {
+        this.amountTarget.value = parseFloat(this.amountTarget.value).toFixed(currency.default_precision)
+      }
+
+      this.symbolTarget.innerText = currency.symbol;
     });
   }
 }

app/javascript/controllers/pie_chart_controller.js

@@ -5,6 +5,7 @@ import * as d3 from "d3";
 export default class extends Controller {
   static values = {
     data: Array,
+    total: String,
     label: String,
   };
 
@@ -38,7 +39,7 @@ export default class extends Controller {
 
   #draw() {
     this.#d3Container.attr("class", "relative");
-    this.#d3Content.html(this.#contentSummaryTemplate(this.dataValue));
+    this.#d3Content.html(this.#contentSummaryTemplate());
 
     const pie = d3
       .pie()
@@ -75,23 +76,17 @@ export default class extends Controller {
         this.#d3Svg
           .selectAll(".arc path")
           .attr("class", (d) => d.data.fill_color);
-        this.#d3ContentMemo.html(this.#contentSummaryTemplate(this.dataValue));
+        this.#d3ContentMemo.html(this.#contentSummaryTemplate());
       });
   }
 
-  #contentSummaryTemplate(data) {
-    const total = data.reduce((acc, cur) => acc + cur.value, 0);
-    const currency = data[0].currency;
-
-    return `${this.#currencyValue({
-      value: total,
-      currency,
-    })} <span class="text-xs">${this.labelValue}</span>`;
+  #contentSummaryTemplate() {
+    return `<span class="text-xl text-gray-900 font-medium">${this.totalValue}</span> <span class="text-xs">${this.labelValue}</span>`;
   }
 
   #contentDetailTemplate(datum) {
     return `
-      <span>${this.#currencyValue(datum)}</span>
+      <span class="text-xl text-gray-900 font-medium">${datum.formatted_value}</span>
       <div class="flex flex-row text-xs gap-2 items-center">
       <div class="w-[10px] h-[10px] rounded-full ${datum.bg_color}"></div>
         <span>${datum.label}</span>
@@ -100,21 +95,6 @@ export default class extends Controller {
     `;
   }
 
-  #currencyValue(datum) {
-    const formattedValue = Intl.NumberFormat(undefined, {
-      style: "currency",
-      currency: datum.currency,
-      currencyDisplay: "narrowSymbol",
-    }).format(datum.value);
-
-    const firstDigitIndex = formattedValue.search(/\d/);
-    const currencyPrefix = formattedValue.substring(0, firstDigitIndex);
-    const mainPart = formattedValue.substring(firstDigitIndex);
-    const [integerPart, fractionalPart] = mainPart.split(".");
-
-    return `<p class="text-gray-500 -space-x-0.5">${currencyPrefix}<span class="text-xl text-gray-900 font-medium">${integerPart}</span>.${fractionalPart}</p>`;
-  }
-
   get #radius() {
     return Math.min(this.#d3ViewboxWidth, this.#d3ViewboxHeight) / 2;
   }

app/javascript/controllers/select_controller.js

@@ -1,179 +0,0 @@
-import { Controller } from "@hotwired/stimulus";
-
-/**
- * A custom "select" element that follows accessibility patterns of a native select element.
- *
- * - If you need to display arbitrary content including non-clickable items, links, buttons, and forms, use the "popover" controller instead.
- */
-export default class extends Controller {
-  static classes = ["active"];
-  static targets = ["option", "button", "list", "input", "buttonText"];
-  static values = { selected: String };
-
-  initialize() {
-    this.show = false;
-
-    const selectedElement = this.optionTargets.find(
-      (option) => option.dataset.value === this.selectedValue
-    );
-    if (selectedElement) {
-      this.updateAriaAttributesAndClasses(selectedElement);
-      this.syncButtonTextWithInput();
-    }
-  }
-
-  connect() {
-    this.syncButtonTextWithInput();
-    if (this.hasButtonTarget) {
-      this.buttonTarget.addEventListener("click", this.toggleList);
-    }
-    this.element.addEventListener("keydown", this.handleKeydown);
-    document.addEventListener("click", this.handleOutsideClick);
-    this.element.addEventListener("turbo:load", this.handleTurboLoad);
-  }
-
-  disconnect() {
-    this.element.removeEventListener("keydown", this.handleKeydown);
-    document.removeEventListener("click", this.handleOutsideClick);
-    this.element.removeEventListener("turbo:load", this.handleTurboLoad);
-
-    if (this.hasButtonTarget) {
-      this.buttonTarget.removeEventListener("click", this.toggleList);
-    }
-  }
-
-  selectedValueChanged() {
-    this.syncButtonTextWithInput();
-  }
-
-  handleOutsideClick = (event) => {
-    if (this.show && !this.element.contains(event.target)) {
-      this.close();
-    }
-  };
-
-  handleTurboLoad = () => {
-    this.close();
-    this.syncButtonTextWithInput();
-  };
-
-  handleKeydown = (event) => {
-    switch (event.key) {
-      case " ":
-      case "Enter":
-        event.preventDefault(); // Prevent the default action to avoid scrolling
-        if (
-          this.hasButtonTarget &&
-          document.activeElement === this.buttonTarget
-        ) {
-          this.toggleList();
-        } else {
-          this.selectOption(event);
-        }
-        break;
-      case "ArrowDown":
-        event.preventDefault(); // Prevent the default action to avoid scrolling
-        this.focusNextOption();
-        break;
-      case "ArrowUp":
-        event.preventDefault(); // Prevent the default action to avoid scrolling
-        this.focusPreviousOption();
-        break;
-      case "Escape":
-        this.close();
-        if (this.hasButtonTarget) {
-          this.buttonTarget.focus(); // Bring focus back to the button
-        }
-        break;
-      case "Tab":
-        this.close();
-        break;
-    }
-  };
-
-  focusNextOption() {
-    this.focusOptionInDirection(1);
-  }
-
-  focusPreviousOption() {
-    this.focusOptionInDirection(-1);
-  }
-
-  focusOptionInDirection(direction) {
-    const currentFocusedIndex = this.optionTargets.findIndex(
-      (option) => option === document.activeElement
-    );
-    const optionsCount = this.optionTargets.length;
-    const nextIndex =
-      (currentFocusedIndex + direction + optionsCount) % optionsCount;
-    this.optionTargets[nextIndex].focus();
-  }
-
-  toggleList = () => {
-    if (!this.hasButtonTarget) return; // Ensure button target is present before toggling
-
-    this.show = !this.show;
-    this.listTarget.classList.toggle("hidden", !this.show);
-    this.buttonTarget.setAttribute("aria-expanded", this.show.toString());
-
-    if (this.show) {
-      // Focus the first option or the selected option when the list is shown
-      const selectedOption = this.optionTargets.find(
-        (option) => option.getAttribute("aria-selected") === "true"
-      );
-      (selectedOption || this.optionTargets[0]).focus();
-    }
-  };
-
-  close() {
-    if (this.hasButtonTarget) {
-      this.show = false;
-      this.listTarget.classList.add("hidden");
-      this.buttonTarget.setAttribute("aria-expanded", "false");
-    }
-  }
-
-  selectOption(event) {
-    const selectedOption =
-      event.type === "keydown" ? document.activeElement : event.currentTarget;
-    this.updateAriaAttributesAndClasses(selectedOption);
-    if (this.inputTarget.value !== selectedOption.getAttribute("data-value")) {
-      this.updateInputValueAndEmitEvent(selectedOption);
-    }
-    this.close(); // Close the list after selection
-  }
-
-  updateAriaAttributesAndClasses(selectedOption) {
-    this.optionTargets.forEach((option) => {
-      option.setAttribute("aria-selected", "false");
-      option.setAttribute("tabindex", "-1");
-      option.classList.remove(...this.activeClasses);
-    });
-    selectedOption.classList.add(...this.activeClasses);
-    selectedOption.setAttribute("aria-selected", "true");
-    selectedOption.focus();
-  }
-
-  updateInputValueAndEmitEvent(selectedOption) {
-    // Update the hidden input's value
-    const selectedValue = selectedOption.getAttribute("data-value");
-    this.inputTarget.value = selectedValue;
-    this.syncButtonTextWithInput();
-
-    // Emit an input event for auto-submit functionality
-    const inputEvent = new Event("input", {
-      bubbles: true,
-      cancelable: true,
-    });
-    this.inputTarget.dispatchEvent(inputEvent);
-  }
-
-  syncButtonTextWithInput() {
-    const matchingOption = this.optionTargets.find(
-      (option) => option.getAttribute("data-value") === this.inputTarget.value
-    );
-    if (matchingOption && this.hasButtonTextTarget) {
-      this.buttonTextTarget.textContent = matchingOption.textContent.trim();
-    }
-  }
-}

app/javascript/controllers/tooltip_controller.js

@@ -0,0 +1,83 @@
+import { Controller } from '@hotwired/stimulus'
+import {
+  computePosition,
+  flip,
+  shift,
+  offset,
+  autoUpdate
+} from '@floating-ui/dom';
+
+export default class extends Controller {
+  static targets = ["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._cleanup = null;
+    this.boundUpdate = this.update.bind(this);
+    this.startAutoUpdate();
+    this.addEventListeners();
+  }
+
+  disconnect() {
+    this.removeEventListeners();
+    this.stopAutoUpdate();
+  }
+
+  addEventListeners() {
+    this.element.addEventListener("mouseenter", this.show);
+    this.element.addEventListener("mouseleave", this.hide);
+  }
+
+  removeEventListeners() {
+    this.element.removeEventListener("mouseenter", this.show);
+    this.element.removeEventListener("mouseleave", this.hide);
+  }
+
+  show = () => {
+    this.tooltipTarget.style.display = 'block';
+    this.update(); // Ensure immediate update when shown
+  }
+
+  hide = () => {
+    this.tooltipTarget.style.display = 'none';
+  }
+
+  startAutoUpdate() {
+    if (!this._cleanup) {
+      this._cleanup = autoUpdate(
+        this.element,
+        this.tooltipTarget,
+        this.boundUpdate
+      );
+    }
+  }
+
+  stopAutoUpdate() {
+    if (this._cleanup) {
+      this._cleanup();
+      this._cleanup = null;
+    }
+  }
+
+  update() {
+    // Update position even if not visible, to ensure correct positioning when shown
+    computePosition(this.element, this.tooltipTarget, {
+      placement: this.placementValue,
+      middleware: [
+        offset({ mainAxis: this.offsetValue, crossAxis: this.crossAxisValue, alignmentAxis: this.alignmentAxisValue }),
+        flip(),
+        shift({ padding: 5 })
+      ],
+    }).then(({ x, y, placement, middlewareData }) => {
+      Object.assign(this.tooltipTarget.style, {
+        left: `${x}px`,
+        top: `${y}px`,
+      });
+    });
+  }
+}

app/javascript/controllers/trade_form_controller.js

@@ -0,0 +1,64 @@
+import {Controller} from "@hotwired/stimulus"
+
+const TRADE_TYPES = {
+  BUY: "buy",
+  SELL: "sell",
+  TRANSFER_IN: "transfer_in",
+  TRANSFER_OUT: "transfer_out",
+  INTEREST: "interest"
+}
+
+const FIELD_VISIBILITY = {
+  [TRADE_TYPES.BUY]: {ticker: true, qty: true, price: true},
+  [TRADE_TYPES.SELL]: {ticker: true, qty: true, price: true},
+  [TRADE_TYPES.TRANSFER_IN]: {amount: true, transferAccount: true},
+  [TRADE_TYPES.TRANSFER_OUT]: {amount: true, transferAccount: true},
+  [TRADE_TYPES.INTEREST]: {amount: true}
+}
+
+// Connects to data-controller="trade-form"
+export default class extends Controller {
+  static targets = ["typeInput", "tickerInput", "amountInput", "transferAccountInput", "qtyInput", "priceInput"]
+
+  connect() {
+    this.handleTypeChange = this.handleTypeChange.bind(this)
+    this.typeInputTarget.addEventListener("change", this.handleTypeChange)
+    this.updateFields(this.typeInputTarget.value || TRADE_TYPES.BUY)
+  }
+
+  disconnect() {
+    this.typeInputTarget.removeEventListener("change", this.handleTypeChange)
+  }
+
+  handleTypeChange(event) {
+    this.updateFields(event.target.value)
+  }
+
+  updateFields(type) {
+    const visibleFields = FIELD_VISIBILITY[type] || {}
+
+    Object.entries(this.fieldTargets).forEach(([field, target]) => {
+      const isVisible = visibleFields[field] || false
+
+      // Update visibility
+      target.hidden = !isVisible
+
+      // Update required status based on visibility
+      if (isVisible) {
+        target.setAttribute('required', '')
+      } else {
+        target.removeAttribute('required')
+      }
+    })
+  }
+
+  get fieldTargets() {
+    return {
+      ticker: this.tickerInputTarget,
+      amount: this.amountInputTarget,
+      transferAccount: this.transferAccountInputTarget,
+      qty: this.qtyInputTarget,
+      price: this.priceInputTarget
+    }
+  }
+}

app/jobs/account_sync_job.rb

@@ -1,7 +1,7 @@
 class AccountSyncJob < ApplicationJob
   queue_as :default
 
-  def perform(account, start_date = nil)
-    account.sync(start_date)
+  def perform(account, start_date: nil)
+    account.sync(start_date: start_date)
   end
 end

app/mailers/application_mailer.rb

@@ -1,16 +1,3 @@
 class ApplicationMailer < ActionMailer::Base
   layout "mailer"
-
-  after_action :set_self_host_settings, if: -> { Rails.configuration.app_mode.self_hosted? }
-
-  private
-
-  def set_self_host_settings
-    mail.from = Setting.email_sender
-    mail.delivery_method.settings.merge!({ address: Setting.smtp_host,
-                                           port: Setting.smtp_port,
-                                           user_name: Setting.smtp_username,
-                                           password: Setting.smtp_password,
-                                           tls: ENV.fetch("SMTP_TLS_ENABLED", "true") == "true" })
-  end
 end

app/mailers/notification_mailer.rb

@@ -1,5 +0,0 @@
-class NotificationMailer < ApplicationMailer
-  def test_email
-    mail(to: params[:user].email, subject: t(".test_email_subject"), body: t(".test_email_body"))
-  end
-end

app/models/account.rb

@@ -1,21 +1,25 @@
 class Account < ApplicationRecord
-  include Syncable
-  include Monetizable
+  include Syncable, Monetizable, Issuable
 
-  broadcasts_refreshes
-
-  validates :family, presence: true
+  validates :name, :balance, :currency, presence: true
 
   belongs_to :family
   belongs_to :institution, optional: true
+  belongs_to :import, optional: true
+
+  has_many :import_mappings, as: :mappable, dependent: :destroy, class_name: "Import::Mapping"
+  has_many :entries, dependent: :destroy, class_name: "Account::Entry"
+  has_many :transactions, through: :entries, source: :entryable, source_type: "Account::Transaction"
+  has_many :valuations, through: :entries, source: :entryable, source_type: "Account::Valuation"
+  has_many :trades, through: :entries, source: :entryable, source_type: "Account::Trade"
+  has_many :holdings, dependent: :destroy
   has_many :balances, dependent: :destroy
-  has_many :valuations, dependent: :destroy
-  has_many :transactions, dependent: :destroy
-  has_many :imports, dependent: :destroy
+  has_many :syncs, dependent: :destroy
+  has_many :issues, as: :issuable, dependent: :destroy
 
   monetize :balance
 
-  enum :status, { ok: "ok", syncing: "syncing", error: "error" }, validate: true
+  enum :classification, { asset: "asset", liability: "liability" }, validate: { allow_nil: true }
 
   scope :active, -> { where(is_active: true) }
   scope :assets, -> { where(classification: "asset") }
@@ -25,82 +29,86 @@ class Account < ApplicationRecord
 
   delegated_type :accountable, types: Accountable::TYPES, dependent: :destroy
 
-  def balance_on(date)
-    balances.where("date <= ?", date).order(date: :desc).first&.balance
+  accepts_nested_attributes_for :accountable
+
+  delegate :value, :series, to: :accountable
+
+  class << self
+    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|
+        types.each do |type|
+          group = grouped_accounts[classification.to_sym].add_child_group(type, currency)
+          self.where(accountable_type: type).each do |account|
+            group.add_value_node(
+              account,
+              account.balance_money.exchange_to(currency, fallback_rate: 0),
+              account.series(period: period, currency: currency)
+            )
+          end
+        end
+      end
+
+      grouped_accounts
+    end
+
+    def create_with_optional_start_balance!(attributes:, start_date: nil, start_balance: nil)
+      transaction do
+        attributes[:accountable_attributes] ||= {} # Ensure accountable is created
+        account = new(attributes)
+
+        # Always initialize an account with a valuation entry to begin tracking value history
+        account.entries.build \
+          date: Date.current,
+          amount: account.balance,
+          currency: account.currency,
+          entryable: Account::Valuation.new
+
+        if start_date.present? && start_balance.present?
+          account.entries.build \
+            date: start_date,
+            amount: start_balance,
+            currency: account.currency,
+            entryable: Account::Valuation.new
+        end
+
+        account.save!
+        account
+      end
+    end
+  end
+
+  def owns_ticker?(ticker)
+    security_id = Security.find_by(ticker: ticker)&.id
+    entries.account_trades
+           .joins("JOIN account_trades ON account_entries.entryable_id = account_trades.id")
+           .where(account_trades: { security_id: security_id }).any?
   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
-    currencies.count > 1
-  end
+  def update_balance!(balance)
+    valuation = entries.account_valuations.find_by(date: Date.current)
 
-  # e.g. Accounts denominated in currency other than family currency
-  def foreign_currency?
-    currency != family.currency
-  end
-
-  def self.by_provider
-    # TODO: When 3rd party providers are supported, dynamically load all providers and their accounts
-    [ { name: "Manual accounts", accounts: all.order(balance: :desc).group_by(&:accountable_type) } ]
-  end
-
-  def self.some_syncing?
-    exists?(status: "syncing")
-  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
-      converted_balance = balance_money.exchange_to(currency)
-      if converted_balance
-        TimeSeries.new([ { date: Date.current, value: converted_balance } ])
-      else
-        TimeSeries.new([])
-      end
+    if valuation
+      valuation.update! amount: balance
     else
-      TimeSeries.from_collection(balance_series, :balance_money)
+      entries.create! \
+        date: Date.current,
+        amount: balance,
+        currency: currency,
+        entryable: Account::Valuation.new
     end
   end
 
-  def self.by_group(period: Period.all, currency: Money.default_currency)
-    grouped_accounts = { assets: ValueGroup.new("Assets", currency), liabilities: ValueGroup.new("Liabilities", currency) }
-
-    Accountable.by_classification.each do |classification, types|
-      types.each do |type|
-        group = grouped_accounts[classification.to_sym].add_child_group(type, currency)
-        self.where(accountable_type: type).each do |account|
-          value_node = group.add_value_node(
-            account,
-            account.balance_money.exchange_to(currency) || Money.new(0, currency),
-            account.series(period: period, currency: currency)
-          )
-        end
-      end
-    end
-
-    grouped_accounts
-  end
-
-  def self.create_with_optional_start_balance!(attributes:, start_date: nil, start_balance: nil)
-    account = self.new(attributes.except(:accountable_type))
-    account.accountable = Accountable.from_type(attributes[:accountable_type])&.new
-
-    # Always build the initial valuation
-    account.valuations.build(date: Date.current, value: attributes[:balance], currency: account.currency)
-
-    # Conditionally build the optional start valuation
-    if start_date.present? && start_balance.present?
-      account.valuations.build(date: start_date, value: start_balance, currency: account.currency)
-    end
-
-    account.save!
-    account
+  def holding_qty(security, date: Date.current)
+    entries.account_trades
+           .joins("JOIN account_trades ON account_entries.entryable_id = account_trades.id")
+           .where(account_trades: { security_id: security.id })
+           .where("account_entries.date <= ?", date)
+           .sum("account_trades.qty")
   end
 end

app/models/account/balance.rb

@@ -1,8 +1,9 @@
 class Account::Balance < ApplicationRecord
-    include Monetizable
+  include Monetizable
 
-    belongs_to :account
-    validates :account, :date, :balance, presence: true
-    monetize :balance
-    scope :in_period, ->(period) { period.date_range.nil? ? all : where(date: period.date_range) }
+  belongs_to :account
+  validates :account, :date, :balance, presence: true
+  monetize :balance
+  scope :in_period, ->(period) { period.date_range.nil? ? all : where(date: period.date_range) }
+  scope :chronological, -> { order(:date) }
 end

app/models/account/balance/calculator.rb

@@ -1,123 +0,0 @@
-class Account::Balance::Calculator
-    attr_reader :daily_balances, :errors, :warnings
-
-    def initialize(account, options = {})
-      @daily_balances = []
-      @errors = []
-      @warnings = []
-      @account = account
-      @calc_start_date = [ options[:calc_start_date], @account.effective_start_date ].compact.max
-    end
-
-    def calculate
-      prior_balance = implied_start_balance
-
-      calculated_balances = ((@calc_start_date + 1.day)..Date.current).map do |date|
-        valuation = normalized_valuations.find { |v| v["date"] == date }
-
-        if valuation
-          current_balance = valuation["value"]
-        else
-          txn_flows = transaction_flows(date)
-          current_balance = prior_balance - txn_flows
-        end
-
-        prior_balance = current_balance
-
-        { date:, balance: current_balance, currency: @account.currency, updated_at: Time.current }
-      end
-
-      @daily_balances = [
-        { date: @calc_start_date, balance: implied_start_balance, currency: @account.currency, updated_at: Time.current },
-        *calculated_balances
-      ]
-
-      if @account.foreign_currency?
-        converted_balances = convert_balances_to_family_currency
-        @daily_balances.concat(converted_balances)
-      end
-
-      self
-    end
-
-    private
-      def convert_balances_to_family_currency
-        rates = ExchangeRate.get_rates(
-          @account.currency,
-          @account.family.currency,
-          @calc_start_date..Date.current
-        ).to_a
-
-        # Abort conversion if some required rates are missing
-        if rates.length != @daily_balances.length
-          @errors << :sync_message_missing_rates
-          return []
-        end
-
-        @daily_balances.map.with_index do |balance, index|
-          converted_balance = balance[:balance] * rates[index].rate
-          { date: balance[:date], balance: converted_balance, currency: @account.family.currency, updated_at: Time.current }
-        end
-      end
-
-      # For calculation, all transactions and valuations need to be normalized to the same currency (the account's primary currency)
-      def normalize_entries_to_account_currency(entries, value_key)
-        grouped_entries = entries.group_by(&:currency)
-        normalized_entries = []
-
-        grouped_entries.each do |currency, entries|
-          if currency != @account.currency
-            dates = entries.map(&:date).uniq
-            rates = ExchangeRate.get_rates(currency, @account.currency, dates).to_a
-            if rates.length != dates.length
-              @errors << :sync_message_missing_rates
-            else
-              entries.each do |entry|
-                ## There can be several entries on the same date so we cannot rely on indeces
-                rate = rates.find { |rate| rate.date == entry.date }
-                value = entry.send(value_key)
-                value *= rate.rate
-                normalized_entries << entry.attributes.merge(value_key.to_s => value, "currency" => currency)
-              end
-            end
-          else
-            normalized_entries.concat(entries)
-          end
-        end
-
-        normalized_entries
-      end
-
-      def normalized_valuations
-        @normalized_valuations ||= normalize_entries_to_account_currency(@account.valuations.where("date >= ?", @calc_start_date).order(:date).select(:date, :value, :currency), :value)
-      end
-
-      def normalized_transactions
-        @normalized_transactions ||= normalize_entries_to_account_currency(@account.transactions.where("date >= ?", @calc_start_date).order(:date).select(:date, :amount, :currency), :amount)
-      end
-
-      def transaction_flows(date)
-        flows = normalized_transactions.select { |t| t["date"] == date }.sum { |t| t["amount"] }
-        flows *= -1 if @account.classification == "liability"
-        flows
-      end
-
-      def implied_start_balance
-        if @calc_start_date > @account.effective_start_date
-          return @account.balance_on(@calc_start_date)
-        end
-
-        oldest_valuation_date = normalized_valuations.first&.date
-        oldest_transaction_date = normalized_transactions.first&.date
-        oldest_entry_date = [ oldest_valuation_date, oldest_transaction_date ].compact.min
-
-        if oldest_entry_date.present? && oldest_entry_date == oldest_valuation_date
-          oldest_valuation = normalized_valuations.find { |v| v["date"] == oldest_valuation_date }
-          oldest_valuation["value"].to_d
-        else
-          net_transaction_flows = normalized_transactions.sum { |t| t["amount"].to_d }
-          net_transaction_flows *= -1 if @account.classification == "liability"
-          @account.balance.to_d + net_transaction_flows
-        end
-      end
-end