Merge branch 'main' into dark-mode-switch

guardian · Oct 19, 2023 · 1c9ccbd · 1c9ccbd
2 parents aee55b5 + b6be51d
commit 1c9ccbd
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 30 deletions.
diff --git a/common/app/conf/switches/FeatureSwitches.scala b/common/app/conf/switches/FeatureSwitches.scala
@@ -522,26 +522,6 @@ trait FeatureSwitches {
     exposeClientSide = true,
   )
 
-  val VerticalVideo = Switch(
-    SwitchGroup.Feature,
-    "vertical-video",
-    "When ON, shows the vertical video container",
-    owners = Seq(Owner.withGithub("@guardian/editorial-experience")),
-    safeState = Off,
-    sellByDate = never,
-    exposeClientSide = true,
-  )
-
-  val VerticalVideoSurvey = Switch(
-    SwitchGroup.Feature,
-    "vertical-video-survey",
-    "When ON, shows the vertical video survey link",
-    owners = Seq(Owner.withGithub("@guardian/editorial-experience")),
-    safeState = Off,
-    sellByDate = never,
-    exposeClientSide = true,
-  )
-
   val DarkModeInApps = Switch(
     SwitchGroup.Feature,
     "dark-mode-apps",

diff --git a/common/app/views/fragments/containers/facia_cards/container.scala.html b/common/app/views/fragments/containers/facia_cards/container.scala.html
@@ -6,7 +6,7 @@
 @import views.html.fragments.containers.facia_cards._
 @import views.support.Commercial.container.shouldRenderAsPaidContainer
 @import views.support.GetClasses
-@import conf.switches.Switches.{MostViewedFronts, VerticalVideo => VerticalVideoSwitch}
+@import conf.switches.Switches.{MostViewedFronts}
 @import experiments.ActiveExperiments
 
 @import conf.audio.FlagshipFrontContainer

diff --git a/common/app/views/fragments/containers/facia_cards/verticalVideoContainer.scala.html b/common/app/views/fragments/containers/facia_cards/verticalVideoContainer.scala.html
@@ -8,7 +8,6 @@
 @import model.VideoFaciaProperties
 @import layout.FaciaCardHeader
 @import model.Pillar.RichPillar
-@import conf.switches.Switches.{VerticalVideoSurvey}
 
 @(containerDefinition: layout.FaciaContainer, frontProperties: model.FrontProperties)(implicit requestHeader: RequestHeader)
 
@@ -116,12 +115,4 @@ <h2 class="video-title fc-container__header__title">
         @fragments.inlineSvg("chevron-right", "icon", Seq("vertical-video-playlist__icon", "vertical-video-playlist__icon--next"))
         </a>
     </div>
-    @if(VerticalVideoSurvey.isSwitchedOn) {
-        <div class="vertical-video__ext-link">
-            We're experimenting with vertical video.&nbsp;
-            <a href="https://guardiannewsandmedia.formstack.com/forms/vertical_video"
-            target="_blank"
-            rel="noopener noreferrer">Tell us what you think</a>
-        </div>
-    }
 </div>