From 2219f8170c490cb9188e8613e725f960f365e9ac Mon Sep 17 00:00:00 2001
From: Shannon Alexander <shannonalexander@Shannons-MBP.fios-router.home>
Date: Fri, 29 Jul 2022 17:35:42 -0400
Subject: [PATCH 01/18] add styles to email stylesheet

---
 app/assets/stylesheets/email.css.scss | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/assets/stylesheets/email.css.scss b/app/assets/stylesheets/email.css.scss
index 0c13b1ef748..9046517db65 100644
--- a/app/assets/stylesheets/email.css.scss
+++ b/app/assets/stylesheets/email.css.scss
@@ -32,6 +32,11 @@
   line-height: 10px;
 }
 
+.s16 {
+  font-size: 16px;
+  line-height: 24px;
+}
+
 .s30 {
   font-size: 30px;
   line-height: 30px;
@@ -47,6 +52,16 @@ h4 {
   margin-bottom: 16px;
 }
 
+.mt-40 {
+  margin-top: 40px;
+}
+
+.button.big table a {
+  padding: 16px 20px;
+  font-size: 20px;
+  border-radius: 8px;
+}
+
 .button.large.expanded table a {
   padding: 20px 0;
 }

From 4bfc8e3f61335312bd4bf690882a05cf35a2ee25 Mon Sep 17 00:00:00 2001
From: Shannon Alexander <shannonalexander@Shannons-MBP.fios-router.home>
Date: Fri, 29 Jul 2022 17:39:52 -0400
Subject: [PATCH 02/18] add heading strings

---
 config/locales/in_person_proofing/en.yml | 1 +
 config/locales/in_person_proofing/es.yml | 1 +
 config/locales/in_person_proofing/fr.yml | 1 +
 3 files changed, 3 insertions(+)

diff --git a/config/locales/in_person_proofing/en.yml b/config/locales/in_person_proofing/en.yml
index 7d39e98f81c..2fcf596b9e3 100644
--- a/config/locales/in_person_proofing/en.yml
+++ b/config/locales/in_person_proofing/en.yml
@@ -88,6 +88,7 @@ en:
       location: Select a location to verify your ID
       prepare: Verify your identity in person
       state_id: Enter the information on your ID
+      success: You successfully verified your identity with Login.gov
       update_address: Update your current address
       update_state_id: Update the information on your ID
     process:
diff --git a/config/locales/in_person_proofing/es.yml b/config/locales/in_person_proofing/es.yml
index dff6dbe5ad1..7fd03fe3084 100644
--- a/config/locales/in_person_proofing/es.yml
+++ b/config/locales/in_person_proofing/es.yml
@@ -92,6 +92,7 @@ es:
       location: Seleccione un lugar para verificar su cédula
       prepare: Verifique su identidad en persona
       state_id: Ingrese la información de su cédula
+      success: Verificó correctamente su identidad con Login.gov
       update_address: Actualizar su dirección actual
       update_state_id: Actualizar la información de su cédula de identidad
     process:
diff --git a/config/locales/in_person_proofing/fr.yml b/config/locales/in_person_proofing/fr.yml
index 6a2454799ff..c544f2dd1c2 100644
--- a/config/locales/in_person_proofing/fr.yml
+++ b/config/locales/in_person_proofing/fr.yml
@@ -96,6 +96,7 @@ fr:
       location: Sélectionnez un lieu pour vérifier votre identité
       prepare: Vérifiez votre identité en personne
       state_id: Saisissez les informations figurant sur votre document d’identité
+      success: Vous avez vérifié avec succès votre identité avec Login.gov
       update_address: Mettre à jour votre adresse actuelle
       update_state_id: Mettre à jour les informations figurant sur votre document d’identité
     process:

From d2859136f979ab2c8b78861e27bc6f6caf9628d0 Mon Sep 17 00:00:00 2001
From: Shannon Alexander <shannonalexander@Shannons-MBP.fios-router.home>
Date: Fri, 29 Jul 2022 17:41:31 -0400
Subject: [PATCH 03/18] add verified email strings

---
 config/locales/user_mailer/en.yml | 10 ++++++++++
 config/locales/user_mailer/es.yml | 11 +++++++++++
 config/locales/user_mailer/fr.yml | 11 +++++++++++
 3 files changed, 32 insertions(+)

diff --git a/config/locales/user_mailer/en.yml b/config/locales/user_mailer/en.yml
index 587cc7c4aa0..7d608772a20 100644
--- a/config/locales/user_mailer/en.yml
+++ b/config/locales/user_mailer/en.yml
@@ -105,6 +105,16 @@ en:
       intro: Here are the details to verify your identity in person at a United States
         Post Office near you.
       subject: You’re ready to verify your identity with %{app_name} in person
+    in_person_verified:
+      greeting: Hi %{name},
+      intro: You successfully verified your identity at the %{location} Post Office on %{date}.
+      link: http://www.secure.login.gov/verify
+      next_sign_in: Next, click the button or copy the link below to sign in to Login.gov.
+      sign_in: Sign in
+      subject: You successfully verified your identity with Login.gov
+      warning_contact_us_html: If you did not attempt to verify your identity in person, 
+        please <a href="%{contact_us}">contact us</a> and <a href="%{sign_in}">sign in</a> to 
+        change your password.
     letter_reminder:
       info_html: The letter you are about to receive will contain a confirmation code
         that helps us verify your address. You can complete the identity
diff --git a/config/locales/user_mailer/es.yml b/config/locales/user_mailer/es.yml
index 7ac1e5820c8..175edcdc50d 100644
--- a/config/locales/user_mailer/es.yml
+++ b/config/locales/user_mailer/es.yml
@@ -111,6 +111,17 @@ es:
       intro: Estos son los detalles para verificar su identidad en persona en una
         oficina de correos de los Estados Unidos cercana a usted.
       subject: Está listo para verificar su identidad con %{app_name} en persona
+    in_person_verified:
+      greeting: 'Hola, %{name}:'
+      intro: El %{date}, verificó correctamente su identidad en la oficina de correos de %{location}.
+      link: http://www.secure.login.gov/verify
+      next_sign_in: Luego, haga clic en el botón o copie el enlace que aparece a continuación para
+       iniciar sesión en Login.gov.
+      sign_in: Iniciar sesión
+      subject: Verificó correctamente su identidad con Login.gov
+      warning_contact_us_html: Si usted no intentó verificar su identidad en persona, por favor, 
+        póngase en <a href="%{contact_us}">contacto con nosotros</a> e 
+        <a href="%{sign_in}">inicie sesión</a> para cambiar su contraseña.
     letter_reminder:
       info_html: La carta que está a punto de recibir contendrá un código de
         confirmación que nos ayudará a verificar su dirección. Puede completar
diff --git a/config/locales/user_mailer/fr.yml b/config/locales/user_mailer/fr.yml
index f1a56ba36e1..2038fc2043b 100644
--- a/config/locales/user_mailer/fr.yml
+++ b/config/locales/user_mailer/fr.yml
@@ -114,6 +114,17 @@ fr:
       intro: Voici les détails pour vérifier votre identité en personne dans un bureau
         de poste des États-Unis près de chez vous.
       subject: Vous êtes prêt à vérifier votre identité avec %{app_name} en personne
+    in_person_verified:
+      greeting: 'Bonjour %{name},'
+      intro: Vous avez vérifié avec succès votre identité au bureau de poste de %{location} le %{date}.
+      link: http://www.secure.login.gov/verify
+      next_sign_in: Ensuite, cliquez sur le bouton ou copiez le lien ci-dessous pour vous 
+        connecter à Login.gov.
+      sign_in: Se connecter
+      subject: Vous avez vérifié avec succès votre identité avec Login.gov
+      warning_contact_us_html: Si vous n’avez pas essayé de vérifier votre identité en personne, 
+        veuillez <a href="%{contact_us}">nous contacter</a> et vous <a href="%{sign_in}">connecter</a>
+        pour changer votre mot de passe.
     letter_reminder:
       info_html: La lettre que vous êtes sur le point de recevoir contiendra un code
         de confirmation nous permettant de vérifier votre adresse. Vous pouvez

From 5d4c674be76b98f26f91535339b82825a9fc0993 Mon Sep 17 00:00:00 2001
From: Shannon Alexander <shannonalexander@Shannons-MBP.fios-router.home>
Date: Fri, 29 Jul 2022 17:41:59 -0400
Subject: [PATCH 04/18] add route

---
 config/routes.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/routes.rb b/config/routes.rb
index ee18ff94063..ead957c6b93 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -329,6 +329,8 @@
       get '/in_person' => 'in_person#index'
       get '/in_person/ready_to_verify' => 'in_person/ready_to_verify#show',
           as: :in_person_ready_to_verify
+      get '/in_person/verified' => 'in_person/verified#show',
+          as: :in_person_verified
       get '/in_person/usps_locations' => 'in_person/usps_locations#index'
       put '/in_person/usps_locations' => 'in_person/usps_locations#update'
       get '/in_person/usps_locations/selected' => 'in_person/usps_locations#show'

From 0d5544283343ff04ce58c6b8ffbfaf478f58fa46 Mon Sep 17 00:00:00 2001
From: Shannon Alexander <shannonalexander@Shannons-MBP.fios-router.home>
Date: Fri, 29 Jul 2022 17:46:23 -0400
Subject: [PATCH 05/18] create verified email and show in preview

---
 .../idv/in_person/verified_controller.rb      | 23 +++++++++
 app/mailers/user_mailer.rb                    | 11 ++++
 .../idv/in_person/verified_presenter.rb       | 21 ++++++++
 .../user_mailer/in_person_verified.html.erb   | 51 +++++++++++++++++++
 spec/mailers/previews/user_mailer_preview.rb  | 23 +++++++++
 5 files changed, 129 insertions(+)
 create mode 100644 app/controllers/idv/in_person/verified_controller.rb
 create mode 100644 app/presenters/idv/in_person/verified_presenter.rb
 create mode 100644 app/views/user_mailer/in_person_verified.html.erb

diff --git a/app/controllers/idv/in_person/verified_controller.rb b/app/controllers/idv/in_person/verified_controller.rb
new file mode 100644
index 00000000000..c9662a1c5ef
--- /dev/null
+++ b/app/controllers/idv/in_person/verified_controller.rb
@@ -0,0 +1,23 @@
+module Idv
+    module InPerson
+      class VerifiedController < ApplicationController
+  
+        def show
+          @presenter = ReadyToVerifyPresenter.new(enrollment: enrollment)
+        end
+
+        def send_verified_email(user, enrollment)
+        user.confirmed_email_addresses.each do |email_address|
+          UserMailer.in_person_verified(
+            user,
+            email_address,
+            first_name: user_session.dig(:idv, :pii, :first_name),
+            enrollment: entrollment,
+          ).deliver_now_or_later
+        end
+      end
+
+      end
+    end
+end
+  
\ No newline at end of file
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 2831a2639f7..d5501d68884 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -236,6 +236,17 @@ def in_person_ready_to_verify(user, email_address, first_name:, enrollment:)
     end
   end
 
+  def in_person_verified(user, email_address, first_name:, enrollment:)
+    with_user_locale(user) do
+      @first_name = first_name
+      @presenter = Idv::InPerson::VerifiedPresenter.new(enrollment: enrollment)
+      mail(
+        to: email_address.email,
+        subject: t('user_mailer.in_person_verified.subject', app_name: APP_NAME),
+      )
+    end
+  end
+
   private
 
   def email_should_receive_nonessential_notifications?(email)
diff --git a/app/presenters/idv/in_person/verified_presenter.rb b/app/presenters/idv/in_person/verified_presenter.rb
new file mode 100644
index 00000000000..6936e8971f2
--- /dev/null
+++ b/app/presenters/idv/in_person/verified_presenter.rb
@@ -0,0 +1,21 @@
+module Idv
+    module InPerson
+        class VerifiedPresenter
+
+        # update to user's time zone when out of pilot
+        USPS_SERVER_TIMEZONE = ActiveSupport::TimeZone['America/New_York']
+            def initialize(enrollment:)
+                @enrollment = enrollment
+            end
+
+            def location
+                @enrollment.selected_location_details["name"]
+            end
+
+            def date
+                @enrollment.status_updated_at.in_time_zone(USPS_SERVER_TIMEZONE).strftime(I18n.t('time.formats.event_date'))
+            end
+
+        end
+    end
+end
\ No newline at end of file
diff --git a/app/views/user_mailer/in_person_verified.html.erb b/app/views/user_mailer/in_person_verified.html.erb
new file mode 100644
index 00000000000..d0117450aa4
--- /dev/null
+++ b/app/views/user_mailer/in_person_verified.html.erb
@@ -0,0 +1,51 @@
+<%= image_tag('user-signup-ial2.svg', alt: '', class: 'float-center') %>
+<p>
+<div class="s16">
+    <%= t('user_mailer.in_person_verified.greeting', name: @first_name ) %><br>
+    <%= t('user_mailer.in_person_verified.intro', location: @presenter.location, date: @presenter.date) %><br /><br />
+    <%= t('user_mailer.in_person_verified.next_sign_in') %>
+</div>
+</p>
+
+<div class="mt-40">
+<table class="button expanded big radius">
+  <tbody>
+    <tr>
+      <td>
+        <table>
+          <tbody>
+            <tr>
+              <td style="text-align: center">
+                <%= link_to t('user_mailer.in_person_verified.sign_in'),
+                            sign_up_create_email_confirmation_url(
+                              _request_id: @request_id,
+                              confirmation_token: @token,
+                              locale: @locale,
+                            ),
+                            target: '_blank',
+                            class: 'float-center',
+                            rel: 'noopener' %>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </td>
+      <td class="expander"></td>
+    </tr>
+  </tbody>
+</table>
+</div>
+
+<p>
+    <%= link_to t('user_mailer.in_person_verified.link'), ('http://www.secure.login.gov/verify') %>
+</p>
+
+<p class="s16">
+<br />
+<%= t('user_mailer.in_person_verified.warning_contact_us_html', 
+        contact_us:"https://www.login.gov/contact/", 
+        sign_in: event_disavowal_url(disavowal_token: @disavowal_token),
+    ) %>
+<a>
+</a>
+</p>
\ No newline at end of file
diff --git a/spec/mailers/previews/user_mailer_preview.rb b/spec/mailers/previews/user_mailer_preview.rb
index 0b1dd186ba0..c3de9b83a38 100644
--- a/spec/mailers/previews/user_mailer_preview.rb
+++ b/spec/mailers/previews/user_mailer_preview.rb
@@ -143,6 +143,15 @@ def in_person_ready_to_verify
     )
   end
 
+  def in_person_verified
+    UserMailer.in_person_verified(
+      user,
+      email_address_record,
+      first_name: 'Michael',
+      enrollment: verified_enrollment,
+    )
+  end
+
   private
 
   def user
@@ -178,6 +187,20 @@ def in_person_enrollment
     )
   end
 
+  def verified_enrollment 
+    unsaveable(
+      InPersonEnrollment.new(
+        user: user,
+        profile: unsaveable(Profile.new(user: user)),
+        status_updated_at: Time.zone.now,
+        status: 2,
+        selected_location_details: {
+          'name' => 'Baltimore',
+        }
+      )
+    )
+  end
+  
   # Remove #save and #save! to make sure we can't write these made-up records
   def unsaveable(record)
     class << record

From d281bf582c8400580e60a5a4fd41fa57e417c3cc Mon Sep 17 00:00:00 2001
From: Shannon Alexander <shannonalexander@Shannons-MBP.fios-router.home>
Date: Fri, 29 Jul 2022 17:48:16 -0400
Subject: [PATCH 06/18] add send verified email to jobs

---
 app/jobs/get_usps_proofing_results_job.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/jobs/get_usps_proofing_results_job.rb b/app/jobs/get_usps_proofing_results_job.rb
index 9f585b6f0de..ad1923828d2 100644
--- a/app/jobs/get_usps_proofing_results_job.rb
+++ b/app/jobs/get_usps_proofing_results_job.rb
@@ -143,6 +143,8 @@ def update_enrollment_status(enrollment, response)
         enrollment.profile.activate
         enrollment.update(status: :passed)
         handle_successful_status_update(enrollment)
+        # move this somewhere it will trigger to test
+        send_verified_email(user, enrollment)
       else
         # Unsupported ID type
         enrollment.update(status: :failed)

From f2be35bd9c7f3c8ae831b4edeba8b22bbc817c34 Mon Sep 17 00:00:00 2001
From: Tomas Apodaca <thomas.apodaca@gsa.gov>
Date: Sun, 31 Jul 2022 14:35:23 -0700
Subject: [PATCH 07/18] lint fix

---
 .../idv/in_person/verified_controller.rb      | 19 +++++------
 .../idv/in_person/verified_presenter.rb       | 33 ++++++++++---------
 .../user_mailer/in_person_verified.html.erb   | 21 +++++++-----
 spec/mailers/previews/user_mailer_preview.rb  | 14 ++++----
 4 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/app/controllers/idv/in_person/verified_controller.rb b/app/controllers/idv/in_person/verified_controller.rb
index c9662a1c5ef..a0ded217ed9 100644
--- a/app/controllers/idv/in_person/verified_controller.rb
+++ b/app/controllers/idv/in_person/verified_controller.rb
@@ -1,23 +1,20 @@
 module Idv
-    module InPerson
-      class VerifiedController < ApplicationController
-  
-        def show
-          @presenter = ReadyToVerifyPresenter.new(enrollment: enrollment)
-        end
+  module InPerson
+    class VerifiedController < ApplicationController
+      def show
+        @presenter = ReadyToVerifyPresenter.new(enrollment: enrollment)
+      end
 
-        def send_verified_email(user, enrollment)
+      def send_verified_email(user, enrollment)
         user.confirmed_email_addresses.each do |email_address|
           UserMailer.in_person_verified(
             user,
             email_address,
             first_name: user_session.dig(:idv, :pii, :first_name),
-            enrollment: entrollment,
+            enrollment: enrollment,
           ).deliver_now_or_later
         end
       end
-
-      end
     end
+  end
 end
-  
\ No newline at end of file
diff --git a/app/presenters/idv/in_person/verified_presenter.rb b/app/presenters/idv/in_person/verified_presenter.rb
index 6936e8971f2..7dac2bd98b2 100644
--- a/app/presenters/idv/in_person/verified_presenter.rb
+++ b/app/presenters/idv/in_person/verified_presenter.rb
@@ -1,21 +1,22 @@
 module Idv
-    module InPerson
-        class VerifiedPresenter
+  module InPerson
+    class VerifiedPresenter
+      # update to user's time zone when out of pilot
+      USPS_SERVER_TIMEZONE = ActiveSupport::TimeZone['America/New_York']
 
-        # update to user's time zone when out of pilot
-        USPS_SERVER_TIMEZONE = ActiveSupport::TimeZone['America/New_York']
-            def initialize(enrollment:)
-                @enrollment = enrollment
-            end
+      def initialize(enrollment:)
+        @enrollment = enrollment
+      end
 
-            def location
-                @enrollment.selected_location_details["name"]
-            end
+      def location
+        @enrollment.selected_location_details['name']
+      end
 
-            def date
-                @enrollment.status_updated_at.in_time_zone(USPS_SERVER_TIMEZONE).strftime(I18n.t('time.formats.event_date'))
-            end
-
-        end
+      def date
+        @enrollment.status_updated_at.in_time_zone(USPS_SERVER_TIMEZONE).strftime(
+          I18n.t('time.formats.event_date'),
+        )
+      end
     end
-end
\ No newline at end of file
+  end
+end
diff --git a/app/views/user_mailer/in_person_verified.html.erb b/app/views/user_mailer/in_person_verified.html.erb
index d0117450aa4..3bc73f7b3a5 100644
--- a/app/views/user_mailer/in_person_verified.html.erb
+++ b/app/views/user_mailer/in_person_verified.html.erb
@@ -1,9 +1,9 @@
 <%= image_tag('user-signup-ial2.svg', alt: '', class: 'float-center') %>
 <p>
 <div class="s16">
-    <%= t('user_mailer.in_person_verified.greeting', name: @first_name ) %><br>
-    <%= t('user_mailer.in_person_verified.intro', location: @presenter.location, date: @presenter.date) %><br /><br />
-    <%= t('user_mailer.in_person_verified.next_sign_in') %>
+  <%= t('user_mailer.in_person_verified.greeting', name: @first_name) %><br>
+  <%= t('user_mailer.in_person_verified.intro', location: @presenter.location, date: @presenter.date) %><br /><br />
+  <%= t('user_mailer.in_person_verified.next_sign_in') %>
 </div>
 </p>
 
@@ -37,15 +37,20 @@
 </div>
 
 <p>
-    <%= link_to t('user_mailer.in_person_verified.link'), ('http://www.secure.login.gov/verify') %>
+  <%= link_to t('user_mailer.in_person_verified.link'), 'http://www.secure.login.gov/verify' %>
 </p>
 
 <p class="s16">
 <br />
-<%= t('user_mailer.in_person_verified.warning_contact_us_html', 
-        contact_us:"https://www.login.gov/contact/", 
+<%= link_to(
+      t(
+        'user_mailer.in_person_verified.warning_contact_us_html',
+        contact_us: MarketingSite.contact_url,
         sign_in: event_disavowal_url(disavowal_token: @disavowal_token),
-    ) %>
+      ),
+      MarketingSite.contact_url,
+    )
+%>
 <a>
 </a>
-</p>
\ No newline at end of file
+</p>
diff --git a/spec/mailers/previews/user_mailer_preview.rb b/spec/mailers/previews/user_mailer_preview.rb
index c3de9b83a38..2130e003856 100644
--- a/spec/mailers/previews/user_mailer_preview.rb
+++ b/spec/mailers/previews/user_mailer_preview.rb
@@ -187,20 +187,18 @@ def in_person_enrollment
     )
   end
 
-  def verified_enrollment 
+  def verified_enrollment
     unsaveable(
       InPersonEnrollment.new(
         user: user,
         profile: unsaveable(Profile.new(user: user)),
-        status_updated_at: Time.zone.now,
-        status: 2,
-        selected_location_details: {
-          'name' => 'Baltimore',
-        }
-      )
+        status_updated_at: Time.zone.now - 1.hour,
+        status: :passed,
+        selected_location_details: { 'name' => 'Baltimore' }.to_json,
+      ),
     )
   end
-  
+
   # Remove #save and #save! to make sure we can't write these made-up records
   def unsaveable(record)
     class << record

From d90efbbabae3224846bc84abc43866220c2e00bd Mon Sep 17 00:00:00 2001
From: Tomas Apodaca <thomas.apodaca@gsa.gov>
Date: Sun, 31 Jul 2022 15:36:27 -0700
Subject: [PATCH 08/18] fix urls? and normalize yaml

---
 .../user_mailer/in_person_verified.html.erb   | 19 ++++++-------------
 config/locales/user_mailer/en.yml             | 10 +++++-----
 config/locales/user_mailer/es.yml             | 15 ++++++++-------
 config/locales/user_mailer/fr.yml             | 15 ++++++++-------
 4 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/app/views/user_mailer/in_person_verified.html.erb b/app/views/user_mailer/in_person_verified.html.erb
index 3bc73f7b3a5..6a052f70b90 100644
--- a/app/views/user_mailer/in_person_verified.html.erb
+++ b/app/views/user_mailer/in_person_verified.html.erb
@@ -17,11 +17,7 @@
             <tr>
               <td style="text-align: center">
                 <%= link_to t('user_mailer.in_person_verified.sign_in'),
-                            sign_up_create_email_confirmation_url(
-                              _request_id: @request_id,
-                              confirmation_token: @token,
-                              locale: @locale,
-                            ),
+                            idv_url,
                             target: '_blank',
                             class: 'float-center',
                             rel: 'noopener' %>
@@ -37,18 +33,15 @@
 </div>
 
 <p>
-  <%= link_to t('user_mailer.in_person_verified.link'), 'http://www.secure.login.gov/verify' %>
+  <%= link_to idv_url, idv_url, target: '_blank', rel: 'noopener' %>
 </p>
 
 <p class="s16">
 <br />
-<%= link_to(
-      t(
-        'user_mailer.in_person_verified.warning_contact_us_html',
-        contact_us: MarketingSite.contact_url,
-        sign_in: event_disavowal_url(disavowal_token: @disavowal_token),
-      ),
-      MarketingSite.contact_url,
+<%= t(
+      'user_mailer.in_person_verified.warning_contact_us_html',
+      contact_us_url: MarketingSite.contact_url,
+      sign_in_url: idv_url,
     )
 %>
 <a>
diff --git a/config/locales/user_mailer/en.yml b/config/locales/user_mailer/en.yml
index 7d608772a20..3d0c37fdbe6 100644
--- a/config/locales/user_mailer/en.yml
+++ b/config/locales/user_mailer/en.yml
@@ -107,14 +107,14 @@ en:
       subject: You’re ready to verify your identity with %{app_name} in person
     in_person_verified:
       greeting: Hi %{name},
-      intro: You successfully verified your identity at the %{location} Post Office on %{date}.
-      link: http://www.secure.login.gov/verify
+      intro: You successfully verified your identity at the %{location} Post Office on
+        %{date}.
       next_sign_in: Next, click the button or copy the link below to sign in to Login.gov.
       sign_in: Sign in
       subject: You successfully verified your identity with Login.gov
-      warning_contact_us_html: If you did not attempt to verify your identity in person, 
-        please <a href="%{contact_us}">contact us</a> and <a href="%{sign_in}">sign in</a> to 
-        change your password.
+      warning_contact_us_html: If you did not attempt to verify your identity in
+        person, please <a href="%{contact_us_url}">contact us</a> and <a
+        href="%{sign_in_url}">sign in</a> to change your password.
     letter_reminder:
       info_html: The letter you are about to receive will contain a confirmation code
         that helps us verify your address. You can complete the identity
diff --git a/config/locales/user_mailer/es.yml b/config/locales/user_mailer/es.yml
index 175edcdc50d..0a634849621 100644
--- a/config/locales/user_mailer/es.yml
+++ b/config/locales/user_mailer/es.yml
@@ -113,15 +113,16 @@ es:
       subject: Está listo para verificar su identidad con %{app_name} en persona
     in_person_verified:
       greeting: 'Hola, %{name}:'
-      intro: El %{date}, verificó correctamente su identidad en la oficina de correos de %{location}.
-      link: http://www.secure.login.gov/verify
-      next_sign_in: Luego, haga clic en el botón o copie el enlace que aparece a continuación para
-       iniciar sesión en Login.gov.
+      intro: El %{date}, verificó correctamente su identidad en la oficina de correos
+        de %{location}.
+      next_sign_in: Luego, haga clic en el botón o copie el enlace que aparece a
+        continuación para iniciar sesión en Login.gov.
       sign_in: Iniciar sesión
       subject: Verificó correctamente su identidad con Login.gov
-      warning_contact_us_html: Si usted no intentó verificar su identidad en persona, por favor, 
-        póngase en <a href="%{contact_us}">contacto con nosotros</a> e 
-        <a href="%{sign_in}">inicie sesión</a> para cambiar su contraseña.
+      warning_contact_us_html: Si usted no intentó verificar su identidad en persona,
+        por favor, póngase en <a href="%{contact_us_url}">contacto con
+        nosotros</a> e <a href="%{sign_in_url}">inicie sesión</a> para cambiar
+        su contraseña.
     letter_reminder:
       info_html: La carta que está a punto de recibir contendrá un código de
         confirmación que nos ayudará a verificar su dirección. Puede completar
diff --git a/config/locales/user_mailer/fr.yml b/config/locales/user_mailer/fr.yml
index 2038fc2043b..13e421f5b96 100644
--- a/config/locales/user_mailer/fr.yml
+++ b/config/locales/user_mailer/fr.yml
@@ -116,15 +116,16 @@ fr:
       subject: Vous êtes prêt à vérifier votre identité avec %{app_name} en personne
     in_person_verified:
       greeting: 'Bonjour %{name},'
-      intro: Vous avez vérifié avec succès votre identité au bureau de poste de %{location} le %{date}.
-      link: http://www.secure.login.gov/verify
-      next_sign_in: Ensuite, cliquez sur le bouton ou copiez le lien ci-dessous pour vous 
-        connecter à Login.gov.
+      intro: Vous avez vérifié avec succès votre identité au bureau de poste de
+        %{location} le %{date}.
+      next_sign_in: Ensuite, cliquez sur le bouton ou copiez le lien ci-dessous pour
+        vous connecter à Login.gov.
       sign_in: Se connecter
       subject: Vous avez vérifié avec succès votre identité avec Login.gov
-      warning_contact_us_html: Si vous n’avez pas essayé de vérifier votre identité en personne, 
-        veuillez <a href="%{contact_us}">nous contacter</a> et vous <a href="%{sign_in}">connecter</a>
-        pour changer votre mot de passe.
+      warning_contact_us_html: Si vous n’avez pas essayé de vérifier votre identité en
+        personne, veuillez <a href="%{contact_us_url}">nous contacter</a> et
+        vous <a href="%{sign_in_url}">connecter</a> pour changer votre mot de
+        passe.
     letter_reminder:
       info_html: La lettre que vous êtes sur le point de recevoir contiendra un code
         de confirmation nous permettant de vérifier votre adresse. Vous pouvez

From 316d4e53f619bede305f3500709cf4b4317b8bb6 Mon Sep 17 00:00:00 2001
From: Tomas Apodaca <thomas.apodaca@gsa.gov>
Date: Sun, 31 Jul 2022 21:03:22 -0700
Subject: [PATCH 09/18] can hide title in layout, added to new template

---
 app/mailers/user_mailer.rb                        | 1 +
 app/views/layouts/user_mailer.html.erb            | 7 +++++--
 app/views/user_mailer/in_person_verified.html.erb | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index d5501d68884..955d9599207 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -239,6 +239,7 @@ def in_person_ready_to_verify(user, email_address, first_name:, enrollment:)
   def in_person_verified(user, email_address, first_name:, enrollment:)
     with_user_locale(user) do
       @first_name = first_name
+      @hide_title = true
       @presenter = Idv::InPerson::VerifiedPresenter.new(enrollment: enrollment)
       mail(
         to: email_address.email,
diff --git a/app/views/layouts/user_mailer.html.erb b/app/views/layouts/user_mailer.html.erb
index f695ac2cfe6..243a7b28278 100644
--- a/app/views/layouts/user_mailer.html.erb
+++ b/app/views/layouts/user_mailer.html.erb
@@ -71,8 +71,11 @@
                                         </tr>
                                       </tbody>
                                     </table>
-                                    <h4><%= @header || message.subject %>
-                                    </h4><%= yield %>
+                                    <% unless @hide_title %>
+                                      <h4><%= @header || message.subject %>
+                                      </h4>
+                                    <% end %>
+                                    <%= yield %>
                                     <table class="spacer">
                                       <tbody>
                                         <tr>
diff --git a/app/views/user_mailer/in_person_verified.html.erb b/app/views/user_mailer/in_person_verified.html.erb
index 6a052f70b90..6d2108b2ae9 100644
--- a/app/views/user_mailer/in_person_verified.html.erb
+++ b/app/views/user_mailer/in_person_verified.html.erb
@@ -1,4 +1,5 @@
 <%= image_tag('user-signup-ial2.svg', alt: '', class: 'float-center') %>
+<h4><%= message.subject %></h4>
 <p>
 <div class="s16">
   <%= t('user_mailer.in_person_verified.greeting', name: @first_name) %><br>

From 990dbea4b3224c5f0d9e0cea6edf923248d4efea Mon Sep 17 00:00:00 2001
From: Tomas Apodaca <thomas.apodaca@gsa.gov>
Date: Sun, 31 Jul 2022 21:04:12 -0700
Subject: [PATCH 10/18] use rasterized header image & add padding

---
 app/assets/images/email/user-signup-ial2.png    | Bin 0 -> 13300 bytes
 .../user_mailer/in_person_verified.html.erb     |   8 +++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/images/email/user-signup-ial2.png

diff --git a/app/assets/images/email/user-signup-ial2.png b/app/assets/images/email/user-signup-ial2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d8521fc12e80e90f367bb6e7380ebfbec844157
GIT binary patch
literal 13300
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

literal 0
HcmV?d00001

diff --git a/app/views/user_mailer/in_person_verified.html.erb b/app/views/user_mailer/in_person_verified.html.erb
index 6d2108b2ae9..db5fd19d1d2 100644
--- a/app/views/user_mailer/in_person_verified.html.erb
+++ b/app/views/user_mailer/in_person_verified.html.erb
@@ -1,4 +1,10 @@
-<%= image_tag('user-signup-ial2.svg', alt: '', class: 'float-center') %>
+<%= image_tag(
+      'email/user-signup-ial2.png',
+      width: 140,
+      height: 177,
+      alt: '',
+      class: 'float-center padding-bottom-4',
+    ) %>
 <h4><%= message.subject %></h4>
 <p>
 <div class="s16">

From 8749b78848167845c64aa9040625714f8fa62616 Mon Sep 17 00:00:00 2001
From: Tomas Apodaca <thomas.apodaca@gsa.gov>
Date: Sun, 31 Jul 2022 21:04:33 -0700
Subject: [PATCH 11/18] use the standard email button size

---
 app/assets/stylesheets/email.css.scss             | 6 ------
 app/views/user_mailer/in_person_verified.html.erb | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/email.css.scss b/app/assets/stylesheets/email.css.scss
index 9046517db65..b2bec51bb6e 100644
--- a/app/assets/stylesheets/email.css.scss
+++ b/app/assets/stylesheets/email.css.scss
@@ -56,12 +56,6 @@ h4 {
   margin-top: 40px;
 }
 
-.button.big table a {
-  padding: 16px 20px;
-  font-size: 20px;
-  border-radius: 8px;
-}
-
 .button.large.expanded table a {
   padding: 20px 0;
 }
diff --git a/app/views/user_mailer/in_person_verified.html.erb b/app/views/user_mailer/in_person_verified.html.erb
index db5fd19d1d2..4c0bf80b6c4 100644
--- a/app/views/user_mailer/in_person_verified.html.erb
+++ b/app/views/user_mailer/in_person_verified.html.erb
@@ -15,7 +15,7 @@
 </p>
 
 <div class="mt-40">
-<table class="button expanded big radius">
+<table class="button expanded large radius">
   <tbody>
     <tr>
       <td>

From 9b75ba3d707c3fc130f77ad8fe2a30f61b173e75 Mon Sep 17 00:00:00 2001
From: Tomas Apodaca <thomas.apodaca@gsa.gov>
Date: Sun, 31 Jul 2022 21:05:08 -0700
Subject: [PATCH 12/18] use existing sample enrollment data for preview

---
 spec/mailers/previews/user_mailer_preview.rb | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/spec/mailers/previews/user_mailer_preview.rb b/spec/mailers/previews/user_mailer_preview.rb
index 2130e003856..702d76eb95d 100644
--- a/spec/mailers/previews/user_mailer_preview.rb
+++ b/spec/mailers/previews/user_mailer_preview.rb
@@ -148,7 +148,7 @@ def in_person_verified
       user,
       email_address_record,
       first_name: 'Michael',
-      enrollment: verified_enrollment,
+      enrollment: in_person_enrollment,
     )
   end
 
@@ -172,7 +172,8 @@ def in_person_enrollment
         user: user,
         profile: unsaveable(Profile.new(user: user)),
         enrollment_code: '2048702198804358',
-        created_at: Time.zone.now,
+        created_at: Time.zone.now - 2.hours,
+        status_updated_at: Time.zone.now - 1.hour,
         current_address_matches_id: true,
         selected_location_details: {
           'name' => 'BALTIMORE',
@@ -187,18 +188,6 @@ def in_person_enrollment
     )
   end
 
-  def verified_enrollment
-    unsaveable(
-      InPersonEnrollment.new(
-        user: user,
-        profile: unsaveable(Profile.new(user: user)),
-        status_updated_at: Time.zone.now - 1.hour,
-        status: :passed,
-        selected_location_details: { 'name' => 'Baltimore' }.to_json,
-      ),
-    )
-  end
-
   # Remove #save and #save! to make sure we can't write these made-up records
   def unsaveable(record)
     class << record

From 77580c7dd3fe9d37de4513b11fd3f7c1c9499d97 Mon Sep 17 00:00:00 2001
From: Tomas Apodaca <thomas.apodaca@gsa.gov>
Date: Sun, 31 Jul 2022 21:32:25 -0700
Subject: [PATCH 13/18] send email in job, remove user's first name

---
 .../idv/in_person/verified_controller.rb      | 20 -------------------
 app/jobs/get_usps_proofing_results_job.rb     | 13 ++++++++++--
 app/mailers/user_mailer.rb                    |  3 +--
 .../user_mailer/in_person_verified.html.erb   |  2 +-
 config/locales/user_mailer/en.yml             |  2 +-
 config/locales/user_mailer/es.yml             |  2 +-
 config/locales/user_mailer/fr.yml             |  2 +-
 config/routes.rb                              |  2 --
 spec/mailers/previews/user_mailer_preview.rb  |  1 -
 9 files changed, 16 insertions(+), 31 deletions(-)
 delete mode 100644 app/controllers/idv/in_person/verified_controller.rb

diff --git a/app/controllers/idv/in_person/verified_controller.rb b/app/controllers/idv/in_person/verified_controller.rb
deleted file mode 100644
index a0ded217ed9..00000000000
--- a/app/controllers/idv/in_person/verified_controller.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module Idv
-  module InPerson
-    class VerifiedController < ApplicationController
-      def show
-        @presenter = ReadyToVerifyPresenter.new(enrollment: enrollment)
-      end
-
-      def send_verified_email(user, enrollment)
-        user.confirmed_email_addresses.each do |email_address|
-          UserMailer.in_person_verified(
-            user,
-            email_address,
-            first_name: user_session.dig(:idv, :pii, :first_name),
-            enrollment: enrollment,
-          ).deliver_now_or_later
-        end
-      end
-    end
-  end
-end
diff --git a/app/jobs/get_usps_proofing_results_job.rb b/app/jobs/get_usps_proofing_results_job.rb
index ad1923828d2..f7eeff09808 100644
--- a/app/jobs/get_usps_proofing_results_job.rb
+++ b/app/jobs/get_usps_proofing_results_job.rb
@@ -143,8 +143,7 @@ def update_enrollment_status(enrollment, response)
         enrollment.profile.activate
         enrollment.update(status: :passed)
         handle_successful_status_update(enrollment)
-        # move this somewhere it will trigger to test
-        send_verified_email(user, enrollment)
+        send_verified_email(enrollment.user, enrollment)
       else
         # Unsupported ID type
         enrollment.update(status: :failed)
@@ -157,4 +156,14 @@ def update_enrollment_status(enrollment, response)
       handle_unsupported_status(enrollment, response['status'])
     end
   end
+
+  def send_verified_email(user, enrollment)
+    user.confirmed_email_addresses.each do |email_address|
+      UserMailer.in_person_verified(
+        user,
+        email_address,
+        enrollment: enrollment,
+      ).deliver_now_or_later
+    end
+  end
 end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 955d9599207..11aaff7da55 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -236,9 +236,8 @@ def in_person_ready_to_verify(user, email_address, first_name:, enrollment:)
     end
   end
 
-  def in_person_verified(user, email_address, first_name:, enrollment:)
+  def in_person_verified(user, email_address, enrollment:)
     with_user_locale(user) do
-      @first_name = first_name
       @hide_title = true
       @presenter = Idv::InPerson::VerifiedPresenter.new(enrollment: enrollment)
       mail(
diff --git a/app/views/user_mailer/in_person_verified.html.erb b/app/views/user_mailer/in_person_verified.html.erb
index 4c0bf80b6c4..99d93b58969 100644
--- a/app/views/user_mailer/in_person_verified.html.erb
+++ b/app/views/user_mailer/in_person_verified.html.erb
@@ -8,7 +8,7 @@
 <h4><%= message.subject %></h4>
 <p>
 <div class="s16">
-  <%= t('user_mailer.in_person_verified.greeting', name: @first_name) %><br>
+  <%= t('user_mailer.in_person_verified.greeting') %><br>
   <%= t('user_mailer.in_person_verified.intro', location: @presenter.location, date: @presenter.date) %><br /><br />
   <%= t('user_mailer.in_person_verified.next_sign_in') %>
 </div>
diff --git a/config/locales/user_mailer/en.yml b/config/locales/user_mailer/en.yml
index 3d0c37fdbe6..42e11bce1ac 100644
--- a/config/locales/user_mailer/en.yml
+++ b/config/locales/user_mailer/en.yml
@@ -106,7 +106,7 @@ en:
         Post Office near you.
       subject: You’re ready to verify your identity with %{app_name} in person
     in_person_verified:
-      greeting: Hi %{name},
+      greeting: Hello,
       intro: You successfully verified your identity at the %{location} Post Office on
         %{date}.
       next_sign_in: Next, click the button or copy the link below to sign in to Login.gov.
diff --git a/config/locales/user_mailer/es.yml b/config/locales/user_mailer/es.yml
index 0a634849621..285bb45383b 100644
--- a/config/locales/user_mailer/es.yml
+++ b/config/locales/user_mailer/es.yml
@@ -112,7 +112,7 @@ es:
         oficina de correos de los Estados Unidos cercana a usted.
       subject: Está listo para verificar su identidad con %{app_name} en persona
     in_person_verified:
-      greeting: 'Hola, %{name}:'
+      greeting: Hola,
       intro: El %{date}, verificó correctamente su identidad en la oficina de correos
         de %{location}.
       next_sign_in: Luego, haga clic en el botón o copie el enlace que aparece a
diff --git a/config/locales/user_mailer/fr.yml b/config/locales/user_mailer/fr.yml
index 13e421f5b96..c637e1659d8 100644
--- a/config/locales/user_mailer/fr.yml
+++ b/config/locales/user_mailer/fr.yml
@@ -115,7 +115,7 @@ fr:
         de poste des États-Unis près de chez vous.
       subject: Vous êtes prêt à vérifier votre identité avec %{app_name} en personne
     in_person_verified:
-      greeting: 'Bonjour %{name},'
+      greeting: Bonjour,
       intro: Vous avez vérifié avec succès votre identité au bureau de poste de
         %{location} le %{date}.
       next_sign_in: Ensuite, cliquez sur le bouton ou copiez le lien ci-dessous pour
diff --git a/config/routes.rb b/config/routes.rb
index ead957c6b93..ee18ff94063 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -329,8 +329,6 @@
       get '/in_person' => 'in_person#index'
       get '/in_person/ready_to_verify' => 'in_person/ready_to_verify#show',
           as: :in_person_ready_to_verify
-      get '/in_person/verified' => 'in_person/verified#show',
-          as: :in_person_verified
       get '/in_person/usps_locations' => 'in_person/usps_locations#index'
       put '/in_person/usps_locations' => 'in_person/usps_locations#update'
       get '/in_person/usps_locations/selected' => 'in_person/usps_locations#show'
diff --git a/spec/mailers/previews/user_mailer_preview.rb b/spec/mailers/previews/user_mailer_preview.rb
index 702d76eb95d..10702d047c6 100644
--- a/spec/mailers/previews/user_mailer_preview.rb
+++ b/spec/mailers/previews/user_mailer_preview.rb
@@ -147,7 +147,6 @@ def in_person_verified
     UserMailer.in_person_verified(
       user,
       email_address_record,
-      first_name: 'Michael',
       enrollment: in_person_enrollment,
     )
   end

From 3330d53f779f754391925b3607054233293cc11e Mon Sep 17 00:00:00 2001
From: Tomas Apodaca <thomas.apodaca@gsa.gov>
Date: Sun, 31 Jul 2022 22:48:04 -0700
Subject: [PATCH 14/18] rename presenter methods

---
 app/presenters/idv/in_person/verified_presenter.rb | 4 ++--
 app/views/user_mailer/in_person_verified.html.erb  | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/presenters/idv/in_person/verified_presenter.rb b/app/presenters/idv/in_person/verified_presenter.rb
index 7dac2bd98b2..027fdd2ebfd 100644
--- a/app/presenters/idv/in_person/verified_presenter.rb
+++ b/app/presenters/idv/in_person/verified_presenter.rb
@@ -8,11 +8,11 @@ def initialize(enrollment:)
         @enrollment = enrollment
       end
 
-      def location
+      def location_name
         @enrollment.selected_location_details['name']
       end
 
-      def date
+      def formatted_verified_date
         @enrollment.status_updated_at.in_time_zone(USPS_SERVER_TIMEZONE).strftime(
           I18n.t('time.formats.event_date'),
         )
diff --git a/app/views/user_mailer/in_person_verified.html.erb b/app/views/user_mailer/in_person_verified.html.erb
index 99d93b58969..6a15ed2cfc0 100644
--- a/app/views/user_mailer/in_person_verified.html.erb
+++ b/app/views/user_mailer/in_person_verified.html.erb
@@ -9,7 +9,11 @@
 <p>
 <div class="s16">
   <%= t('user_mailer.in_person_verified.greeting') %><br>
-  <%= t('user_mailer.in_person_verified.intro', location: @presenter.location, date: @presenter.date) %><br /><br />
+  <%= t(
+        'user_mailer.in_person_verified.intro',
+        location: @presenter.location_name,
+        date: @presenter.formatted_verified_date,
+      ) %><br /><br />
   <%= t('user_mailer.in_person_verified.next_sign_in') %>
 </div>
 </p>

From ed692724616a0290338dc5fa20728b4c8c8f17b2 Mon Sep 17 00:00:00 2001
From: Tomas Apodaca <thomas.apodaca@gsa.gov>
Date: Sun, 31 Jul 2022 22:48:17 -0700
Subject: [PATCH 15/18] tests

---
 .../get_usps_proofing_results_job_spec.rb     | 50 +++++++++++++++++--
 spec/mailers/user_mailer_spec.rb              | 45 +++++++++++++++++
 .../idv/in_person/verified_presenter_spec.rb  | 32 ++++++++++++
 3 files changed, 123 insertions(+), 4 deletions(-)
 create mode 100644 spec/presenters/idv/in_person/verified_presenter_spec.rb

diff --git a/spec/jobs/get_usps_proofing_results_job_spec.rb b/spec/jobs/get_usps_proofing_results_job_spec.rb
index 9ff78d25b28..7f217d3aae6 100644
--- a/spec/jobs/get_usps_proofing_results_job_spec.rb
+++ b/spec/jobs/get_usps_proofing_results_job_spec.rb
@@ -17,16 +17,36 @@
       let!(:passed_enrollment) { create(:in_person_enrollment, :passed) }
 
       let!(:pending_enrollment) do
-        create(:in_person_enrollment, status: :pending, enrollment_code: SecureRandom.hex(16))
+        create(
+          :in_person_enrollment,
+          status: :pending,
+          enrollment_code: SecureRandom.hex(16),
+          selected_location_details: { name: 'FRIENDSHIP' },
+        )
       end
       let!(:pending_enrollment_2) do
-        create(:in_person_enrollment, status: :pending, enrollment_code: SecureRandom.hex(16))
+        create(
+          :in_person_enrollment,
+          status: :pending,
+          enrollment_code: SecureRandom.hex(16),
+          selected_location_details: { name: 'BALTIMORE' },
+        )
       end
       let!(:pending_enrollment_3) do
-        create(:in_person_enrollment, status: :pending, enrollment_code: SecureRandom.hex(16))
+        create(
+          :in_person_enrollment,
+          status: :pending,
+          enrollment_code: SecureRandom.hex(16),
+          selected_location_details: { name: 'WASHINGTON' },
+        )
       end
       let!(:pending_enrollment_4) do
-        create(:in_person_enrollment, status: :pending, enrollment_code: SecureRandom.hex(16))
+        create(
+          :in_person_enrollment,
+          status: :pending,
+          enrollment_code: SecureRandom.hex(16),
+          selected_location_details: { name: 'ARLINGTON' },
+        )
       end
       let(:pending_enrollments) do
         [
@@ -148,6 +168,28 @@
         end
       end
 
+      it 'sends verifed email on 2xx responses with valid JSON' do
+        stub_request_token
+        stub_request_passed_proofing_results
+
+        allow(InPersonEnrollment).to receive(:needs_usps_status_check).
+          and_return([pending_enrollment])
+
+        mailer = instance_double(ActionMailer::MessageDelivery, deliver_now_or_later: true)
+        user = pending_enrollment.user
+        user.email_addresses.each do |email_address|
+          expect(UserMailer).to receive(:in_person_verified).
+            with(
+              user,
+              email_address,
+              enrollment: instance_of(InPersonEnrollment),
+            ).
+            and_return(mailer)
+        end
+
+        job.perform(Time.zone.now)
+      end
+
       it 'receives a non-hash value' do
         stub_request_token
         stub_request_proofing_results_with_responses({})
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 878879d46c9..4c929362b92 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -520,6 +520,51 @@ def expect_email_body_to_have_help_and_contact_links
     end
   end
 
+  describe '#in_person_ready_to_verify' do
+    let(:first_name) { 'Michael' }
+    let!(:enrollment) {
+      create(
+        :in_person_enrollment,
+        :pending,
+        selected_location_details: { name: 'FRIENDSHIP' },
+        status_updated_at: Time.zone.now - 2.hours,
+      )
+    }
+
+    let(:mail) do
+      UserMailer.in_person_ready_to_verify(
+        user,
+        user.email_addresses.first,
+        first_name: first_name,
+        enrollment: enrollment,
+      )
+    end
+
+    it_behaves_like 'a system email'
+    it_behaves_like 'an email that respects user email locale preference'
+  end
+
+  describe '#in_person_verified' do
+    let(:enrollment) {
+      create(
+        :in_person_enrollment,
+        selected_location_details: { name: 'FRIENDSHIP' },
+        status_updated_at: Time.zone.now - 2.hours,
+      )
+    }
+
+    let(:mail) do
+      UserMailer.in_person_verified(
+        user,
+        user.email_addresses.first,
+        enrollment: enrollment,
+      )
+    end
+
+    it_behaves_like 'a system email'
+    it_behaves_like 'an email that respects user email locale preference'
+  end
+
   def strip_tags(str)
     ActionController::Base.helpers.strip_tags(str)
   end
diff --git a/spec/presenters/idv/in_person/verified_presenter_spec.rb b/spec/presenters/idv/in_person/verified_presenter_spec.rb
new file mode 100644
index 00000000000..26c83dfcb75
--- /dev/null
+++ b/spec/presenters/idv/in_person/verified_presenter_spec.rb
@@ -0,0 +1,32 @@
+require 'rails_helper'
+
+RSpec.describe Idv::InPerson::VerifiedPresenter do
+  let(:location_name) { 'FRIENDSHIP' }
+  let(:status_updated_at) { described_class::USPS_SERVER_TIMEZONE.parse('2022-07-14T00:00:00Z') }
+  let!(:enrollment) do
+    create(
+      :in_person_enrollment,
+      :pending,
+      selected_location_details: { name: location_name },
+    )
+  end
+
+  subject(:presenter) { described_class.new(enrollment: enrollment) }
+
+  describe '#location_name' do
+    it 'returns the enrollment location name' do
+      expect(presenter.location_name).to eq(location_name)
+    end
+  end
+
+  describe '#formatted_verified_date' do
+    around do |example|
+      Time.use_zone('UTC') { example.run }
+    end
+
+    it 'returns a formatted verified date' do
+      enrollment.update(status_updated_at: status_updated_at)
+      expect(presenter.formatted_verified_date).to eq 'July 13, 2022'
+    end
+  end
+end

From 7cf9bd7dea6bec9afef6f3820c6dae5ba8247ad3 Mon Sep 17 00:00:00 2001
From: Tomas Apodaca <thomas.apodaca@gsa.gov>
Date: Sun, 31 Jul 2022 23:07:24 -0700
Subject: [PATCH 16/18] add changelog

changelog: Upcoming Features, In-Person Proofing, Implement "You verified" email notification

From 7ecde017c3fbe2e339e7f4e0b5232c547bc46553 Mon Sep 17 00:00:00 2001
From: Tomas Apodaca <thomas.apodaca@gsa.gov>
Date: Mon, 1 Aug 2022 08:44:49 -0700
Subject: [PATCH 17/18] fix i18n test failures

---
 app/views/user_mailer/in_person_verified.html.erb | 2 +-
 config/locales/in_person_proofing/en.yml          | 1 -
 config/locales/in_person_proofing/es.yml          | 1 -
 config/locales/in_person_proofing/fr.yml          | 1 -
 config/locales/user_mailer/en.yml                 | 4 ++--
 config/locales/user_mailer/es.yml                 | 4 ++--
 config/locales/user_mailer/fr.yml                 | 4 ++--
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/views/user_mailer/in_person_verified.html.erb b/app/views/user_mailer/in_person_verified.html.erb
index 6a15ed2cfc0..52a8194c3d5 100644
--- a/app/views/user_mailer/in_person_verified.html.erb
+++ b/app/views/user_mailer/in_person_verified.html.erb
@@ -14,7 +14,7 @@
         location: @presenter.location_name,
         date: @presenter.formatted_verified_date,
       ) %><br /><br />
-  <%= t('user_mailer.in_person_verified.next_sign_in') %>
+  <%= t('user_mailer.in_person_verified.next_sign_in', app_name: APP_NAME) %>
 </div>
 </p>
 
diff --git a/config/locales/in_person_proofing/en.yml b/config/locales/in_person_proofing/en.yml
index 2fcf596b9e3..7d39e98f81c 100644
--- a/config/locales/in_person_proofing/en.yml
+++ b/config/locales/in_person_proofing/en.yml
@@ -88,7 +88,6 @@ en:
       location: Select a location to verify your ID
       prepare: Verify your identity in person
       state_id: Enter the information on your ID
-      success: You successfully verified your identity with Login.gov
       update_address: Update your current address
       update_state_id: Update the information on your ID
     process:
diff --git a/config/locales/in_person_proofing/es.yml b/config/locales/in_person_proofing/es.yml
index 7fd03fe3084..dff6dbe5ad1 100644
--- a/config/locales/in_person_proofing/es.yml
+++ b/config/locales/in_person_proofing/es.yml
@@ -92,7 +92,6 @@ es:
       location: Seleccione un lugar para verificar su cédula
       prepare: Verifique su identidad en persona
       state_id: Ingrese la información de su cédula
-      success: Verificó correctamente su identidad con Login.gov
       update_address: Actualizar su dirección actual
       update_state_id: Actualizar la información de su cédula de identidad
     process:
diff --git a/config/locales/in_person_proofing/fr.yml b/config/locales/in_person_proofing/fr.yml
index c544f2dd1c2..6a2454799ff 100644
--- a/config/locales/in_person_proofing/fr.yml
+++ b/config/locales/in_person_proofing/fr.yml
@@ -96,7 +96,6 @@ fr:
       location: Sélectionnez un lieu pour vérifier votre identité
       prepare: Vérifiez votre identité en personne
       state_id: Saisissez les informations figurant sur votre document d’identité
-      success: Vous avez vérifié avec succès votre identité avec Login.gov
       update_address: Mettre à jour votre adresse actuelle
       update_state_id: Mettre à jour les informations figurant sur votre document d’identité
     process:
diff --git a/config/locales/user_mailer/en.yml b/config/locales/user_mailer/en.yml
index 42e11bce1ac..4583d0ca0ee 100644
--- a/config/locales/user_mailer/en.yml
+++ b/config/locales/user_mailer/en.yml
@@ -109,9 +109,9 @@ en:
       greeting: Hello,
       intro: You successfully verified your identity at the %{location} Post Office on
         %{date}.
-      next_sign_in: Next, click the button or copy the link below to sign in to Login.gov.
+      next_sign_in: Next, click the button or copy the link below to sign in to %{app_name}.
       sign_in: Sign in
-      subject: You successfully verified your identity with Login.gov
+      subject: You successfully verified your identity with %{app_name}
       warning_contact_us_html: If you did not attempt to verify your identity in
         person, please <a href="%{contact_us_url}">contact us</a> and <a
         href="%{sign_in_url}">sign in</a> to change your password.
diff --git a/config/locales/user_mailer/es.yml b/config/locales/user_mailer/es.yml
index 285bb45383b..35b2b9b65af 100644
--- a/config/locales/user_mailer/es.yml
+++ b/config/locales/user_mailer/es.yml
@@ -116,9 +116,9 @@ es:
       intro: El %{date}, verificó correctamente su identidad en la oficina de correos
         de %{location}.
       next_sign_in: Luego, haga clic en el botón o copie el enlace que aparece a
-        continuación para iniciar sesión en Login.gov.
+        continuación para iniciar sesión en %{app_name}.
       sign_in: Iniciar sesión
-      subject: Verificó correctamente su identidad con Login.gov
+      subject: Verificó correctamente su identidad con %{app_name}
       warning_contact_us_html: Si usted no intentó verificar su identidad en persona,
         por favor, póngase en <a href="%{contact_us_url}">contacto con
         nosotros</a> e <a href="%{sign_in_url}">inicie sesión</a> para cambiar
diff --git a/config/locales/user_mailer/fr.yml b/config/locales/user_mailer/fr.yml
index c637e1659d8..b336b21951f 100644
--- a/config/locales/user_mailer/fr.yml
+++ b/config/locales/user_mailer/fr.yml
@@ -119,9 +119,9 @@ fr:
       intro: Vous avez vérifié avec succès votre identité au bureau de poste de
         %{location} le %{date}.
       next_sign_in: Ensuite, cliquez sur le bouton ou copiez le lien ci-dessous pour
-        vous connecter à Login.gov.
+        vous connecter à %{app_name}.
       sign_in: Se connecter
-      subject: Vous avez vérifié avec succès votre identité avec Login.gov
+      subject: Vous avez vérifié avec succès votre identité avec %{app_name}
       warning_contact_us_html: Si vous n’avez pas essayé de vérifier votre identité en
         personne, veuillez <a href="%{contact_us_url}">nous contacter</a> et
         vous <a href="%{sign_in_url}">connecter</a> pour changer votre mot de

From 24f02d3b4eb6beaa1372aed0608ca0787b9fb769 Mon Sep 17 00:00:00 2001
From: Tomas Apodaca <thomas.apodaca@gsa.gov>
Date: Tue, 2 Aug 2022 08:43:42 -0700
Subject: [PATCH 18/18] LG-6434: Create template for "Your identity could not
 be verified" email, and send when status is set to failed (#6676)

* add strings

* fr strings added

* refactor presenter

* add failure email ui

* update spec to use refactored presenter

* failure email

* normalize yaml, split list into steps

* email styles: no header image, bold list opener

* mover lower part of both emails into a partial

* Interpolate app_name

Required by tests for single point of update

* styling changes

Co-authored-by: Shannon Alexander <shannonalexander@Shannons-MBP.fios-router.home>
Co-authored-by: Andrew Duthie <andrew.duthie@gsa.gov>
---
 app/assets/stylesheets/email.css.scss         |  4 --
 app/jobs/get_usps_proofing_results_job.rb     | 11 +++++
 app/mailers/user_mailer.rb                    | 12 ++++-
 ...> verification_results_email_presenter.rb} |  2 +-
 ...-verification-results-email-lower.html.erb | 38 ++++++++++++++++
 .../user_mailer/in_person_failed.html.erb     | 20 +++++++++
 .../user_mailer/in_person_verified.html.erb   | 45 +------------------
 config/locales/user_mailer/en.yml             | 14 ++++++
 config/locales/user_mailer/es.yml             | 15 +++++++
 config/locales/user_mailer/fr.yml             | 17 +++++++
 .../get_usps_proofing_results_job_spec.rb     | 26 ++++++++++-
 spec/mailers/previews/user_mailer_preview.rb  |  8 ++++
 spec/mailers/user_mailer_spec.rb              | 21 +++++++++
 ...ification_results_email_presenter_spec.rb} |  2 +-
 14 files changed, 183 insertions(+), 52 deletions(-)
 rename app/presenters/idv/in_person/{verified_presenter.rb => verification_results_email_presenter.rb} (92%)
 create mode 100644 app/views/shared/_in-person-verification-results-email-lower.html.erb
 create mode 100644 app/views/user_mailer/in_person_failed.html.erb
 rename spec/presenters/idv/in_person/{verified_presenter_spec.rb => verification_results_email_presenter_spec.rb} (92%)

diff --git a/app/assets/stylesheets/email.css.scss b/app/assets/stylesheets/email.css.scss
index b2bec51bb6e..b9e1286126f 100644
--- a/app/assets/stylesheets/email.css.scss
+++ b/app/assets/stylesheets/email.css.scss
@@ -52,10 +52,6 @@ h4 {
   margin-bottom: 16px;
 }
 
-.mt-40 {
-  margin-top: 40px;
-}
-
 .button.large.expanded table a {
   padding: 20px 0;
 }
diff --git a/app/jobs/get_usps_proofing_results_job.rb b/app/jobs/get_usps_proofing_results_job.rb
index f7eeff09808..8b3b78bd7dd 100644
--- a/app/jobs/get_usps_proofing_results_job.rb
+++ b/app/jobs/get_usps_proofing_results_job.rb
@@ -152,6 +152,7 @@ def update_enrollment_status(enrollment, response)
     when IPP_STATUS_FAILED
       enrollment.update(status: :failed)
       handle_failed_status(enrollment, response)
+      send_failed_email(enrollment.user, enrollment)
     else
       handle_unsupported_status(enrollment, response['status'])
     end
@@ -166,4 +167,14 @@ def send_verified_email(user, enrollment)
       ).deliver_now_or_later
     end
   end
+
+  def send_failed_email(user, enrollment)
+    user.confirmed_email_addresses.each do |email_address|
+      UserMailer.in_person_failed(
+        user,
+        email_address,
+        enrollment: enrollment,
+      ).deliver_now_or_later
+    end
+  end
 end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 11aaff7da55..ccb2bef93d6 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -239,7 +239,7 @@ def in_person_ready_to_verify(user, email_address, first_name:, enrollment:)
   def in_person_verified(user, email_address, enrollment:)
     with_user_locale(user) do
       @hide_title = true
-      @presenter = Idv::InPerson::VerifiedPresenter.new(enrollment: enrollment)
+      @presenter = Idv::InPerson::VerificationResultsEmailPresenter.new(enrollment: enrollment)
       mail(
         to: email_address.email,
         subject: t('user_mailer.in_person_verified.subject', app_name: APP_NAME),
@@ -247,6 +247,16 @@ def in_person_verified(user, email_address, enrollment:)
     end
   end
 
+  def in_person_failed(user, email_address, enrollment:)
+    with_user_locale(user) do
+      @presenter = Idv::InPerson::VerificationResultsEmailPresenter.new(enrollment: enrollment)
+      mail(
+        to: email_address.email,
+        subject: t('user_mailer.in_person_failed.subject', app_name: APP_NAME),
+      )
+    end
+  end
+
   private
 
   def email_should_receive_nonessential_notifications?(email)
diff --git a/app/presenters/idv/in_person/verified_presenter.rb b/app/presenters/idv/in_person/verification_results_email_presenter.rb
similarity index 92%
rename from app/presenters/idv/in_person/verified_presenter.rb
rename to app/presenters/idv/in_person/verification_results_email_presenter.rb
index 027fdd2ebfd..d8970ec9388 100644
--- a/app/presenters/idv/in_person/verified_presenter.rb
+++ b/app/presenters/idv/in_person/verification_results_email_presenter.rb
@@ -1,6 +1,6 @@
 module Idv
   module InPerson
-    class VerifiedPresenter
+    class VerificationResultsEmailPresenter
       # update to user's time zone when out of pilot
       USPS_SERVER_TIMEZONE = ActiveSupport::TimeZone['America/New_York']
 
diff --git a/app/views/shared/_in-person-verification-results-email-lower.html.erb b/app/views/shared/_in-person-verification-results-email-lower.html.erb
new file mode 100644
index 00000000000..3ebe6dca242
--- /dev/null
+++ b/app/views/shared/_in-person-verification-results-email-lower.html.erb
@@ -0,0 +1,38 @@
+<div class="margin-top-5">
+  <table class="button expanded large radius">
+    <tbody>
+      <tr>
+        <td>
+          <table>
+            <tbody>
+              <tr>
+                <td style="text-align: center">
+                  <%= link_to t('user_mailer.in_person_verified.sign_in'),
+                              idv_url,
+                              target: '_blank',
+                              class: 'float-center',
+                              rel: 'noopener' %>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        <td class="expander"></td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+<p>
+  <%= link_to idv_url, idv_url, target: '_blank', rel: 'noopener' %>
+</p>
+
+<div class="s16">
+  <br />
+  <%= t(
+        'user_mailer.in_person_verified.warning_contact_us_html',
+        contact_us_url: MarketingSite.contact_url,
+        sign_in_url: idv_url,
+      )
+  %>
+</div>
diff --git a/app/views/user_mailer/in_person_failed.html.erb b/app/views/user_mailer/in_person_failed.html.erb
new file mode 100644
index 00000000000..f34e8718abb
--- /dev/null
+++ b/app/views/user_mailer/in_person_failed.html.erb
@@ -0,0 +1,20 @@
+<div class="s16">
+  <%= t('user_mailer.in_person_verified.greeting') %><br>
+  <p class="s16">
+    <%= t(
+          'user_mailer.in_person_failed.intro',
+          location: @presenter.location_name,
+          date: @presenter.formatted_verified_date,
+        ) %>
+  </p>
+  <p class="s16">
+    <%= t('user_mailer.in_person_failed.body', app_name: APP_NAME) %><br><br />
+  </p>
+  <strong><%= t('user_mailer.in_person_failed.verifying_identity') %></strong><br>
+  <ul class="usa-list">
+    <li><%= t('user_mailer.in_person_failed.verifying_step_not_expired') %></li>
+    <li><%= t('user_mailer.in_person_failed.verifying_step_proof_of_address') %></li>
+  </ul>
+</div>
+
+<%= render 'shared/in-person-verification-results-email-lower' %>
diff --git a/app/views/user_mailer/in_person_verified.html.erb b/app/views/user_mailer/in_person_verified.html.erb
index 52a8194c3d5..8ffd02a9cce 100644
--- a/app/views/user_mailer/in_person_verified.html.erb
+++ b/app/views/user_mailer/in_person_verified.html.erb
@@ -6,8 +6,7 @@
       class: 'float-center padding-bottom-4',
     ) %>
 <h4><%= message.subject %></h4>
-<p>
-<div class="s16">
+<p class="s16">
   <%= t('user_mailer.in_person_verified.greeting') %><br>
   <%= t(
         'user_mailer.in_person_verified.intro',
@@ -15,46 +14,6 @@
         date: @presenter.formatted_verified_date,
       ) %><br /><br />
   <%= t('user_mailer.in_person_verified.next_sign_in', app_name: APP_NAME) %>
-</div>
-</p>
-
-<div class="mt-40">
-<table class="button expanded large radius">
-  <tbody>
-    <tr>
-      <td>
-        <table>
-          <tbody>
-            <tr>
-              <td style="text-align: center">
-                <%= link_to t('user_mailer.in_person_verified.sign_in'),
-                            idv_url,
-                            target: '_blank',
-                            class: 'float-center',
-                            rel: 'noopener' %>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </td>
-      <td class="expander"></td>
-    </tr>
-  </tbody>
-</table>
-</div>
-
-<p>
-  <%= link_to idv_url, idv_url, target: '_blank', rel: 'noopener' %>
 </p>
 
-<p class="s16">
-<br />
-<%= t(
-      'user_mailer.in_person_verified.warning_contact_us_html',
-      contact_us_url: MarketingSite.contact_url,
-      sign_in_url: idv_url,
-    )
-%>
-<a>
-</a>
-</p>
+<%= render 'shared/in-person-verification-results-email-lower' %>
diff --git a/config/locales/user_mailer/en.yml b/config/locales/user_mailer/en.yml
index 4583d0ca0ee..634f1ad81aa 100644
--- a/config/locales/user_mailer/en.yml
+++ b/config/locales/user_mailer/en.yml
@@ -100,6 +100,20 @@ en:
         %{app_name} %{help_link} or %{contact_link}.
       subject: Email address deleted
     help_link_text: Help Center
+    in_person_failed:
+      body: Click the button or copy the link below to try verifying your identity
+        online again through %{app_name}. If you are still experiencing issues,
+        please contact the agency you are trying to access.
+      intro: Your identity could not be verified at the %{location} Post Office on
+        %{date}.
+      subject: Your identity could not be verified in person
+      verifying_identity: 'When verifying your identity:'
+      verifying_step_not_expired: 'Your state-issued ID or driver’s license must not
+        be expired. We do not currently accept any other forms of
+        identification, such as passports and military IDs.'
+      verifying_step_proof_of_address: 'If you try to verify your identity in person
+        again, you need to bring a valid proof of address if your current
+        address is different than the address on your ID.'
     in_person_ready_to_verify:
       greeting: Hi %{name},
       intro: Here are the details to verify your identity in person at a United States
diff --git a/config/locales/user_mailer/es.yml b/config/locales/user_mailer/es.yml
index 35b2b9b65af..9f0634ed76a 100644
--- a/config/locales/user_mailer/es.yml
+++ b/config/locales/user_mailer/es.yml
@@ -106,6 +106,21 @@ es:
         %{app_name} %{help_link} o el %{contact_link}.
       subject: Dirección de correo electrónico eliminada
     help_link_text: Centro de Ayuda
+    in_person_failed:
+      body: Haga clic en el botón o copie el enlace siguiente para volver a intentar
+        verificar su identidad en línea con %{app_name}. Si sigue teniendo
+        problemas, póngase en contacto con la agencia a la que intenta acceder.
+      intro: El %{date}, no se pudo verificar su identidad en la oficina de correos de
+        %{location}.
+      subject: No se pudo verificar su identidad en persona
+      verifying_identity: 'Al verificar su identidad:'
+      verifying_step_not_expired: Su documento de identidad o permiso de conducir
+        emitido por el estado debe estar vigente. Por el momento, no aceptamos
+        otras formas de identificación, como pasaportes o cartillas militares.
+      verifying_step_proof_of_address: Si vuelve a intentar verificar su identidad en
+        persona, deberá llevar un comprobante de domicilio vigente si su
+        dirección actual es distinta de la que aparece en su documento de
+        identidad.
     in_person_ready_to_verify:
       greeting: 'Hola, %{name}:'
       intro: Estos son los detalles para verificar su identidad en persona en una
diff --git a/config/locales/user_mailer/fr.yml b/config/locales/user_mailer/fr.yml
index b336b21951f..1e72e5204ce 100644
--- a/config/locales/user_mailer/fr.yml
+++ b/config/locales/user_mailer/fr.yml
@@ -109,6 +109,23 @@ fr:
         veuillez visiter le %{help_link} de %{app_name} ou %{contact_link}.
       subject: Adresse email supprimée
     help_link_text: Centre d’aide
+    in_person_failed:
+      body: Cliquez sur le bouton ou copiez le lien ci-dessous pour essayer de
+        vérifier à nouveau votre identité en ligne par le biais de %{app_name}.
+        Si vous rencontrez toujours des problèmes, veuillez contacter l’agence à
+        laquelle vous essayez d’accéder.
+      intro: Votre identité n’a pas pu être vérifiée au bureau de poste de %{location}
+        le %{date}.
+      subject: Votre identité n’a pas pu être vérifiée en personne
+      verifying_identity: 'Lors de la vérification de votre identité :'
+      verifying_step_not_expired: Votre carte d’identité ou votre permis de conduire
+        délivré par l’État ne doit pas être périmé. Nous n’acceptons
+        actuellement aucune autre forme d’identification, comme les passeports
+        et les cartes d’identité militaires.
+      verifying_step_proof_of_address: Si vous tentez à nouveau de vérifier votre
+        identité en personne, vous devez apporter un justificatif de domicile
+        valable si votre adresse actuelle est différente de celle figurant sur
+        votre pièce d’identité.
     in_person_ready_to_verify:
       greeting: Bonjour %{name},
       intro: Voici les détails pour vérifier votre identité en personne dans un bureau
diff --git a/spec/jobs/get_usps_proofing_results_job_spec.rb b/spec/jobs/get_usps_proofing_results_job_spec.rb
index 7f217d3aae6..5500a41e826 100644
--- a/spec/jobs/get_usps_proofing_results_job_spec.rb
+++ b/spec/jobs/get_usps_proofing_results_job_spec.rb
@@ -113,7 +113,7 @@
         )
       end
 
-      it 'logs details about failed requests' do
+      it 'logs details about a failed proofing' do
         stub_request_token
         stub_request_failed_proofing_results
 
@@ -141,7 +141,29 @@
         )
       end
 
-      it 'updates enrollment records and activates profiles on 2xx responses with valid JSON' do
+      it 'sends proofing failed email on response with failed status' do
+        stub_request_token
+        stub_request_failed_proofing_results
+
+        allow(InPersonEnrollment).to receive(:needs_usps_status_check).
+          and_return([pending_enrollment])
+
+        mailer = instance_double(ActionMailer::MessageDelivery, deliver_now_or_later: true)
+        user = pending_enrollment.user
+        user.email_addresses.each do |email_address|
+          expect(UserMailer).to receive(:in_person_failed).
+            with(
+              user,
+              email_address,
+              enrollment: instance_of(InPersonEnrollment),
+            ).
+            and_return(mailer)
+        end
+
+        job.perform(Time.zone.now)
+      end
+
+      it 'updates enrollment records and activates profiles on response with passed status' do
         stub_request_token
         stub_request_passed_proofing_results
 
diff --git a/spec/mailers/previews/user_mailer_preview.rb b/spec/mailers/previews/user_mailer_preview.rb
index 10702d047c6..d4535666b41 100644
--- a/spec/mailers/previews/user_mailer_preview.rb
+++ b/spec/mailers/previews/user_mailer_preview.rb
@@ -151,6 +151,14 @@ def in_person_verified
     )
   end
 
+  def in_person_failed
+    UserMailer.in_person_failed(
+      user,
+      email_address_record,
+      enrollment: in_person_enrollment,
+    )
+  end
+
   private
 
   def user
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 4c929362b92..feb9d2188fe 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -565,6 +565,27 @@ def expect_email_body_to_have_help_and_contact_links
     it_behaves_like 'an email that respects user email locale preference'
   end
 
+  describe '#in_person_failed' do
+    let(:enrollment) {
+      create(
+        :in_person_enrollment,
+        selected_location_details: { name: 'FRIENDSHIP' },
+        status_updated_at: Time.zone.now - 2.hours,
+      )
+    }
+
+    let(:mail) do
+      UserMailer.in_person_failed(
+        user,
+        user.email_addresses.first,
+        enrollment: enrollment,
+      )
+    end
+
+    it_behaves_like 'a system email'
+    it_behaves_like 'an email that respects user email locale preference'
+  end
+
   def strip_tags(str)
     ActionController::Base.helpers.strip_tags(str)
   end
diff --git a/spec/presenters/idv/in_person/verified_presenter_spec.rb b/spec/presenters/idv/in_person/verification_results_email_presenter_spec.rb
similarity index 92%
rename from spec/presenters/idv/in_person/verified_presenter_spec.rb
rename to spec/presenters/idv/in_person/verification_results_email_presenter_spec.rb
index 26c83dfcb75..8d05000ea47 100644
--- a/spec/presenters/idv/in_person/verified_presenter_spec.rb
+++ b/spec/presenters/idv/in_person/verification_results_email_presenter_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Idv::InPerson::VerifiedPresenter do
+RSpec.describe Idv::InPerson::VerificationResultsEmailPresenter do
   let(:location_name) { 'FRIENDSHIP' }
   let(:status_updated_at) { described_class::USPS_SERVER_TIMEZONE.parse('2022-07-14T00:00:00Z') }
   let!(:enrollment) do