From 518a5abee5eee1cbe73a9bed3bc3467e14cf4bba Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Fri, 28 Oct 2022 12:20:03 +0100
Subject: [PATCH] refactor: tidy up code and add single quotes instead of
 apostrophes

---
 .../organisation_relationships/housing_providers.html.erb | 8 +++-----
 .../remove_housing_provider.html.erb                      | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/views/organisation_relationships/housing_providers.html.erb b/app/views/organisation_relationships/housing_providers.html.erb
index 8444d9f80..28efac675 100644
--- a/app/views/organisation_relationships/housing_providers.html.erb
+++ b/app/views/organisation_relationships/housing_providers.html.erb
@@ -9,8 +9,7 @@
         ) do |notification_banner|
           notification_banner.heading(text: "#{Organisation.find(params['related_organisation_id']).name} is now one of your housing providers")
         end %>
-  <% end %>
-  <% if params["removed_organisation_id"] %>
+  <% elsif params["removed_organisation_id"] %>
     <%= govuk_notification_banner(
           title_text: "Success",
           success: true, title_heading_level: 3,
@@ -32,14 +31,13 @@
         ) do |notification_banner|
           notification_banner.heading(text: "#{Organisation.find(params['related_organisation_id']).name} is now one of this organisation's housing providers")
         end %>
-  <% end %>
-  <% if params["removed_organisation_id"] %>
+  <% elsif params["removed_organisation_id"] %>
     <%= govuk_notification_banner(
           title_text: "Success",
           success: true, title_heading_level: 3,
           title_id: "swanky-notifications"
         ) do |notification_banner|
-      notification_banner.heading(text: "#{Organisation.find(params['removed_organisation_id']).name} is no longer one of this organisation housing providers")
+      notification_banner.heading(text: "#{Organisation.find(params['removed_organisation_id']).name} is no longer one of this organisation's housing providers")
     end %>
   <% end %>
   <p class="govuk-body">This organisation can submit logs for its housing providers.</p>
diff --git a/app/views/organisation_relationships/remove_housing_provider.html.erb b/app/views/organisation_relationships/remove_housing_provider.html.erb
index d173b7dbf..e8bc0c5c0 100644
--- a/app/views/organisation_relationships/remove_housing_provider.html.erb
+++ b/app/views/organisation_relationships/remove_housing_provider.html.erb
@@ -8,12 +8,12 @@
   <% @housing_provider = Organisation.find(@organisation_to_remove_id) %>
   <% if current_user.support? %>
     <%= govuk_back_link(href: :back) %>
-    <%= render partial: "organisations/headings", locals: { main: "You are removing '#{@housing_provider.name}' from this organisation's housing providers", sub: nil } %>
+    <%= render partial: "organisations/headings", locals: { main: "You are removing ‘#{@housing_provider.name}’ from this organisation's housing providers", sub: nil } %>
   <% else %>
     <% content_for :before_content do %>
       <%= govuk_back_link(href: :back) %>
     <% end %>
-    <%= render partial: "organisations/headings", locals: { main: "You are removing #{@housing_provider.name} from your organisation's housing providers", sub: nil } %>
+    <%= render partial: "organisations/headings", locals: { main: "You are removing ‘#{@housing_provider.name}’ from your organisation's housing providers", sub: nil } %>
   <% end %>
   <%= govuk_warning_text text: "You will no longer be able to submit logs for #{@housing_provider.name}" %>
   <div class="govuk-button-group">