Change based on PR suggestion

alphagov · Mar 9, 2022 · 2bbe914 · 2bbe914
1 parent 33a5810
commit 2bbe914
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 20 deletions.
diff --git a/app/controllers/content_items_controller.rb b/app/controllers/content_items_controller.rb
@@ -13,8 +13,6 @@ class ContentItemsController < ApplicationController
 
   attr_accessor :content_item, :taxonomy_navigation
 
-  helper_method :show_email_subscription_success_banner?
-
   def show
     load_content_item
 
@@ -48,10 +46,6 @@ def service_sign_in_options
     end
   end
 
-  def show_email_subscription_success_banner?
-    @account_flash.include?("email-subscription-success") || @account_flash.include?("email-unsubscribe-success") || @account_flash.include?("email-subscription-already-subscribed")
-  end
-
 private
 
   def is_history_page?

diff --git a/app/helpers/content_items_helper.rb b/app/helpers/content_items_helper.rb
@@ -0,0 +1,15 @@
+module ContentItemsHelper
+  def email_subscription_success_banner_heading(account_flash)
+    if account_flash.include?("email-subscription-success")
+      sanitize(t("email.subscribe_title"))
+    elsif account_flash.include?("email-unsubscribe-success")
+      sanitize(t("email.unsubscribe_title"))
+    elsif account_flash.include?("email-subscription-already-subscribed")
+      sanitize(t("email.already_subscribed_title"))
+    end
+  end
+
+  def show_email_subscription_success_banner?(account_flash)
+    account_flash.include?("email-subscription-success") || account_flash.include?("email-unsubscribe-success") || account_flash.include?("email-subscription-already-subscribed")
+  end
+end
diff --git a/app/views/shared/_email_subscribe_unsubscribe_flash.html.erb b/app/views/shared/_email_subscribe_unsubscribe_flash.html.erb
@@ -1,24 +1,12 @@
-<% banner_heading = capture do %>
-  <%
-    if @account_flash.include?("email-subscription-success")
-      sanitize(t("email.subscribe_title"))
-    elsif @account_flash.include?("email-unsubscribe-success")
-      sanitize(t("email.unsubscribe_title"))
-    elsif @account_flash.include?("email-subscription-already-subscribed")
-      sanitize(t("email.already_subscribed_title"))
-    end
-  %>
-<% end %>
-
 <% banner_description = capture do %>
   <a class="govuk-link govuk-notification-banner__link" href="/email/manage"><%= t("email.description") %></a>
 <% end %>
 
-<% if show_email_subscription_success_banner? %>
+<% if show_email_subscription_success_banner?(@account_flash) %>
   <div class="govuk-grid-row govuk-!-margin-top-3">
     <div class="govuk-grid-column-two-thirds">
       <%= render "govuk_publishing_components/components/success_alert", {
-        message: banner_heading,
+        message: email_subscription_success_banner_heading(@account_flash),
         description: banner_description,
         margin_bottom: 0,
       } %>