From 03920fe21703e272985db7bd06e3c6dd5c609ab7 Mon Sep 17 00:00:00 2001
From: Andrew Duthie <andrew.duthie@gsa.gov>
Date: Wed, 8 Sep 2021 13:04:49 -0400
Subject: [PATCH 1/2] Remove unused service_provider_mfa/new.html.erb

**Why**: Because it's unused and is an ongoing maintenance burden (e.g. #5279).
---
 app/views/service_provider_mfa/new.html.erb | 40 ---------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 app/views/service_provider_mfa/new.html.erb

diff --git a/app/views/service_provider_mfa/new.html.erb b/app/views/service_provider_mfa/new.html.erb
deleted file mode 100644
index 494dde1d9aa..00000000000
--- a/app/views/service_provider_mfa/new.html.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-<% title t('titles.two_factor_setup') %>
-
-<% if @presenter.icon %>
-  <%= image_tag(asset_url(@presenter.icon), class: 'margin-bottom-3', alt: 'important alert icon') %>
-<% end %>
-
-<h1 class="margin-y-0"><%= @presenter.heading %></h1>
-
-<p class="mt-tiny"><%== @presenter.intro %></p>
-
-<%= validated_form_for @two_factor_options_form,
-                       html: { autocomplete: 'off' },
-                       method: :patch,
-                       url: two_factor_options_path do |f| %>
-  <div class="margin-bottom-4">
-    <fieldset class="margin-0 padding-0 border-none">
-      <legend class="margin-bottom-2"><%= t('forms.two_factor_choice.legend') %>:</legend>
-      <% @presenter.options.each do |option| %>
-        <%= label_tag "two_factor_options_form_selection_#{option.type}",
-                      class: "btn-border col-12 margin-bottom-2 #{option.html_class}",
-                      hidden: option.html_class == 'display-none' do %>
-          <div class="radio">
-            <%= radio_button_tag('two_factor_options_form[selection]', option.type) %>
-            <span class="indicator mt-tiny"></span>
-            <span class="blue bold fs-20p"><%= option.label %></span>
-            <div class="regular gray-dark fs-10p margin-top-0 mb-tiny"><%= option.info %></div>
-          </div>
-        <% end %>
-    <% end %>
-    </fieldset>
-  </div>
-
-  <div>
-    <%= f.button :submit, t('forms.buttons.continue'), class: 'usa-button--big usa-button--wide margin-bottom-1' %>
-  </div>
-<% end %>
-
-<%= render 'shared/cancel', link: destroy_user_session_path %>
-
-<%= javascript_packs_tag_once("webauthn-unhide-signup") %>

From 17b11db0a043307a8620fe195e8d78608541b8c4 Mon Sep 17 00:00:00 2001
From: Andrew Duthie <andrew.duthie@gsa.gov>
Date: Thu, 9 Sep 2021 08:29:28 -0400
Subject: [PATCH 2/2] Remove empty directory from ERBLint exclude

---
 .erb-lint.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.erb-lint.yml b/.erb-lint.yml
index b3f9655db6b..d4efff7188d 100644
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -27,7 +27,6 @@ linters:
       - '*/app/views/event_disavowal/*'
       - '*/app/views/mfa_confirmation/*'
       - '*/app/views/reactivate_account/*'
-      - '*/app/views/service_provider_mfa/*'
       - '*/app/views/session_timeout/*'
       - '*/app/views/shared/*'
       - '*/app/views/two_factor_authentication/*'