Release v0.1.0

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.example

@@ -1,6 +1,6 @@
 # Custom port config
 # For users who have other applications listening at 3000, this allows them to set a value puma will listen to.
-PORT=
+PORT=3000
 
 # Exchange Rate API
 # This is used to convert between different currencies in the app. We use Synth, which is a Maybe product. You can sign up for a free account at synthfinance.com.
@@ -15,7 +15,7 @@ SMTP_USERNAME=
 SMTP_PASSWORD=
 SMTP_TLS_ENABLED=true
 
-# Email Configuration
+# Address that emails are sent from
 EMAIL_SENDER=
 
 # Database Configuration
@@ -36,8 +36,8 @@ SENTRY_DSN=
 # This is useful for controlling who can sign up for your Maybe instance.
 REQUIRE_INVITE_CODE=false
 
-# Enables self hosting features
-SELF_HOSTING_ENABLED=false
+# Enables self hosting features (should be set to true for most folks)
+SELF_HOSTED=true
 
 # The hosting platform used to deploy the app (e.g. "render")
 # `localhost` (or unset) is used for local development and testing
@@ -86,3 +86,19 @@ GITHUB_REPO_BRANCH=main
 # S3_SECRET_ACCESS_KEY=
 # S3_REGION= # defaults to `us-east-1` if not set
 # S3_BUCKET=
+#
+# Cloudflare R2
+# =============
+# ACTIVE_STORAGE_SERVICE=cloudflare
+# CLOUDFLARE_ACCOUNT_ID=
+# CLOUDFLARE_ACCESS_KEY_ID=
+# CLOUDFLARE_SECRET_ACCESS_KEY=
+# CLOUDFLARE_BUCKET=
+
+# ======================================================================================================
+# Billing Module - responsible for handling billing
+# ======================================================================================================
+#
+STRIPE_PUBLISHABLE_KEY=
+STRIPE_SECRET_KEY=
+STRIPE_WEBHOOK_SECRET=

.github/workflows/ci.yml

@@ -52,9 +52,6 @@ jobs:
       - name: Lint code for consistent style
         run: bin/rubocop -f github
 
-      - name: Lint templates for consistent style
-        run: ./bin/erblint ./app/**/*.erb
-
   test:
     runs-on: ubuntu-latest
     timeout-minutes: 10

.gitignore

@@ -59,3 +59,4 @@ compose-dev.yaml
 gcp-storage-keyfile.json
 
 coverage
+.cursorrules

.rubocop.yml

@@ -1,12 +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/ElseAlignment:
-  Enabled: false
-Layout/EndAlignment:
-  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"
@@ -38,16 +38,20 @@ gem "image_processing", ">= 1.2"
 gem "bcrypt", "~> 3.1"
 gem "faraday"
 gem "faraday-retry"
+gem "faraday-multipart"
 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"
+gem "stripe"
+gem "intercom-rails"
+gem "holidays"
 
 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"

Gemfile.lock

@@ -1,38 +1,36 @@
 GIT
   remote: https://github.com/maybe-finance/lucide-rails.git
-  revision: 79d989593ee4ac6c50106ec5e4d2bd4ec8f5af87
+  revision: 272e5fb8418ea458da3995d6abe0ba0ceee9c9f0
   specs:
     lucide-rails (0.2.0)
       railties (>= 4.1.0)
 
-GIT
-  remote: https://github.com/rails/rails.git
-  revision: 43530b4ac911b8722b8a7ac8025eb9298e1292b4
-  branch: 7-2-stable
+GEM
+  remote: https://rubygems.org/
   specs:
-    actioncable (7.2.0.beta3)
-      actionpack (= 7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
+    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.beta3)
-      actionpack (= 7.2.0.beta3)
-      activejob (= 7.2.0.beta3)
-      activerecord (= 7.2.0.beta3)
-      activestorage (= 7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
+    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.beta3)
-      actionpack (= 7.2.0.beta3)
-      actionview (= 7.2.0.beta3)
-      activejob (= 7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
+    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.beta3)
-      actionview (= 7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
+    actionpack (7.2.1)
+      actionview (= 7.2.1)
+      activesupport (= 7.2.1)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4, < 3.2)
@@ -41,35 +39,35 @@ GIT
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.0.beta3)
-      actionpack (= 7.2.0.beta3)
-      activerecord (= 7.2.0.beta3)
-      activestorage (= 7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
+    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.beta3)
-      activesupport (= 7.2.0.beta3)
+    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.beta3)
-      activesupport (= 7.2.0.beta3)
+    activejob (7.2.1)
+      activesupport (= 7.2.1)
       globalid (>= 0.3.6)
-    activemodel (7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
-    activerecord (7.2.0.beta3)
-      activemodel (= 7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
+    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.beta3)
-      actionpack (= 7.2.0.beta3)
-      activejob (= 7.2.0.beta3)
-      activerecord (= 7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
+    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.beta3)
+    activesupport (7.2.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -80,50 +78,24 @@ GIT
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    rails (7.2.0.beta3)
-      actioncable (= 7.2.0.beta3)
-      actionmailbox (= 7.2.0.beta3)
-      actionmailer (= 7.2.0.beta3)
-      actionpack (= 7.2.0.beta3)
-      actiontext (= 7.2.0.beta3)
-      actionview (= 7.2.0.beta3)
-      activejob (= 7.2.0.beta3)
-      activemodel (= 7.2.0.beta3)
-      activerecord (= 7.2.0.beta3)
-      activestorage (= 7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
-      bundler (>= 1.15.0)
-      railties (= 7.2.0.beta3)
-    railties (7.2.0.beta3)
-      actionpack (= 7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
-      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)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.961.0)
-    aws-sdk-core (3.201.3)
+    aws-partitions (1.985.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.88.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-kms (1.94.0)
+      aws-sdk-core (~> 3, >= 3.207.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.157.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-s3 (1.167.0)
+      aws-sdk-core (~> 3, >= 3.207.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.9.1)
+    aws-sigv4 (1.10.0)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
     bcrypt (3.1.20)
@@ -136,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)
@@ -152,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
@@ -164,9 +136,9 @@ 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.6.0)
@@ -181,10 +153,13 @@ GEM
       tzinfo
     faker (3.4.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.10.1)
-      faraday-net_http (>= 2.0, < 3.2)
+    faraday (2.12.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      json
       logger
-    faraday-net_http (3.1.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (3.3.0)
       net-http
     faraday-retry (2.2.1)
       faraday (~> 2.0)
@@ -194,25 +169,26 @@ GEM
     ffi (1.17.0-x86-linux-gnu)
     ffi (1.17.0-x86_64-darwin)
     ffi (1.17.0-x86_64-linux-gnu)
-    fugit (1.11.0)
+    fugit (1.11.1)
       et-orbi (~> 1, >= 1.2.11)
       raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    good_job (4.1.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)
+    hashdiff (1.1.1)
     highline (3.0.1)
-    hotwire-livereload (1.4.0)
+    holidays (8.8.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)
@@ -227,15 +203,17 @@ GEM
     image_processing (1.13.0)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    importmap-rails (2.0.1)
+    importmap-rails (2.0.2)
       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)
+    intercom-rails (1.0.1)
+      activesupport (> 4.0)
     io-console (0.7.2)
-    irb (1.14.0)
+    irb (1.14.1)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
@@ -249,7 +227,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)
@@ -262,10 +240,11 @@ GEM
     matrix (0.4.2)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    minitest (5.24.1)
+    minitest (5.25.1)
     mocha (2.4.5)
       ruby2_keywords (>= 0.0.5)
     msgpack (1.7.2)
+    multipart-post (2.4.1)
     net-http (0.4.1)
       uri
     net-imap (0.4.14)
@@ -293,22 +272,22 @@ GEM
     octokit (9.1.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    pagy (9.0.5)
+    pagy (9.1.0)
     parallel (1.25.1)
     parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
-    pg (1.5.7)
-    prism (0.30.0)
-    propshaft (0.9.0)
+    pg (1.5.8)
+    prism (1.1.0)
+    propshaft (1.1.0)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
       railties (>= 7.0.0)
     psych (5.1.2)
       stringio
-    public_suffix (5.1.0)
-    puma (6.4.2)
+    public_suffix (6.0.1)
+    puma (6.4.3)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.1)
@@ -320,6 +299,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
@@ -333,21 +326,28 @@ 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.2)
+    rbs (3.6.1)
       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.4)
-      strscan
+    rexml (3.3.8)
     rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -377,13 +377,13 @@ GEM
       rubocop-minitest
       rubocop-performance
       rubocop-rails
-    ruby-lsp (0.17.8)
+    ruby-lsp (0.19.1)
       language_server-protocol (~> 3.17.0)
-      prism (>= 0.29.0, < 0.31)
+      prism (>= 1.1, < 2.0)
       rbs (>= 3, < 4)
       sorbet-runtime (>= 0.5.10782)
-    ruby-lsp-rails (0.3.11)
-      ruby-lsp (>= 0.17.2, < 0.18.0)
+    ruby-lsp-rails (0.3.18)
+      ruby-lsp (>= 0.19.0, < 0.20.0)
     ruby-progressbar (1.13.0)
     ruby-vips (2.2.2)
       ffi (~> 1.12)
@@ -394,16 +394,16 @@ GEM
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     securerandom (0.3.1)
-    selenium-webdriver (4.23.0)
+    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.18.2)
+    sentry-rails (5.20.1)
       railties (>= 5.0)
-      sentry-ruby (~> 5.18.2)
-    sentry-ruby (5.18.2)
+      sentry-ruby (~> 5.20.1)
+    sentry-ruby (5.20.1)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     simplecov (0.22.0)
@@ -413,55 +413,55 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    sorbet-runtime (0.5.11491)
+    sorbet-runtime (0.5.11597)
     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.5)
+    stripe (13.0.0)
+    tailwindcss-rails (2.7.7)
       railties (>= 7.0.0)
-    tailwindcss-rails (2.6.5-aarch64-linux)
+    tailwindcss-rails (2.7.7-aarch64-linux)
       railties (>= 7.0.0)
-    tailwindcss-rails (2.6.5-arm-linux)
+    tailwindcss-rails (2.7.7-arm-linux)
       railties (>= 7.0.0)
-    tailwindcss-rails (2.6.5-arm64-darwin)
+    tailwindcss-rails (2.7.7-arm64-darwin)
       railties (>= 7.0.0)
-    tailwindcss-rails (2.6.5-x86_64-darwin)
+    tailwindcss-rails (2.7.7-x86_64-darwin)
       railties (>= 7.0.0)
-    tailwindcss-rails (2.6.5-x86_64-linux)
+    tailwindcss-rails (2.7.7-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.6)
+    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)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.23.1)
+    webmock (3.24.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.8.1)
+    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.17)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   aarch64-linux
@@ -484,13 +484,16 @@ DEPENDENCIES
   erb_lint
   faker
   faraday
+  faraday-multipart
   faraday-retry
   good_job
+  holidays
   hotwire-livereload
   i18n-tasks
   image_processing (>= 1.2)
   importmap-rails
   inline_svg
+  intercom-rails
   letter_opener
   lucide-rails!
   mocha
@@ -499,7 +502,7 @@ DEPENDENCIES
   pg (~> 1.5)
   propshaft
   puma (>= 5.0)
-  rails!
+  rails (~> 7.2.1)
   rails-settings-cached
   redcarpet
   rubocop-rails-omakase
@@ -510,6 +513,7 @@ DEPENDENCIES
   simplecov
   stackprof
   stimulus-rails
+  stripe
   tailwindcss-rails
   turbo-rails
   tzinfo-data
@@ -518,7 +522,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/images/discord-icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 127.14 96.36"><path fill="#5865f2" d="M107.7,8.07A105.15,105.15,0,0,0,81.47,0a72.06,72.06,0,0,0-3.36,6.83A97.68,97.68,0,0,0,49,6.83,72.37,72.37,0,0,0,45.64,0,105.89,105.89,0,0,0,19.39,8.09C2.79,32.65-1.71,56.6.54,80.21h0A105.73,105.73,0,0,0,32.71,96.36,77.7,77.7,0,0,0,39.6,85.25a68.42,68.42,0,0,1-10.85-5.18c.91-.66,1.8-1.34,2.66-2a75.57,75.57,0,0,0,64.32,0c.87.71,1.76,1.39,2.66,2a68.68,68.68,0,0,1-10.87,5.19,77,77,0,0,0,6.89,11.1A105.25,105.25,0,0,0,126.6,80.22h0C129.24,52.84,122.09,29.11,107.7,8.07ZM42.45,65.69C36.18,65.69,31,60,31,53s5-12.74,11.43-12.74S54,46,53.89,53,48.84,65.69,42.45,65.69Zm42.24,0C78.41,65.69,73.25,60,73.25,53s5-12.74,11.44-12.74S96.23,46,96.12,53,91.08,65.69,84.69,65.69Z"/></svg>

app/assets/images/github-icon.svg

@@ -0,0 +1 @@
+<svg width="98" height="96" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z" fill="#24292f"/></svg>

app/assets/images/logo-squircle.svg

@@ -0,0 +1,160 @@
+<svg width="70" height="70" viewBox="0 0 70 70" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_iii_4725_68011)">
+<path d="M1.66199 28.3573C3.33915 4.37286 8.83917 -0.408237 32.8236 1.26892L41.868 1.90136C65.8524 3.57851 70.6335 9.07854 68.9563 33.063L68.3239 42.1073C66.6467 66.0917 61.1467 70.8728 37.1623 69.1957L28.1179 68.5632C4.13349 66.8861 -0.647606 61.3861 1.02955 37.4016L1.66199 28.3573Z" fill="url(#paint0_linear_4725_68011)"/>
+<path d="M1.66199 28.3573C3.33915 4.37286 8.83917 -0.408237 32.8236 1.26892L41.868 1.90136C65.8524 3.57851 70.6335 9.07854 68.9563 33.063L68.3239 42.1073C66.6467 66.0917 61.1467 70.8728 37.1623 69.1957L28.1179 68.5632C4.13349 66.8861 -0.647606 61.3861 1.02955 37.4016L1.66199 28.3573Z" fill="black" fill-opacity="0.7"/>
+</g>
+<path d="M2.82179 28.4384C3.23922 22.4687 3.89051 17.7733 4.98031 14.1012C6.06625 10.4421 7.56711 7.86966 9.64032 6.06745C11.7135 4.26524 14.4698 3.13701 18.2445 2.57088C22.0324 2.00274 26.7729 2.01127 32.7425 2.42871L41.7868 3.06115C47.7565 3.47859 52.452 4.12988 56.124 5.21968C59.7831 6.30562 62.3556 7.80648 64.1578 9.87969C65.96 11.9529 67.0882 14.7092 67.6544 18.4838C68.2225 22.2718 68.214 27.0122 67.7965 32.9819L67.1641 42.0262C66.7466 47.9959 66.0953 52.6913 65.0056 56.3634C63.9196 60.0225 62.4188 62.5949 60.3455 64.3971C58.2723 66.1994 55.516 67.3276 51.7414 67.8937C47.9534 68.4619 43.213 68.4533 37.2434 68.0359L28.199 67.4034C22.2294 66.986 17.5339 66.3347 13.8619 65.2449C10.2028 64.159 7.6303 62.6581 5.82808 60.5849C4.02587 58.5117 2.89764 55.7554 2.33151 51.9808C1.76337 48.1928 1.77191 43.4524 2.18934 37.4827L2.82179 28.4384Z" stroke="white" stroke-width="2.32525"/>
+<path d="M2.82179 28.4384C3.23922 22.4687 3.89051 17.7733 4.98031 14.1012C6.06625 10.4421 7.56711 7.86966 9.64032 6.06745C11.7135 4.26524 14.4698 3.13701 18.2445 2.57088C22.0324 2.00274 26.7729 2.01127 32.7425 2.42871L41.7868 3.06115C47.7565 3.47859 52.452 4.12988 56.124 5.21968C59.7831 6.30562 62.3556 7.80648 64.1578 9.87969C65.96 11.9529 67.0882 14.7092 67.6544 18.4838C68.2225 22.2718 68.214 27.0122 67.7965 32.9819L67.1641 42.0262C66.7466 47.9959 66.0953 52.6913 65.0056 56.3634C63.9196 60.0225 62.4188 62.5949 60.3455 64.3971C58.2723 66.1994 55.516 67.3276 51.7414 67.8937C47.9534 68.4619 43.213 68.4533 37.2434 68.0359L28.199 67.4034C22.2294 66.986 17.5339 66.3347 13.8619 65.2449C10.2028 64.159 7.6303 62.6581 5.82808 60.5849C4.02587 58.5117 2.89764 55.7554 2.33151 51.9808C1.76337 48.1928 1.77191 43.4524 2.18934 37.4827L2.82179 28.4384Z" stroke="url(#paint1_linear_4725_68011)" stroke-width="2.32525"/>
+<path d="M3.66933 28.4976C4.08541 22.5474 4.73164 17.9253 5.79481 14.343C6.85131 10.7831 8.28392 8.3723 10.1977 6.70866C12.1115 5.04503 14.6982 3.96188 18.3705 3.4111C22.0659 2.85684 26.7329 2.86017 32.6832 3.27625L41.7276 3.9087C47.6779 4.32478 52.2999 4.97101 55.8823 6.03418C59.4422 7.09068 61.8529 8.52329 63.5166 10.4371C65.1802 12.3509 66.2634 14.9376 66.8141 18.6098C67.3684 22.3053 67.3651 26.9723 66.949 32.9226L66.3165 41.967C65.9005 47.9172 65.2542 52.5393 64.1911 56.1216C63.1345 59.6815 61.7019 62.0923 59.7882 63.7559C57.8744 65.4196 55.2877 66.5027 51.6154 67.0535C47.92 67.6078 43.2529 67.6044 37.3026 67.1883L28.2583 66.5559C22.308 66.1398 17.6859 65.4936 14.1036 64.4304C10.5437 63.3739 8.13293 61.9413 6.4693 60.0275C4.80566 58.1137 3.72251 55.527 3.17173 51.8548C2.61747 48.1593 2.6208 43.4923 3.03688 37.542L3.66933 28.4976Z" stroke="url(#paint2_linear_4725_68011)" stroke-opacity="0.05" stroke-width="4.02448"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.20106 14.4635C5.15118 18.0011 4.50747 22.5866 4.09206 28.5272L3.45962 37.5716C3.04421 43.5122 3.04348 48.1426 3.59081 51.7919C4.13394 55.4131 5.1946 57.9152 6.78912 59.7495C8.38363 61.5838 10.7138 62.9824 14.2242 64.0242C17.7617 65.0741 22.3472 65.7178 28.2878 66.1332L37.3322 66.7656C43.2728 67.181 47.9033 67.1818 51.5525 66.6344C55.1738 66.0913 57.6759 65.0306 59.5101 63.4361C61.3444 61.8416 62.743 59.5115 63.7848 56.0011C64.8347 52.4635 65.4784 47.878 65.8938 41.9374L66.5262 32.893C66.9417 26.9524 66.9424 22.322 66.3951 18.6727C65.8519 15.0515 64.7913 12.5494 63.1968 10.7151C61.6022 8.88082 59.2721 7.48225 55.7617 6.44043C52.2241 5.39055 47.6387 4.74684 41.698 4.33143L32.6537 3.69899C26.713 3.28358 22.0826 3.28284 18.4333 3.83018C14.8121 4.3733 12.31 5.43397 10.4757 7.02849C8.64145 8.623 7.24288 10.9531 6.20106 14.4635ZM32.8236 1.26892C8.83917 -0.408237 3.33915 4.37286 1.66199 28.3573L1.02955 37.4016C-0.647606 61.3861 4.13349 66.8861 28.1179 68.5632L37.1623 69.1957C61.1467 70.8728 66.6467 66.0917 68.3239 42.1073L68.9563 33.063C70.6335 9.07854 65.8524 3.57851 41.868 1.90136L32.8236 1.26892Z" fill="url(#paint3_linear_4725_68011)"/>
+<g filter="url(#filter1_ddii_4725_68011)">
+<path d="M20.8165 43.8927L14.5692 43.4559C13.0888 43.3523 11.8006 44.5292 11.6919 46.0845C11.5831 47.6398 12.695 48.9845 14.1753 49.088L20.4227 49.5248C21.903 49.6284 23.1912 48.4515 23.3 46.8962C23.4087 45.3409 22.2968 43.9962 20.8165 43.8927Z" fill="#F23E94"/>
+<path d="M14.5574 43.6244L20.8047 44.0612C22.1842 44.1577 23.2343 45.4143 23.1315 46.8844C23.0287 48.3546 21.814 49.4528 20.4344 49.3564L14.1871 48.9195C12.8076 48.823 11.7576 47.5664 11.8604 46.0963C11.9632 44.6261 13.1779 43.5279 14.5574 43.6244Z" stroke="url(#paint4_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+<path d="M48.3652 51.4775L54.6125 51.9144C56.0928 52.0179 57.381 50.841 57.4898 49.2857C57.5985 47.7305 56.4866 46.3858 55.0063 46.2823L48.759 45.8454C47.2787 45.7419 45.9905 46.9188 45.8817 48.474C45.7729 50.0293 46.8848 51.374 48.3652 51.4775Z" fill="#F23E94"/>
+<path d="M54.6243 51.7459L48.3769 51.309C46.9974 51.2126 45.9474 49.956 46.0502 48.4858C46.153 47.0157 47.3677 45.9174 48.7472 46.0139L54.9945 46.4508C56.3741 46.5472 57.4241 47.8038 57.3213 49.274C57.2185 50.7441 56.0038 51.8423 54.6243 51.7459Z" stroke="url(#paint5_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+<path d="M37.3154 45.0271L32.2298 44.6714C30.7495 44.5679 29.4613 45.7448 29.3525 47.3001C29.2438 48.8553 30.3556 50.2001 31.836 50.3036L36.9215 50.6592C38.4019 50.7627 39.6901 49.5858 39.7988 48.0306C39.9076 46.4753 38.7957 45.1306 37.3154 45.0271Z" fill="#F23E94"/>
+<path d="M32.218 44.8399L37.3036 45.1956C38.6831 45.292 39.7331 46.5486 39.6303 48.0188C39.5275 49.4889 38.3128 50.5872 36.9333 50.4907L31.8478 50.1351C30.4682 50.0386 29.4182 48.782 29.521 47.3119C29.6238 45.8417 30.8385 44.7435 32.218 44.8399Z" stroke="url(#paint6_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+<path d="M46.5039 43.2046L52.5198 43.6253C54.0001 43.7288 55.2884 42.5519 55.3971 40.9967C55.5059 39.4414 54.394 38.0967 52.9136 37.9932L46.8977 37.5725C45.4174 37.469 44.1292 38.6459 44.0204 40.2011C43.9116 41.7564 45.0235 43.1011 46.5039 43.2046Z" fill="#6927DA"/>
+<path d="M52.5316 43.4568L46.5156 43.0361C45.1361 42.9397 44.0861 41.6831 44.1889 40.2129C44.2917 38.7428 45.5064 37.6445 46.8859 37.741L52.9019 38.1617C54.2814 38.2582 55.3314 39.5148 55.2286 40.9849C55.1258 42.455 53.9111 43.5533 52.5316 43.4568Z" stroke="url(#paint7_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+<path d="M23.7094 35.95L17.6934 35.5293C16.2131 35.4258 14.9249 36.6027 14.8161 38.158C14.7074 39.7133 15.8193 41.058 17.2996 41.1615L23.3155 41.5822C24.7959 41.6857 26.0841 40.5088 26.1928 38.9535C26.3016 37.3983 25.1897 36.0535 23.7094 35.95Z" fill="#6927DA"/>
+<path d="M17.6817 35.6978L23.6976 36.1185C25.0771 36.215 26.1272 37.4716 26.0244 38.9417C25.9215 40.4119 24.7069 41.5101 23.3273 41.4137L17.3114 40.993C15.9319 40.8965 14.8818 39.6399 14.9846 38.1698C15.0874 36.6996 16.3021 35.6014 17.6817 35.6978Z" stroke="url(#paint8_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+<path d="M39.8134 37.0582L30.8613 36.4322C29.381 36.3287 28.0927 37.5055 27.984 39.0608C27.8752 40.6161 28.9871 41.9608 30.4675 42.0643L39.4195 42.6903C40.8999 42.7938 42.1881 41.6169 42.2968 40.0617C42.4056 38.5064 41.2937 37.1617 39.8134 37.0582Z" fill="#6927DA"/>
+<path d="M30.8495 36.6007L39.8016 37.2267C41.1811 37.3231 42.2311 38.5797 42.1283 40.0499C42.0255 41.52 40.8108 42.6183 39.4313 42.5218L30.4792 41.8958C29.0997 41.7994 28.0497 40.5428 28.1525 39.0726C28.2553 37.6025 29.47 36.5042 30.8495 36.6007Z" stroke="url(#paint9_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+<path d="M32.3636 28.1666L20.9406 27.3679C19.4603 27.2643 18.1721 28.4412 18.0633 29.9965C17.9546 31.5518 19.0665 32.8965 20.5468 33L31.9698 33.7988C33.4501 33.9023 34.7383 32.7254 34.8471 31.1701C34.9558 29.6148 33.8439 28.2701 32.3636 28.1666Z" fill="#1570EF"/>
+<path d="M20.9289 27.5363L32.3518 28.3351C33.7314 28.4316 34.7814 29.6882 34.6786 31.1583C34.5758 32.6285 33.3611 33.7267 31.9816 33.6303L20.5586 32.8315C19.179 32.735 18.129 31.4784 18.2318 30.0083C18.3346 28.5381 19.5493 27.4399 20.9289 27.5363Z" stroke="url(#paint10_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+<path d="M39.7417 34.3403L50.4352 35.0881C51.9156 35.1916 53.2038 34.0147 53.3125 32.4594C53.4213 30.9042 52.3094 29.5595 50.8291 29.456L40.1356 28.7082C38.6552 28.6047 37.367 29.7816 37.2583 31.3368C37.1495 32.8921 38.2614 34.2368 39.7417 34.3403Z" fill="#1570EF"/>
+<path d="M50.447 34.9196L39.7535 34.1718C38.374 34.0754 37.324 32.8188 37.4268 31.3486C37.5296 29.8785 38.7442 28.7802 40.1238 28.8767L50.8173 29.6245C52.1968 29.7209 53.2468 30.9775 53.144 32.4477C53.0412 33.9178 51.8265 35.0161 50.447 34.9196Z" stroke="url(#paint11_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+<path d="M48.8251 21.1728L42.7957 20.7512C41.3154 20.6476 40.0272 21.8245 39.9184 23.3798C39.8097 24.9351 40.9216 26.2798 42.4019 26.3833L48.4312 26.8049C49.9116 26.9084 51.1998 25.7315 51.3085 24.1763C51.4173 22.621 50.3054 21.2763 48.8251 21.1728Z" fill="#22CCEE"/>
+<path d="M42.784 20.9196L48.8133 21.3413C50.1928 21.4377 51.2428 22.6943 51.14 24.1645C51.0372 25.6346 49.8226 26.7329 48.443 26.6364L42.4137 26.2148C41.0342 26.1183 39.9841 24.8617 40.0869 23.3916C40.1897 21.9214 41.4044 20.8232 42.784 20.9196Z" stroke="url(#paint12_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+<path d="M30.0984 19.8627L24.0691 19.4411C22.5887 19.3376 21.3005 20.5145 21.1918 22.0697C21.083 23.625 22.1949 24.9697 23.6752 25.0732L29.7046 25.4948C31.1849 25.5983 32.4731 24.4215 32.5819 22.8662C32.6906 21.3109 31.5787 19.9662 30.0984 19.8627Z" fill="#22CCEE"/>
+<path d="M24.0573 19.6096L30.0866 20.0312C31.4661 20.1277 32.5162 21.3843 32.4134 22.8544C32.3106 24.3246 31.0959 25.4228 29.7163 25.3263L23.687 24.9047C22.3075 24.8083 21.2574 23.5517 21.3603 22.0815C21.4631 20.6114 22.6777 19.5131 24.0573 19.6096Z" stroke="url(#paint13_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+</g>
+<g opacity="0.23" filter="url(#filter2_f_4725_68011)">
+<path d="M2.69258 40.4874L12.7122 44.9449L39.098 57.1213L66.9412 61.8859L45.5294 72.5984L-0.202764 68.4613L2.69258 40.4874Z" fill="#F24396"/>
+</g>
+<g opacity="0.23" filter="url(#filter3_f_4725_68011)">
+<path d="M2.56821 1.97031L52.6272 -2.04293L69.5358 11.3492L56.9932 16.1074L23.2807 14.6892L2.56821 1.97031Z" fill="#22CCEE"/>
+</g>
+<defs>
+<filter id="filter0_iii_4725_68011" x="0.72644" y="-2.61149" width="68.533" height="75.6876" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1.27762"/>
+<feGaussianBlur stdDeviation="1.59703"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.196078 0 0 0 0 0.188235 0 0 0 0 0.219608 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_4725_68011"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="3.57731"/>
+<feGaussianBlur stdDeviation="2.68298"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.321569 0 0 0 0 0.905882 0 0 0 0 1 0 0 0 0.6 0"/>
+<feBlend mode="normal" in2="effect1_innerShadow_4725_68011" result="effect2_innerShadow_4725_68011"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-3.57731"/>
+<feGaussianBlur stdDeviation="1.78866"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.933333 0 0 0 0 0.160784 0 0 0 0 0.509804 0 0 0 0.5 0"/>
+<feBlend mode="normal" in2="effect2_innerShadow_4725_68011" result="effect3_innerShadow_4725_68011"/>
+</filter>
+<filter id="filter1_ddii_4725_68011" x="1.54998" y="10.9893" width="66.0817" height="52.755" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1.6891"/>
+<feGaussianBlur stdDeviation="5.0673"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.29135 0 0 0 0 0.0895476 0 0 0 0 0.654593 0 0 0 1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4725_68011"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1.6891"/>
+<feGaussianBlur stdDeviation="4.22275"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_4725_68011" result="effect2_dropShadow_4725_68011"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_4725_68011" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-1.6891"/>
+<feGaussianBlur stdDeviation="0.844549"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
+<feBlend mode="normal" in2="shape" result="effect3_innerShadow_4725_68011"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1.6891"/>
+<feGaussianBlur stdDeviation="0.844549"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.05 0"/>
+<feBlend mode="normal" in2="effect3_innerShadow_4725_68011" result="effect4_innerShadow_4725_68011"/>
+</filter>
+<filter id="filter2_f_4725_68011" x="-23.4553" y="17.2348" width="113.649" height="78.6161" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="11.6263" result="effect1_foregroundBlur_4725_68011"/>
+</filter>
+<filter id="filter3_f_4725_68011" x="-20.6843" y="-25.2955" width="113.473" height="64.6555" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="11.6263" result="effect1_foregroundBlur_4725_68011"/>
+</filter>
+<linearGradient id="paint0_linear_4725_68011" x1="53.7772" y1="8.36942" x2="38.7315" y2="35.4937" gradientUnits="userSpaceOnUse">
+<stop stop-color="#363636"/>
+<stop offset="1" stop-color="#141414"/>
+</linearGradient>
+<linearGradient id="paint1_linear_4725_68011" x1="37.3458" y1="1.58514" x2="32.6401" y2="68.8795" gradientUnits="userSpaceOnUse">
+<stop stop-color="#52EDFF"/>
+<stop offset="0.274483" stop-color="#4361EE"/>
+<stop offset="0.629793" stop-color="#7209B7"/>
+<stop offset="1" stop-color="#F12980"/>
+</linearGradient>
+<linearGradient id="paint2_linear_4725_68011" x1="37.019" y1="6.25836" x2="33.4897" y2="56.7291" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint3_linear_4725_68011" x1="37.3458" y1="1.58514" x2="32.6401" y2="68.8795" gradientUnits="userSpaceOnUse">
+<stop stop-color="#52EDFF"/>
+<stop offset="0.274483" stop-color="#4361EE"/>
+<stop offset="0.629793" stop-color="#7209B7"/>
+<stop offset="1" stop-color="#F12980"/>
+</linearGradient>
+<linearGradient id="paint4_linear_4725_68011" x1="17.6928" y1="43.6743" x2="17.299" y2="49.3064" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint5_linear_4725_68011" x1="51.4888" y1="51.6959" x2="51.8826" y2="46.0638" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint6_linear_4725_68011" x1="34.7726" y1="44.8492" x2="34.3788" y2="50.4814" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint7_linear_4725_68011" x1="49.5118" y1="43.415" x2="49.9057" y2="37.7829" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint8_linear_4725_68011" x1="20.7014" y1="35.7397" x2="20.3076" y2="41.3718" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint9_linear_4725_68011" x1="35.3373" y1="36.7452" x2="34.9435" y2="42.3773" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint10_linear_4725_68011" x1="26.6521" y1="27.7672" x2="26.2583" y2="33.3994" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint11_linear_4725_68011" x1="45.0885" y1="34.7142" x2="45.4823" y2="29.0821" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint12_linear_4725_68011" x1="45.8104" y1="20.962" x2="45.4166" y2="26.5941" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint13_linear_4725_68011" x1="27.0837" y1="19.6519" x2="26.6899" y2="25.284" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+</defs>
+</svg>

app/assets/stylesheets/application.tailwind.css

@@ -20,14 +20,14 @@
   }
 
   .form-field__label {
-    @apply block text-xs text-gray-500;
+    @apply block text-xs text-gray-500 peer-disabled:text-gray-400;
   }
 
   .form-field__input {
     @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,7 +35,7 @@
   }
 
   .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 {
@@ -63,12 +63,16 @@
   }
 
   select[multiple="multiple"] option {
-    @apply p-2 rounded-md;
+    @apply py-2 rounded-md;
   }
 
   select[multiple="multiple"] option:checked {
-    @apply bg-gray-50;
-    @apply after:content-['\2713'] after:float-right after:text-gray-500;
+    @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 {
@@ -94,6 +98,26 @@
   .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 */
@@ -110,4 +134,4 @@
   .scrollbar::-webkit-scrollbar-thumb:hover {
     background: #a6a6a6;
   }
-}
+}

app/controllers/account/entries_controller.rb

@@ -2,7 +2,7 @@ class Account::EntriesController < ApplicationController
   layout :with_sidebar
 
   before_action :set_account
-  before_action :set_entry, only: %i[ edit update show destroy ]
+  before_action :set_entry, only: %i[edit update show destroy]
 
   def edit
     render entryable_view_path(:edit)
@@ -25,7 +25,7 @@ class Account::EntriesController < ApplicationController
   def destroy
     @entry.destroy!
     @entry.sync_account_later
-    redirect_back_or_to account_url(@entry.account), notice: t(".success")
+    redirect_to account_url(@entry.account), notice: t(".success")
   end
 
   private

app/controllers/account/holdings_controller.rb

@@ -2,7 +2,7 @@ class Account::HoldingsController < ApplicationController
   layout :with_sidebar
 
   before_action :set_account
-  before_action :set_holding, only: :show
+  before_action :set_holding, only: %i[show destroy]
 
   def index
     @holdings = @account.holdings.current
@@ -11,6 +11,11 @@ class Account::HoldingsController < ApplicationController
   def show
   end
 
+  def destroy
+    @holding.destroy_holding_and_entries!
+    redirect_back_or_to account_holdings_path(@account)
+  end
+
   private
 
     def set_account

app/controllers/account/trades_controller.rb

@@ -2,23 +2,34 @@ class Account::TradesController < ApplicationController
   layout :with_sidebar
 
   before_action :set_account
+  before_action :set_entry, only: :update
 
   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 ])
+    @entries = @account.entries.reverse_chronological.where(entryable_type: %w[Account::Trade Account::Transaction])
   end
 
   def create
-    @builder = Account::TradeBuilder.new(entry_params)
+    @builder = Account::EntryBuilder.new(entry_params)
 
     if entry = @builder.save
       entry.sync_account_later
       redirect_to account_path(@account), notice: t(".success")
     else
-      render :new, status: :unprocessable_entity
+      flash[:alert] = t(".failure")
+      redirect_back_or_to account_path(@account)
+    end
+  end
+
+  def update
+    @entry.update!(entry_params)
+
+    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
 
@@ -28,7 +39,21 @@ class Account::TradesController < ApplicationController
       @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(:type, :date, :qty, :ticker, :price).merge(account: @account)
+      params.require(:account_entry)
+            .permit(
+              :type, :date, :qty, :ticker, :price, :amount, :notes, :excluded, :currency, :transfer_account_id, :entryable_type,
+              entryable_attributes: [
+                :id,
+                :qty,
+                :ticker,
+                :price
+              ]
+            )
+            .merge(account: @account)
     end
 end

app/controllers/account/transactions_controller.rb

@@ -5,12 +5,14 @@ class Account::TransactionsController < ApplicationController
   before_action :set_entry, only: :update
 
   def index
-    @entries = @account.entries.account_transactions.reverse_chronological
+    @pagy, @entries = pagy(
+      @account.entries.account_transactions.reverse_chronological,
+      limit: params[:per_page] || "10"
+    )
   end
 
   def update
-    @entry.update!(entry_params.merge(amount: amount))
-    @entry.sync_account_later
+    @entry.update!(entry_params)
 
     respond_to do |format|
       format.html { redirect_to account_entry_path(@account, @entry), notice: t(".success") }
@@ -31,23 +33,25 @@ class Account::TransactionsController < ApplicationController
     def entry_params
       params.require(:account_entry)
             .permit(
-              :name, :date, :amount, :currency, :entryable_type,
+              :name, :date, :amount, :currency, :excluded, :notes, :entryable_type, :nature,
               entryable_attributes: [
                 :id,
-                :notes,
-                :excluded,
                 :category_id,
                 :merchant_id,
                 { tag_ids: [] }
               ]
-            )
-    end
+            ).tap do |permitted_params|
+              nature = permitted_params.delete(:nature)
 
-    def amount
-      if params[:account_entry][:nature] == "income"
-        entry_params[:amount].to_d * -1
-      else
-        entry_params[:amount].to_d
-      end
+              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

@@ -40,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

@@ -12,7 +12,7 @@ class Account::ValuationsController < ApplicationController
 
     if @entry.save
       @entry.sync_account_later
-      redirect_to account_valuations_path(@account), notice: t(".success")
+      redirect_back_or_to account_valuations_path(@account), notice: t(".success")
     else
       flash[:alert] = @entry.errors.full_messages.to_sentence
       redirect_to account_path(@account)

app/controllers/accounts_controller.rb

@@ -2,7 +2,7 @@ class AccountsController < ApplicationController
   layout :with_sidebar
 
   include Filterable
-  before_action :set_account, only: %i[ edit show destroy sync update ]
+  before_action :set_account, only: %i[edit show destroy sync update]
 
   def index
     @institutions = Current.family.institutions
@@ -23,7 +23,12 @@ class AccountsController < ApplicationController
   end
 
   def new
-    @account = Account.new(accountable: Accountable.from_type(params[:type])&.new)
+    @account = Account.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])
@@ -36,14 +41,11 @@ class AccountsController < ApplicationController
   end
 
   def edit
+    @account.accountable.build_address if @account.accountable.is_a?(Property) && @account.accountable.address.blank?
   end
 
   def update
-    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
+    @account.update_with_sync!(account_params)
     redirect_back_or_to account_path(@account), notice: t(".success")
   end
 
@@ -56,8 +58,6 @@ class AccountsController < ApplicationController
                         start_balance: account_params[:start_balance]
     @account.sync_later
     redirect_back_or_to account_path(@account), notice: t(".success")
-  rescue ActiveRecord::RecordInvalid => e
-    redirect_back_or_to accounts_path, alert: e.record.errors.full_messages.to_sentence
   end
 
   def destroy

app/controllers/application_controller.rb

@@ -1,10 +1,7 @@
 class ApplicationController < ActionController::Base
-  include AutoSync, Authentication, Invitable, SelfHostable
+  include Localize, AutoSync, Authentication, Invitable, SelfHostable, StoreLocation
   include Pagy::Backend
 
-  # 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

app/controllers/categories_controller.rb

@@ -1,7 +1,7 @@
 class CategoriesController < ApplicationController
   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/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,6 +2,7 @@ module Authentication
   extend ActiveSupport::Concern
 
   included do
+    before_action :set_request_details
     before_action :authenticate_user!
   end
 
@@ -12,28 +13,30 @@ module Authentication
   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
-    set_last_login_at
-  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/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/credit_cards_controller.rb

@@ -0,0 +1,41 @@
+class CreditCardsController < 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_with_sync!(account_params)
+    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, :institution_id, :start_date, :start_balance, :currency, :accountable_type,
+          accountable_attributes: [
+            :id,
+            :available_credit,
+            :minimum_payment,
+            :apr,
+            :annual_fee,
+            :expiration_date
+          ]
+        )
+    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,118 +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 upload_csv
-    begin
-      @import.raw_csv_str = import_params[:raw_csv_str].read
-    rescue NoMethodError
-      flash.now[:alert] = "Please select a file to upload"
-      render :load, status: :unprocessable_entity and return
-    end
-    if @import.save
-      redirect_to configure_import_path(@import), notice: t(".import_loaded")
-    else
-      flash.now[:alert] = @import.errors.full_messages.to_sentence
-      render :load, status: :unprocessable_entity
-    end
-  end
-
-  def load_csv
-    if @import.update(import_params)
-      redirect_to configure_import_path(@import), notice: t(".import_loaded")
-    else
-      flash.now[:alert] = @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,18 @@
+class InviteCodesController < ApplicationController
+  before_action :ensure_self_hosted
+
+  def index
+    @invite_codes = InviteCode.all
+  end
+
+  def create
+    InviteCode.generate!
+    redirect_back_or_to invite_codes_path, notice: "Code generated"
+  end
+
+  private
+
+    def ensure_self_hosted
+      redirect_to root_path unless self_hosted?
+    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/loans_controller.rb

@@ -0,0 +1,39 @@
+class LoansController < 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_with_sync!(account_params)
+    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, :institution_id, :start_date, :start_balance, :currency, :accountable_type,
+          accountable_attributes: [
+            :id,
+            :rate_type,
+            :interest_rate,
+            :term_months
+          ]
+        )
+    end
+end

app/controllers/merchants_controller.rb

@@ -1,7 +1,7 @@
 class MerchantsController < ApplicationController
   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,6 @@
 class PagesController < ApplicationController
-  layout :with_sidebar
+  skip_before_action :authenticate_user!, only: %i[early_access]
+  layout :with_sidebar, except: %i[early_access]
 
   include Filterable
 
@@ -25,18 +26,23 @@ class PagesController < ApplicationController
 
     # TODO: Placeholders for trendlines
     placeholder_series_data = 10.times.map do |i|
-      { date: Date.current - i.days, value: Money.new(0) }
+      { date: Date.current - i.days, value: Money.new(0, Current.family.currency) }
     end
     @investing_series = TimeSeries.new(placeholder_series_data)
   end
 
   def changelog
-    @releases_notes = Provider::Github.new.fetch_latest_releases_notes
+    @release_notes = Provider::Github.new.fetch_latest_release_notes
   end
 
   def feedback
   end
 
-  def invites
+  def early_access
+    redirect_to root_path if self_hosted?
+
+    @invite_codes_count = InviteCode.count
+    @invite_code = InviteCode.order("RANDOM()").limit(1).first
+    render layout: false
   end
 end

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,40 @@
+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_with_sync!(account_params)
+    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, :institution_id, :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 +1,2 @@
 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[:alert] = 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[:alert] = 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/subscriptions_controller.rb

@@ -0,0 +1,37 @@
+class SubscriptionsController < ApplicationController
+  def new
+    client = Stripe::StripeClient.new(ENV["STRIPE_SECRET_KEY"])
+
+    if Current.family.stripe_customer_id.blank?
+      customer = client.v1.customers.create(
+        email: Current.family.primary_user.email,
+        metadata: { family_id: Current.family.id }
+      )
+      Current.family.update(stripe_customer_id: customer.id)
+    end
+
+    session = client.v1.checkout.sessions.create({
+      customer: Current.family.stripe_customer_id,
+      line_items: [ {
+        price: ENV["STRIPE_PLAN_ID"],
+        quantity: 1
+      } ],
+      mode: "subscription",
+      allow_promotion_codes: true,
+      success_url: settings_billing_url,
+      cancel_url: settings_billing_url
+    })
+
+    redirect_to session.url, allow_other_host: true, status: :see_other
+  end
+
+  def show
+    client = Stripe::StripeClient.new(ENV["STRIPE_SECRET_KEY"])
+
+    portal_session = client.v1.billing_portal.sessions.create(
+      customer: Current.family.stripe_customer_id,
+      return_url: settings_billing_url
+    )
+    redirect_to portal_session.url, allow_other_host: true, status: :see_other
+  end
+end

app/controllers/tags_controller.rb

@@ -1,7 +1,7 @@
 class TagsController < ApplicationController
   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

@@ -17,6 +17,9 @@ class TransactionsController < ApplicationController
     @entry = Current.family.entries.new(entryable: Account::Transaction.new).tap do |e|
       if 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
@@ -67,9 +70,6 @@ class TransactionsController < ApplicationController
     redirect_back_or_to transactions_url, notice: t(".success")
   end
 
-  def rules
-  end
-
   private
 
     def amount
@@ -93,7 +93,8 @@ class TransactionsController < ApplicationController
     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_entry_params

app/controllers/vehicles_controller.rb

@@ -0,0 +1,41 @@
+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_with_sync!(account_params)
+    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, :institution_id, :start_date, :start_balance, :currency, :accountable_type,
+          accountable_attributes: [
+            :id,
+            :make,
+            :model,
+            :year,
+            :mileage_value,
+            :mileage_unit
+          ]
+        )
+    end
+end

app/controllers/webhooks_controller.rb

@@ -0,0 +1,61 @@
+class WebhooksController < ApplicationController
+  skip_before_action :verify_authenticity_token, only: [ :stripe ]
+  skip_authentication
+
+  def stripe
+    webhook_body = request.body.read
+    sig_header = request.env["HTTP_STRIPE_SIGNATURE"]
+    client = Stripe::StripeClient.new(ENV["STRIPE_SECRET_KEY"])
+
+    begin
+      thin_event = client.parse_thin_event(webhook_body, sig_header, ENV["STRIPE_WEBHOOK_SECRET"])
+
+      event = client.v1.events.retrieve(thin_event.id)
+
+      case event.type
+      when /^customer\.subscription\./
+        handle_subscription_event(event)
+      when "customer.created", "customer.updated", "customer.deleted"
+        handle_customer_event(event)
+      else
+        Rails.logger.info "Unhandled event type: #{event.type}"
+      end
+
+    rescue JSON::ParserError
+      render json: { error: "Invalid payload" }, status: :bad_request
+      return
+    rescue Stripe::SignatureVerificationError
+      render json: { error: "Invalid signature" }, status: :bad_request
+      return
+    end
+
+    render json: { received: true }, status: :ok
+  end
+
+  private
+
+    def handle_subscription_event(event)
+      subscription = event.data.object
+      family = Family.find_by(stripe_customer_id: subscription.customer)
+
+      if family
+        family.update(
+          stripe_plan_id: subscription.plan.id,
+          stripe_subscription_status: subscription.status
+        )
+      else
+        Rails.logger.error "Family not found for Stripe customer ID: #{subscription.customer}"
+      end
+    end
+
+    def handle_customer_event(event)
+      customer = event.data.object
+      family = Family.find_by(stripe_customer_id: customer.id)
+
+      if family
+        family.update(stripe_customer_id: customer.id)
+      else
+        Rails.logger.error "Family not found for Stripe customer ID: #{customer.id}"
+      end
+    end
+end

app/helpers/account/entries_helper.rb

@@ -38,7 +38,7 @@ module Account::EntriesHelper
       name      = entry.name || generated
       name
     else
-      entry.name
+      entry.name || "Transaction"
     end
   end
 

app/helpers/accounts_helper.rb

@@ -1,4 +1,9 @@
 module AccountsHelper
+  def summary_card(title:, &block)
+    content = capture(&block)
+    render "accounts/summary_card", title: title, content: content
+  end
+
   def to_accountable_title(accountable)
     accountable.model_name.human
   end
@@ -23,14 +28,50 @@ module AccountsHelper
     class_mapping(accountable_type)[:hex]
   end
 
-  def account_tabs(account)
-    holdings_tab = { key: "holdings", label: t("accounts.show.holdings"), path: account_path(account, tab: "holdings"), content_path: account_holdings_path(account) }
-    cash_tab = { key: "cash", label: t("accounts.show.cash"), path: account_path(account, tab: "cash"), content_path: account_cashes_path(account) }
-    value_tab        = { key: "valuations", label: t("accounts.show.value"), path: account_path(account, tab: "valuations"), content_path: account_valuations_path(account) }
-    transactions_tab = { key: "transactions", label: t("accounts.show.transactions"), path: account_path(account, tab: "transactions"), content_path: account_transactions_path(account) }
-    trades_tab       = { key: "trades", label: t("accounts.show.trades"), path: account_path(account, tab: "trades"), content_path: account_trades_path(account) }
+  # 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
+    when "Loan"
+      loans_path
+    when "CreditCard"
+      credit_cards_path
+    else
+      accounts_path
+    end
+  end
 
-    return [ holdings_tab, cash_tab, trades_tab ] if account.investment?
+  def edit_account_form_url(account)
+    case account.accountable_type
+    when "Property"
+      property_path(account)
+    when "Vehicle"
+      vehicle_path(account)
+    when "Loan"
+      loan_path(account)
+    when "CreditCard"
+      credit_card_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 [ value_tab ] if account.other_asset? || account.other_liability?
+    return [ overview_tab, value_tab ] if account.property? || account.vehicle?
+    return [ holdings_tab, cash_tab, trades_tab, value_tab ] if account.investment?
+    return [ overview_tab, value_tab, transactions_tab ] if account.loan? || account.credit_card?
 
     [ value_tab, transactions_tab ]
   end
@@ -43,6 +84,11 @@ module AccountsHelper
     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)

app/helpers/application_helper.rb

@@ -57,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 = {})
@@ -137,14 +137,18 @@ module ApplicationHelper
   end
 
   def format_money(number_or_money, options = {})
+    return nil unless number_or_money
+
     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 = {})
+    return nil unless number_or_money
+
     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
 

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

@@ -10,11 +10,6 @@ module FormsHelper
     render partial: "shared/modal_form", locals: { title:, subtitle:, content: }
   end
 
-  def form_field_tag(options = {}, &block)
-    options[:class] = [ "form-field", options[:class] ].compact.join(" ")
-    tag.div(**options, &block)
-  end
-
   def radio_tab_tag(form:, name:, value:, label:, icon:, checked: false, disabled: false)
     form.label name, for: form.field_id(name, value), class: "group has-[:disabled]:cursor-not-allowed" do
       concat radio_tab_contents(label:, icon:)
@@ -27,55 +22,11 @@ module FormsHelper
     form.select(:period, periods_for_select, { selected: selected }, class: classes, data: { "auto-submit-form-target": "auto" })
   end
 
-  def money_with_currency_field(form, money_method, options = {})
-    render partial: "shared/money_field", locals: {
-      form:          form,
-      money_method:  money_method,
-      default_currency: options[:default_currency] || "USD",
-      disable_currency: options[:disable_currency] || false,
-      hide_currency: options[:hide_currency] || false,
-      label:         options[:label] || "Amount"
-    }
-  end
-
-  def money_field(form, method, options = {})
-    value = form.object ? form.object.send(method) : nil
-
-    currency = value&.currency || Money::Currency.new(options[:default_currency] || "USD")
-
-    # See "Monetizable" concern
-    money_amount_method = method.to_s.chomp("_money").to_sym
-
-    money_options = {
-      value: value&.amount,
-      placeholder: "100",
-      min:   -99999999999999,
-      max:   99999999999999,
-      step:  currency.step
-    }
-
-    merged_options = options.merge(money_options)
-
-    form.number_field money_amount_method, merged_options
-  end
-
-  def currency_select_full(form, method, options = {}, html_options = {}, &block)
-    choices = currencies_for_select.map { |currency| [ "#{currency.name} (#{currency.iso_code})", currency.iso_code ] }
-    form.select method, choices, options, html_options, &block
-  end
-
-  def currency_select(form, method, options = {}, html_options = {}, &block)
-    choices = currencies_for_select.map(&:iso_code)
-    form.select method, choices, options, html_options, &block
+  def currencies_for_select
+    Money::Currency.all_instances.sort_by { |currency| [ currency.priority, currency.name ] }
   end
 
   private
-
-    def currencies_for_select
-      Money::Currency.all_instances
-                     .sort_by(&:priority)
-    end
-
     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
         concat lucide_icon(icon, class: "w-5 h-5")

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

@@ -0,0 +1,2 @@
+module Settings::BillingHelper
+end

app/helpers/settings_helper.rb

@@ -1,14 +1,47 @@
 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.billing_label"), path: :settings_billing_path },
+    { 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

@@ -6,53 +6,69 @@ class StyledFormBuilder < ActionView::Helpers::FormBuilder
   text_field_helpers.each do |selector|
     class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
       def #{selector}(method, options = {})
-        input_html = label_html(method, options) + super(method, merged_options(options))
-        input_html = apply_form_field_wrapper(input_html) unless options[:inline]
-        input_html
+        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 = {})
-    super(method, tag_value, merged_options(options, "form-field__radio"))
+    merged_options = { class: "form-field__radio" }.merge(options)
+
+    super(method, tag_value, merged_options)
   end
 
   def select(method, choices, options = {}, html_options = {})
-    input_html = label_html(method, options) + super(method, choices, options, merged_options(html_options))
-    input_html = apply_form_field_wrapper(input_html, class: "pr-0") unless options[:inline]
-    input_html
+    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 = {})
-    input_html = label_html(method, options) + super(method, collection, value_method, text_method, options, merged_options(html_options))
-    input_html = apply_form_field_wrapper(input_html, class: "pr-0") unless options[:inline]
-    input_html
+    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, options = {})
+    @template.render partial: "shared/money_field", locals: {
+      form: self,
+      amount_method:,
+      currency_method: options[:currency_method] || :currency,
+      **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(options, "form-field__submit"))
+    super(value, merged_options)
   end
 
   private
 
-    def apply_form_field_wrapper(input_html, **options)
-      @template.form_field_tag(**options) do
-        input_html
+    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 merged_options(options, default_class = "form-field__input")
-      combined_classes = options.fetch(:class, "") + " #{default_class}"
-      style_options = { class: combined_classes }
-      non_custom_options = options.except(:class, :label, :inline)
-      style_options.merge(non_custom_options)
-    end
-
-    def label_html(method, options)
-      return label(method, class: "form-field__label") if options[:label] == true
+    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/subscription_helper.rb

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

app/helpers/transactions_helper.rb

@@ -1,12 +1,13 @@
 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/vehicles_helper.rb

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

app/helpers/webhooks_helper.rb

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

app/javascript/controllers/bulk_select_controller.js

@@ -1,21 +1,21 @@
-import {Controller} from "@hotwired/stimulus"
+import { Controller } from "@hotwired/stimulus"
 
 // Connects to data-controller="bulk-select"
 export default class extends Controller {
   static targets = ["row", "group", "selectionBar", "selectionBarText", "bulkEditDrawerTitle"]
   static values = {
     resource: String,
-    selectedIds: {type: Array, default: []}
+    selectedIds: { type: Array, default: [] }
   }
 
   connect() {
-    document.addEventListener("turbo:load", this.#updateView)
+    document.addEventListener("turbo:load", this._updateView)
 
-    this.#updateView()
+    this._updateView()
   }
 
   disconnect() {
-    document.removeEventListener("turbo:load", this.#updateView)
+    document.removeEventListener("turbo:load", this._updateView)
   }
 
   bulkEditDrawerTitleTargetConnected(element) {
@@ -63,7 +63,7 @@ export default class extends Controller {
   }
 
   selectedIdsValueChanged() {
-    this.#updateView()
+    this._updateView()
   }
 
   #addHiddenFormInputsForSelectedIds(form, paramName, transactionIds) {
@@ -101,7 +101,7 @@ export default class extends Controller {
     this.selectedIdsValue = this.rowTargets.map(t => t.dataset.id)
   }
 
-  #updateView = () => {
+  _updateView = () => {
     this.#updateSelectionBar()
     this.#updateGroups()
     this.#updateRows()

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/csv_upload_controller.js

@@ -1,94 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  static targets = ["input", "preview", "submit", "filename", "filesize"]
-
-  connect() {
-    this.submitTarget.disabled = true
-  }
-
-  addFile(event) {
-    const file = event.target.files[0]
-    this._fileAdded(file)
-  }
-
-  dragover(event) {
-    event.preventDefault()
-    event.stopPropagation()
-    event.currentTarget.classList.add("bg-gray-100")
-  }
-
-  dragleave(event) {
-    event.preventDefault()
-    event.stopPropagation()
-    event.currentTarget.classList.remove("bg-gray-100")
-  }
-
-  drop(event) {
-    event.preventDefault()
-    event.stopPropagation()
-    event.currentTarget.classList.remove("bg-gray-100")
-
-    const file = event.dataTransfer.files[0]
-    if (file && this._isCSVFile(file)) {
-      this._setFileInput(file);
-      this._fileAdded(file)
-    } else {
-      this.previewTarget.classList.add("text-red-500")
-      this.previewTarget.textContent = "Only CSV files are allowed."
-    }
-  }
-
-  // Private
-
-  _fetchFileSize(size) {
-    let fileSize = '';
-    if (size < 1024 * 1024) {
-      fileSize = (size / 1024).toFixed(2) + ' KB'; // Convert bytes to KB
-    } else {
-      fileSize = (size / (1024 * 1024)).toFixed(2) + ' MB'; // Convert bytes to MB
-    }
-    return fileSize;
-  }
-
-  _fileAdded(file) {
-    const fileSizeLimit = 5 * 1024 * 1024 // 5MB
-
-    if (file) {
-      if (file.size > fileSizeLimit) {
-        this.previewTarget.classList.add("text-red-500")
-        this.previewTarget.textContent = "File size exceeds the limit of 5MB"
-        return
-      }
-
-      this.submitTarget.classList.remove([
-        "bg-alpha-black-25",
-        "text-gray",
-        "cursor-not-allowed",
-      ]);
-      this.submitTarget.classList.add(
-        "bg-gray-900",
-        "text-white",
-        "cursor-pointer",
-      );
-      this.submitTarget.disabled = false;
-      this.previewTarget.innerHTML = document.querySelector("#template-preview").innerHTML;
-      this.previewTarget.classList.remove("text-red-500")
-      this.previewTarget.classList.add("text-gray-900")
-      this.filenameTarget.textContent = file.name;
-      this.filesizeTarget.textContent = this._fetchFileSize(file.size);
-    }
-  }
-
-  _isCSVFile(file) {
-    const acceptedTypes = ["text/csv", "application/csv", ".csv"]
-    const extension = file.name.split('.').pop().toLowerCase()
-    return acceptedTypes.includes(file.type) || extension === "csv"
-  }
-
-  _setFileInput(file) {
-    const dataTransfer = new DataTransfer();
-    dataTransfer.items.add(file);
-    this.inputTarget.files = dataTransfer.files;
-  }
-}

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

@@ -13,7 +13,6 @@ export default class extends Controller {
 
   updateAmount(currency) {
     (new CurrenciesService).get(currency).then((currency) => {
-      console.log(currency)
       this.amountTarget.step = currency.step;
 
       if (isFinite(this.amountTarget.value)) {

app/javascript/controllers/time_series_chart_controller.js

@@ -11,12 +11,12 @@ export default class extends Controller {
     usePercentSign: Boolean
   }
 
-  #d3SvgMemo = null
-  #d3GroupMemo = null
-  #d3Tooltip = null
-  #d3InitialContainerWidth = 0
-  #d3InitialContainerHeight = 0
-  #normalDataPoints = []
+  #d3SvgMemo = null;
+  #d3GroupMemo = null;
+  #d3Tooltip = null;
+  #d3InitialContainerWidth = 0;
+  #d3InitialContainerHeight = 0;
+  #normalDataPoints = [];
 
   connect() {
     this.#install()
@@ -181,7 +181,7 @@ export default class extends Controller {
       .call(
         d3
           .axisBottom(this.#d3XScale)
-          .tickValues([ this.#normalDataPoints[0].date, this.#normalDataPoints[this.#normalDataPoints.length - 1].date ])
+          .tickValues([this.#normalDataPoints[0].date, this.#normalDataPoints[this.#normalDataPoints.length - 1].date])
           .tickSize(0)
           .tickFormat(d3.timeFormat("%d %b %Y"))
       )
@@ -247,7 +247,6 @@ export default class extends Controller {
       .style("fill", `url(#${this.element.id}-trendline-gradient)`)
   }
 
-
   #drawTooltip() {
     this.#d3Tooltip = d3
       .select(`#${this.element.id}`)
@@ -345,7 +344,7 @@ export default class extends Controller {
   }
 
   #tooltipTemplate(datum) {
-    return(`
+    return (`
       <div style="margin-bottom: 4px; color: ${tailwindColors.gray[500]};">
         ${d3.timeFormat("%b %d, %Y")(datum.date)}
       </div>
@@ -428,7 +427,7 @@ export default class extends Controller {
       .append("svg")
       .attr("width", this.#d3InitialContainerWidth)
       .attr("height", this.#d3InitialContainerHeight)
-      .attr("viewBox", [ 0, 0, this.#d3InitialContainerWidth, this.#d3InitialContainerHeight ])
+      .attr("viewBox", [0, 0, this.#d3InitialContainerWidth, this.#d3InitialContainerHeight])
   }
 
   #createMainGroup() {
@@ -502,7 +501,7 @@ export default class extends Controller {
   get #d3XScale() {
     return d3
       .scaleTime()
-      .rangeRound([ 0, this.#d3ContainerWidth ])
+      .rangeRound([0, this.#d3ContainerWidth])
       .domain(d3.extent(this.#normalDataPoints, d => d.date))
   }
 
@@ -514,7 +513,7 @@ export default class extends Controller {
 
     return d3
       .scaleLinear()
-      .rangeRound([ this.#d3ContainerHeight, 0 ])
-      .domain([ dataMin - padding, dataMax + padding ])
+      .rangeRound([this.#d3ContainerHeight, 0])
+      .domain([dataMin - padding, dataMax + padding])
   }
 }

app/javascript/controllers/tooltip_controller.js

@@ -4,11 +4,11 @@ import {
   flip,
   shift,
   offset,
-  arrow
+  autoUpdate
 } from '@floating-ui/dom';
 
 export default class extends Controller {
-  static targets = ["arrow", "tooltip"];
+  static targets = ["tooltip"];
   static values = {
     placement: { type: String, default: "top" },
     offset: { type: Number, default: 10 },
@@ -17,58 +17,67 @@ export default class extends Controller {
   };
 
   connect() {
-    this.element.addEventListener("mouseenter", this.showTooltip);
-    this.element.addEventListener("mouseleave", this.hideTooltip);
-    this.element.addEventListener("focus", this.showTooltip);
-    this.element.addEventListener("blur", this.hideTooltip);
-  };
-
-  showTooltip = () => {
-    this.tooltipTarget.style.display = 'block';
-    this.#update();
-  };
-
-  hideTooltip = () => {
-    this.tooltipTarget.style.display = '';
-  };
+    this._cleanup = null;
+    this.boundUpdate = this.update.bind(this);
+    this.startAutoUpdate();
+    this.addEventListeners();
+  }
 
   disconnect() {
-    this.element.removeEventListener("mouseenter", this.showTooltip);
-    this.element.removeEventListener("mouseleave", this.hideTooltip);
-    this.element.removeEventListener("focus", this.showTooltip);
-    this.element.removeEventListener("blur", this.hideTooltip);
-  };
+    this.removeEventListeners();
+    this.stopAutoUpdate();
+  }
 
-  #update() {
+  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 }),
-        arrow({ element: this.arrowTarget }),
+        shift({ padding: 5 })
       ],
     }).then(({ x, y, placement, middlewareData }) => {
       Object.assign(this.tooltipTarget.style, {
         left: `${x}px`,
         top: `${y}px`,
       });
-
-      const { x: arrowX, y: arrowY } = middlewareData.arrow;
-      const staticSide = {
-        top: 'bottom',
-        right: 'left',
-        bottom: 'top',
-        left: 'right',
-      }[placement.split('-')[0]];
-
-      Object.assign(this.arrowTarget.style, {
-        left: arrowX != null ? `${arrowX}px` : '',
-        top: arrowY != null ? `${arrowY}px` : '',
-        right: '',
-        bottom: '',
-        [staticSide]: '-4px',
-      });
     });
-  };
-}
+  }
+}

app/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/mailers/application_mailer.rb

@@ -1,16 +1,4 @@
 class ApplicationMailer < ActionMailer::Base
+  default from: ENV["EMAIL_SENDER"] if ENV["EMAIL_SENDER"].present?
   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/mailers/password_mailer.rb

@@ -1,5 +1,9 @@
 class PasswordMailer < ApplicationMailer
   def password_reset
-    mail to: params[:user].email
+    @user = params[:user]
+    @subject = t(".subject")
+    @cta = t(".cta")
+
+    mail to: @user.email, subject: @subject
   end
 end

app/models/account.rb

@@ -1,20 +1,21 @@
 class Account < ApplicationRecord
-  include Syncable
-  include Monetizable
+  include Syncable, Monetizable, Issuable
 
   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 :imports, dependent: :destroy
   has_many :syncs, dependent: :destroy
+  has_many :issues, as: :issuable, dependent: :destroy
 
   monetize :balance
 
@@ -28,19 +29,26 @@ class Account < ApplicationRecord
 
   delegated_type :accountable, types: Accountable::TYPES, dependent: :destroy
 
+  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)
-            )
+          accounts = self.where(accountable_type: type)
+          if accounts.any?
+            group = grouped_accounts[classification.to_sym].add_child_group(type, currency)
+            accounts.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
       end
@@ -49,64 +57,56 @@ class Account < ApplicationRecord
     end
 
     def 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
+      transaction do
+        attributes[:accountable_attributes] ||= {} # Ensure accountable is created
+        account = new(attributes)
 
-      # Always build the initial valuation
-      account.entries.build \
-        date: Date.current,
-        amount: attributes[:balance],
-        currency: account.currency,
-        entryable: Account::Valuation.new
-
-      # Conditionally build the optional start valuation
-      if start_date.present? && start_balance.present?
+        # Always initialize an account with a valuation entry to begin tracking value history
         account.entries.build \
-          date: start_date,
-          amount: start_balance,
+          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
-
-      account.save!
-      account
     end
   end
 
-  # Start of temporary fix for #1068
-  # ==========================================================================
-
-  # TODO: Both `series` and `value` methods are a temporary fix for #1068, which appears to be a data corruption issue.
-  # Every account should have an accountable no matter what, but some self hosted instances seem to have missing accountables.
-  # When this is fixed, we can add this back to `delegate :value, :series, to: :accountable`
-  def series(period: Period.all, currency: self.currency)
-    if accountable.present?
-      accountable.series(period: period, currency: currency)
-    else
-      TimeSeries.new([])
-    end
+  def original_balance
+    balance_amount = balances.chronological.first&.balance || balance
+    Money.new(balance_amount, currency)
   end
 
-  def value
-    if accountable.present?
-      accountable.value
-    else
-      balance_money
-    end
-  end
-
-  # ==========================================================================
-  # End of temporary fix for #1068
-
-  def alert
-    latest_sync = syncs.latest
-    [ latest_sync&.error, *latest_sync&.warnings ].compact.first
+  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
 
+  def update_with_sync!(attributes)
+    transaction do
+      update!(attributes)
+      update_balance!(attributes[:balance]) if attributes[:balance]
+    end
+
+    sync_later
+  end
+
   def update_balance!(balance)
     valuation = entries.account_valuations.find_by(date: Date.current)
 

app/models/account/balance.rb

@@ -1,9 +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) }
-    scope :chronological, -> { order(:date) }
+  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/syncer.rb

@@ -1,9 +1,6 @@
 class Account::Balance::Syncer
-  attr_reader :warnings
-
   def initialize(account, start_date: nil)
     @account = account
-    @warnings = []
     @sync_start_date = calculate_sync_start_date(start_date)
   end
 
@@ -17,9 +14,12 @@ class Account::Balance::Syncer
 
       if daily_balances.any?
         account.reload
-        account.update! balance: daily_balances.select { |db| db.currency == account.currency }.last&.balance
+        last_balance = daily_balances.select { |db| db.currency == account.currency }.last&.balance
+        account.update! balance: last_balance
       end
     end
+  rescue Money::ConversionError => e
+    account.observe_missing_exchange_rates(from: e.from_currency, to: e.to_currency, dates: [ e.date ])
   end
 
   private
@@ -67,20 +67,26 @@ class Account::Balance::Syncer
       from_currency = account.currency
       to_currency = account.family.currency
 
+      if ExchangeRate.exchange_rates_provider.nil?
+        account.observe_missing_exchange_rate_provider
+        return []
+      end
+
       exchange_rates = ExchangeRate.find_rates from: from_currency,
                                                to: to_currency,
                                                start_date: sync_start_date
 
+      missing_exchange_rates = balances.map(&:date) - exchange_rates.map(&:date)
+
+      if missing_exchange_rates.any?
+        account.observe_missing_exchange_rates(from: from_currency, to: to_currency, dates: missing_exchange_rates)
+        return []
+      end
+
       balances.map do |balance|
         exchange_rate = exchange_rates.find { |er| er.date == balance.date }
-
-        raise Money::ConversionError.new("missing exchange rate from #{from_currency} to #{to_currency} on date #{balance.date}") unless exchange_rate
-
         build_balance(balance.date, exchange_rate.rate * balance.balance, to_currency)
       end
-    rescue Money::ConversionError
-      @warnings << "missing exchange rates from #{from_currency} to #{to_currency}"
-      []
     end
 
     def build_balance(date, balance, currency = nil)
@@ -97,7 +103,7 @@ class Account::Balance::Syncer
     end
 
     def find_prior_balance
-      account.balances.where("date < ?", sync_start_date).order(date: :desc).first&.balance
+      account.balances.where(currency: account.currency).where("date < ?", sync_start_date).order(date: :desc).first&.balance
     end
 
     def net_entry_flows(entries, target_currency = account.currency)

app/models/account/entry.rb

@@ -5,6 +5,7 @@ class Account::Entry < ApplicationRecord
 
   belongs_to :account
   belongs_to :transfer, optional: true
+  belongs_to :import, optional: true
 
   delegated_type :entryable, types: Account::Entryable::TYPES, dependent: :destroy
   accepts_nested_attributes_for :entryable
@@ -12,7 +13,6 @@ class Account::Entry < ApplicationRecord
   validates :date, :amount, :currency, presence: true
   validates :date, uniqueness: { scope: [ :account_id, :entryable_type ] }, if: -> { account_valuation? }
   validates :date, comparison: { greater_than: -> { min_supported_date } }
-  validate :trade_valid?, if: -> { account_trade? }
 
   scope :chronological, -> { order(:date, :created_at) }
   scope :reverse_chronological, -> { order(date: :desc, created_at: :desc) }
@@ -109,8 +109,8 @@ class Account::Entry < ApplicationRecord
     def bulk_update!(bulk_update_params)
       bulk_attributes = {
         date: bulk_update_params[:date],
+        notes: bulk_update_params[:notes],
         entryable_attributes: {
-          notes: bulk_update_params[:notes],
           category_id: bulk_update_params[:category_id],
           merchant_id: bulk_update_params[:merchant_id]
         }.compact_blank
@@ -129,17 +129,21 @@ class Account::Entry < ApplicationRecord
     end
 
     def income_total(currency = "USD")
-      without_transfers.account_transactions.includes(:entryable)
+      total = without_transfers.account_transactions.includes(:entryable)
         .where("account_entries.amount <= 0")
                        .map { |e| e.amount_money.exchange_to(currency, date: e.date, fallback_rate: 0) }
                        .sum
+
+      Money.new(total, currency)
     end
 
     def expense_total(currency = "USD")
-      without_transfers.account_transactions.includes(:entryable)
+      total = without_transfers.account_transactions.includes(:entryable)
                        .where("account_entries.amount > 0")
                        .map { |e| e.amount_money.exchange_to(currency, date: e.date, fallback_rate: 0) }
                        .sum
+
+      Money.new(total, currency)
     end
 
     def search(params)
@@ -148,6 +152,27 @@ class Account::Entry < ApplicationRecord
       query = query.where("account_entries.date >= ?", params[:start_date]) if params[:start_date].present?
       query = query.where("account_entries.date <= ?", params[:end_date]) if params[:end_date].present?
 
+      if params[:types].present?
+        query = query.where(marked_as_transfer: false) unless params[:types].include?("transfer")
+
+        if params[:types].include?("income") && !params[:types].include?("expense")
+          query = query.where("account_entries.amount < 0")
+        elsif params[:types].include?("expense") && !params[:types].include?("income")
+          query = query.where("account_entries.amount >= 0")
+        end
+      end
+
+      if params[:amount].present? && params[:amount_operator].present?
+        case params[:amount_operator]
+        when "equal"
+          query = query.where("ABS(ABS(account_entries.amount) - ?) <= 0.01", params[:amount].to_f.abs)
+        when "less"
+          query = query.where("ABS(account_entries.amount) < ?", params[:amount].to_f.abs)
+        when "greater"
+          query = query.where("ABS(account_entries.amount) > ?", params[:amount].to_f.abs)
+        end
+      end
+
       if params[:accounts].present? || params[:account_ids].present?
         query = query.joins(:account)
       end
@@ -198,14 +223,4 @@ class Account::Entry < ApplicationRecord
         previous: previous_entry&.amount_money,
         favorable_direction: account.favorable_direction
     end
-
-    def trade_valid?
-      if account_trade.sell?
-        current_qty = account.holding_qty(account_trade.security)
-
-        if current_qty < account_trade.qty.abs
-          errors.add(:base, "cannot sell #{account_trade.qty.abs} shares of #{account_trade.security.ticker} because you only own #{current_qty} shares")
-        end
-      end
-    end
 end

app/models/account/entry_builder.rb

@@ -0,0 +1,45 @@
+class Account::EntryBuilder
+  include ActiveModel::Model
+
+  TYPES = %w[income expense buy sell interest transfer_in transfer_out].freeze
+
+  attr_accessor :type, :date, :qty, :ticker, :price, :amount, :currency, :account, :transfer_account_id
+
+  validates :type, inclusion: { in: TYPES }
+
+  def save
+    if valid?
+      create_builder.save
+    end
+  end
+
+  private
+
+    def create_builder
+      case type
+      when "buy", "sell"
+        create_trade_builder
+      else
+        create_transaction_builder
+      end
+    end
+
+    def create_trade_builder
+      Account::TradeBuilder.new \
+        type: type,
+        date: date,
+        qty: qty,
+        ticker: ticker,
+        price: price,
+        account: account
+    end
+
+    def create_transaction_builder
+      Account::TransactionBuilder.new \
+        type: type,
+        date: date,
+        amount: amount,
+        account: account,
+        transfer_account_id: transfer_account_id
+    end
+end

app/models/account/entryable.rb

@@ -1,7 +1,7 @@
 module Account::Entryable
   extend ActiveSupport::Concern
 
-  TYPES = %w[ Account::Valuation Account::Transaction Account::Trade ]
+  TYPES = %w[Account::Valuation Account::Transaction Account::Trade]
 
   def self.from_type(entryable_type)
     entryable_type.presence_in(TYPES).constantize

app/models/account/holding.rb

@@ -14,9 +14,12 @@ class Account::Holding < ApplicationRecord
   scope :known_value, -> { where.not(amount: nil) }
   scope :for, ->(security) { where(security_id: security).order(:date) }
 
-  delegate :name, to: :security
   delegate :ticker, to: :security
 
+  def name
+    security.name || ticker
+  end
+
   def weight
     return nil unless amount
 
@@ -34,6 +37,19 @@ class Account::Holding < ApplicationRecord
     @trend ||= calculate_trend
   end
 
+  def trades
+    account.entries.where(entryable: account.trades.where(security: security)).reverse_chronological
+  end
+
+  def destroy_holding_and_entries!
+    transaction do
+      account.entries.where(entryable: account.trades.where(security: security)).destroy_all
+      destroy
+    end
+
+    account.sync_later
+  end
+
   private
 
     def calculate_trend

app/models/account/holding/syncer.rb

@@ -1,9 +1,6 @@
 class Account::Holding::Syncer
-  attr_reader :warnings
-
   def initialize(account, start_date: nil)
     @account = account
-    @warnings = []
     @sync_date_range = calculate_sync_start_date(start_date)..Date.current
     @portfolio = {}
 
@@ -51,7 +48,9 @@ class Account::Holding::Syncer
                              end
 
                              ticker_start_dates.each do |ticker, date|
-                               prices[ticker] = Security::Price.find_prices(ticker: ticker, start_date: date, end_date: Date.current)
+                               fetched_prices = Security::Price.find_prices(ticker: ticker, start_date: date, end_date: Date.current)
+                               gapfilled_prices = Gapfiller.new(fetched_prices, start_date: date, end_date: Date.current, cache: false).run
+                               prices[ticker] = gapfilled_prices
                              end
 
                              prices
@@ -69,6 +68,8 @@ class Account::Holding::Syncer
 
         price = get_cached_price(ticker, date) || trade_price
 
+        account.observe_missing_price(ticker:, date:) unless price
+
         account.holdings.build \
           date: date,
           security_id: holding[:security_id],