Move TOTP views to new location

app/views/settings/_security.haml

@@ -1,7 +0,0 @@
-.card
-  .card-body
-    %h2= t(".heading")
-    - if current_user.otp_module_disabled?
-      = render partial: "settings/security/totp_setup", locals: { qr_svg: qr_svg }
-    - else
-      = render partial: "settings/security/totp_enabled", locals: { recovery_code_count: recovery_code_count }

app/views/settings/security/_totp_enabled.haml

@@ -1,6 +0,0 @@
-%p= t(".body")
-%p= t(".recovery_code_count", count: recovery_code_count)
-= button_to t(".remove.action"), destroy_user_2fa_path, class: "btn btn-danger", method: "delete",
-          data: { confirm: t(".remove.confirm") }
-= button_to t(".regenerate.action"), reset_user_recovery_codes_path, class: "btn btn-primary", method: "delete",
-          data: { confirm: t(".regenerate.confirm") }

app/views/settings/two_factor_authentication/otp_authentication/_totp_enabled.haml

@@ -0,0 +1,6 @@
+%p= t(".body")
+%p= t(".recovery_code_count", count: recovery_code_count)
+= button_to t(".remove.action"), settings_two_factor_authentication_otp_authentication_path, class: "btn btn-danger", method: "delete",
+          data: { confirm: t(".remove.confirm") }
+= button_to t(".regenerate.action"), settings_two_factor_authentication_otp_authentication_reset_path, class: "btn btn-primary", method: "delete",
+          data: { confirm: t(".regenerate.confirm") }

app/views/settings/two_factor_authentication/otp_authentication/_totp_setup.haml

@@ -8,7 +8,7 @@
           = t(".setup_key")
           %code= current_user.otp_secret_key.scan(/.{4}/).flatten.join(" ")
     .totp-setup__content.col
-      = bootstrap_form_for(current_user, url: { action: :update_2fa, method: :post }) do |f|
+      = bootstrap_form_for(current_user, url: settings_two_factor_authentication_otp_authentication_path) do |f|
         %p= t(".app.none")
         %ul.list-unstyled.pl-3
           %li

app/views/settings/two_factor_authentication/otp_authentication/index.haml

@@ -0,0 +1,10 @@
+.card
+  .card-body
+    %h2= t(".heading")
+    - if current_user.otp_module_disabled?
+      = render partial: "settings/two_factor_authentication/otp_authentication/totp_setup", locals: { qr_svg: @qr_svg }
+    - else
+      = render partial: "settings/two_factor_authentication/otp_authentication/totp_enabled", locals: { recovery_code_count: @recovery_code_count }
+
+- provide(:title, generate_title(t(".title")))
+- parent_layout "user/settings"

app/views/tabs/_settings.haml

@@ -3,7 +3,7 @@
     = list_group_item t(".account"), edit_user_registration_path
     = list_group_item t(".profile"), settings_profile_path
     = list_group_item t(".privacy"), settings_privacy_path
-    = list_group_item t(".security"), edit_user_security_path
+    = list_group_item t(".security"),settings_two_factor_authentication_otp_authentication_path
     = list_group_item t(".sharing"), services_path
     = list_group_item t(".mutes"), edit_user_mute_rules_path
     = list_group_item t(".blocks"), edit_user_blocks_path