Add additional subtypes, add None option, prefill edit with previously selected option. (#1286)

* Add additional subtypes and allow for None

* Add parens for consistency on 401

* Remove cryptocurrency investment subtype

* Handle nil value

* Use objects current subtype as the initial selection

* Remove "None" option to default to helper prompt

* Fix blank/none selection

* Only include blank if subtype is present

* Simplify investment subtype dropdown

* Improve depository subtype

app/models/investment.rb

@@ -6,11 +6,13 @@ class Investment < ApplicationRecord
     [ "Pension", "pension" ],
     [ "Retirement", "retirement" ],
     [ "401(k)", "401k" ],
-    [ "529 plan", "529_plan" ],
+    [ "Traditional 401(k)", "traditional_401k" ],
+    [ "Roth 401(k)", "roth_401k" ],
+    [ "529 Plan", "529_plan" ],
     [ "Health Savings Account", "hsa" ],
     [ "Mutual Fund", "mutual_fund" ],
+    [ "Traditional IRA", "traditional_ira" ],
     [ "Roth IRA", "roth_ira" ],
-    [ "Roth 401k", "roth_401k" ],
     [ "Angel", "angel" ]
   ].freeze
 

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

@@ -1 +1 @@
-<%= f.select :subtype, options_for_select([["Checking", "checking"], ["Savings", "savings"]], selected: ""), { label: "Type" } %>
+<%= f.select :subtype, [["Checking", "checking"], ["Savings", "savings"]], { label: true, prompt: t(".prompt"), include_blank: t(".none") } %>

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

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

config/locales/views/accounts/en.yml

@@ -5,6 +5,9 @@ en:
       has_issues: Issue detected.
       troubleshoot: Troubleshoot
     accountables:
+      investment:
+        prompt: Select a subtype
+        none: None
       credit_card:
         annual_fee: Annual fee
         annual_fee_placeholder: '99'
@@ -23,6 +26,9 @@ en:
           expiration_date: Expiration Date
           minimum_payment: Minimum Payment
           unknown: Unknown
+      depository:
+        prompt: Select a subtype
+        none: None
       loan:
         interest_rate: Interest rate
         interest_rate_placeholder: '5.25'