From d7b3b667fc018db8a3083ae3ce09f12e2a89f9db Mon Sep 17 00:00:00 2001
From: Ryan Eddy <44847768+RyanEddyIC@users.noreply.github.com>
Date: Tue, 14 Jan 2025 20:36:47 -0500
Subject: [PATCH] more csp enabled cucumber fixes (#4904)

* create plan year cucumbers

* remove html_safe

* benefit application form cucumber fixes

* add missing comma

* fix check for disabled button

* qle cucumber fixes

* add save_btn pom

* fix disabled link cucumber step

* term sep type cucumber fixes

* immigration expiration cucumber fix

* fix send secure msg ajax trigger

* more fixes

* tribe field cucumber fix

* remove conditional for doc date field init

---------

Co-authored-by: kristinmerbach <78749008+kristinmerbach@users.noreply.github.com>
---
 app/assets/javascripts/employee_role.js       |  9 +-
 .../javascripts/exchanges/hbx_profiles.js     |  2 +-
 app/assets/javascripts/families.js            |  4 +
 .../_new_benefit_application.html.slim        | 86 +----------------
 .../hbx_profiles/_new_secure_message.html.erb |  2 +-
 .../new_benefit_application.js.erb            | 94 ++++++++++++++++++-
 .../docs_shared/_expiration_date.html.erb     |  8 --
 .../immigration_document_options.js.erb       | 10 +-
 .../_effective_on_kind_fields.html.erb        |  5 -
 .../insured/families/_qle_detail.html.erb     |  4 +-
 .../families/_terminate_confirmation.html.erb |  4 +-
 .../insured/families/check_qle_date.js.erb    |  8 +-
 .../people/landing_pages/_personal.html.erb   |  6 +-
 .../inboxes/_individual_message.html.erb      |  9 +-
 .../v1/cards/_metal_level_select.html.slim    | 41 ++++----
 .../v1/cards/_sponsor_contributions.html.slim | 11 ++-
 .../benefit_applications/_form.html.slim      |  4 +-
 .../benefit_applications/new.html.slim        |  7 +-
 .../benefit_applications/new.js.erb           | 12 ++-
 .../_benefit_application_fields.html.slim     | 21 +++--
 .../benefit_packages/_form.html.slim          |  6 +-
 .../prior_py_ivl_admin_sep_steps.rb           |  3 +-
 .../add_plan_year_for_employer.feature        |  4 +-
 .../view_eligibility_steps.rb                 |  2 +-
 .../household_info_continue_button_steps.rb   |  2 +-
 features/step_definitions/individual_steps.rb |  4 +-
 .../registration/ee_family_information.rb     |  6 +-
 27 files changed, 219 insertions(+), 155 deletions(-)

diff --git a/app/assets/javascripts/employee_role.js b/app/assets/javascripts/employee_role.js
index 02fd31c1c80..554a3231b32 100644
--- a/app/assets/javascripts/employee_role.js
+++ b/app/assets/javascripts/employee_role.js
@@ -101,10 +101,14 @@ $(function () {
 	});
 });
 
+$(document).on('selectric-change', "#terminate-reason-select", function() {
+	EmployeeRole.disableTerminateSubmit($(this).data('enrollment-id'))
+})
+
 var EmployeeRole = ( function( window, undefined ) {
   function disableTerminateSubmit(hbx_id) {
-    var target = $('#terminate_confirm_' + hbx_id);
-    var terminate_reason = target.find('select.interaction-choice-control-terminate-reason').val();
+    var target = $("#terminate_confirm_" + hbx_id);
+    var terminate_reason = target.find('#terminate-reason-select').val();
     if(terminate_reason == undefined || terminate_reason == ""){
       target.find('.terminate_reason_submit').attr("disabled",true);
     }else{
@@ -116,4 +120,3 @@ var EmployeeRole = ( function( window, undefined ) {
     disableTerminateSubmit : disableTerminateSubmit,
   };
 })( window );
-
diff --git a/app/assets/javascripts/exchanges/hbx_profiles.js b/app/assets/javascripts/exchanges/hbx_profiles.js
index ac6cd509b00..ed64986e8d7 100644
--- a/app/assets/javascripts/exchanges/hbx_profiles.js
+++ b/app/assets/javascripts/exchanges/hbx_profiles.js
@@ -76,7 +76,7 @@ function confirmSecureMsg(event){
   });
 }
 
-$(document).on('click', '.btn-confirmation', function() {
+$(document).on('click', '.btn-confirmation.send-secure-msg-confirm', function() {
     confirmSecureMsg(event);
     return false;
 });
diff --git a/app/assets/javascripts/families.js b/app/assets/javascripts/families.js
index d886adbb4b8..81b12be5ad2 100644
--- a/app/assets/javascripts/families.js
+++ b/app/assets/javascripts/families.js
@@ -65,6 +65,10 @@ function enableTransition() {
 
 }
 
+ $(document).on('click', '.terminate_reason_submit', function() {
+   fetchDate($(this).data('enrollment-id'))
+ })
+
 function fetchDate(id){
   var date = document.getElementById(id).value;
   document.getElementById(`terminate_date_${id}`).value = date;
diff --git a/app/views/exchanges/hbx_profiles/_new_benefit_application.html.slim b/app/views/exchanges/hbx_profiles/_new_benefit_application.html.slim
index 67218bc3601..bdd20e7e2af 100644
--- a/app/views/exchanges/hbx_profiles/_new_benefit_application.html.slim
+++ b/app/views/exchanges/hbx_profiles/_new_benefit_application.html.slim
@@ -1,5 +1,6 @@
 = form_tag create_benefit_application_exchanges_hbx_profiles_path(benefit_sponsorship_id: @ba_form.benefit_sponsorship_id),class:'admin-plan-year-form', id: 'admin-create-ba', :method => :post, :remote => true do
   = hidden_field_tag :employer_actions_id, params["employer_actions_id"]
+  = hidden_field_tag :start_on_options_json, @ba_form.start_on_options.to_json
 
   br
   .row
@@ -11,7 +12,7 @@
         = l10n("hbx_profiles.effective_start_date")
       br
       .input-group
-        = select_tag :start_on, options_for_select(@ba_form.start_on_options.keys), {:prompt => "SELECT START ON", class:'form-control floatlabel benefit-application-start-date', onchange:"selectedDate(this); validateInputs()", id:'baStartDate'}
+        = select_tag :start_on, options_for_select(@ba_form.start_on_options.keys), {:prompt => "SELECT START ON", class:'form-control floatlabel benefit-application-start-date', id:'baStartDate'}
     .col-md-4
       label[for="effectiveEndDate" style="font-weight:bold"]
         = l10n("hbx_profiles.effective_end_date")
@@ -24,7 +25,7 @@
       label[for="fullTimeEmployees" style="font-weight:bold"]
         = l10n("hbx_profiles.full_time_employees")
       br
-      = text_field_tag :fte_count, nil, class:'form-control', id:'fteCount', onchange: "enableDisableSubmit()", onblur: "checkifValid(this)"
+      = text_field_tag :fte_count, nil, class:'form-control', id:'fteCount'
       .required-item.hidden
         = l10n("hbx_profiles.provide_fte_count")
   br
@@ -51,87 +52,6 @@
       button#adminCreatePyButton.pull-right.btn.btn-primary.disabled type="submit" data-disable-with=l10n("please_wait")
         | Submit
 
-javascript:
-  $( function() {
-    $("#open_enrollment_start_on").datepicker();
-    $("#open_enrollment_end_on").datepicker();
-    $("#binder_due_date").datepicker();
-  } );
-
-  function selectedDate(element) {
-    if (element && element.value) {
-      assignBenefitApplicationDates(element.value)
-      document.getElementById('open_enrollment_start_on').classList.remove('blocking');
-      document.getElementById('open_enrollment_end_on').classList.remove('blocking');
-    } else {
-      resetInputOptions()
-    }
-    enableDisableSubmit()
-  }
-
-  function checkifValid(element) {
-    input = element.closest('input');
-    label = element.closest('.col-md-4').getElementsByTagName('label')[0];
-    feedback = element.nextSibling;
-    if (!element.value) {
-      label.setAttribute("class", "required-feedback");
-      input.setAttribute("class", "required-input");
-      feedback.classList.remove('hidden');
-    } else {
-      feedback.classList.add('hidden');
-      label.classList.remove('required-feedback');
-      input.classList.remove('required-input');
-    }
-  }
-
-  function validateInputs() {
-    inputs = document.getElementsByClassName('admin-plan-year-form')[0].querySelectorAll('input');
-    for (input of inputs) {
-      if (input.id === 'open_enrollment_start_on' || input.id === 'open_enrollment_end_on') {
-        checkifValid(input);
-      }
-    }
-  }
-
-  function closeRow(element) {
-    element.closest('tr').remove();
-  }
-
-  var employeeCounts = {
-    fte: Number
-  }
-
-  function enableDisableSubmit() {
-    var start_on = document.getElementById('baStartDate');
-    var end_on = document.getElementById('end_on');
-    var oe_start_on = document.getElementById('open_enrollment_start_on');
-    var oe_end_on = document.getElementById('open_enrollment_end_on');
-    var fte_count = document.getElementById('fteCount');
-
-    if (fte_count) {
-      employeeCounts.fte = fte_count.value
-    }
-
-    if ((employeeCounts.fte >= 1) && start_on.value && end_on.value && oe_start_on.value && oe_end_on.value) {
-      document.getElementById('adminCreatePyButton').classList.remove('disabled');
-    } else {
-      document.getElementById('adminCreatePyButton').classList.add('disabled')
-    }
-  }
-
-  function resetInputOptions() {
-    document.querySelector('input#end_on').value = '';
-    document.querySelector("input#open_enrollment_start_on").value = '';
-    document.querySelector("input#open_enrollment_end_on").value = '';
-  }
-
-  function assignBenefitApplicationDates(targetDate) {
-    var date = JSON.parse('#{@ba_form.start_on_options.to_json.html_safe}');
-    document.querySelector('input#end_on').value = getFormattedDate(date[targetDate]["benefit_application_end_on"]);
-    document.querySelector("input#open_enrollment_start_on").value = getFormattedDate(date[targetDate]["open_enrollment_start_on"]);
-    document.querySelector("input#open_enrollment_end_on").value = getFormattedDate(date[targetDate]["open_enrollment_end_on"]);
-  }
-
 css:
   .required-feedback {
     color: #dc3545;
diff --git a/app/views/exchanges/hbx_profiles/_new_secure_message.html.erb b/app/views/exchanges/hbx_profiles/_new_secure_message.html.erb
index 9242c53d92d..d9c85ec88d4 100644
--- a/app/views/exchanges/hbx_profiles/_new_secure_message.html.erb
+++ b/app/views/exchanges/hbx_profiles/_new_secure_message.html.erb
@@ -114,7 +114,7 @@
             <p>Are you sure you want to <b>Send/Upload</b> this message?</p>
           </div>
           <div class="modal-footer">
-            <button type="button" class="btn btn-primary btn-confirmation">Confirm</button>
+            <button type="button" class="btn btn-primary btn-confirmation send-secure-msg-confirm">Confirm</button>
             <button type="button" class="btn btn-default pull-left" data-dismiss="modal">Cancel</button>
           </div>
         </div>
diff --git a/app/views/exchanges/hbx_profiles/new_benefit_application.js.erb b/app/views/exchanges/hbx_profiles/new_benefit_application.js.erb
index 7d221257a28..c27b6b5efd0 100644
--- a/app/views/exchanges/hbx_profiles/new_benefit_application.js.erb
+++ b/app/views/exchanges/hbx_profiles/new_benefit_application.js.erb
@@ -7,9 +7,99 @@ if ( $('tr.child-row:visible').length > 0 ) {
 }
 
 if ( !($parent_row.next().hasClass('child-row'))) {
-  $parent_row.after('<tr class="child-row"><td colspan="100"><%= j render "new_benefit_application"%></td></tr>');
+  $parent_row.after('<tr class="child-row"><td colspan="100"><%= j render "new_benefit_application"%></td></tr>').ready(initNewBAForm());
   $("li>a:contains('Collapse Form')").eq(containing_row.index()).removeClass('disabled');
   $('.dropdown.pull-right').removeClass('open');
 }
 
-applyJQDatePickers();
\ No newline at end of file
+applyJQDatePickers();
+
+function initNewBAForm() {
+  $(document).on('change', '#baStartDate', function() {
+    selectedDate(this);
+    validateInputs()
+  })
+
+  $(document).on('change', '#fteCount', function() {enableDisableSubmit()})
+  $(document).on('blur', '#fteCount', function() {checkifValid(this)})
+
+  $( function() {
+    $("#open_enrollment_start_on").datepicker();
+    $("#open_enrollment_end_on").datepicker();
+    $("#binder_due_date").datepicker();
+  } );
+
+  function selectedDate(element) {
+    if (element && element.value) {
+      assignBenefitApplicationDates(element.value)
+      document.getElementById('open_enrollment_start_on').classList.remove('blocking');
+      document.getElementById('open_enrollment_end_on').classList.remove('blocking');
+    } else {
+      resetInputOptions()
+    }
+    enableDisableSubmit()
+  }
+
+  function checkifValid(element) {
+    input = element.closest('input');
+    label = element.closest('.col-md-4').getElementsByTagName('label')[0];
+    feedback = element.nextSibling;
+    if (!element.value) {
+      label.setAttribute("class", "required-feedback");
+      input.setAttribute("class", "required-input");
+      feedback.classList.remove('hidden');
+    } else {
+      feedback.classList.add('hidden');
+      label.classList.remove('required-feedback');
+      input.classList.remove('required-input');
+    }
+  }
+
+  function validateInputs() {
+    inputs = document.getElementsByClassName('admin-plan-year-form')[0].querySelectorAll('input');
+    for (input of inputs) {
+      if (input.id === 'open_enrollment_start_on' || input.id === 'open_enrollment_end_on') {
+        checkifValid(input);
+      }
+    }
+  }
+
+  function closeRow(element) {
+    element.closest('tr').remove();
+  }
+
+  function enableDisableSubmit() {
+    var employeeCounts = {
+      fte: Number
+    }
+    var start_on = document.getElementById('baStartDate');
+    var end_on = document.getElementById('end_on');
+    var oe_start_on = document.getElementById('open_enrollment_start_on');
+    var oe_end_on = document.getElementById('open_enrollment_end_on');
+    var fte_count = document.getElementById('fteCount');
+
+    if (fte_count) {
+      employeeCounts.fte = fte_count.value
+    }
+
+    if ((employeeCounts.fte >= 1) && start_on.value && end_on.value && oe_start_on.value && oe_end_on.value) {
+      document.getElementById('adminCreatePyButton').classList.remove('disabled');
+    } else {
+      document.getElementById('adminCreatePyButton').classList.add('disabled')
+    }
+  }
+
+  function resetInputOptions() {
+    document.querySelector('input#end_on').value = '';
+    document.querySelector("input#open_enrollment_start_on").value = '';
+    document.querySelector("input#open_enrollment_end_on").value = '';
+  }
+
+  function assignBenefitApplicationDates(targetDate) {
+    // var date = JSON.parse('#{@ba_form.start_on_options.to_json.html_safe}');
+    var date = JSON.parse($('#start_on_options_json').attr('value'))
+    document.querySelector('input#end_on').value = getFormattedDate(date[targetDate]["benefit_application_end_on"]);
+    document.querySelector("input#open_enrollment_start_on").value = getFormattedDate(date[targetDate]["open_enrollment_start_on"]);
+    document.querySelector("input#open_enrollment_end_on").value = getFormattedDate(date[targetDate]["open_enrollment_end_on"]);
+  }
+}
diff --git a/app/views/insured/consumer_roles/docs_shared/_expiration_date.html.erb b/app/views/insured/consumer_roles/docs_shared/_expiration_date.html.erb
index 9c664fb9fdb..7dc55760d1e 100644
--- a/app/views/insured/consumer_roles/docs_shared/_expiration_date.html.erb
+++ b/app/views/insured/consumer_roles/docs_shared/_expiration_date.html.erb
@@ -7,12 +7,4 @@
 <div class="col-md-4 col-sm-4 col-xs-6 form-group form-group-lg no-pd">
   <%= v.text_field :expiration_date, {id: "doc_date_field", class: "#{!FinancialAssistanceRegistry.feature_enabled?(:optional_document_fields) ? "required" : "" } date-field doc_fields", placeholder: l10n("insured.consumer_roles.docs_shared.expiration_date", name: name), value: (v.object.expiration_date.blank? ? '' : v.object.expiration_date.strftime('%m/%d/%Y'))} %><br>
 </div>
-
-<script>
-  $(function() {
-    $( "#doc_date_field" ).datepicker({
-      dateFormat: 'mm/dd/yy'
-    });
-  });
-</script>
 <% end %>
diff --git a/app/views/insured/consumer_roles/immigration_document_options.js.erb b/app/views/insured/consumer_roles/immigration_document_options.js.erb
index 015b4b132ce..2829b2bf7c5 100644
--- a/app/views/insured/consumer_roles/immigration_document_options.js.erb
+++ b/app/views/insured/consumer_roles/immigration_document_options.js.erb
@@ -37,10 +37,18 @@
   <% url = @target.is_a?(Person) ? {} : employee_dependent_submission_options_for(@target) %>
   '<%= form_for @target, url do |f| %>'
     '<%= f.fields_for find_consumer_role_for_fields(f.object) do |c| %>'
-      $(".vlp_doc_area").html("<%= escape_javascript(render partial: partial_target, locals: {c: c}) %>")
+      $(".vlp_doc_area").html("<%= escape_javascript(render partial: partial_target, locals: {c: c}) %>").ready(initExpirationDateField())
     '<% end %>'
     <% if EnrollRegistry[:enroll_app].setting(:verifiable_immigration_statuses).item %>
       $(".vlp_doc_area").append("<%= escape_javascript(render partial: 'immigration_statuses', locals: {c: f}) %>")
     <% end %>
   '<% end %>'
 <% end %>
+
+function initExpirationDateField() {
+  $(function() {
+    $( "#doc_date_field" ).datepicker({
+      dateFormat: 'mm/dd/yy'
+    });
+  });
+}
diff --git a/app/views/insured/families/_effective_on_kind_fields.html.erb b/app/views/insured/families/_effective_on_kind_fields.html.erb
index 1da3f0422b6..6ebe6c8a671 100644
--- a/app/views/insured/families/_effective_on_kind_fields.html.erb
+++ b/app/views/insured/families/_effective_on_kind_fields.html.erb
@@ -9,11 +9,6 @@
     <div style='margin: 0 auto;max-width:250px;'>
       <%= select_tag 'effective_on_kind', options_for_select(generate_options_for_effective_on_kinds(@qle, @qle_event_date)), include_blank: "#{l10n('.select_effective_date').to_s.upcase} *" %>
     </div>
-    <script type="text/javascript">
-      if (!disableSelectric) {
-        $('select').selectric();
-      }
-    </script>
   <% end %>
 <% else %>
   <%= hidden_field_tag 'effective_on_kind', @qle.effective_on_kinds.first %>
diff --git a/app/views/insured/families/_qle_detail.html.erb b/app/views/insured/families/_qle_detail.html.erb
index 8b208d2ce67..da7fba4b1eb 100644
--- a/app/views/insured/families/_qle_detail.html.erb
+++ b/app/views/insured/families/_qle_detail.html.erb
@@ -104,7 +104,7 @@
                 <div class="spec_reasons">
                 </div>
                 <div class="text-center <%= pundit_class Family,:updateable? %>">
-                  <%= submit_tag l10n('.continue'), id: 'sep_continue', class: 'btn btn-primary', data: { disable_with: false }, onkeydown: "handleButtonKeyDown(event, 'sep_continue')"  %>
+                  <%= submit_tag l10n('.continue'), id: 'sep_continue', class: 'btn btn-primary', data: { disable_with: false } %>
                   <br/>
                   <br/>
                 </div>
@@ -130,4 +130,6 @@
 $(document).on('turbolinks:load', function () {
   QLE.initialize();
 });
+
+$(document).on('keydown', '#sep_continue', function(event) { handleButtonKeyDown(event, 'sep_continue') })
 </script>
diff --git a/app/views/insured/families/_terminate_confirmation.html.erb b/app/views/insured/families/_terminate_confirmation.html.erb
index bdd86d438f6..9ef249fd521 100644
--- a/app/views/insured/families/_terminate_confirmation.html.erb
+++ b/app/views/insured/families/_terminate_confirmation.html.erb
@@ -11,11 +11,11 @@
         <%= hidden_field_tag 'hbx_enrollment_id', enrollment.id %>
         <%= hidden_field_tag "terminate_date_#{enrollment.hbx_id}" %>
         <div class="modal-body">
-          <%= select_tag "terminate_reason", options_for_select(HbxEnrollment::WAIVER_REASONS), {include_blank: l10n("insured.please_select_terminate_reason"), onchange: "EmployeeRole.disableTerminateSubmit('#{enrollment.id}')"} %>
+          <%= select_tag "terminate_reason", options_for_select(HbxEnrollment::WAIVER_REASONS), {id: "terminate-reason-select", include_blank: l10n("insured.please_select_terminate_reason"), data: {enrollment_id: "#{enrollment.id}"} } %>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default" data-dismiss="modal"><%= l10n('.close') %></button>
-          <%= submit_tag l10n('.submit'), onclick: "fetchDate('#{enrollment.hbx_id}')",  class: 'btn btn-primary terminate_reason_submit', disabled: true %>
+          <%= submit_tag l10n('.submit'),  class: 'btn btn-primary terminate_reason_submit', data: {enrollment_id: "#{enrollment.hbx_id}"}, disabled: true %>
         </div>
       <% end %>
     </div>
diff --git a/app/views/insured/families/check_qle_date.js.erb b/app/views/insured/families/check_qle_date.js.erb
index a2e45b692d9..c3e7c051d41 100644
--- a/app/views/insured/families/check_qle_date.js.erb
+++ b/app/views/insured/families/check_qle_date.js.erb
@@ -20,7 +20,7 @@ $('#qle-details .initial-info').addClass('hidden');
     var mecNotice = "<%= l10n('insured.qle_detail.error_text_middle_of_month', immediate_month_date: @qle_date.beginning_of_month, following_month_date: (@qle_date + 1.month).beginning_of_month, contact_center_phone_number: contact_center_phone_number, call_date: @qle_date.beginning_of_month - 1.day) %>";
     toggleSuccess(mecNotice);
   <% elsif @qle.present? %>
-    $(".effective_on_kinds").html("<%= escape_javascript(render 'effective_on_kind_fields') %>");
+    $(".effective_on_kinds").html("<%= escape_javascript(render 'effective_on_kind_fields') %>").ready(initEffectiveOnKindFields());
     <% if @qle.effective_on_kinds.count > 1 %>
       $('#qle_success_submit').attr('disabled', 'disabled');
     <% end %>
@@ -35,3 +35,9 @@ $('#qle-details .initial-info').addClass('hidden');
   var errorNoticeAction = "<%= l10n('insured.qle_detail.error_text_future_date', contact_center_name: raw(contact_center_name), contact_center_phone_number: EnrollRegistry[:enroll_app].setting(:health_benefit_exchange_authority_phone_number)&.item) %>";
   toggleSuccess(errorNoticeAction);
 <% end %>
+
+function initEffectiveOnKindFields() {
+  if (!disableSelectric) {
+    $('select').selectric();
+  }
+}
diff --git a/app/views/people/landing_pages/_personal.html.erb b/app/views/people/landing_pages/_personal.html.erb
index 019ad4c398b..c12e3a89456 100644
--- a/app/views/people/landing_pages/_personal.html.erb
+++ b/app/views/people/landing_pages/_personal.html.erb
@@ -38,7 +38,7 @@
           <%= f.label :ssn, l10n("social_security") %>
           <% if EnrollRegistry.feature_enabled?(:mask_ssn_ui_fields) %>
             <%= render partial: 'shared/person/ssn/consumer_ssn_field',
-              locals: { f: f, presenter: organize_ssn_params(f.object) } 
+              locals: { f: f, presenter: organize_ssn_params(f.object) }
             %>
           <% else %>
             <% if EnrollRegistry.feature_enabled?(:ssn_ui_validation) %>
@@ -72,7 +72,7 @@
     <% if current_user.does_not_have_any_staff_role? && !current_user.has_insured_role? %>
       <%= render 'shared/age_off_excluded', f: f %>
     <% end %>
-    
+
     <section class="mb-4">
       <% if @person.is_consumer_role_active? %>
         <div id="consumer_fields_sets ">
@@ -198,6 +198,7 @@
       </div>
       <% end %>
     <br />
+
     <% if @person.is_consumer_role_active? %>
     <div id="consumer_fields_sets">
       <%= render 'shared/consumer_fields', f: f %><br>
@@ -267,6 +268,7 @@
     $(document).ready(function() {
       $.inputMasks();
     });
+    init_tribe_fields()
   </script>
 <% end %>
 
diff --git a/app/views/shared/inboxes/_individual_message.html.erb b/app/views/shared/inboxes/_individual_message.html.erb
index ac29efdd7f2..47ed857eb9f 100644
--- a/app/views/shared/inboxes/_individual_message.html.erb
+++ b/app/views/shared/inboxes/_individual_message.html.erb
@@ -26,7 +26,7 @@
   </tr>
 
 <% else %>
-  <tr tabindex="0" onkeydown="handleButtonKeyDown(event, 'message_inbox')", id="message_inbox" class='<%=message.message_read==true ? "msg-inbox-read" : "msg-inbox-unread"%>' onclick="showMessage('<%= retrieve_show_path(provider, message) %>');">
+  <tr tabindex="0" id="message_inbox" class='<%=message.message_read==true ? "msg-inbox-read" : "msg-inbox-unread"%>' data-show-path="<%= retrieve_show_path(provider, message) %>">
     <td style="font-weight:bold">
       <%= message.try(:from) if @folder == 'Inbox' %>
       <%= message.try(:to)   if @folder == 'Sent'%>
@@ -48,6 +48,13 @@
   </tr>
 <% end %>
 <script>
+  $(document).on('click', '#message_inbox', function() {
+    showMessage($(this).data('show-path'))
+  })
+  $(document).on('keydown', '#message_inbox', function(event) {
+    handleButtonKeyDown(event, 'message_inbox')
+  })
+
   function showMessage(url) {
     $.ajax({type: "GET", url: url, dataType: 'script'});
   }
diff --git a/app/views/ui-components/v1/cards/_metal_level_select.html.slim b/app/views/ui-components/v1/cards/_metal_level_select.html.slim
index 9f51cd16722..605128baec7 100644
--- a/app/views/ui-components/v1/cards/_metal_level_select.html.slim
+++ b/app/views/ui-components/v1/cards/_metal_level_select.html.slim
@@ -25,17 +25,17 @@
         ul.nav.nav-tabs role="tablist"
           input#ppKind type="hidden" name="benefit_package[sponsored_benefits_attributes][0][product_package_kind]"
           - if @benefit_package_form.health_package_kinds.include?(:single_issuer)
-            li.col-md-4.col-sm-4 role="presentation" onclick="radioSelected(this)"
+            li.col-md-4.col-sm-4.kind-radio role="presentation"
               a href="#carrier" aria-controls="carrier" role="tab" data-toggle="tab" data-name="single_issuer"
                 i.far.fa-circle.mr-2
                 = fetch_plan_title_for_single_carrier
           - if @benefit_package_form.health_package_kinds.include?(:metal_level)
-            li.col-md-4.col-sm-4 role="presentation" onclick="radioSelected(this)"
+            li.col-md-4.col-sm-4.kind-radio role="presentation"
               a href="#level" aria-controls="level" role="tab" data-toggle="tab" data-name="metal_level"
                 i.far.fa-circle.mr-2
                 = fetch_plan_title_for_metal_level
           - if @benefit_package_form.health_package_kinds.include?(:single_product)
-            li.col-md-4.col-sm-4 role="presentation" onclick="radioSelected(this)"
+            li.col-md-4.col-sm-4.kind-radio role="presentation"
               a href="#plan" aria-controls="plan" role="tab" data-toggle="tab" data-name="single_product"
                 i.far.fa-circle.mr-2
                 = fetch_plan_title_for_single_plan
@@ -50,7 +50,7 @@
                   label.container
                     = issuer_name
                     = f.hidden_field :kind, value: "health"
-                    = f.radio_button :product_option_choice, "#{issuer_id}", class: 'product_option_choice', onclick:"getPlanInfo(this)", data: {name: issuer_name}
+                    = f.radio_button :product_option_choice, "#{issuer_id}", class: 'product_option_choice', data: {name: issuer_name}
                     span.checkmark
 
           .tab-pane.fade#level role="tabpanel"
@@ -63,7 +63,7 @@
                   label.container
                     = kind.capitalize
                     = f.hidden_field :kind, value: "health"
-                    = f.radio_button :product_option_choice, kind, class: 'product_option_choice', onclick:"getPlanInfo(this)", data: {name: kind}
+                    = f.radio_button :product_option_choice, kind, class: 'product_option_choice', data: {name: kind}
                     span.checkmark
 
           .tab-pane.fade#plan role="tabpanel"
@@ -76,7 +76,7 @@
                   label.container
                     = carrier_name
                     = f.hidden_field :kind, value: "health"
-                    = f.radio_button :product_option_choice, carrier_id, class: 'product_option_choice', onclick:"getPlanInfo(this)", data: {name: carrier_name}
+                    = f.radio_button :product_option_choice, carrier_id, class: 'product_option_choice', data: {name: carrier_name}
                     span.checkmark
 
 
@@ -118,7 +118,7 @@
             i.far.fa-file-pdf.fa-2x.mr-1
             | Summary of Benefits and Coverage
         .pull-right
-          button.btn.btn-default.btn-sm#btnMoreDetails type="button" onclick="showMoreDetails()" More Details
+          button.btn.btn-default.btn-sm#btnMoreDetails type="button" More Details
           button.btn.btn-default.btn-sm#closeModal type="button" data-dismiss="modal" style="margin-top:-1px" Close
 
 
@@ -135,6 +135,16 @@ javascript:
   var minContributions = #{f.object.sponsor_contribution.min_contributions_map.to_json.html_safe};
 	var productsTotal;
 
+  $(document).on('click', '.kind-radio a', function() { radioSelected(this.parentElement) })
+  $(document).on('click', '.product_option_choice', function() { getPlanInfo(this) })
+  $(document).on('click', '#btnMoreDetails', function() { showMoreDetails() })
+  $(document).on('click', '.ref-plan-radio', function() { newContributionAmounts() })
+  $(document).on('click', '.rp-view-summary', function() { viewSummary(this) })
+
+  $(document).on('change', '.contribution_handler', function() { newContributionAmounts(this) })
+  $(document).on('change', '.contribution-factor-slider', function() { setInputSliderValue(this) })
+  $(document).on('change', '.contribution-factor-number', function() { setNumberInputValue(this) })
+
   function radioSelected(element) {
     setCircle(element)
     disableNewPlanYearButton()
@@ -155,7 +165,7 @@ javascript:
 
   function setCircle(element) {
 		var items = document.querySelectorAll('#metal-level-select ul li')
-	
+
 		for (item of items) {
 			item.querySelector('i').classList.remove('fa-dot-circle');
 		}
@@ -165,7 +175,7 @@ javascript:
 				element.querySelector('i').classList.add('fa-dot-circle')
 			}
 		},200)
-		
+
     // Gets product option info
     productOptionKind = element.querySelector('a').dataset.name;
     // Sets kind to hidden input field for form submission
@@ -195,7 +205,7 @@ javascript:
 
     // Replace below statement with plain Javascript
     $('[data-toggle="tooltip"]').tooltip();
-    
+
     // Makes reference plans visible
     document.getElementById('referencePlans').classList.remove('hidden');
     // Removes reference plans if metal level changes
@@ -226,9 +236,8 @@ javascript:
               <span class="plan-label">Level:</span> <span class="rp-plan-info">${plan.metal_level_kind}</span><br>
               <span class="plan-label">Network:</span> <span class="rp-plan-info">${plan.network}</span><br>
               <span class="plan-label">#{l10n('standard_plan')}:</span> <span class="rp-plan-info">${displayStandardPlan(plan.is_standard_plan)}</span><br>
-              
-              <span class="plan-label mt-1 rp-view-summary" onclick="viewSummary(this)" data-plan-title="${plan.title}" data-plan-id="${plan.id}">View Summary</span><br>
-              <input type="radio" name="benefit_package[sponsored_benefits_attributes][0][reference_plan_id]" id="${plan.id}" onclick="newContributionAmounts()" value="${plan.id}" data-plan-title="${plan.title}" data-plan-standard-plan="${plan.is_standard_plan}" data-plan-carrier="${plan.carrier_name}" data-plan-id="${plan.id}" data-plan-metal-level="${plan.metal_level_kind}" data-plan-type="${plan.product_type}" data-network="${plan.network}">
+              <span class="plan-label mt-1 rp-view-summary" data-plan-title="${plan.title}" data-plan-id="${plan.id}">View Summary</span><br>
+              <input type="radio" name="benefit_package[sponsored_benefits_attributes][0][reference_plan_id]" id="${plan.id}" class="ref-plan-radio" value="${plan.id}" data-plan-title="${plan.title}" data-plan-standard-plan="${plan.is_standard_plan}" data-plan-carrier="${plan.carrier_name}" data-plan-id="${plan.id}" data-plan-metal-level="${plan.metal_level_kind}" data-plan-type="${plan.product_type}" data-network="${plan.network}">
               <span class="checkmark"></span>
             </label>
           </div>
@@ -262,7 +271,7 @@ javascript:
 			      <div class="row sc-container">\
 			        <div class="col-xs-12 ml-2 mt-2">\
 			          <label class="container ml-1">' +contribution.display_name+'\
-			            <input type="checkbox" checked="checked" id="' + attrPrefix + '[is_offered]" class="contribution_handler" name="' + attrPrefix +'[is_offered]" value="' + contribution["is_offered"] +'" data-displayname="'+contribution.display_name+'" onchange="newContributionAmounts(this)"/>\
+			            <input type="checkbox" checked="checked" id="' + attrPrefix + '[is_offered]" class="contribution_handler" name="' + attrPrefix +'[is_offered]" value="' + contribution["is_offered"] +'" data-displayname="'+contribution.display_name+'"/>\
 			            <span class="checkmark"></span>\
 			          </label>\
 			        </div>\
@@ -271,10 +280,10 @@ javascript:
 			    <div class="col-xs-6">\
 			      <div class="col-xs-3">\
 			        <input id="' + attrPrefix + '[display_name]" name="' + attrPrefix + '[display_name]" type="hidden" value="' + contribution["display_name"] + '" />\
-			        <input type="number" id="'+contribution.id+'" name="'+ attrPrefix +'[contribution_factor]" value="' + (contribution["contribution_factor"] * 100) + '" onchange="setInputSliderValue(this)" data-displayname="'+contribution.display_name+'" data-contribution-input="true">\
+			        <input type="number" id="'+contribution.id+'" class="contribution-factor-slider" name="'+ attrPrefix +'[contribution_factor]" value="' + (contribution["contribution_factor"] * 100) + '" data-displayname="'+contribution.display_name+'" data-contribution-input="true">\
 			      </div>\
 			      <div class="col-xs-9">\
-			        <input type="range" min="0" max="100" value="' + (contribution["contribution_factor"] * 100) + '" step="5" class="slider" id="'+contribution.id+'" onchange="setNumberInputValue(this)" data-id="'+contribution.id+'" data-displayname="'+contribution.display_name+'">\
+			        <input class="contribution-factor-number" type="range" min="0" max="100" value="' + (contribution["contribution_factor"] * 100) + '" step="5" class="slider" id="'+contribution.id+'" data-id="'+contribution.id+'" data-displayname="'+contribution.display_name+'">\
 			      </div>\
 			    </div>\
 			</div>'
diff --git a/app/views/ui-components/v1/cards/_sponsor_contributions.html.slim b/app/views/ui-components/v1/cards/_sponsor_contributions.html.slim
index 673cdd100ce..7edd6915b8f 100644
--- a/app/views/ui-components/v1/cards/_sponsor_contributions.html.slim
+++ b/app/views/ui-components/v1/cards/_sponsor_contributions.html.slim
@@ -14,11 +14,16 @@
         .col-xs-4.ml-4.mt-1
           = f.hidden_field :id, value: f.object.id
           = f.hidden_field :contribution_unit_id, value: f.object.contribution_unit_id
-          = f.check_box :is_offered, {class: 'contribution_handler', disabled: (f.object.is_employee_cl), "data-displayname" => f.object.display_name, onchange: "contributionAmounts(this)"}, "true", "false"
+          = f.check_box :is_offered, {class: 'contribution_handler', disabled: (f.object.is_employee_cl), "data-displayname" => f.object.display_name}, "true", "false"
           = f.object.display_name
           = f.hidden_field :display_name, value: f.object.display_name
         .col-xs-6
           .col-xs-3
-            = f.number_field :contribution_factor, {value: "#{(f.object.contribution_factor * 100).to_i}", id: "#{f.object.id}", min: 0, max: 100, onblur: "setSliderValue(this)", "data-contribution-input" => 'true', "data-displayname" => f.object.display_name}
+            = f.number_field :contribution_factor, {value: "#{(f.object.contribution_factor * 100).to_i}", id: "#{f.object.id}", class: "contribution-factor-number", min: 0, max: 100, "data-contribution-input" => 'true', "data-displayname" => f.object.display_name}
           .col-xs-9
-            input type="range" min="0" max="100" value="#{(f.object.contribution_factor * 100).to_i}" step="1" class="slider" id="#{f.object.id}" oninput="setInputValue(this)" data-id="#{f.object.id}"
+            input type="range" min="0" max="100" value="#{(f.object.contribution_factor * 100).to_i}" step="1" class="slider contribution-factor-input" id="#{f.object.id}" data-id="#{f.object.id}"
+
+javascript:
+  $(document).on('change', '.contribution_handler', function() { contributionAmounts(this) })
+  $(document).on('blur', '.contribution-factor-number', function() { setSliderValue(this) })
+  $(document).on('input', '.contribution-factor-input', function() { setInputValue(this) })
diff --git a/components/benefit_sponsors/app/views/benefit_sponsors/benefit_applications/benefit_applications/_form.html.slim b/components/benefit_sponsors/app/views/benefit_sponsors/benefit_applications/benefit_applications/_form.html.slim
index 8923fd64bcd..c7a16ad26ea 100644
--- a/components/benefit_sponsors/app/views/benefit_sponsors/benefit_applications/benefit_applications/_form.html.slim
+++ b/components/benefit_sponsors/app/views/benefit_sponsors/benefit_applications/benefit_applications/_form.html.slim
@@ -7,8 +7,8 @@
             - if @just_a_warning == false
               h4 = pluralize(@benefit_application_form.errors.count, "error")
               | prohibited this benefit application from being saved:
-              <ul>
+              ul
                 - @benefit_application_form.errors.delete(:benefit_packages)
                 - @benefit_application_form.errors.full_messages.each do |msg|
                   li = msg
-        = render "benefit_sponsors/benefit_applications/benefit_applications/shared/benefit_application_fields", f: f
\ No newline at end of file
+        = render "benefit_sponsors/benefit_applications/benefit_applications/shared/benefit_application_fields", f: f
diff --git a/components/benefit_sponsors/app/views/benefit_sponsors/benefit_applications/benefit_applications/new.html.slim b/components/benefit_sponsors/app/views/benefit_sponsors/benefit_applications/benefit_applications/new.html.slim
index 46bd4015c95..50d470f1b2c 100644
--- a/components/benefit_sponsors/app/views/benefit_sponsors/benefit_applications/benefit_applications/new.html.slim
+++ b/components/benefit_sponsors/app/views/benefit_sponsors/benefit_applications/benefit_applications/new.html.slim
@@ -3,9 +3,4 @@
 
 = form_for @benefit_application_form, as: :benefit_application, url: benefit_sponsorship_benefit_applications_path, method: :post, html: {novalidate: true} do |f|
   = render 'form', f: f
-  = f.submit "Continue", class:'btn btn-primary btn-lg pull-right disabled', onclick:'showProgress()', id:'benefitContinueBtn'
-
-javascript:
-  function showProgress() {
-    swal({title: "Please Hold!", text: "Retrieving Plan Options !", icon:"success", buttons:false, closeOnClickOutside:false});
-  }
\ No newline at end of file
+  = f.submit "Continue", class:'btn btn-primary btn-lg pull-right disabled', id:'benefitContinueBtn'
diff --git a/components/benefit_sponsors/app/views/benefit_sponsors/benefit_applications/benefit_applications/new.js.erb b/components/benefit_sponsors/app/views/benefit_sponsors/benefit_applications/benefit_applications/new.js.erb
index 26ab9fe330e..a0a5de7a98c 100644
--- a/components/benefit_sponsors/app/views/benefit_sponsors/benefit_applications/benefit_applications/new.js.erb
+++ b/components/benefit_sponsors/app/views/benefit_sponsors/benefit_applications/benefit_applications/new.js.erb
@@ -1 +1,11 @@
-$('.col-md-10').html("<%= escape_javascript(render partial: "new") %>");
\ No newline at end of file
+$('.col-md-10').html("<%= escape_javascript(render partial: "new") %>");
+
+$(document).on('click', '#benefitContinueBtn', function(e) {
+  console.log('benefitContinueBtn clicked')
+  e.preventDefault()
+  showProgress()
+})
+
+function showProgress() {
+  swal({title: "Please Hold!", text: "Retrieving Plan Options !", icon:"success", buttons:false, closeOnClickOutside:false});
+}
diff --git a/components/benefit_sponsors/app/views/benefit_sponsors/benefit_applications/benefit_applications/shared/_benefit_application_fields.html.slim b/components/benefit_sponsors/app/views/benefit_sponsors/benefit_applications/benefit_applications/shared/_benefit_application_fields.html.slim
index c558b57be12..b612a8c439b 100644
--- a/components/benefit_sponsors/app/views/benefit_sponsors/benefit_applications/benefit_applications/shared/_benefit_application_fields.html.slim
+++ b/components/benefit_sponsors/app/views/benefit_sponsors/benefit_applications/benefit_applications/shared/_benefit_application_fields.html.slim
@@ -20,7 +20,7 @@ h1.heading-text Add Benefit Package
     .row.row-form-wrapper#uic-wrapper
       .col-md-6.col-sm-12
         = f.hidden_field :benefit_sponsorship_id
-        = f.select :start_on, benefit_application_start_dates,{:prompt => "SELECT START ON", :selected => formatted_start_on}, class:'floatlabel benefit-application-start-date', onchange:'selectedDate(this)', id:'baStartDate', disabled: (f.object.is_renewing? || formatted_start_on.present?)
+        = f.select :start_on, benefit_application_start_dates,{:prompt => "SELECT START ON", :selected => formatted_start_on}, class:'floatlabel benefit-application-start-date', id:'baStartDate', disabled: (f.object.is_renewing? || formatted_start_on.present?)
       .col-md-6.col-sm-12
         = f.text_field :end_on, class: "form-control", required: true, placeholder: 'END ON', readonly: true
 .row.pl-1
@@ -38,9 +38,9 @@ h1.heading-text Add Benefit Package
         - oe_min_date = f.object.open_enrollment_start_on
         - oe_max_date = f.object.open_enrollment_end_on
       .col-md-6.col-sm-12
-        = f.text_field :open_enrollment_start_on, class: "form-control", required: true, placeholder: 'OPEN ENROLLMENT START DATE', onmouseover:"showDatepicker('benefit_application_open_enrollment_start_on')", :"data-date-min" => f.object.start_on ? (Date.strptime(f.object.start_on, "%m/%d/%Y") - 2.months) : "", "data-oe-start-date" => oe_start_on, "data-oe-min-Date" => oe_min_date
+        = f.text_field :open_enrollment_start_on, class: "form-control", required: true, placeholder: 'OPEN ENROLLMENT START DATE', :"data-date-min" => f.object.start_on ? (Date.strptime(f.object.start_on, "%m/%d/%Y") - 2.months) : "", "data-oe-start-date" => oe_start_on, "data-oe-min-Date" => oe_min_date
       .col-md-6.col-sm-12
-        = f.text_field :open_enrollment_end_on, class: "form-control interaction-field-control-plan_year-open_enrollment_end_on", required: true, placeholder: 'OPEN ENROLLMENT END DATE', onmouseover:"showDatepicker('benefit_application_open_enrollment_end_on')", "data-oe-end-date" => oe_end_on, "data-oe-max-Date" => oe_max_date
+        = f.text_field :open_enrollment_end_on, class: "form-control interaction-field-control-plan_year-open_enrollment_end_on", required: true, placeholder: 'OPEN ENROLLMENT END DATE', "data-oe-end-date" => oe_end_on, "data-oe-max-Date" => oe_max_date
 .row.pl-1
   h3 Add the total number of employees in your workforce
 .row
@@ -49,20 +49,29 @@ h1.heading-text Add Benefit Package
       .col-md-4.col-sm-12
         label for="inputFTE" Full Time Employees
         br
-        = f.text_field :fte_count, class: "", required: true, placeholder: 'FULL TIME EMPLOYEES', id:'fteEmployee', onblur:'checkEmployeeCount(this)'
+        = f.text_field :fte_count, class: "", required: true, placeholder: 'FULL TIME EMPLOYEES', id:'fteEmployee'
       .col-md-4.col-sm-12
         label for="inputPTE" Part Time Employees
         br
-        = f.text_field :pte_count, class: "", required: true, placeholder: 'PART TIME EMPLOYEES', id:'pteEmployee', onblur:'checkEmployeeCount(this)'
+        = f.text_field :pte_count, class: "", required: true, placeholder: 'PART TIME EMPLOYEES', id:'pteEmployee'
       .col-md-4.col-sm-12
         label for="inputMSP" Medicare Second Payers
         br
-        = f.text_field :msp_count, class: "", required: true, placeholder: 'MEDICARE SECOND PAYERS', id:'medSecPayers', onblur:'checkEmployeeCount(this)'
+        = f.text_field :msp_count, class: "", required: true, placeholder: 'MEDICARE SECOND PAYERS', id:'medSecPayers'
 
 #recommend_dates.hidden.mt-1
   = render "benefit_sponsors/benefit_applications/benefit_applications/recommend_dates"
 
 javascript:
+  $(document).on('selectric-change', '#baStartDate', function() { selectedDate(this) })
+  $(document).on('mouseover', '#benefit_application_open_enrollment_start_on', function() {
+    showDatepicker('benefit_application_open_enrollment_start_on')
+  })
+  $(document).on('mouseover', '#benefit_application_open_enrollment_end_on', function() {
+    showDatepicker('benefit_application_open_enrollment_end_on')
+  })
+  $(document).on('blur', '#fteEmployee, #pteEmployee, #medSecPayers', function() { checkEmployeeCount(this) })
+
 
   var disableSelectric = false;
   var defaultOEStartOn = '';
diff --git a/components/benefit_sponsors/app/views/benefit_sponsors/benefit_packages/benefit_packages/_form.html.slim b/components/benefit_sponsors/app/views/benefit_sponsors/benefit_packages/benefit_packages/_form.html.slim
index b26a9cf7541..38f78d7a67e 100644
--- a/components/benefit_sponsors/app/views/benefit_sponsors/benefit_packages/benefit_packages/_form.html.slim
+++ b/components/benefit_sponsors/app/views/benefit_sponsors/benefit_packages/benefit_packages/_form.html.slim
@@ -12,7 +12,7 @@ h1.heading-text Benefit Package - Set Up
   .plan-title#uic-wrapper
     .row.row-form-wrapper
       - title_value = f.object.title.present? ? f.object.title : "#{TimeKeeper.date_of_record.year} Employer Benefits"
-      = f.text_field :title, class: "form-control", placeholder:'My Benefit Package', onchange: 'validateTitle()', id: 'benefitPackageTitle', required: true
+      = f.text_field :title, class: "form-control", placeholder:'My Benefit Package', id: 'benefitPackageTitle', required: true
     .row.row-form-wrapper
       = f.text_field :description, class: "form-control", placeholder:'My Description'
     .row.row-form-wrapper
@@ -33,6 +33,10 @@ h1.heading-text Benefit Package - Set Up
 javascript:
   var disableSelectric = false;
 
+  $(document).on('change', '#benefitPackageTitle', function() {
+    validateTitle()
+  })
+
   function validateTitle() {
     var new_title = document.getElementById("benefitPackageTitle").value
     previousBPTitles = "#{@benefit_package_form.previous_bp_titles}"
diff --git a/features/admin/step_definitions/prior_py_ivl_admin_sep_steps.rb b/features/admin/step_definitions/prior_py_ivl_admin_sep_steps.rb
index 9a6214afcbc..76317d5937c 100644
--- a/features/admin/step_definitions/prior_py_ivl_admin_sep_steps.rb
+++ b/features/admin/step_definitions/prior_py_ivl_admin_sep_steps.rb
@@ -109,6 +109,7 @@
 
 Then(/^Admin clicks confirm on popup$/) do
   find(AddSepAction.popup_confirmation).click
+  wait_for_ajax
 end
 
 And(/^I see a SEP success message for (.*)$/) do |named_person|
@@ -117,4 +118,4 @@
 
 And(/^I see a SEP error message for (.*)$/) do |_named_person|
   expect(page).to have_content("SEP not saved. (Error: Next poss effective date out of range.)")
-end
\ No newline at end of file
+end
diff --git a/features/employers/add_plan_year_for_employer.feature b/features/employers/add_plan_year_for_employer.feature
index 89aa3a7dbcd..b3f0411f49b 100644
--- a/features/employers/add_plan_year_for_employer.feature
+++ b/features/employers/add_plan_year_for_employer.feature
@@ -24,7 +24,6 @@ Feature: Add Plan Year For Employer
     And employer selected by metal level plan offerings
     Then employer should see gold metal level type
     And employer clicked on gold metal level
-    Then employer should see create plan year button disabled
     And employer selected <contribution_percent> contribution percent for the application
     Then employer should see your estimated montly cost
     And employer clicked on create plan year button
@@ -48,7 +47,6 @@ Feature: Add Plan Year For Employer
     And employer selected by metal level plan offerings
     Then employer should see gold metal level type
     And employer clicked on gold metal level
-    Then employer should see create plan year button disabled
     And employer selected <contribution_percent> contribution percent for the application
     Then employer should see your estimated montly cost
     And employer should see that the create plan year is <plan_year_btn_enabled>
@@ -58,4 +56,4 @@ Feature: Add Plan Year For Employer
       | contribution_percent | plan_year_btn_enabled |
       | 100                  | true                  |
       | 60                   | true                  |
-      | 20                   | false                 |
\ No newline at end of file
+      | 20                   | false                 |
diff --git a/features/financial_assistance/step_definitions/view_eligibility_steps.rb b/features/financial_assistance/step_definitions/view_eligibility_steps.rb
index 310db23ea4f..3cef72aed8d 100644
--- a/features/financial_assistance/step_definitions/view_eligibility_steps.rb
+++ b/features/financial_assistance/step_definitions/view_eligibility_steps.rb
@@ -18,7 +18,7 @@
 end
 
 Then(/^the "View Eligibility Determination" link will be disabled$/) do
-  find_link('View Eligibility Determination')['disabled'].should == 'disabled'
+  expect(find_link('View Eligibility Determination')['disabled']).not_to eq nil
 end
 
 Given(/^that a user with a family has a Financial Assistance application in the "submitted" state$/) do
diff --git a/features/step_definitions/household_info_continue_button_steps.rb b/features/step_definitions/household_info_continue_button_steps.rb
index cb8a93f521c..694f613d32d 100644
--- a/features/step_definitions/household_info_continue_button_steps.rb
+++ b/features/step_definitions/household_info_continue_button_steps.rb
@@ -79,7 +79,7 @@
 end
 
 Then(/^the CONTINUE button will be disabled$/) do
-  expect(page).to have_css("#btn-continue[disabled]")
+  expect(page).to have_css("#btn-continue.disabled")
 end
 
 Given(/^the primary member exists$/) do
diff --git a/features/step_definitions/individual_steps.rb b/features/step_definitions/individual_steps.rb
index 74c8f5f9ff9..59e3b4cd7ea 100644
--- a/features/step_definitions/individual_steps.rb
+++ b/features/step_definitions/individual_steps.rb
@@ -728,12 +728,12 @@ class VlpDocument
   sleep 2
   find(IvlManageFamilyPage.personal_tab).click
   find(AdminHomepage.remove_mailing_address).click
-  find(EmployeeFamilyInformation.save_btn).click
+  find(EmployeeFamilyInformation.save_personal_btn).click
   find('select[name="person[addresses_attributes][0][state]"]').click
   find(AdminHomepage.non_dc_state).click
   sleep 2
   fill_in IvlPersonalInformation.zip, with: '30043'
-  find(EmployeeFamilyInformation.save_btn).click
+  find(EmployeeFamilyInformation.save_personal_btn).click
   find(EmployeeHomepage.my_dc_health_link).click
 end
 
diff --git a/features/support/object_model_pages/shop/employee/registration/ee_family_information.rb b/features/support/object_model_pages/shop/employee/registration/ee_family_information.rb
index 201e87db71d..b6657f1ed3d 100644
--- a/features/support/object_model_pages/shop/employee/registration/ee_family_information.rb
+++ b/features/support/object_model_pages/shop/employee/registration/ee_family_information.rb
@@ -174,4 +174,8 @@ def self.confirm_member_btn
   def self.lives_with_primary
     '[data-cuke="lives_with_primary_checkbox"]'
   end
-end
\ No newline at end of file
+
+  def self.save_personal_btn
+    "#save_personal"
+  end
+end