FYST-1065 AZ content updates pt. 1

app/assets/stylesheets/_state-file.scss

@@ -287,6 +287,22 @@
       padding: 0 1rem;
     }
 
+    .text-input-group:has(.text-input-group__prefix) {
+      border-width: 0.1rem;
+
+      .text-input {
+        border: none;
+      }
+    }
+
+    .text-input-group {
+      .text-input-group__prefix {
+        background: none;
+        box-shadow: none;
+        padding: 0 10px 0 10px;
+      }
+    }
+
     .question-with-follow-up__follow-up {
       :not(.not-centered) {
         margin: 0;
@@ -408,6 +424,12 @@
         margin-bottom: 0;
       }
     }
+
+    .text--help {
+      font-size: 1.3rem;
+      margin-bottom: 0.8rem;
+      color: $color-state-file-grey-darker;
+    }
   }
 
   .h1 {

app/assets/stylesheets/_variables.scss

@@ -50,6 +50,7 @@ $color-state-file-input-border: #1B1B1B;
 $color-state-file-primary: #21C834;
 $color-state-file-separator: #BCBCBC;
 $color-state-file-chat: #4dcce3;
+$color-state-file-grey-darker: #808080;
 
 // Size
 $intake-max-width: 570px;

app/controllers/state_file/landing_page_controller.rb

@@ -16,6 +16,7 @@ def edit
       end
       @state_code = params[:us_state]
       @state_name = StateFile::StateInformationService.state_name(@state_code)
+      @built_with_name = @state_code == "nj" ? "New Jersey Office of Innovation" : @state_name
     end
 
     def update

app/views/state_file/landing_page/edit.html.erb

@@ -38,7 +38,7 @@
           <% else %>
             <% unless @user_name.present? %>
               <h2 class="h2">
-                <%= t(".#{@state_code}.built_with_html") %>
+                <%= t(".built_with_html", state_name: @built_with_name) %>
               </h2>
             <% end %>
 
@@ -64,9 +64,17 @@
                 </h2>
               <% end %>
             <% else %>
-              <div class="white-group spacing-below-60">
-                <% # i18n-tasks-use t('state_file.landing_page.edit.help_text_html') # hint for the i18n linter that, yes, we are using this key (sometimes) %>
-                <%= t(".#{@state_code}.help_text_html", default: :'.help_text_html', filing_year: current_tax_year) %>
+              <div class="reveal">
+                <p>
+                  <button class="reveal__button">
+                    <% # i18n-tasks-use t('state_file.landing_page.edit.help_text_title') # hint for the i18n linter that, yes, we are using this key (sometimes) %>
+                    <strong><%= t(".#{@state_code}.help_text_title", default: :'.help_text_title') %></strong>
+                  </button>
+                </p>
+                <div class="reveal__content">
+                  <% # i18n-tasks-use t('state_file.landing_page.edit.help_text_html') # hint for the i18n linter that, yes, we are using this key (sometimes) %>
+                  <%= t(".#{@state_code}.help_text_html", default: :'.help_text_html', filing_year: current_tax_year) %>
+                </div>
               </div>
               <%= form_with model: @form, url: { action: :update }, local: true, method: :put, builder: VitaMinFormBuilder do |f| %>
                 <%= f.submit t("general.get_started"), class: "button button--primary button--wide", id: "firstCta" %>

app/views/state_file/questions/az_prior_last_names/edit.html.erb

@@ -2,7 +2,7 @@
 <% content_for :page_title, title %>
 <% content_for :card do %>
   <h1 class="h2"><%= title %></h1>
-  <p><%= t(".subtitle") %></p>
+  <p><%= t(".subtitle", start_year: current_tax_year - 5, end_year: current_tax_year - 2) %></p>
 
   <%= form_with model: @form, url: { action: :update }, local: true, method: "put",
                 data: { efile_security_information: true, form_name: "state_file_az_prior_last_names_form" },

app/views/state_file/questions/az_public_school_contributions/_form.html.erb

@@ -1,4 +1,4 @@
-<% @main_heading = t("state_file.questions.az_public_school_contributions.edit.title", year: current_tax_year) %>
+<% @main_heading = t("state_file.questions.az_public_school_contributions.edit.title_html") %>
 
 <% content_for :page_title, @main_heading %>
 
@@ -10,7 +10,7 @@
         <div class="white-group">
           <%= f.cfa_radio_set(
                 :made_contribution,
-                label_text: t('state_file.questions.az_public_school_contributions.edit.made_contribution', year: current_tax_year),
+                label_text: t('state_file.questions.az_public_school_contributions.edit.made_contribution', count: current_intake.filer_count, year: current_tax_year),
                 collection: [
                   { value: :yes, label: t('general.affirmative'), input_html: { "data-follow-up": "#contribution-details" } },
                   { value: :no, label: t('general.negative') }
@@ -20,14 +20,43 @@
         </div>
       </div>
 
+      <div class="reveal">
+        <button class="reveal__button"><%= t('.which_qualify') %></button>
+        <div class="reveal__content">
+          <ul>
+            <% t(".qualifying_list").each do |list_item| %>
+              <li><%= list_item %></li>
+            <% end %>
+          </ul>
+          <p><%= t(".more_details_html") %></p>
+        </div>
+      </div>
+
+      <div class="reveal">
+        <button class="reveal__button"><%= t(".donations_this_year", current_year: current_tax_year + 1) %></button>
+        <div class="reveal__content">
+          <p><%= t(".donations_this_year_details_html", current_year: current_tax_year + 1) %></p>
+        </div>
+      </div>
+
       <div class="question-with-follow-up__follow-up" id="contribution-details">
         <div class="white-group">
           <p class="form-question spacing-below-25"><%= t('state_file.questions.az_public_school_contributions.edit.additional_info') %></p>
           <div class="form-group-tight">
-            <%= f.cfa_input_field(:school_name, t('state_file.questions.az_public_school_contributions.edit.school_name'), classes: ["form-width--long"]) %>
+            <%= f.cfa_input_field(
+                  :school_name,
+                  t('state_file.questions.az_public_school_contributions.edit.school_name'),
+                  classes: ["form-width--long"],
+                  help_text: t("state_file.questions.az_public_school_contributions.edit.school_name_help_text")
+                ) %>
             <%= f.cfa_input_field(:ctds_code, t('state_file.questions.az_public_school_contributions.edit.ctds_code'), classes: ["form-width--long"]) %>
             <%= f.cfa_input_field(:district_name, t('state_file.questions.az_public_school_contributions.edit.district_name'), classes: ["form-width--long"]) %>
-            <%= f.vita_min_money_field(:amount, t('state_file.questions.az_public_school_contributions.edit.amount', year: current_tax_year), classes: ["form-width--long"]) %>
+            <%= f.vita_min_money_field(
+                  :amount,
+                  t('state_file.questions.az_public_school_contributions.edit.amount', year: current_tax_year),
+                  classes: ["form-width--long"],
+                  help_text: t("state_file.questions.az_public_school_contributions.edit.amount_help_text", count: current_intake.filer_count)
+                ) %>
             <div class="date-select">
               <%= f.cfa_date_select(
                     :date_of_contribution,
@@ -40,6 +69,13 @@
             </div>
           </div>
         </div>
+
+        <div class="reveal">
+          <button class="reveal__button"><%= t(".school_details_question") %></button>
+          <div class="reveal__content">
+            <p><%= t(".school_details_answer_html") %></p>
+          </div>
+        </div>
       </div>
     </div>
 

app/views/state_file/questions/az_senior_dependents/edit.html.erb

@@ -1,4 +1,4 @@
-<% title = t('.title') %>
+<% title = t('.title', dependents_name_list: @form.dependents.pluck(:first_name).to_sentence) %>
 <% content_for :page_title, title %>
 
 <% content_for :card do %>

app/views/state_file/questions/eligible/_az_supported.html.erb

@@ -3,4 +3,6 @@
   <li><a href="https://azdor.gov/individuals/income-tax-filing-assistance/deductions-and-exemptions" target="_blank" rel="noopener nofollow"><%= t(".dependent_credit") %></a></li>
   <li><a href="https://azdor.gov/individuals/income-tax-filing-assistance/tax-credits" target="_blank" rel="noopener nofollow"><%= t(".family_income_credit") %></a></li>
   <li><a href="https://azdor.gov/forms/tax-credits-forms/credit-increased-excise-taxes" target="_blank" rel="noopener nofollow"><%= t(".increased_excise_credit") %></a></li>
+  <li><%= t(".public_school_credit") %></li>
+  <li><%= t(".charitable_contributions_credit") %></li>
 </ul>

app/views/state_file/questions/eligible/_az_unsupported.html.erb

@@ -19,8 +19,6 @@
   <%=t('.other_credits_heading') %>
   <ul>
     <li><%=t('.other_credits_529_html') %></li>
-    <li><%=t('.other_credits_qcos_html') %></li>
-    <li><%=t('.other_credits_qfcos_html') %></li>
     <li><%=t('.other_credits_301_html') %></li>
     <li><%=t('.other_credits_itemized_deductions') %></li>
     <li><%=t('.other_credits_add_dependents') %></li>

app/views/state_file/questions/eligible/edit.html.erb

@@ -3,26 +3,30 @@
 <% content_for :page_title, title1 %>
 <% content_for :card do %>
   <h1 class="h2"><%= title1 %></h1>
-  <h2 class="h2"><%= t(".title2_html") %></h2>
+  <p><%= t(".body_html") %></p>
 
   <div class="white-group">
     <%= render partial: "state_file/questions/eligible/#{current_state_code}_supported" %>
   </div>
 
   <div class="reveal">
-    <p><button class="reveal__button"><%= t('.not_supported') %></button></p>
+    <p>
+      <button class="reveal__button"><%= t('.not_supported') %></button>
+    </p>
     <div class="reveal__content">
       <% unless current_intake.disqualifying_eligibility_rules.empty? %>
         <%= render partial: "state_file/questions/eligible/#{current_state_code}_unsupported" %>
       <% end %>
-      <div class="with-top-separator">
-        <p class="text--bold"><%=t('.want_to_claim_heading') %></p>
-        <p><%=t('.want_to_claim_vita', state_name: current_state_name) %></p>
-        <p>
-          <a href="<%= @vita_link %>" target="_blank" rel="noopener nofollow"><%= t('state_file.questions.eligibility_offboarding.other_options.vita_link') %></a>
-        </p>
-        <p><%=t('.want_to_claim_learn_more_html', link: @faq_other_options_link) %></p>
-      </div>
+    </div>
+  </div>
+  <div class="reveal">
+    <button class="reveal__button"><%= t('.not_supported_reveal_heading') %></button>
+    <div class="reveal__content">
+      <p><%= t('.want_to_claim_vita', state_name: current_state_name) %></p>
+      <p>
+        <a href="<%= @vita_link %>" target="_blank" rel="noopener nofollow"><%= t('state_file.questions.eligibility_offboarding.other_options.vita_link') %></a>
+      </p>
+      <p><%= t('.want_to_claim_learn_more_html', link: @faq_other_options_link) %></p>
     </div>
   </div>
 

app/views/state_file/questions/income_review/edit.html.erb

@@ -4,26 +4,6 @@
   <h1 class="h2"><%= title %></h1>
   <p><%= t(".help_text") %></p>
 
-  <% if current_intake.state_file1099_rs.present? %>
-    <div class="white-group retirement-income" id="form1099rs">
-      <p class="text--bold spacing-below-0"><%= t(".retirement_income_title") %></p>
-      <% current_intake.state_file1099_rs.each do |state_1099r| %>
-        <div class="spacing-above-25">
-          <p class="text--bold spacing-below-5"><%= state_1099r.recipient_name %></p>
-          <p class="spacing-below-5"><%= state_1099r.payer_name %></p>
-          <%= link_to t(".review_and_edit_state_info"),
-                      StateFile::Questions::RetirementIncomeController.to_path_helper(
-                        action: :edit,
-                        id: state_1099r.id,
-                        return_to_review: params[:return_to_review]
-                      ),
-                      class: "button--small"
-          %>
-        </div>
-      <% end %>
-    </div>
-  <% end %>
-
   <% if @w2s.present? %>
     <div class="white-group" id="w2s">
       <p class="text--bold spacing-below-0"><%= t(".w2s_title") %></p>
@@ -44,15 +24,6 @@
     </div>
   <% end %>
 
-  <% if current_intake.direct_file_json_data.interest_reports.count > 0 %>
-    <div class="white-group">
-      <p class="text--bold spacing-below-0"><%= t(".interest_income_title") %></p>
-      <p class="text--grey-bold spacing-above-15 spacing-below-0">
-        <%= t(".interest_income_body") %>
-      </p>
-    </div>
-  <% end %>
-
   <% if current_intake.direct_file_data.fed_unemployment > 0 %>
     <div class="white-group unemployment" id="form1099gs">
       <p class="text--bold spacing-below-0"><%= t(".unemployment_title") %></p>
@@ -80,6 +51,35 @@
     </div>
   <% end %>
 
+  <% if current_intake.state_file1099_rs.present? %>
+    <div class="white-group retirement-income" id="form1099rs">
+      <p class="text--bold spacing-below-0"><%= t(".retirement_income_title") %></p>
+      <% current_intake.state_file1099_rs.each do |state_1099r| %>
+        <div class="spacing-above-25">
+          <p class="text--bold spacing-below-5"><%= state_1099r.recipient_name %></p>
+          <p class="spacing-below-5"><%= state_1099r.payer_name %></p>
+          <%= link_to t(".review_and_edit_state_info"),
+                      StateFile::Questions::RetirementIncomeController.to_path_helper(
+                        action: :edit,
+                        id: state_1099r.id,
+                        return_to_review: params[:return_to_review]
+                      ),
+                      class: "button--small"
+          %>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+
+  <% if current_intake.direct_file_json_data.interest_reports.count > 0 %>
+    <div class="white-group">
+      <p class="text--bold spacing-below-0"><%= t(".interest_income_title") %></p>
+      <p class="text--grey-bold spacing-above-15 spacing-below-0">
+        <%= t(".interest_income_body") %>
+      </p>
+    </div>
+  <% end %>
+
   <% if current_intake.direct_file_data.fed_ssb > 0 || current_intake.direct_file_data.fed_taxable_ssb > 0 %>
     <div class="white-group">
       <p class="text--bold spacing-below-0"><%= t(".ssa_title") %></p>

app/views/state_file/questions/retirement_income/edit.html.erb

@@ -1,4 +1,4 @@
-<% @main_heading = t("state_file.questions.retirement_income.edit.title", payer_name: @state_file1099_r.payer_name) %>
+<% @main_heading = t("state_file.questions.retirement_income.edit.title_html", payer_name: @state_file1099_r.payer_name) %>
 <% content_for :page_title, @main_heading %>
 
 <% content_for :card do %>
@@ -18,7 +18,7 @@
             <%= f.vita_min_money_field(:state_tax_withheld_amount, t(".box14_html"), classes: ["form-width--long"]) %>
           </div>
           <div class="form-question spacing-below-15">
-            <%= f.cfa_input_field(:payer_state_identification_number, t(".box15_html"), classes: ["form-width--long"]) %>
+            <%= f.cfa_input_field(:payer_state_identification_number, t(".box15_html"), classes: ["form-width--long"], prefix: current_state_code.upcase) %>
           </div>
           <div class="form-question spacing-below-15">
             <%= f.vita_min_money_field(:state_distribution_amount, t(".box16_html"), classes: ["form-width--long"]) %>