Merge pull request #20660 from guardian/revert-20619-rp-interactive-h…

…eader

Revert "Midterms interactives header switch "

common/app/conf/switches/FeatureSwitches.scala

@@ -495,17 +495,6 @@ trait FeatureSwitches {
     exposeClientSide = true
   )
 
-  // Midterms interactive header switch
-  val InteractiveHeaderSwitch = Switch(
-    SwitchGroup.Feature,
-    "interactive-header-switch",
-    "If switched on, the header on all interctives will display in full.",
-    owners = Seq(Owner.withName("dotcom.platform")),
-    safeState = Off,
-    sellByDate = new LocalDate(2018, 11, 9),
-    exposeClientSide = true
-  )
-
   val NewNavEnabled = Switch(
     SwitchGroup.Feature,
     "new-nav-enabled",
@@ -515,4 +504,5 @@ trait FeatureSwitches {
     sellByDate = new LocalDate(2018, 11, 19),
     exposeClientSide = false
   )
+
 }

common/app/model/content.scala

@@ -22,7 +22,6 @@ import views.support._
 import scala.collection.JavaConverters._
 import scala.util.Try
 import implicits.Booleans._
-import conf.switches.Switches.InteractiveHeaderSwitch
 
 sealed trait ContentType {
   def content: Content
@@ -885,11 +884,12 @@ object Interactive {
     val contentType = DotcomContentType.Interactive
     val fields = content.fields
     val section = content.metadata.sectionId
+
     val metadata = content.metadata.copy(
       contentType = Some(contentType),
       adUnitSuffix = section + "/" + contentType.name.toLowerCase,
       twitterPropertiesOverrides = Map( "twitter:title" -> fields.linkText ),
-      contentWithSlimHeader = InteractiveHeaderSwitch.isSwitchedOff
+      contentWithSlimHeader = true
     )
     val contentOverrides = content.copy(
       metadata = metadata