From fdf8afa54533fa71298e903a6d0462d6b1e4eafd Mon Sep 17 00:00:00 2001
From: rakesh nagilla <rakesh.nagilla@gsa.gov>
Date: Tue, 18 Oct 2022 00:51:03 -0400
Subject: [PATCH 1/5] LG-7449 Add first error page for inherited proofing when
 there is no response from VA for any reason

---
 .../no_information.html.erb                   | 25 +++++++++++++++++++
 config/locales/inherited_proofing/en.yml      |  6 +++++
 config/locales/inherited_proofing/es.yml      |  6 +++++
 config/locales/inherited_proofing/fr.yml      |  6 +++++
 config/routes.rb                              |  1 +
 5 files changed, 44 insertions(+)
 create mode 100644 app/views/idv/inherited_proofing/no_information.html.erb

diff --git a/app/views/idv/inherited_proofing/no_information.html.erb b/app/views/idv/inherited_proofing/no_information.html.erb
new file mode 100644
index 00000000000..f06b675c50b
--- /dev/null
+++ b/app/views/idv/inherited_proofing/no_information.html.erb
@@ -0,0 +1,25 @@
+<%= render(
+      'idv/shared/error',
+      type: :warning,
+      title: t('inherited_proofing.errors.cannot_retrieve.title'),
+      heading: t('inherited_proofing.errors.cannot_retrieve.heading'),
+    ) do %>
+  <p>
+     <%= t('inherited_proofing.errors.cannot_retrieve.info') %>
+  </p>
+
+  <%= link_to t('inherited_proofing.buttons.try_again'), root_url, class: 'usa-button usa-button--big usa-button--wide' %>
+
+  <%= render(
+      'shared/troubleshooting_options',
+      heading_tag: :h3,
+      heading: t('components.troubleshooting_options.default_heading'),
+      options: [
+        {
+          url: 'https://www.va.gov/resources/managing-your-vagov-profile/',
+          text: t('inherited_proofing.troubleshooting.options.get_va_help'),
+          new_tab: true,
+        },
+      ].select(&:present?),
+    ) %>
+<% end %>
diff --git a/config/locales/inherited_proofing/en.yml b/config/locales/inherited_proofing/en.yml
index c483acac45b..945c3773db1 100644
--- a/config/locales/inherited_proofing/en.yml
+++ b/config/locales/inherited_proofing/en.yml
@@ -3,6 +3,7 @@ en:
   inherited_proofing:
     buttons:
       continue: Continue
+      try_again: Try again
     cancel:
       actions:
         keep_going: No, keep going
@@ -59,3 +60,8 @@ en:
       options:
         get_va_help: Get help at VA.gov
         learn_more_phone_or_mail: Learn more about verifying by phone or mail
+    errors:
+      cannot_retrieve:
+        info: We are temporarily having trouble retrieving your information. Please try again.
+        heading: We could not retrieve your information from My HealtheVet
+        title: Couldn't retrieve information
diff --git a/config/locales/inherited_proofing/es.yml b/config/locales/inherited_proofing/es.yml
index f3d54c86544..20a52cb4bb2 100644
--- a/config/locales/inherited_proofing/es.yml
+++ b/config/locales/inherited_proofing/es.yml
@@ -3,6 +3,7 @@ es:
   inherited_proofing:
     buttons:
       continue: Continuar
+      try_again: Inténtelo de nuevo
     cancel:
       actions:
         keep_going: No, continuar
@@ -55,3 +56,8 @@ es:
       options:
         get_va_help: to be implemented
         learn_more_phone_or_mail: to be implemented
+    errors:
+      cannot_retrieve:
+        info: Estamos teniendo problemas temporalmente para obtener su información. Inténtelo de nuevo.
+        heading: No hemos podido obtener su información de My HealtheVet
+        title: to be implemented
\ No newline at end of file
diff --git a/config/locales/inherited_proofing/fr.yml b/config/locales/inherited_proofing/fr.yml
index 501322985c9..9786eed8b07 100644
--- a/config/locales/inherited_proofing/fr.yml
+++ b/config/locales/inherited_proofing/fr.yml
@@ -3,6 +3,7 @@ fr:
   inherited_proofing:
     buttons:
       continue: Continuer
+      try_again: Réessayez
     cancel:
       actions:
         keep_going: Non, continuer
@@ -56,3 +57,8 @@ fr:
       options:
         get_va_help: to be implemented
         learn_more_phone_or_mail: to be implemented
+    errors:
+      cannot_retrieve:
+        info: Nous avons temporairement des difficultés à récupérer vos informations. Veuillez réessayer.
+        heading: Nous n'avons pas pu récupérer vos informations dans My HealtheVet
+        title: to be implemented
diff --git a/config/routes.rb b/config/routes.rb
index e23547ed07a..77b821f0f33 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -364,6 +364,7 @@
       get '/:step' => 'inherited_proofing#show', as: :step
       put '/:step' => 'inherited_proofing#update'
       get '/return_to_sp' => 'inherited_proofing#return_to_sp'
+      get '/errors/no_information' => 'inherited_proofing#no_information'
     end
 
     namespace :api do

From dc07abcfbfe49c2f82b234cf2a62e876ea3301c0 Mon Sep 17 00:00:00 2001
From: rakesh nagilla <rakesh.nagilla@gsa.gov>
Date: Tue, 18 Oct 2022 00:51:37 -0400
Subject: [PATCH 2/5] changelog: Upcoming
 Features,InheritedProofing,AddFirstErrorPage


From cfd07cdeaf733984e55d6730cb5aaa4f2c82634c Mon Sep 17 00:00:00 2001
From: rakesh nagilla <rakesh.nagilla@gsa.gov>
Date: Tue, 18 Oct 2022 00:56:21 -0400
Subject: [PATCH 3/5] fix lint and normalize yml

---
 .../no_information.html.erb                   | 22 +++++++++----------
 config/locales/inherited_proofing/en.yml      | 11 +++++-----
 config/locales/inherited_proofing/es.yml      | 11 +++++-----
 config/locales/inherited_proofing/fr.yml      | 11 +++++-----
 4 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/app/views/idv/inherited_proofing/no_information.html.erb b/app/views/idv/inherited_proofing/no_information.html.erb
index f06b675c50b..38c620cebbb 100644
--- a/app/views/idv/inherited_proofing/no_information.html.erb
+++ b/app/views/idv/inherited_proofing/no_information.html.erb
@@ -11,15 +11,15 @@
   <%= link_to t('inherited_proofing.buttons.try_again'), root_url, class: 'usa-button usa-button--big usa-button--wide' %>
 
   <%= render(
-      'shared/troubleshooting_options',
-      heading_tag: :h3,
-      heading: t('components.troubleshooting_options.default_heading'),
-      options: [
-        {
-          url: 'https://www.va.gov/resources/managing-your-vagov-profile/',
-          text: t('inherited_proofing.troubleshooting.options.get_va_help'),
-          new_tab: true,
-        },
-      ].select(&:present?),
-    ) %>
+        'shared/troubleshooting_options',
+        heading_tag: :h3,
+        heading: t('components.troubleshooting_options.default_heading'),
+        options: [
+          {
+            url: 'https://www.va.gov/resources/managing-your-vagov-profile/',
+            text: t('inherited_proofing.troubleshooting.options.get_va_help'),
+            new_tab: true,
+          },
+        ].select(&:present?),
+      ) %>
 <% end %>
diff --git a/config/locales/inherited_proofing/en.yml b/config/locales/inherited_proofing/en.yml
index 945c3773db1..b3debae651b 100644
--- a/config/locales/inherited_proofing/en.yml
+++ b/config/locales/inherited_proofing/en.yml
@@ -20,6 +20,12 @@ en:
       instructions:
         switch_back: Switch back to your computer to finish verifying your identity.
         switch_back_image: Arrow pointing from phone to computer
+    errors:
+      cannot_retrieve:
+        heading: We could not retrieve your information from My HealtheVet
+        info: We are temporarily having trouble retrieving your information. Please try
+          again.
+        title: Couldn’t retrieve information
     headings:
       lets_go: How verifying your identity works
       retrieval: We are retrieving your information from My HealtheVet
@@ -60,8 +66,3 @@ en:
       options:
         get_va_help: Get help at VA.gov
         learn_more_phone_or_mail: Learn more about verifying by phone or mail
-    errors:
-      cannot_retrieve:
-        info: We are temporarily having trouble retrieving your information. Please try again.
-        heading: We could not retrieve your information from My HealtheVet
-        title: Couldn't retrieve information
diff --git a/config/locales/inherited_proofing/es.yml b/config/locales/inherited_proofing/es.yml
index 20a52cb4bb2..5db2db25e86 100644
--- a/config/locales/inherited_proofing/es.yml
+++ b/config/locales/inherited_proofing/es.yml
@@ -21,6 +21,12 @@ es:
         switch_back: Regrese a su computadora para continuar con la verificación de su
           identidad.
         switch_back_image: Flecha que apunta del teléfono a la computadora
+    errors:
+      cannot_retrieve:
+        heading: No hemos podido obtener su información de My HealtheVet
+        info: Estamos teniendo problemas temporalmente para obtener su información.
+          Inténtelo de nuevo.
+        title: to be implemented
     headings:
       lets_go: to be implemented
       retrieval: Estamos recuperando su información de My HealtheVet
@@ -56,8 +62,3 @@ es:
       options:
         get_va_help: to be implemented
         learn_more_phone_or_mail: to be implemented
-    errors:
-      cannot_retrieve:
-        info: Estamos teniendo problemas temporalmente para obtener su información. Inténtelo de nuevo.
-        heading: No hemos podido obtener su información de My HealtheVet
-        title: to be implemented
\ No newline at end of file
diff --git a/config/locales/inherited_proofing/fr.yml b/config/locales/inherited_proofing/fr.yml
index 9786eed8b07..daea03b9f27 100644
--- a/config/locales/inherited_proofing/fr.yml
+++ b/config/locales/inherited_proofing/fr.yml
@@ -22,6 +22,12 @@ fr:
         switch_back: Retournez sur votre ordinateur pour continuer à vérifier votre
           identité.
         switch_back_image: Flèche pointant du téléphone vers l’ordinateur
+    errors:
+      cannot_retrieve:
+        heading: Nous n’avons pas pu récupérer vos informations dans My HealtheVet
+        info: Nous avons temporairement des difficultés à récupérer vos informations.
+          Veuillez réessayer.
+        title: to be implemented
     headings:
       lets_go: to be implemented
       retrieval: Nous récupérons vos informations depuis My HealtheVet.
@@ -57,8 +63,3 @@ fr:
       options:
         get_va_help: to be implemented
         learn_more_phone_or_mail: to be implemented
-    errors:
-      cannot_retrieve:
-        info: Nous avons temporairement des difficultés à récupérer vos informations. Veuillez réessayer.
-        heading: Nous n'avons pas pu récupérer vos informations dans My HealtheVet
-        title: to be implemented

From 5e922c3f3a0f47fe00ef7a69a5651c9d064d5ed8 Mon Sep 17 00:00:00 2001
From: rakesh nagilla <rakesh.nagilla@gsa.gov>
Date: Tue, 18 Oct 2022 11:36:48 -0400
Subject: [PATCH 4/5] add placeholder method, before filter and remove h2

---
 app/controllers/idv/inherited_proofing_controller.rb     | 6 ++++++
 app/views/idv/inherited_proofing/no_information.html.erb | 1 -
 app/views/idv/inherited_proofing/phone.html.erb          | 2 --
 3 files changed, 6 insertions(+), 3 deletions(-)
 delete mode 100644 app/views/idv/inherited_proofing/phone.html.erb

diff --git a/app/controllers/idv/inherited_proofing_controller.rb b/app/controllers/idv/inherited_proofing_controller.rb
index 0d76f6d4728..e16d55545f9 100644
--- a/app/controllers/idv/inherited_proofing_controller.rb
+++ b/app/controllers/idv/inherited_proofing_controller.rb
@@ -1,5 +1,7 @@
 module Idv
   class InheritedProofingController < ApplicationController
+    before_action :confirm_two_factor_authenticated
+
     include Flow::FlowStateMachine
     include IdvSession
     include InheritedProofing404Concern
@@ -15,5 +17,9 @@ class InheritedProofingController < ApplicationController
     def return_to_sp
       redirect_to return_to_sp_failure_to_proof_url(step: next_step, location: params[:location])
     end
+
+    # for errors/no_information
+    def no_information
+    end
   end
 end
diff --git a/app/views/idv/inherited_proofing/no_information.html.erb b/app/views/idv/inherited_proofing/no_information.html.erb
index 38c620cebbb..49f04ed3876 100644
--- a/app/views/idv/inherited_proofing/no_information.html.erb
+++ b/app/views/idv/inherited_proofing/no_information.html.erb
@@ -12,7 +12,6 @@
 
   <%= render(
         'shared/troubleshooting_options',
-        heading_tag: :h3,
         heading: t('components.troubleshooting_options.default_heading'),
         options: [
           {
diff --git a/app/views/idv/inherited_proofing/phone.html.erb b/app/views/idv/inherited_proofing/phone.html.erb
deleted file mode 100644
index 73e389470f6..00000000000
--- a/app/views/idv/inherited_proofing/phone.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-Hello
-<% t('step_indicator.flows.idv.verify_phone') %>

From af997e3509b0f168161a7305e8d3fdd1b8e6b147 Mon Sep 17 00:00:00 2001
From: rakesh nagilla <rakesh.nagilla@gsa.gov>
Date: Tue, 18 Oct 2022 13:04:20 -0400
Subject: [PATCH 5/5] remove unsed translations

---
 config/locales/step_indicator/en.yml | 1 -
 config/locales/step_indicator/es.yml | 1 -
 config/locales/step_indicator/fr.yml | 1 -
 3 files changed, 3 deletions(-)

diff --git a/config/locales/step_indicator/en.yml b/config/locales/step_indicator/en.yml
index b7a4fe4b551..4867d45caac 100644
--- a/config/locales/step_indicator/en.yml
+++ b/config/locales/step_indicator/en.yml
@@ -11,7 +11,6 @@ en:
         secure_account: Secure your account
         verify_id: Verify your ID
         verify_info: Verify your personal details
-        verify_phone: Verify phone
         verify_phone_or_address: Verify phone or address
     status:
       complete: Completed
diff --git a/config/locales/step_indicator/es.yml b/config/locales/step_indicator/es.yml
index 25217916852..d878afd0bad 100644
--- a/config/locales/step_indicator/es.yml
+++ b/config/locales/step_indicator/es.yml
@@ -11,7 +11,6 @@ es:
         secure_account: Proteje tu cuenta
         verify_id: Verifica tu identificación
         verify_info: Verifica tus datos personales
-        verify_phone: to implement
         verify_phone_or_address: Verifica el teléfono o dirección
     status:
       complete: Completo
diff --git a/config/locales/step_indicator/fr.yml b/config/locales/step_indicator/fr.yml
index 619193b1a57..3323146f8dc 100644
--- a/config/locales/step_indicator/fr.yml
+++ b/config/locales/step_indicator/fr.yml
@@ -11,7 +11,6 @@ fr:
         secure_account: Sécurisez votre compte
         verify_id: Vérifier votre identité
         verify_info: Vérifier vos données personnelles
-        verify_phone: to implement
         verify_phone_or_address: Vérifier le téléphone ou l’adresse
     status:
       complete: Terminé