Fixed crypto and loan add menus (#1306)

* Fixed crypto and loan add menus

* Changed unspecified crypto account type to none for consistency

* Added default add message for loan subtype

* Made the short form of non-mortgage loans in loans.rb match the long form

* Edited the crypto tooltip to be country generic

* Update config/locales/views/loans/en.yml

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Signed-off-by: Geoffrey <79559478+CYBRXT@users.noreply.github.com>

* Update app/views/loans/_form.html.erb

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Signed-off-by: Geoffrey <79559478+CYBRXT@users.noreply.github.com>

* Following Dosu's comment on my issue for consistency

---------

Signed-off-by: Geoffrey <79559478+CYBRXT@users.noreply.github.com>
Co-authored-by: Geoffrey <geoffrey@github.worker>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
This commit is contained in:
Geoffrey
2026-04-07 05:39:18 -04:00
committed by GitHub
parent 0870ebb56b
commit ac2817d704
5 changed files with 17 additions and 9 deletions

View File

@@ -3,9 +3,9 @@ class Loan < ApplicationRecord
SUBTYPES = {
"mortgage" => { short: "Mortgage", long: "Mortgage" },
"student" => { short: "Student", long: "Student Loan" },
"auto" => { short: "Auto", long: "Auto Loan" },
"other" => { short: "Other", long: "Other Loan" }
"student" => { short: "Student Loan", long: "Student Loan" },
"auto" => { short: "Auto Loan", long: "Auto Loan" },
"other" => { short: "Other Loan", long: "Other Loan" }
}.freeze
def monthly_payment

View File

@@ -4,12 +4,12 @@
<%= form.fields_for :accountable do |crypto_form| %>
<%= crypto_form.select :subtype,
Crypto::SUBTYPES.map { |k, v| [v[:long], k] },
{ label: t(".subtype_label"), prompt: t(".subtype_prompt"), include_blank: t(".subtype_none") } %>
{ label: t("cryptos.form.subtype_label"), prompt: t("cryptos.form.subtype_prompt"), include_blank: t("cryptos.form.subtype_none") } %>
<%= crypto_form.select :tax_treatment,
Crypto.tax_treatments.keys.map { |k| [t("accounts.tax_treatments.#{k}"), k] },
{ label: t(".tax_treatment_label"), include_blank: false },
{ label: t("cryptos.form.tax_treatment_label"), include_blank: false },
{} %>
<p class="text-xs text-secondary mt-1"><%= t(".tax_treatment_hint") %></p>
<p class="text-xs text-secondary mt-1"><%= t("cryptos.form.tax_treatment_hint") %></p>
<% end %>
<% end %>

View File

@@ -28,6 +28,12 @@
label: t("loans.form.term_months"),
placeholder: t("loans.form.term_months_placeholder") %>
</div>
<div>
<%= loan_form.select :subtype,
Loan::SUBTYPES.map { |k, v| [v[:long], k] },
{ label: true, prompt: t("loans.form.subtype_prompt"), include_blank: t("loans.form.none") } %>
</div>
<% end %>
</div>
<% end %>

View File

@@ -5,10 +5,10 @@ en:
edit: Edit %{account}
form:
subtype_label: Account type
subtype_prompt: Select type...
subtype_none: Not specified
subtype_prompt: Select account type
subtype_none: None
tax_treatment_label: Tax Treatment
tax_treatment_hint: Most cryptocurrency is held in taxable accounts. Select a different option if held in a tax-advantaged account like a self-directed IRA.
tax_treatment_hint: Most cryptocurrency is held in taxable accounts. Select a different option if held in a tax-advantaged account.
new:
title: Enter account balance
subtypes:

View File

@@ -10,6 +10,8 @@ en:
rate_type: Rate type
term_months: Term (months)
term_months_placeholder: '360'
subtype_prompt: Select loan type
subtype_none: None
new:
title: Enter loan details
overview: