Merge branch 'verification-details-household-summary' into verificati…

…ons-individual-summary
ideacrew · Jan 24, 2025 · 7d40971 · 7d40971
2 parents ffddb99 + 030d4d0
commit 7d40971
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/app/helpers/verification_helper.rb b/app/helpers/verification_helper.rb
@@ -458,9 +458,9 @@ def is_evidence_market_eligibility?(evidence)
   end
 
   def evidence_displayable?(evidence)
-    return true unless is_evidence_market_eligibility?(evidence)
+    return can_display_type?(evidence) if is_evidence_market_eligibility?(evidence)
 
-    can_display_type?(evidence)
+    !(evidence.evidence_item_key == :local_mec_evidence && !FinancialAssistanceRegistry.feature_enabled?(:mec_check))
   end
 
   def consumer_evidence_displayable?(evidence)

diff --git a/app/views/insured/families/verification/_admin_verification_actions.html.erb b/app/views/insured/families/verification/_admin_verification_actions.html.erb
@@ -62,8 +62,10 @@
       <%= hidden_field_tag 'verification_type', type_id %>
       <%= hidden_field_tag 'admin_action', 'extend' %>
       <%= hidden_field_tag('family', f_member.family.id) %>       
-      <%= link_to "Cancel", '#', class: "button outline v-type-confirm-button mr-2" %>
-      <%= submit_tag "Confirm", class: "button v-type-confirm-button" %>
+      <div class='d-flex'>
+        <%= link_to "Cancel", '#', class: "btn outline mr-2 v-type-confirm-button" %>
+        <%= submit_tag "Confirm", class: "btn btn-default v-type-confirm-button" %>
+      </div>
     <% end %>
   </div>
 <% else %>

diff --git a/...iews/financial_assistance/applications/verifications/_admin_verification_actions.html.erb b/...iews/financial_assistance/applications/verifications/_admin_verification_actions.html.erb
@@ -51,10 +51,8 @@
       <%= hidden_field_tag 'applicant_id', applicant.id  %>
       <%= hidden_field_tag 'evidence_kind', evidence_kind  %>
       <%= hidden_field_tag 'admin_action', 'extend' %> 
-      <div class="col-md-3">
-        <%= link_to "Cancel", '#', class: "btn btn-default v-type-confirm-button" %>
-      </div>
-      <div class="col-md-3">
+      <div class='d-flex'>
+        <%= link_to "Cancel", '#', class: "btn outline mr-2 v-type-confirm-button" %>
         <%= submit_tag "Confirm", class: "btn btn-default v-type-confirm-button" %>
       </div>
     <% end %>

diff --git a/...nce/app/views/financial_assistance/applications/verifications/_verification_card.html.erb b/...nce/app/views/financial_assistance/applications/verifications/_verification_card.html.erb
@@ -2,7 +2,6 @@
 <% if @bs4 %>
   <% can_show_actions_button = current_user.has_hbx_staff_role? && evidence_type.present? %>
   <% badge_col_class = can_show_actions_button ? "5" : "4" %>
-  <% action_id = "#{applicant.id}-#{evidence_type.downcase.split.join('-')}" %>
   <div class="my-3" data-cuke="<%= evidence_kind %>_for_<%= applicant.full_name.parameterize.underscore %>">
     <div class="row mb-2 mx-0 p-0">
       <div class="d-flex col-xl-7 px-0 pb-2 pb-xl-0 align-items-center">
@@ -24,7 +23,7 @@
       <div class="d-flex col-xl-5 pl-xl-2 px-0 justify-content-xl-end">
         <% if can_show_actions_button %>
           <span class="v-type-actions mr-2">
-            <%= select_tag :verification_actions, admin_actions_on_faa_documents(evidence), {id: "v-action-#{action_id}", prompt: l10n("insured.consumer_roles.upload_ridp_documents.actions"), class: "button-select"} %>
+            <%= select_tag :verification_actions, admin_actions_on_faa_documents(evidence), {id: "v-action-#{applicant.id}-#{evidence_kind.to_s.downcase.split.join('-')}", prompt: l10n("insured.consumer_roles.upload_ridp_documents.actions"), class: "button-select"} %>
           </span>
         <% end %>
         <% if display_upload_for_evidence?(evidence) %>
@@ -78,7 +77,7 @@
       <% end %>
     </div>
     <% if current_user.has_hbx_staff_role? && evidence_type.present? %>
-      <%= render :partial => "financial_assistance/applications/verifications/admin_verification_actions", locals: { application: application, applicant: applicant, evidence: evidence, evidence_kind: evidence_kind, action_id: action_id} %>
+      <%= render :partial => "financial_assistance/applications/verifications/admin_verification_actions", locals: { application: application, applicant: applicant, evidence: evidence, evidence_kind: evidence_kind} %>
     <% end %>
   </div>
 <% else %>
@@ -114,17 +113,16 @@
           <% end %>
         <% end %>
       </div>
-      <% action_id = "#{applicant.id}-#{evidence_type.downcase.split.join('-')}" %>
       <% if current_user.has_hbx_staff_role? && evidence_type.present? %>
         <div class="v-type-actions col-md-2">
-          <%= select_tag :verification_actions, admin_actions_on_faa_documents(evidence), {id: "v-action-#{action_id}", prompt: 'Action'} %>
+          <%= select_tag :verification_actions, admin_actions_on_faa_documents(evidence), {id: "v-action-#{applicant.id}-#{evidence_type.downcase.split.join('-')}", prompt: 'Action'} %>
         </div>
       <% end %>
     </div>
   </div>
 
   <% if current_user.has_hbx_staff_role? && evidence_type.present? %>
-    <%= render :partial => "financial_assistance/applications/verifications/admin_verification_actions", locals: { application: application, applicant: applicant, evidence: evidence, evidence_kind: evidence_kind, action_id: action_id} %>
+    <%= render :partial => "financial_assistance/applications/verifications/admin_verification_actions", locals: { application: application, applicant: applicant, evidence: evidence, evidence_kind: evidence_kind} %>
   <% end %>
 
   <div class="row">