Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/concerns/idv/document_capture_concern.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def successful_response

# copied from Flow::Failure module
def failure(message, extra = nil)
flow_session[:error_message] = message if defined?(flow_session)
flash[:error] = message
form_response_params = { success: false, errors: { message: message } }
form_response_params[:extra] = extra unless extra.nil?
FormResponse.new(**form_response_params)
Expand Down
2 changes: 0 additions & 2 deletions app/controllers/idv/agreement_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ def show
'agreement', :view,
true
)

render :show, locals: { flow_session: flow_session }
end

def update
Expand Down
2 changes: 0 additions & 2 deletions app/controllers/idv/getting_started_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ def show

@sp_name = decorated_session.sp_name || APP_NAME
@title = t('doc_auth.headings.getting_started', sp_name: @sp_name)

render :show, locals: { flow_session: flow_session }
end

def update
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/idv/hybrid_handoff_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ def rate_limited_failure

# copied from Flow::Failure module
def failure(message, extra = nil)
flow_session[:error_message] = message
flash[:error] = message
form_response_params = { success: false, errors: { message: message } }
form_response_params[:extra] = extra unless extra.nil?
FormResponse.new(**form_response_params)
Expand Down
4 changes: 2 additions & 2 deletions app/views/idv/agreement/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
class: [
'js-consent-form-alert',
'margin-bottom-4',
flow_session[:error_message].blank? && 'display-none',
'display-none',
Comment thread
kbighorse marked this conversation as resolved.
].select(&:present?),
message: flow_session[:error_message].presence || t('errors.doc_auth.consent_form'),
message: t('errors.doc_auth.consent_form'),
) %>

<%= render PageHeadingComponent.new.with_content(t('doc_auth.headings.lets_go')) %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/idv/getting_started/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
class: [
'js-consent-form-alert',
'margin-bottom-4',
flow_session[:error_message].blank? && 'display-none',
'display-none',
].select(&:present?),
message: flow_session[:error_message].presence || t('errors.doc_auth.consent_form'),
message: t('errors.doc_auth.consent_form'),
) %>

<%= render PageHeadingComponent.new.with_content(@title) %>
Expand Down
4 changes: 2 additions & 2 deletions spec/controllers/idv/link_sent_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
put :update

expect(response).to redirect_to(idv_hybrid_handoff_url)
expect(flow_session[:error_message]).to eq(error_message)
expect(flash[:error]).to eq(error_message)
end
end

Expand All @@ -182,7 +182,7 @@
put :update

expect(response).to have_http_status(204)
expect(flow_session[:error_message]).to eq(t('errors.doc_auth.phone_step_incomplete'))
expect(flash[:error]).to eq(t('errors.doc_auth.phone_step_incomplete'))
end
end
end
Expand Down