Merge pull request #4262 from nhsuk/aqua-green-tags

Ensure triage and consent tags use the correct status colour

Author: thomasleese

app/helpers/consents_helper.rb

@@ -34,7 +34,7 @@ def consent_status_tag(consent)
       if consent.withdrawn? || consent.invalidated?
         "grey"
       elsif consent.response_given?
-        "green"
+        "aqua-green"
       elsif consent.response_refused?
         "red"
       else
@@ -50,24 +50,31 @@ def consent_status_tag(consent)
         )
       end
 
+    # We can’t use the colour param as NHS.UK frontend uses different colour
+    # names (aqua-green) than those supported by GOV.UK Frontend (turquoise)
     if consent.invalidated?
       safe_join(
         [
-          govuk_tag(text: tag.s(text), colour:),
+          govuk_tag(text: tag.s(text), classes: "nhsuk-tag--#{colour}"),
           vaccine_method,
           tag.span("Invalid", class: "nhsuk-u-secondary-text-color")
         ].compact
       )
     elsif consent.withdrawn?
       safe_join(
         [
-          govuk_tag(text: tag.s(text), colour:),
+          govuk_tag(text: tag.s(text), classes: "nhsuk-tag--#{colour}"),
           vaccine_method,
           tag.span("Withdrawn", class: "nhsuk-u-secondary-text-color")
         ].compact
       )
     else
-      safe_join([govuk_tag(text:, colour:), vaccine_method].compact)
+      safe_join(
+        [
+          govuk_tag(text:, classes: "nhsuk-tag--#{colour}"),
+          vaccine_method
+        ].compact
+      )
     end
   end
 end

app/helpers/triages_helper.rb

@@ -16,22 +16,24 @@ def triage_status_tag(triage)
       if triage.invalidated?
         "grey"
       elsif triage.ready_to_vaccinate?
-        "green"
+        "aqua-green"
       elsif triage.do_not_vaccinate?
         "red"
       else
         "blue"
       end
 
+    # We can’t use the colour param as NHS.UK frontend uses different colour
+    # names (aqua-green) than those supported by GOV.UK Frontend (turquoise)
     if triage.invalidated?
       safe_join(
         [
-          govuk_tag(text: tag.s(text), colour:),
+          govuk_tag(text: tag.s(text), classes: "nhsuk-tag--#{colour}"),
           tag.span("Invalid", class: "nhsuk-u-secondary-text-color")
         ]
       )
     else
-      govuk_tag(text:, colour:)
+      govuk_tag(text:, classes: "nhsuk-tag--#{colour}")
     end
   end
 end