diff --git a/app/controllers/idv/hybrid_handoff_controller.rb b/app/controllers/idv/hybrid_handoff_controller.rb index 83799c82e15..0c26a3972d9 100644 --- a/app/controllers/idv/hybrid_handoff_controller.rb +++ b/app/controllers/idv/hybrid_handoff_controller.rb @@ -118,10 +118,7 @@ def bypass_send_link_steps end def extra_view_variables - { - flow_session: flow_session, - idv_phone_form: build_form, - } + { idv_phone_form: build_form } end def build_form diff --git a/app/controllers/idv/link_sent_controller.rb b/app/controllers/idv/link_sent_controller.rb index f6c345eb50a..d5e7a760321 100644 --- a/app/controllers/idv/link_sent_controller.rb +++ b/app/controllers/idv/link_sent_controller.rb @@ -30,8 +30,7 @@ def update end def extra_view_variables - { phone: idv_session.phone_for_mobile_flow, - flow_session: flow_session } + { phone: idv_session.phone_for_mobile_flow } end private diff --git a/app/views/idv/agreement/show.html.erb b/app/views/idv/agreement/show.html.erb index d246c2b409f..ccf4418b788 100644 --- a/app/views/idv/agreement/show.html.erb +++ b/app/views/idv/agreement/show.html.erb @@ -9,16 +9,6 @@ ) %> <% end %> -<%= render AlertComponent.new( - type: :error, - class: [ - 'js-consent-form-alert', - 'margin-bottom-4', - 'display-none', - ].select(&:present?), - message: t('errors.doc_auth.consent_form'), - ) %> - <%= render PageHeadingComponent.new.with_content(t('doc_auth.headings.lets_go')) %>

<%= t('doc_auth.info.lets_go') %>

<%= t('doc_auth.headings.verify_identity') %>

diff --git a/app/views/idv/doc_auth/_error_messages.html.erb b/app/views/idv/doc_auth/_error_messages.html.erb deleted file mode 100644 index c8f591e659c..00000000000 --- a/app/views/idv/doc_auth/_error_messages.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -<% unless flow_session[:error_message].nil? %> - <%= render AlertComponent.new( - type: :error, - class: 'margin-bottom-4', - ) do %> - <%= flow_session[:error_message] %> - <% end %> -<% end %> diff --git a/app/views/idv/getting_started/show.html.erb b/app/views/idv/getting_started/show.html.erb index 934eae6c721..442cc502a75 100644 --- a/app/views/idv/getting_started/show.html.erb +++ b/app/views/idv/getting_started/show.html.erb @@ -5,16 +5,6 @@ intro: t('idv.getting_started.no_js_intro', sp_name: @sp_name), ) do %> -<%= render AlertComponent.new( - type: :error, - class: [ - 'js-consent-form-alert', - 'margin-bottom-4', - 'display-none', - ].select(&:present?), - message: t('errors.doc_auth.consent_form'), - ) %> - <%= render PageHeadingComponent.new.with_content(@title) %>

<%= t( diff --git a/app/views/idv/hybrid_handoff/show.html.erb b/app/views/idv/hybrid_handoff/show.html.erb index deb4c3e5277..4bddec81277 100644 --- a/app/views/idv/hybrid_handoff/show.html.erb +++ b/app/views/idv/hybrid_handoff/show.html.erb @@ -9,8 +9,6 @@ ) %> <% end %> -<%= render 'idv/doc_auth/error_messages', flow_session: flow_session %> - <%= render PageHeadingComponent.new do %> <%= t('doc_auth.headings.hybrid_handoff') %> <% end %> diff --git a/app/views/idv/link_sent/show.html.erb b/app/views/idv/link_sent/show.html.erb index 8fb01c7d954..fa4e321a6dc 100644 --- a/app/views/idv/link_sent/show.html.erb +++ b/app/views/idv/link_sent/show.html.erb @@ -9,14 +9,6 @@ <% title t('titles.doc_auth.link_sent') %> -<% if flow_session[:error_message] %> - <%= render AlertComponent.new( - type: :error, - class: 'margin-bottom-4', - message: flow_session[:error_message], - ) %> -<% end %> - <%= render AlertComponent.new(type: :warning, class: 'margin-bottom-4') do %> <%= t('doc_auth.info.keep_window_open') %> <% if FeatureManagement.doc_capture_polling_enabled? %> diff --git a/spec/controllers/idv/link_sent_controller_spec.rb b/spec/controllers/idv/link_sent_controller_spec.rb index 9a1943f6309..4ee86a96336 100644 --- a/spec/controllers/idv/link_sent_controller_spec.rb +++ b/spec/controllers/idv/link_sent_controller_spec.rb @@ -3,10 +3,7 @@ RSpec.describe Idv::LinkSentController do include IdvHelper - let(:flow_session) do - { document_capture_session_uuid: 'fd14e181-6fb1-4cdc-92e0-ef66dad0df4e', - threatmetrix_session_id: 'c90ae7a5-6629-4e77-b97c-f1987c2df7d0' } - end + let(:flow_session) { {} } let(:user) { create(:user) } diff --git a/spec/features/idv/doc_auth/agreement_spec.rb b/spec/features/idv/doc_auth/agreement_spec.rb index d5913f97186..36222de0fab 100644 --- a/spec/features/idv/doc_auth/agreement_spec.rb +++ b/spec/features/idv/doc_auth/agreement_spec.rb @@ -2,27 +2,6 @@ RSpec.feature 'agreement step error checking' do include DocAuthHelper - context 'when JS is disabled' do - before do - sign_in_and_2fa_user - complete_doc_auth_steps_before_agreement_step - end - - it 'shows the notice if the user clicks continue without giving consent' do - click_continue - - expect(page).to have_current_path(idv_agreement_url) - expect(page).to have_content(t('errors.doc_auth.consent_form')) - end - - it 'allows the user to continue after checking the checkbox' do - check t('doc_auth.instructions.consent', app_name: APP_NAME) - click_continue - - expect(page).to have_current_path(idv_hybrid_handoff_path) - end - end - context 'skipping hybrid_handoff step', :js, driver: :headless_chrome_mobile do let(:fake_analytics) { FakeAnalytics.new } diff --git a/spec/features/idv/doc_auth/getting_started_spec.rb b/spec/features/idv/doc_auth/getting_started_spec.rb index 0d3ad5a7e16..557fb13c200 100644 --- a/spec/features/idv/doc_auth/getting_started_spec.rb +++ b/spec/features/idv/doc_auth/getting_started_spec.rb @@ -45,22 +45,6 @@ ) end - context 'when JS is disabled' do - it 'shows the notice if the user clicks continue without giving consent' do - click_continue - - expect(page).to have_current_path(idv_getting_started_url) - expect(page).to have_content(t('errors.doc_auth.consent_form')) - end - - it 'allows the user to continue after checking the checkbox' do - check t('doc_auth.instructions.consent', app_name: APP_NAME) - click_continue - - expect(page).to have_current_path(idv_hybrid_handoff_path) - end - end - context 'skipping hybrid_handoff step', :js, driver: :headless_chrome_mobile do before do complete_getting_started_step diff --git a/spec/views/idv/agreement/show.html.erb_spec.rb b/spec/views/idv/agreement/show.html.erb_spec.rb index c145a907c18..d4aceb05d7f 100644 --- a/spec/views/idv/agreement/show.html.erb_spec.rb +++ b/spec/views/idv/agreement/show.html.erb_spec.rb @@ -1,10 +1,7 @@ require 'rails_helper' RSpec.describe 'idv/agreement/show' do - let(:flow_session) { {} } - before do - allow(view).to receive(:flow_session).and_return(flow_session) allow(view).to receive(:user_signing_up?).and_return(false) allow(view).to receive(:url_for).and_wrap_original do |method, *args, &block| method.call(*args, &block) diff --git a/spec/views/idv/getting_started/show.html.erb_spec.rb b/spec/views/idv/getting_started/show.html.erb_spec.rb index a63321effe8..a93404df492 100644 --- a/spec/views/idv/getting_started/show.html.erb_spec.rb +++ b/spec/views/idv/getting_started/show.html.erb_spec.rb @@ -1,7 +1,6 @@ require 'rails_helper' RSpec.describe 'idv/getting_started/show' do - let(:flow_session) { {} } let(:user_fully_authenticated) { true } let(:sp_name) { nil } let(:user) { create(:user) } @@ -12,7 +11,6 @@ @title = t('doc_auth.headings.getting_started', sp_name: @sp_name) allow(@decorated_session).to receive(:sp_name).and_return(sp_name) allow(view).to receive(:decorated_session).and_return(@decorated_session) - allow(view).to receive(:flow_session).and_return(flow_session) allow(view).to receive(:user_fully_authenticated?).and_return(user_fully_authenticated) allow(view).to receive(:user_signing_up?).and_return(false) allow(view).to receive(:url_for).and_wrap_original do |method, *args, &block|