From 7d5d77a461e75860859d40d20a547cb85c458308 Mon Sep 17 00:00:00 2001
From: Andrew Duthie <andrew.duthie@gsa.gov>
Date: Thu, 24 Sep 2020 11:39:22 -0400
Subject: [PATCH] LG-3427: Update doc auth ID support texts (#4228)

* Support string tagName for formatHTML handler

* Support variables substitution in i18n strings

* Update doc auth ID support texts

* Remove unused string idv.messages.jurisdiction.no_id

* Remove unused "No ID" error screen

* Remove unnecessary HTML suffix for plaintext use_cac string

* Extract getServiceProvider to conditionally create SP object

See: https://github.com/18F/identity-idp/pull/4228/files#r492903440

* Support including attributes in match in formatHTML

**Why**: Improved reuse of strings between server-side and client-side

* Substitute no_other_id_help_bold with no_other_id_help_bold_html

* Remove link "Full list of accepted IDs"
---
 .../idv/jurisdiction_errors_controller.rb     | 10 -----
 .../components/mobile-intro-step.jsx          | 25 ++++++++++--
 .../context/service-provider.js               | 12 ++++++
 .../document-capture/hooks/use-i18n.js        | 31 ++++++++++++---
 .../packages/document-capture/index.js        |  1 +
 app/javascript/packs/document-capture.jsx     | 29 +++++++++-----
 .../idv/capture_doc/document_capture.html.erb |  7 +++-
 .../idv/doc_auth/document_capture.html.erb    |  7 +++-
 app/views/idv/doc_auth/upload.html.erb        | 37 ++++++++++--------
 .../idv/jurisdiction_errors/no_id.html.erb    | 13 -------
 .../idv/shared/_document_capture.html.erb     |  2 +
 config/js_locale_strings.yml                  |  3 +-
 config/locales/doc_auth/en.yml                |  6 ++-
 config/locales/doc_auth/es.yml                |  6 ++-
 config/locales/doc_auth/fr.yml                |  7 +++-
 config/locales/idv/en.yml                     |  4 --
 config/locales/idv/es.yml                     |  6 ---
 config/locales/idv/fr.yml                     |  6 ---
 config/routes.rb                              |  1 -
 spec/features/idv/cac/use_cac_step_spec.rb    |  2 +-
 .../context/service-provider-spec.js          | 11 ++++++
 .../document-capture/hooks/use-i18n-spec.jsx  | 39 ++++++++++++++++++-
 .../idv/doc_auth/upload.html.erb_spec.rb      | 35 +++++++++++++++++
 .../no_id.html.erb_spec.rb                    | 34 ----------------
 24 files changed, 217 insertions(+), 117 deletions(-)
 delete mode 100644 app/controllers/idv/jurisdiction_errors_controller.rb
 create mode 100644 app/javascript/packages/document-capture/context/service-provider.js
 delete mode 100644 app/views/idv/jurisdiction_errors/no_id.html.erb
 create mode 100644 spec/javascripts/packages/document-capture/context/service-provider-spec.js
 delete mode 100644 spec/views/idv/jurisdiction_errors/no_id.html.erb_spec.rb

diff --git a/app/controllers/idv/jurisdiction_errors_controller.rb b/app/controllers/idv/jurisdiction_errors_controller.rb
deleted file mode 100644
index b82726d66bb..00000000000
--- a/app/controllers/idv/jurisdiction_errors_controller.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module Idv
-  class JurisdictionErrorsController < ApplicationController
-    include IdvSession
-
-    before_action :confirm_two_factor_authenticated
-    before_action :confirm_idv_needed
-
-    def no_id; end
-  end
-end
diff --git a/app/javascript/packages/document-capture/components/mobile-intro-step.jsx b/app/javascript/packages/document-capture/components/mobile-intro-step.jsx
index 8cb6585177a..d49907efa2d 100644
--- a/app/javascript/packages/document-capture/components/mobile-intro-step.jsx
+++ b/app/javascript/packages/document-capture/components/mobile-intro-step.jsx
@@ -1,16 +1,33 @@
-import React from 'react';
+import React, { useContext } from 'react';
+import ServiceProviderContext from '../context/service-provider';
 import useI18n from '../hooks/use-i18n';
 
 function MobileIntroStep() {
-  const { t } = useI18n();
+  const { t, formatHTML } = useI18n();
+  const serviceProvider = useContext(ServiceProviderContext);
 
   return (
     <>
       <p>{t('doc_auth.info.document_capture_intro_acknowledgment')}</p>
       <p>
-        <a href="/verify/jurisdiction/errors/no_id">{t('idv.messages.jurisdiction.no_id')}</a>
+        {formatHTML(t('doc_auth.info.id_worn_html'), {
+          strong: 'strong',
+        })}
+      </p>
+      {serviceProvider && (
+        <p>
+          {formatHTML(
+            t('doc_auth.info.no_other_id_help_bold_html', { sp_name: serviceProvider.name }),
+            {
+              strong: 'strong',
+              a: ({ children }) => <a href={serviceProvider.failureToProofURL}>{children}</a>,
+            },
+          )}
+        </p>
+      )}
+      <p className="margin-top-4 margin-bottom-0">
+        {t('doc_auth.tips.document_capture_header_text')}
       </p>
-      <p className="margin-bottom-0">{t('doc_auth.tips.document_capture_header_text')}</p>
       <ul>
         <li>{t('doc_auth.tips.document_capture_id_text1')}</li>
         <li>{t('doc_auth.tips.document_capture_id_text2')}</li>
diff --git a/app/javascript/packages/document-capture/context/service-provider.js b/app/javascript/packages/document-capture/context/service-provider.js
new file mode 100644
index 00000000000..2b0e43a48c4
--- /dev/null
+++ b/app/javascript/packages/document-capture/context/service-provider.js
@@ -0,0 +1,12 @@
+import { createContext } from 'react';
+
+/**
+ * @typedef ServiceProviderContext
+ *
+ * @prop {string} name Service provider name.
+ * @prop {string} failureToProofURL URL to redirect user on failure to proof.
+ */
+
+const ServiceProviderContext = createContext(/** @type {ServiceProviderContext=} */ (undefined));
+
+export default ServiceProviderContext;
diff --git a/app/javascript/packages/document-capture/hooks/use-i18n.js b/app/javascript/packages/document-capture/hooks/use-i18n.js
index fed87077b6b..063ced36b66 100644
--- a/app/javascript/packages/document-capture/hooks/use-i18n.js
+++ b/app/javascript/packages/document-capture/hooks/use-i18n.js
@@ -21,13 +21,13 @@ import I18nContext from '../context/i18n';
  * });
  * ```
  *
- * @param {string}                   html     HTML to format.
- * @param {Record<string,Component>} handlers Mapping of tag names to components.
+ * @param {string} html HTML to format.
+ * @param {Record<string,Component|string>} handlers Mapping of tag names to tag name or component.
  *
  * @return {import('react').ReactNode}
  */
 export function formatHTML(html, handlers) {
-  const pattern = new RegExp(`</?(?:${Object.keys(handlers).join('|')})>`, 'g');
+  const pattern = new RegExp(`</?(?:${Object.keys(handlers).join('|')})(?: .*?)?>`, 'g');
   const matches = html.match(pattern);
   if (!matches) {
     return html;
@@ -37,7 +37,9 @@ export function formatHTML(html, handlers) {
   const parts = html.split(pattern);
 
   for (let i = 0; i < matches.length; i += 2) {
-    const tag = matches[i].slice(1, -1);
+    const match = matches[i];
+    const end = match.search(/[ >]/);
+    const tag = matches[i].slice(1, end);
     const part = /** @type {string} */ (parts[i + 1]);
     const replacement = createElement(handlers[tag], null, part);
     parts[i + 1] = cloneElement(replacement, { key: part });
@@ -46,6 +48,21 @@ export function formatHTML(html, handlers) {
   return parts.filter(Boolean);
 }
 
+/**
+ * Returns string with variable substitution.
+ *
+ * @param {string} string Original string.
+ * @param {Record<string,string>} variables Variables to replace.
+ *
+ * @return {string} String with variables substituted.
+ */
+export function replaceVariables(string, variables) {
+  return Object.keys(variables).reduce(
+    (result, key) => result.replace(new RegExp(`%{${key}}`, 'g'), variables[key]),
+    string,
+  );
+}
+
 function useI18n() {
   const strings = useContext(I18nContext);
 
@@ -53,10 +70,14 @@ function useI18n() {
    * Returns the translated string by the given key.
    *
    * @param {string} key Key to retrieve.
+   * @param {Record<string,string>=} variables Variables to substitute in string.
    *
    * @return {string} Translated string.
    */
-  const t = (key) => (Object.prototype.hasOwnProperty.call(strings, key) ? strings[key] : key);
+  function t(key, variables) {
+    const string = Object.prototype.hasOwnProperty.call(strings, key) ? strings[key] : key;
+    return variables ? replaceVariables(string, variables) : string;
+  }
 
   return {
     t,
diff --git a/app/javascript/packages/document-capture/index.js b/app/javascript/packages/document-capture/index.js
index 25b98426664..f09fc2b62aa 100644
--- a/app/javascript/packages/document-capture/index.js
+++ b/app/javascript/packages/document-capture/index.js
@@ -4,3 +4,4 @@ export { default as I18nContext } from './context/i18n';
 export { default as DeviceContext } from './context/device';
 export { Provider as AcuantProvider } from './context/acuant';
 export { Provider as UploadContextProvider } from './context/upload';
+export { default as ServiceProviderContext } from './context/service-provider';
diff --git a/app/javascript/packs/document-capture.jsx b/app/javascript/packs/document-capture.jsx
index adfef8c9137..637ffbaebb9 100644
--- a/app/javascript/packs/document-capture.jsx
+++ b/app/javascript/packs/document-capture.jsx
@@ -7,12 +7,25 @@ import {
   DeviceContext,
   AcuantProvider,
   UploadContextProvider,
+  ServiceProviderContext,
 } from '@18f/identity-document-capture';
 import { loadPolyfills } from '@18f/identity-polyfill';
 import { isCameraCapableMobile } from '@18f/identity-device';
 
 const { I18n: i18n, assets } = window.LoginGov;
 
+const appRoot = document.getElementById('document-capture-form');
+const isLivenessEnabled = appRoot.hasAttribute('data-liveness');
+const isMockClient = appRoot.hasAttribute('data-mock-client');
+
+function getServiceProvider() {
+  const name = appRoot.getAttribute('data-sp-name');
+  const failureToProofURL = appRoot.getAttribute('data-failure-to-proof-url');
+  if (name && failureToProofURL) {
+    return { name, failureToProofURL };
+  }
+}
+
 function getMetaContent(name) {
   return document.querySelector(`meta[name="${name}"]`)?.content ?? null;
 }
@@ -23,10 +36,6 @@ const device = {
 };
 
 loadPolyfills(['fetch']).then(() => {
-  const appRoot = document.getElementById('document-capture-form');
-  const isLivenessEnabled = appRoot.hasAttribute('data-liveness');
-  const isMockClient = appRoot.hasAttribute('data-mock-client');
-
   render(
     <AcuantProvider
       credentials={getMetaContent('acuant-sdk-initialization-creds')}
@@ -42,11 +51,13 @@ loadPolyfills(['fetch']).then(() => {
         }}
       >
         <I18nContext.Provider value={i18n.strings}>
-          <AssetContext.Provider value={assets}>
-            <DeviceContext.Provider value={device}>
-              <DocumentCapture isLivenessEnabled={isLivenessEnabled} />
-            </DeviceContext.Provider>
-          </AssetContext.Provider>
+          <ServiceProviderContext.Provider value={getServiceProvider()}>
+            <AssetContext.Provider value={assets}>
+              <DeviceContext.Provider value={device}>
+                <DocumentCapture isLivenessEnabled={isLivenessEnabled} />
+              </DeviceContext.Provider>
+            </AssetContext.Provider>
+          </ServiceProviderContext.Provider>
         </I18nContext.Provider>
       </UploadContextProvider>
     </AcuantProvider>,
diff --git a/app/views/idv/capture_doc/document_capture.html.erb b/app/views/idv/capture_doc/document_capture.html.erb
index 292d66cfc55..3d8a7289552 100644
--- a/app/views/idv/capture_doc/document_capture.html.erb
+++ b/app/views/idv/capture_doc/document_capture.html.erb
@@ -1 +1,6 @@
-<%= render 'idv/shared/document_capture', flow_session: flow_session %>
+<%= render(
+  'idv/shared/document_capture',
+  flow_session: flow_session,
+  sp_name: decorated_session.sp_name,
+  failure_to_proof_url: decorated_session.failure_to_proof_url
+) %>
diff --git a/app/views/idv/doc_auth/document_capture.html.erb b/app/views/idv/doc_auth/document_capture.html.erb
index 292d66cfc55..3d8a7289552 100644
--- a/app/views/idv/doc_auth/document_capture.html.erb
+++ b/app/views/idv/doc_auth/document_capture.html.erb
@@ -1 +1,6 @@
-<%= render 'idv/shared/document_capture', flow_session: flow_session %>
+<%= render(
+  'idv/shared/document_capture',
+  flow_session: flow_session,
+  sp_name: decorated_session.sp_name,
+  failure_to_proof_url: decorated_session.failure_to_proof_url
+) %>
diff --git a/app/views/idv/doc_auth/upload.html.erb b/app/views/idv/doc_auth/upload.html.erb
index 5e2c9e049eb..2e3543daf29 100644
--- a/app/views/idv/doc_auth/upload.html.erb
+++ b/app/views/idv/doc_auth/upload.html.erb
@@ -19,28 +19,33 @@
 <% end %>
 
 <p>
-  <strong><%= t('doc_auth.info.upload_no_image_storage') %></strong>
+  <%= t('doc_auth.info.upload_no_image_storage') %>
 </p>
 
-<% if Figaro.env.cac_proofing_enabled == 'true' && desktop_device? %>
-  <div class='mt2 mb2'>
+<p>
+  <%= t('doc_auth.info.id_worn_html') %>
+</p>
+
+<% if decorated_session.sp_name %>
+  <p>
     <%= t(
-      'doc_auth.info.use_cac_html',
-      link: link_to(
-        t('doc_auth.info.use_cac_link'),
-        idv_cac_step_path(step: :choose_method),
-      ),
+      'doc_auth.info.no_other_id_help_bold_html',
+      failure_to_proof_url: decorated_session.failure_to_proof_url,
+      sp_name: decorated_session.sp_name,
     ) %>
-  </div>
+  </p>
 <% end %>
 
-<div class='mt2 mb3'>
-  <%= link_to t('idv.messages.jurisdiction.no_id'), idv_jurisdiction_errors_no_id_path %>
-</div>
+<% if Figaro.env.cac_proofing_enabled == 'true' && desktop_device? %>
+  <p>
+    <strong><%= t('doc_auth.info.use_cac') %></strong>
+    <%= link_to(t('doc_auth.info.use_cac_link'), idv_cac_step_path(step: :choose_method)) %>
+  </p>
+<% end %>
 
-<hr/>
+<hr class="margin-y-4" />
 
-<div class='clearfix mt3 mb3'>
+<div class='clearfix'>
   <div class='sm-col sm-col-3'>
     <%= image_tag(
       asset_url('idv/phone.png'),
@@ -75,9 +80,9 @@
   </div>
 </div>
 
-<hr/>
+<hr class="margin-y-4" />
 
-<div class='clearfix mt3 mb3'>
+<div class='clearfix'>
   <div id="upload-comp-liveness-off"
     class='sm-col sm-col-12 <%= 'hidden' if liveness_checking_enabled? %>'>
     <%= t('doc_auth.info.upload_from_computer') %>&nbsp;
diff --git a/app/views/idv/jurisdiction_errors/no_id.html.erb b/app/views/idv/jurisdiction_errors/no_id.html.erb
deleted file mode 100644
index df97da4576c..00000000000
--- a/app/views/idv/jurisdiction_errors/no_id.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% title t("idv.titles.no_id") %>
-
-<%= image_tag(asset_url('alert/fail-x.svg'), width: 54, alt: '') %>
-
-<h1 class="h3 mb1 mt3 my0">
-  <%= t("idv.titles.no_id") %>
-</h1>
-
-<p>
-  <%= t("idv.messages.jurisdiction.no_id_failure") %>
-</p>
-
-<%= render 'idv/shared/back_to_sp_link' %>
diff --git a/app/views/idv/shared/_document_capture.html.erb b/app/views/idv/shared/_document_capture.html.erb
index 6a29c633538..332a9a8bb27 100644
--- a/app/views/idv/shared/_document_capture.html.erb
+++ b/app/views/idv/shared/_document_capture.html.erb
@@ -8,6 +8,8 @@
   mock_client: (DocAuth::Client.doc_auth_vendor == 'mock').presence,
   document_capture_session_uuid: flow_session[:document_capture_session_uuid],
   endpoint: api_verify_images_url,
+  sp_name: sp_name,
+  failure_to_proof_url: failure_to_proof_url,
 } %>
 <div class="js-fallback">
   <%= render 'idv/doc_auth/error_messages', flow_session: flow_session %>
diff --git a/config/js_locale_strings.yml b/config/js_locale_strings.yml
index 176f91426e1..8f0dd263614 100644
--- a/config/js_locale_strings.yml
+++ b/config/js_locale_strings.yml
@@ -20,8 +20,10 @@
 - doc_auth.info.capture_status_tap_to_capture
 - doc_auth.info.document_capture_intro_acknowledgment
 - doc_auth.info.document_capture_upload_image
+- doc_auth.info.id_worn_html
 - doc_auth.info.interstitial_eta
 - doc_auth.info.interstitial_thanks
+- doc_auth.info.no_other_id_help_bold_html
 - doc_auth.instructions.document_capture_selfie_consent_banner
 - doc_auth.instructions.document_capture_selfie_consent_blocked
 - doc_auth.instructions.document_capture_selfie_consent_reason
@@ -52,7 +54,6 @@
 - idv.errors.pattern_mismatch.state_id_number
 - idv.errors.pattern_mismatch.zipcode
 - idv.failure.button.warning
-- idv.messages.jurisdiction.no_id
 - instructions.password.strength.i
 - instructions.password.strength.ii
 - instructions.password.strength.iii
diff --git a/config/locales/doc_auth/en.yml b/config/locales/doc_auth/en.yml
index 465b78512ab..ffcf1e3f31d 100644
--- a/config/locales/doc_auth/en.yml
+++ b/config/locales/doc_auth/en.yml
@@ -67,6 +67,8 @@ en:
         your identity.
       document_capture_upload_image: We only use your ID to verify your identity,
         and we will not save any images.
+      id_worn_html: "<strong>Is your ID worn or damaged?</strong> Use another state-issued
+        ID if you have one."
       interstitial_eta: This might take up to a minute. We’ll load the next step automatically
         when it’s done.
       interstitial_thanks: Thanks for your patience!
@@ -74,6 +76,8 @@ en:
       - Please check your phone and follow instructions to take a photo of your state
         issued ID.
       - When you are done click continue here to finish verifying your identity.
+      no_other_id_help_bold_html: "<strong>If you do not have another state-issued
+        ID</strong>, <a href=%{failure_to_proof_url}>get help at %{sp_name}.</a>"
       tag: Recommended
       take_picture: Use the camera on your mobile phone and upload images of your
         ID.  We only use the images to verify your identity.
@@ -90,7 +94,7 @@ en:
         are the owner of the ID.
       upload_no_image_storage: We do not store images you upload. We only verify your
         identity.
-      use_cac_html: Do you have a government employee ID? %{link}
+      use_cac: Do you have a government employee ID?
       use_cac_link: Use a PIV/CAC instead
       welcome: We verify your identity to make sure you are you—not someone pretending
         to be you.  Verifying your identity lets you access services that handle sensitive
diff --git a/config/locales/doc_auth/es.yml b/config/locales/doc_auth/es.yml
index 89754a0462b..6c348e7a173 100644
--- a/config/locales/doc_auth/es.yml
+++ b/config/locales/doc_auth/es.yml
@@ -69,6 +69,8 @@ es:
         que subes. Solo verificamos su identidad.
       document_capture_upload_image: Solo utilizamos su ID para verificar su identidad
         y no guardaremos ninguna imagen.
+      id_worn_html: "<strong>¿Su identificación está desgastada o dañada?</strong>
+        Use otra identificación emitida por el estado si tiene una."
       interstitial_eta: Esto puede tardar hasta un minuto. Cargaremos el siguiente
         paso automáticamente cuando esté listo.
       interstitial_thanks: "¡Gracias por su paciencia!"
@@ -77,6 +79,8 @@ es:
         la identificación emitida por su estado.
       - Cuando haya terminado, haga clic en continuar aquí para terminar de verificar
         su identidad.
+      no_other_id_help_bold_html: "<strong>Si no tiene otra identificación emitida
+        por el estado</strong>, <a href=%{failure_to_proof_url}>obtenga ayuda en %{sp_name}.</a>"
       tag: Recomendar
       take_picture: Use la cámara en su teléfono móvil y cargue imágenes de su identificación.
         Solo usamos las imágenes para verificar su identidad.
@@ -95,7 +99,7 @@ es:
         propietario de la identificación.
       upload_no_image_storage: No almacenamos imágenes que cargue. Solo verificamos
         su identidad.
-      use_cac_html: "¿Tiene una identificación de empleado del gobierno? %{link}"
+      use_cac: "¿Tiene una identificación de empleado del gobierno?"
       use_cac_link: Usa un PIV/CAC en su lugar
       welcome: Verificamos su identidad para asegurarnos de que usted es usted, y
         no alguien que pretende ser usted. Verificar su identidad le permite acceder
diff --git a/config/locales/doc_auth/fr.yml b/config/locales/doc_auth/fr.yml
index b210accf89b..a68314034c6 100644
--- a/config/locales/doc_auth/fr.yml
+++ b/config/locales/doc_auth/fr.yml
@@ -74,6 +74,8 @@ fr:
         images que vous téléchargez. Nous vérifions uniquement votre identité.
       document_capture_upload_image: Nous n'utilisons votre identifiant que pour vérifier
         votre identité, et nous n'enregistrerons aucune image.
+      id_worn_html: "<strong>Votre pièce d'identité est-elle usée ou endommagée?</strong>
+        Utilisez un autre identifiant émis par l'État si vous en avez un."
       interstitial_eta: Cela peut prendre jusqu'à une minute. Nous chargerons automatiquement
         l’étape suivante une fois celle-ci terminée.
       interstitial_thanks: Merci pour votre patience!
@@ -81,6 +83,9 @@ fr:
       - Veuillez vérifier votre téléphone et suivre les instructions pour prendre
         une photo de votre identité émise par l'État.
       - Lorsque vous avez terminé, cliquez ici pour continuer à vérifier votre identité.
+      no_other_id_help_bold_html: "<strong>Si vous n'avez pas d'autre identifiant
+        émis par l'État</strong>, <a href=%{failure_to_proof_url}>obtenez de l'aide
+        auprès de %{sp_name}.</a>"
       tag: Recommander
       take_picture: Utilisez l'appareil photo sur votre téléphone portable et téléchargez
         des images de votre identifiant. Nous utilisons uniquement les images pour
@@ -103,7 +108,7 @@ fr:
         une photo de vous pour confirmer que vous êtes le propriétaire de la pièce
         d'identité.
       upload_no_image_storage: Nous ne stockons pas les images que vous téléchargez.
-      use_cac_html: Avez-vous un identifiant d'employé du gouvernement? %{link}
+      use_cac: Avez-vous un identifiant d'employé du gouvernement?
       use_cac_link: Utilisez plutôt un PIV/CAC
       welcome: Nous vérifions votre identité pour nous assurer que vous êtes bien,
         et non quelqu'un prétendant être vous. La vérification de votre identité vous
diff --git a/config/locales/idv/en.yml b/config/locales/idv/en.yml
index fd616d0922d..96db481c034 100644
--- a/config/locales/idv/en.yml
+++ b/config/locales/idv/en.yml
@@ -104,9 +104,6 @@ en:
       confirm: You have encrypted your verified data
       hardfail: We can't log you in right now, but you can try verifying your identity
         again in %{hours} hours.
-      jurisdiction:
-        no_id: I don't have a state-issued ID
-        no_id_failure: We're working hard to add more ways to verify your identity.
       mail_sent: Your letter is on its way
       otp_delivery_method:
         phone_number_html: We'll send a code to <strong>%{phone}</strong>
@@ -157,7 +154,6 @@ en:
       mail:
         resend: Want another letter?
         verify: Want a letter?
-      no_id: We are unable to verify your identity without a state-issued ID
       otp_delivery_method: How would you like to receive a code?
       phone: Phone number of record
       review: Review and submit
diff --git a/config/locales/idv/es.yml b/config/locales/idv/es.yml
index 9c3ebd2809d..6fe09d26bc5 100644
--- a/config/locales/idv/es.yml
+++ b/config/locales/idv/es.yml
@@ -105,10 +105,6 @@ es:
       confirm: Usted ha encriptado sus datos verificados.
       hardfail: No puedes iniciar sesión en estos instantes pero puedes intentar verificar
         tu edad de nuevo en %{hours} horas.
-      jurisdiction:
-        no_id: No tengo una identificación emitida por el estado
-        no_id_failure: Estamos trabajando arduamente para agregar más formas de verificar
-          su identidad.
       mail_sent: Su carta está en camino
       otp_delivery_method:
         phone_number_html: Te enviaremos un código a <strong>%{phone}</strong>
@@ -161,8 +157,6 @@ es:
       mail:
         resend: "¿Desea otra carta?"
         verify: "¿Desea una carta?"
-      no_id: No podemos verificar su identidad sin una identificación emitida por
-        el estado
       otp_delivery_method: "¿Cómo te gustaría recibir el código?"
       phone: Número de teléfono del registro
       review: Revise y envíe
diff --git a/config/locales/idv/fr.yml b/config/locales/idv/fr.yml
index d9ffa5dba43..dafa160dff5 100644
--- a/config/locales/idv/fr.yml
+++ b/config/locales/idv/fr.yml
@@ -114,10 +114,6 @@ fr:
       confirm: Vous avez crypté vos données vérifiées
       hardfail: Nous ne pouvons pas vous connecter pour le moment, mais vous pouvez
         retenter d'effectuer la vérification de votre identité dans %{hours} heures.
-      jurisdiction:
-        no_id: Je n'ai pas de carte d'identité officielle
-        no_id_failure: Nous travaillons dur pour ajouter plus de moyens de vérifier
-          votre identité.
       mail_sent: Votre lettre est en route
       otp_delivery_method:
         phone_number_html: Nous enverrons un code au <strong>%{phone}</strong>
@@ -174,8 +170,6 @@ fr:
       mail:
         resend: Vous voulez une autre lettre?
         verify: Vous voulez une lettre?
-      no_id: Nous ne sommes pas en mesure de vérifier votre identité sans une pièce
-        d'identité officielle
       otp_delivery_method: Comment souhaitez-vous recevoir le code ?
       phone: Numéro de téléphone enregistré
       review: Réviser et soumettre
diff --git a/config/routes.rb b/config/routes.rb
index 02876cfe65f..b05aa7755c8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -305,7 +305,6 @@
       get '/session/errors/recovery_exception' => 'session_errors#recovery_exception'
       get '/session/errors/recovery_throttled' => 'session_errors#recovery_throttled'
       delete '/session' => 'sessions#destroy'
-      get '/jurisdiction/errors/no_id' => 'jurisdiction_errors#no_id'
       get '/cancel/' => 'cancellations#new', as: :cancel
       delete '/cancel' => 'cancellations#destroy'
       get '/address' => 'address#new'
diff --git a/spec/features/idv/cac/use_cac_step_spec.rb b/spec/features/idv/cac/use_cac_step_spec.rb
index 15a94e90fc6..8db657014c6 100644
--- a/spec/features/idv/cac/use_cac_step_spec.rb
+++ b/spec/features/idv/cac/use_cac_step_spec.rb
@@ -5,7 +5,7 @@
   include DocAuthHelper
 
   let(:use_cac_content) do
-    strip_tags(t('doc_auth.info.use_cac_html', link: t('doc_auth.info.use_cac_link')))
+    strip_tags(t('doc_auth.info.use_cac', link: t('doc_auth.info.use_cac_link')))
   end
 
   it 'shows cac proofing option if cac proofing is enabled' do
diff --git a/spec/javascripts/packages/document-capture/context/service-provider-spec.js b/spec/javascripts/packages/document-capture/context/service-provider-spec.js
new file mode 100644
index 00000000000..69ecf940435
--- /dev/null
+++ b/spec/javascripts/packages/document-capture/context/service-provider-spec.js
@@ -0,0 +1,11 @@
+import { useContext } from 'react';
+import { renderHook } from '@testing-library/react-hooks';
+import ServiceProviderContext from '@18f/identity-document-capture/context/device';
+
+describe('document-capture/context/service-provider', () => {
+  it('defaults to undefined', () => {
+    const { current } = renderHook(() => useContext(ServiceProviderContext));
+
+    expect(current).to.be.undefined();
+  });
+});
diff --git a/spec/javascripts/packages/document-capture/hooks/use-i18n-spec.jsx b/spec/javascripts/packages/document-capture/hooks/use-i18n-spec.jsx
index 45124018d83..f06a469e9a6 100644
--- a/spec/javascripts/packages/document-capture/hooks/use-i18n-spec.jsx
+++ b/spec/javascripts/packages/document-capture/hooks/use-i18n-spec.jsx
@@ -1,7 +1,10 @@
 import React from 'react';
 import { renderHook } from '@testing-library/react-hooks';
 import I18nContext from '@18f/identity-document-capture/context/i18n';
-import useI18n, { formatHTML } from '@18f/identity-document-capture/hooks/use-i18n';
+import useI18n, {
+  formatHTML,
+  replaceVariables,
+} from '@18f/identity-document-capture/hooks/use-i18n';
 import render from '../../../support/render';
 
 describe('document-capture/hooks/use-i18n', () => {
@@ -14,7 +17,7 @@ describe('document-capture/hooks/use-i18n', () => {
       expect(container.innerHTML).to.equal('Hello &lt;strong&gt;world&lt;/strong&gt;!');
     });
 
-    it('returns html string chunked by handlers', () => {
+    it('returns html string chunked by component handlers', () => {
       const formatted = formatHTML('Hello <strong>world</strong>!', {
         strong: ({ children }) => <strong>{children}</strong>,
       });
@@ -24,6 +27,16 @@ describe('document-capture/hooks/use-i18n', () => {
       expect(container.innerHTML).to.equal('Hello <strong>world</strong>!');
     });
 
+    it('returns html string chunked by string handlers', () => {
+      const formatted = formatHTML('Hello <strong>world</strong>!', {
+        strong: 'strong',
+      });
+
+      const { container } = render(formatted);
+
+      expect(container.innerHTML).to.equal('Hello <strong>world</strong>!');
+    });
+
     it('returns html string chunked by multiple handlers', () => {
       const formatted = formatHTML(
         'Message: <lg-custom>Hello</lg-custom> <strong>world</strong>!',
@@ -47,6 +60,28 @@ describe('document-capture/hooks/use-i18n', () => {
 
       expect(container.childNodes).to.have.lengthOf(2);
     });
+
+    it('allows (but discards) attributes in the input string', () => {
+      const formatted = formatHTML(
+        '<strong data-before>Hello</strong> <strong data-before>world</strong>',
+        {
+          strong: ({ children }) => <strong data-after>{children}</strong>,
+        },
+      );
+
+      const { container } = render(formatted);
+
+      expect(container.querySelectorAll('[data-after]')).to.have.lengthOf(2);
+      expect(container.querySelectorAll('[data-before]')).to.have.lengthOf(0);
+    });
+  });
+
+  describe('replaceVariables', () => {
+    it('replaces all variables', () => {
+      const result = replaceVariables('The price is $%{price}, not %{price} €', { price: '2' });
+
+      expect(result).to.equal('The price is $2, not 2 €');
+    });
   });
 
   describe('t', () => {
diff --git a/spec/views/idv/doc_auth/upload.html.erb_spec.rb b/spec/views/idv/doc_auth/upload.html.erb_spec.rb
index d7153b95041..c77f7d07298 100644
--- a/spec/views/idv/doc_auth/upload.html.erb_spec.rb
+++ b/spec/views/idv/doc_auth/upload.html.erb_spec.rb
@@ -3,8 +3,14 @@
 describe 'idv/doc_auth/upload.html.erb' do
   let(:flow_session) { {} }
   let(:user_fully_authenticated) { true }
+  let(:sp_name) { nil }
+  let(:failure_to_proof_url) { 'https://example.com' }
 
   before do
+    @decorated_session = instance_double(ServiceProviderSessionDecorator)
+    allow(@decorated_session).to receive(:sp_name).and_return(sp_name)
+    allow(@decorated_session).to receive(:failure_to_proof_url).and_return(failure_to_proof_url)
+    allow(view).to receive(:decorated_session).and_return(@decorated_session)
     allow(view).to receive(:flow_session).and_return(flow_session)
     allow(view).to receive(:user_fully_authenticated?).and_return(user_fully_authenticated)
     allow(view).to receive(:url_for).and_return('https://www.example.com/')
@@ -32,4 +38,33 @@
       expect(rendered).to have_content(t('doc_auth.headings.upload_from_phone'))
     end
   end
+
+  context 'without service provider' do
+    it 'does not render fallback support link' do
+      render template: 'idv/doc_auth/upload.html.erb'
+
+      link_text = t(
+        'doc_auth.info.no_other_id_help_bold_html',
+        failure_to_proof_url: @decorated_session.failure_to_proof_url,
+        sp_name: @decorated_session.sp_name,
+      )
+
+      expect(rendered).not_to include(link_text)
+    end
+  end
+
+  context 'with service provider' do
+    let(:sp_name) { 'Example App' }
+
+    it 'renders fallback support link' do
+      render template: 'idv/doc_auth/upload.html.erb'
+
+      link_text = t(
+        'doc_auth.info.no_other_id_help_bold_html',
+        failure_to_proof_url: @decorated_session.failure_to_proof_url,
+        sp_name: @decorated_session.sp_name,
+      )
+      expect(rendered).to include(link_text)
+    end
+  end
 end
diff --git a/spec/views/idv/jurisdiction_errors/no_id.html.erb_spec.rb b/spec/views/idv/jurisdiction_errors/no_id.html.erb_spec.rb
deleted file mode 100644
index cd1f7878c4f..00000000000
--- a/spec/views/idv/jurisdiction_errors/no_id.html.erb_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'rails_helper'
-
-describe 'idv/jurisdiction_errors/no_id.html.erb' do
-  let(:decorated_session) { instance_double(ServiceProviderSessionDecorator) }
-  let(:sp_name) { 'Test SP' }
-  let(:failure_to_proof_url) { 'https://sp.example.com/failed' }
-
-  before do
-    allow(decorated_session).to receive(:sp_name).and_return(sp_name)
-    allow(decorated_session).to receive(:failure_to_proof_url).and_return(failure_to_proof_url)
-    allow(view).to receive(:decorated_session).and_return(decorated_session)
-  end
-
-  context 'with an SP' do
-    it 'renders a link to return to the SP' do
-      render
-
-      expect(rendered).to have_content(
-        strip_tags(t('idv.failure.help.get_help_html', sp_name: sp_name)),
-      )
-      expect(rendered).to have_link(sp_name, href: failure_to_proof_url)
-    end
-  end
-
-  context 'without an SP' do
-    let(:sp_name) { nil }
-
-    it 'does not render a link to return to the SP' do
-      render
-
-      expect(rendered).to_not have_link(sp_name, href: failure_to_proof_url)
-    end
-  end
-end