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/mailers/user_mailer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ def in_person_ready_to_verify(enrollment:)
).image_data

with_user_locale(user) do
@header = t('in_person_proofing.headings.barcode', app_name: APP_NAME)
@header = t('in_person_proofing.headings.barcode')
@presenter = Idv::InPerson::ReadyToVerifyPresenter.new(
enrollment: enrollment,
barcode_image_url: attachments['barcode.png'].url,
Expand Down
112 changes: 51 additions & 61 deletions app/views/idv/in_person/ready_to_verify/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,78 +9,36 @@
) %>
<% end %>

<%= image_tag(
asset_url('idv/user-in-person.svg'),
width: 136,
height: 136,
class: 'display-block margin-x-auto margin-bottom-4',
alt: '',
) %>

<%= render PageHeadingComponent.new(class: 'text-center') do %>
<%= t('in_person_proofing.headings.barcode', app_name: APP_NAME) %>
<% end %>

<%= render AlertComponent.new(class: 'margin-y-4', text_tag: :div) do %>
<p class="margin-bottom-1"><strong><%= t('in_person_proofing.body.barcode.deadline', deadline: @presenter.formatted_due_date) %></strong></p>
<p class="margin-bottom-0"><%= t('in_person_proofing.body.barcode.deadline_restart') %></p>
<%= t('in_person_proofing.headings.barcode') %>
<% end %>

<p><%= t('in_person_proofing.body.barcode.email_sent') %></p>

<p class="margin-top-3 margin-bottom-4">
<% if @presenter.service_provider_homepage_url.present? %>
<%= render ClickObserverComponent.new(event_name: 'IdV: user clicked sp link on ready to verify page') do %>
<%= t(
'in_person_proofing.body.barcode.return_to_partner_html',
link: link_to(
t(
'in_person_proofing.body.barcode.return_to_partner_link',
sp_name: @presenter.sp_name,
),
@presenter.service_provider_homepage_url,
),
) %>
<% end %>
<% else %>
<%= t('in_person_proofing.body.barcode.close_window') %>
<% end %>
</p>

<section class="border-1px border-primary-light radius-lg padding-4">
<h2 class="margin-top-0 margin-bottom-2"><%= t('in_person_proofing.body.barcode.items_to_bring') %></h2>
<p><%= t('in_person_proofing.body.barcode.speak_to_associate') %></p>
<%= render ProcessListComponent.new(heading_level: :h3, class: 'margin-y-3') do |c| %>
<% c.item(heading: t('in_person_proofing.process.barcode.heading')) do %>
<p><%= t('in_person_proofing.process.barcode.info') %></p>
<div class="display-inline-block">
<div class="text-center">
<%= render 'idv/shared/mini_logo' %>
<%= render BarcodeComponent.new(
barcode_data: @presenter.enrollment_code,
label: t('in_person_proofing.process.barcode.caption_label'),
label_formatter: Idv::InPerson::EnrollmentCodeFormatter.method(:format),
) %>
</div>


<%= render AlertComponent.new(class: 'margin-y-4', text_tag: :div) do %>
<p class="margin-bottom-1 margin-top-0 h3"><strong><%= t('in_person_proofing.body.barcode.deadline', deadline: @presenter.formatted_due_date) %></strong></p>
<p class="margin-bottom-0"><%= t('in_person_proofing.body.barcode.deadline_restart') %></p>
<% end %>

<section class="border-1px border-primary-light radius-lg padding-4">
<h2 class="margin-top-0 margin-bottom-2"><%= t('in_person_proofing.body.barcode.what_to_expect') %></h2>
<%= render ProcessListComponent.new(heading_level: :h3, class: 'margin-y-3') do |c| %>
<% c.item(heading: t('in_person_proofing.process.what_to_do.heading')) do %>
<p><%= t('in_person_proofing.process.what_to_do.info', app_name: APP_NAME) %></p>
<% end %>
<% c.item(heading: t('in_person_proofing.process.state_id.heading')) do %>
<p class="margin-bottom-105"><%= t('in_person_proofing.process.state_id.info') %></p>
<ul class="usa-list margin-y-105">
<% t('in_person_proofing.process.state_id.acceptable_documents').each do |document| %>
<li><%= document %></li>
<% end %>
</ul>
<p><%= t('in_person_proofing.process.state_id.no_other_documents') %></p>
<% c.item(heading: t('in_person_proofing.process.barcode.heading', app_name: APP_NAME)) do %>
<p class="margin-bottom-105"><%= t('in_person_proofing.process.barcode.info') %></p>
<% end %>
<% if @presenter.needs_proof_of_address? %>
<% c.item(heading: t('in_person_proofing.process.proof_of_address.heading')) do %>
<p class="margin-bottom-105"><%= t('in_person_proofing.process.proof_of_address.info') %></p>
<ul class="usa-list margin-y-105">
<% t('in_person_proofing.process.proof_of_address.acceptable_proof').each do |proof| %>
<li><%= proof %></li>
<% end %>
</ul>
<p><%= t('in_person_proofing.process.proof_of_address.physical_or_digital_copy') %></p>
<% end %>
<% c.item(heading: t('in_person_proofing.process.state_id.heading')) do %>
<p><%= t('in_person_proofing.process.state_id.info') %></p>
<% end %>
<% end %>
<p class="margin-bottom-0">
Expand All @@ -97,8 +55,16 @@
</p>
</section>

<h2 class="margin-bottom-2"><%= t('in_person_proofing.body.location.heading') %></h2>
<p>
<%= t('in_person_proofing.body.location.info') %>
<% if @presenter.selected_location_details.present? %>
<%= t('in_person_proofing.body.location.selection') %>
<% end %>
</p>

<% if @presenter.selected_location_details.present? %>
<section aria-label="<%= t('in_person_proofing.body.barcode.location_details') %>" class="margin-y-4">
<section aria-label="<%= t('in_person_proofing.body.barcode.location_details') %>" class="margin-bottom-4">
<address>
<h2 class="font-sans-md margin-bottom-1"><%= @presenter.selected_location_details['name'] %></h2>
<div class="margin-bottom-1">
Expand All @@ -115,6 +81,30 @@
</section>
<% end %>

<h2 class="margin-bottom-2"><%= t('in_person_proofing.body.expect.heading') %></h2>
<p><%= t('in_person_proofing.body.expect.info') %></p>

<p class="margin-top-4"><strong><%= t('in_person_proofing.body.barcode.email_sent') %></strong></p>

<p class="margin-top-3 margin-bottom-4">
<% if @presenter.service_provider_homepage_url.present? %>
<%= render ClickObserverComponent.new(event_name: 'IdV: user clicked sp link on ready to verify page') do %>
<%= t(
'in_person_proofing.body.barcode.return_to_partner_html',
link: link_to(
t(
'in_person_proofing.body.barcode.return_to_partner_link',
sp_name: @presenter.sp_name,
),
@presenter.service_provider_homepage_url,
),
) %>
<% end %>
<% else %>
<%= t('in_person_proofing.body.barcode.close_window') %>
<% end %>
</p>

<%= render PageFooterComponent.new do %>
<%= link_to t('in_person_proofing.body.barcode.cancel_link_text'), idv_cancel_path(step: 'barcode') %>
<% end %>
5 changes: 0 additions & 5 deletions app/views/user_mailer/in_person_ready_to_verify.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
<p>
<%= t('user_mailer.in_person_ready_to_verify.greeting') %><br>
<%= t('user_mailer.in_person_ready_to_verify.intro') %>
</p>

<%= render 'user_mailer/shared/in_person_ready_to_verify' %>
68 changes: 33 additions & 35 deletions app/views/user_mailer/shared/_in_person_ready_to_verify.html.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<div class="text-center">
<%= render 'idv/shared/mini_logo', filename: 'logo.png' %>
<%= render BarcodeComponent.new(
barcode_data: @presenter.enrollment_code,
barcode_image_url: @presenter.barcode_image_url,
label: nil,
label_formatter: Idv::InPerson::EnrollmentCodeFormatter.method(:format),
) %>
</div>

<table class="info-alert margin-y-4">
<tr>
<td width="16">
Expand All @@ -10,56 +20,33 @@
</tr>
</table>

<div class="border-1px border-primary-light radius-lg padding-4">
<div class="border-1px border-primary-light radius-lg padding-4 margin-bottom-4">
<h2 class="margin-top-0 margin-bottom-2 font-heading-lg text-bold">
<%= t('in_person_proofing.body.barcode.items_to_bring') %>
<%= t('in_person_proofing.body.barcode.what_to_expect') %>
</h2>
<p><%= t('in_person_proofing.body.barcode.speak_to_associate') %></p>
<table class="process-list">
<tr>
<td><div class="process-list__circle">1</div></td>
<td>
<h3 class="font-heading-md text-bold"><%= t('in_person_proofing.process.barcode.heading') %></h3>
<p><%= t('in_person_proofing.process.barcode.info') %></p>
<div class="display-inline-block">
<%= render 'idv/shared/mini_logo', filename: 'logo.png' %>
<%= render BarcodeComponent.new(
barcode_data: @presenter.enrollment_code,
barcode_image_url: @presenter.barcode_image_url,
label: nil,
label_formatter: Idv::InPerson::EnrollmentCodeFormatter.method(:format),
) %>
</div>
<h3 class="font-heading-md text-bold"><%= t('in_person_proofing.process.what_to_do.heading') %></h3>
<p><%= t('in_person_proofing.process.what_to_do.info', app_name: APP_NAME) %></p>

</td>
</tr>
<tr>
<td><div class="process-list__circle">2</div></td>
<td>
<h3 class="font-heading-md text-bold"><%= t('in_person_proofing.process.barcode.heading', app_name: APP_NAME) %></h3>
<p class="margin-bottom-105"><%= t('in_person_proofing.process.barcode.info') %></p>
</td>
</tr>
<tr>
<td><div class="process-list__circle">3</div></td>
<td>
<h3 class="font-heading-md text-bold"><%= t('in_person_proofing.process.state_id.heading') %></h3>
<p class="margin-bottom-105"><%= t('in_person_proofing.process.state_id.info') %></p>
<ul class="usa-list margin-y-105">
<% t('in_person_proofing.process.state_id.acceptable_documents').each do |document| %>
<li><%= document %></li>
<% end %>
</ul>
<p><%= t('in_person_proofing.process.state_id.no_other_documents') %></p>
</td>
</tr>
<% if @presenter.needs_proof_of_address? %>
<tr>
<td><div class="process-list__circle">3</div></td>
<td>
<h3 class="font-heading-md text-bold"><%= t('in_person_proofing.process.proof_of_address.heading') %></h3>
<p class="margin-bottom-105"><%= t('in_person_proofing.process.proof_of_address.info') %></p>
<ul class="usa-list margin-y-105">
<% t('in_person_proofing.process.proof_of_address.acceptable_proof').each do |proof| %>
<li><%= proof %></li>
<% end %>
</ul>
<p><%= t('in_person_proofing.process.proof_of_address.physical_or_digital_copy') %></p>
</td>
</tr>
<% end %>
</table>
<p class="margin-bottom-0">
<%= t('in_person_proofing.body.barcode.questions') %>
Expand All @@ -73,6 +60,14 @@
</p>
</div>

<h2 class="font-heading-lg text-bold margin-top-2"><%= t('in_person_proofing.body.location.heading') %></h2>
<p class="margin-bottom-0">
<%= t('in_person_proofing.body.location.info') %>
<% if @presenter.selected_location_details.present? %>
<%= t('in_person_proofing.body.location.selection') %>
<% end %>
</p>

<% if @presenter.selected_location_details.present? %>
<div class="margin-y-4">
<h2 class="font-sans-md margin-bottom-1 text-normal text-bold"><%= @presenter.selected_location_details['name'] %></h2>
Expand All @@ -88,3 +83,6 @@
</div>
</div>
<% end %>

<h2 class="font-heading-lg text-bold margin-bottom-2"><%= t('in_person_proofing.body.expect.heading') %></h2>
<p class="margin-bottom-0"><%= t('in_person_proofing.body.expect.info') %></p>
22 changes: 11 additions & 11 deletions config/locales/doc_auth/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ en:
alerts:
barcode_content_check: We couldn’t read the barcode on the back of your ID. It
could be because of a problem with the barcode, or the barcode is a
new type that we don’t recognize yet. Use another state-issued ID if
new type that we don’t recognize yet. Use another stateissued ID if
you have one.
barcode_read_check: We couldn’t read the barcode on the back of your ID. Try
taking a new picture.
Expand All @@ -44,7 +44,7 @@ en:
visible_photo_check: We couldn’t verify the photo on your ID. Try taking new pictures.
barcode_attention:
confirm_info: If the information below is incorrect, please upload new photos of
your state-issued ID.
your stateissued ID.
heading: We couldn’t read the barcode on your ID.
camera:
blocked: Your camera is blocked
Expand Down Expand Up @@ -102,12 +102,12 @@ en:
headings:
address: Update your mailing address
back: Back
capture_complete: We have verified your state-issued ID
capture_complete: We have verified your stateissued ID
capture_scan_warning_html: We couldn’t read the barcode on your ID. If the
information below is incorrect, please %{link} of your state-issued ID.
information below is incorrect, please %{link} of your stateissued ID.
capture_scan_warning_link: upload new photos
capture_troubleshooting_tips: Having trouble adding your state-issued ID?
document_capture: Add your state-issued ID
capture_troubleshooting_tips: Having trouble adding your stateissued ID?
document_capture: Add your stateissued ID
document_capture_back: Back of your ID
document_capture_front: Front of your ID
front: Front
Expand Down Expand Up @@ -142,7 +142,7 @@ en:
capture_status_small_document: Move Closer
capture_status_tap_to_capture: Tap to Capture
document_capture_intro_acknowledgment: We’ll collect information about you by
reading your state-issued ID. We use this information to verify your
reading your stateissued ID. We use this information to verify your
identity.
image_loaded: Image loaded
image_loading: Image loading
Expand All @@ -155,7 +155,7 @@ en:
learn_more: Learn more about how we protect your sensitive information
lets_go: 'Identity verification happens in two parts:'
link_sent: Please check your phone and follow instructions to take a photo of
your state-issued ID.
your stateissued ID.
link_sent_complete_no_polling: When you are done, click Continue here to finish verifying your identity.
link_sent_complete_polling: The next step will load automatically.
no_sp_name: The agency that you are trying to access
Expand All @@ -168,7 +168,7 @@ en:
ssn: We need your Social Security number to verify your name, date of birth and
address.
tag: Recommended
upload: We’ll collect information about you by reading your state-issued ID.
upload: We’ll collect information about you by reading your stateissued ID.
upload_from_computer: Don’t have a phone? Upload photos of your ID from this computer.
upload_from_phone: You won’t have to sign in again, and you’ll switch back to
this computer after you take photos. Your mobile phone must have a
Expand All @@ -179,7 +179,7 @@ en:
pretending to be you.'
you_entered: 'You entered:'
instructions:
bullet1: State-issued ID
bullet1: Stateissued ID
bullet2: Social Security number
bullet3: Phone number OR home address
consent: By checking this box, you are letting %{app_name} ask for, use, keep,
Expand Down Expand Up @@ -218,7 +218,7 @@ en:
document_capture_id_text2: Take the photo on a flat surface
document_capture_id_text3: Do not use the flash on your camera
document_capture_id_text4: File size should be at least 2 MB
review_issues_id_header_text: 'Review the images of your state-issued ID:'
review_issues_id_header_text: 'Review the images of your stateissued ID:'
review_issues_id_text1: Did you use a dark background?
review_issues_id_text2: Did you take the photo on a flat surface?
review_issues_id_text3: Is the flash on your camera off?
Expand Down
2 changes: 1 addition & 1 deletion config/locales/headings/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ en:
sign_in_without_sp: Sign in
sp_handoff_bounced: There was a problem connecting to %{sp_name}
ssn: Social Security Number
state_id: State-issued ID
state_id: Stateissued ID
totp_setup:
new: Add an authentication app
verify: Verify your information
Expand Down
10 changes: 5 additions & 5 deletions config/locales/idv/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ en:
- If you forgot your password, you’ll need to reset it and fill out the
form again.
- You’ll have to re-enter your personal information, like your name,
state-issued ID, etc.
stateissued ID, etc.
form:
address1: Address line 1
address2: Address line 2
Expand All @@ -154,8 +154,8 @@ en:
index:
id:
need_html: If you’re creating an account, you’ll need a <strong>current
state-issued ID</strong>.
state_issue: State-issued ID
stateissued ID</strong>.
state_issue: Stateissued ID
messages:
activated_html: Your identity has been verified. If you need to change your
verified information, please %{link}.
Expand Down Expand Up @@ -227,15 +227,15 @@ en:
need_assistance: 'Need immediate assistance? Here’s how to get help:'
still_having_trouble: Still having trouble?
options:
add_new_photos: Add new photos of your state-issued ID
add_new_photos: Add new photos of your stateissued ID
contact_support: Contact %{app_name} Support
doc_capture_tips: More tips for adding photos of your ID
get_help_at_sp: Get help at %{sp_name}
learn_more_address_verification_options: Learn more about verifying by phone or mail
learn_more_verify_by_mail: Learn more about verifying your address by mail
learn_more_verify_by_phone: Learn more about what phone number to use
learn_more_verify_in_person: Learn more about verifying in person
supported_documents: See a list of accepted state-issued IDs
supported_documents: See a list of accepted stateissued IDs
verify_by_mail: Verify your address by mail instead
unavailable:
exit_button: 'Exit %{app_name}'
Expand Down
Loading