From 5db01b9af7565758b073250bed42071cff1592c2 Mon Sep 17 00:00:00 2001
From: cmaddox5 <christian.maddox93@gmail.com>
Date: Mon, 2 Dec 2024 15:20:27 -0500
Subject: [PATCH] Add header and footer instances in closures CG.

---
 assets/css/elevator_v2.scss                   |  8 ++
 assets/css/v2/elevator/elevator_closures.scss |  2 +-
 assets/css/v2/elevator/footer.scss            |  7 +-
 assets/css/v2/elevator/header.scss            |  7 +-
 assets/css/v2/elevator/normal.scss            | 17 +++-
 .../v2/elevator/elevator_closures.tsx         | 55 +++++--------
 assets/src/components/v2/elevator/footer.tsx  |  2 +-
 .../components/v2/elevator/normal_screen.tsx  | 10 ++-
 assets/src/components/v2/normal_header.tsx    | 18 ++---
 assets/src/util/util.tsx                      |  6 +-
 .../v2/candidate_generator/elevator.ex        | 25 +++++-
 .../candidate_generator/elevator/closures.ex  | 26 +++++--
 .../v2/widget_instance/elevator_closures.ex   | 13 ++--
 lib/screens/v2/widget_instance/footer.ex      | 13 +++-
 .../v2/widget_instance/normal_header.ex       | 16 +++-
 .../elevator/closures_test.exs                | 78 ++++++++++++++-----
 .../v2/candidate_generator/elevator_test.exs  | 35 ++++++---
 .../elevator_closures_test.exs                | 10 +--
 .../v2/widget_instance/normal_header_test.exs |  3 +-
 19 files changed, 225 insertions(+), 126 deletions(-)

diff --git a/assets/css/elevator_v2.scss b/assets/css/elevator_v2.scss
index fe322c454..e6bdfeaf5 100644
--- a/assets/css/elevator_v2.scss
+++ b/assets/css/elevator_v2.scss
@@ -34,3 +34,11 @@ body {
 *::after {
   box-sizing: border-box;
 }
+
+.normal-header,
+.footer {
+  &--closed {
+    color: white;
+    background-color: $accessibility-blue;
+  }
+}
diff --git a/assets/css/v2/elevator/elevator_closures.scss b/assets/css/v2/elevator/elevator_closures.scss
index 4e76c5224..15fc556d1 100644
--- a/assets/css/v2/elevator/elevator_closures.scss
+++ b/assets/css/v2/elevator/elevator_closures.scss
@@ -2,7 +2,7 @@
   position: relative;
   display: flex;
   flex-direction: column;
-  height: 1632px;
+  height: 100%;
   color: $cool-black-15;
   background-color: $warm-neutral-90;
 
diff --git a/assets/css/v2/elevator/footer.scss b/assets/css/v2/elevator/footer.scss
index 696176347..86a964854 100644
--- a/assets/css/v2/elevator/footer.scss
+++ b/assets/css/v2/elevator/footer.scss
@@ -1,5 +1,5 @@
 .footer {
-  height: 184px;
+  height: 100%;
   padding: 26px 48px;
   font-size: 48px;
   font-weight: 500;
@@ -7,11 +7,6 @@
   color: white;
   background-color: $cool-black-30;
 
-  &--blue {
-    color: white;
-    background-color: $accessibility-blue;
-  }
-
   b {
     letter-spacing: -0.2px;
   }
diff --git a/assets/css/v2/elevator/header.scss b/assets/css/v2/elevator/header.scss
index 0b1e17726..c3102b3cd 100644
--- a/assets/css/v2/elevator/header.scss
+++ b/assets/css/v2/elevator/header.scss
@@ -2,16 +2,11 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  height: 104px;
+  height: 100%;
   padding: 0 48px;
   font-family: Inter, sans-serif;
   font-size: 48px;
   line-height: 62px;
   color: $warm-neutral-90;
   background-color: $cool-black-15;
-
-  &--blue {
-    color: white;
-    background-color: $accessibility-blue;
-  }
 }
diff --git a/assets/css/v2/elevator/normal.scss b/assets/css/v2/elevator/normal.scss
index ceff2d56e..cdf209a7c 100644
--- a/assets/css/v2/elevator/normal.scss
+++ b/assets/css/v2/elevator/normal.scss
@@ -5,7 +5,18 @@
   margin-left: auto;
 }
 
-.screen-normal__main-content {
-  width: 100%;
-  height: 1920px;
+.screen-normal__header {
+  width: 1080px;
+  height: 104px;
+}
+
+.screen-normal__body {
+  width: 1080px;
+  height: 1632px;
+}
+
+.screen-normal__footer {
+  position: relative;
+  width: 1080px;
+  height: 184px;
 }
diff --git a/assets/src/components/v2/elevator/elevator_closures.tsx b/assets/src/components/v2/elevator/elevator_closures.tsx
index 766fb4d40..3f414a7fa 100644
--- a/assets/src/components/v2/elevator/elevator_closures.tsx
+++ b/assets/src/components/v2/elevator/elevator_closures.tsx
@@ -9,8 +9,6 @@ import OutsideClosuresView from "Components/v2/elevator/closures/outside_closure
 import CurrentElevatorClosedView, {
   type Coordinates,
 } from "Components/v2/elevator/closures/current_elevator_closed_view";
-import Footer from "Components/v2/elevator/footer";
-import NormalHeader from "Components/v2/normal_header";
 
 export type StationWithClosures = {
   id: string;
@@ -35,7 +33,6 @@ interface Props extends WrappedComponentProps {
   accessible_path_direction_arrow: Direction;
   accessible_path_image_url: string | null;
   accessible_path_image_here_coordinates: Coordinates;
-  time: string;
 }
 
 const ElevatorClosures: React.ComponentType<Props> = ({
@@ -46,7 +43,6 @@ const ElevatorClosures: React.ComponentType<Props> = ({
   accessible_path_direction_arrow: accessiblePathDirectionArrow,
   accessible_path_image_url: accessiblePathImageUrl,
   accessible_path_image_here_coordinates: accessiblePathImageHereCoordinates,
-  time,
   lastUpdate,
   onFinish,
 }: Props) => {
@@ -55,36 +51,27 @@ const ElevatorClosures: React.ComponentType<Props> = ({
   );
 
   return (
-    <>
-      <NormalHeader
-        text={`Elevator ${id}`}
-        time={time}
-        maxHeight={104}
-        classModifiers={currentElevatorClosure ? "blue" : ""}
-      />
-      <div className="elevator-closures">
-        {currentElevatorClosure ? (
-          <CurrentElevatorClosedView
-            closure={currentElevatorClosure}
-            alternateDirectionText={alternateDirectionText}
-            accessiblePathDirectionArrow={accessiblePathDirectionArrow}
-            accessiblePathImageUrl={accessiblePathImageUrl}
-            accessiblePathImageHereCoordinates={
-              accessiblePathImageHereCoordinates
-            }
-            onFinish={onFinish}
-            lastUpdate={lastUpdate}
-          />
-        ) : (
-          <OutsideClosuresView
-            stations={otherStationsWithClosures}
-            lastUpdate={lastUpdate}
-            onFinish={onFinish}
-          />
-        )}
-      </div>
-      <Footer variant={currentElevatorClosure ? "blue" : ""} />
-    </>
+    <div className="elevator-closures">
+      {currentElevatorClosure ? (
+        <CurrentElevatorClosedView
+          closure={currentElevatorClosure}
+          alternateDirectionText={alternateDirectionText}
+          accessiblePathDirectionArrow={accessiblePathDirectionArrow}
+          accessiblePathImageUrl={accessiblePathImageUrl}
+          accessiblePathImageHereCoordinates={
+            accessiblePathImageHereCoordinates
+          }
+          onFinish={onFinish}
+          lastUpdate={lastUpdate}
+        />
+      ) : (
+        <OutsideClosuresView
+          stations={otherStationsWithClosures}
+          lastUpdate={lastUpdate}
+          onFinish={onFinish}
+        />
+      )}
+    </div>
   );
 };
 
diff --git a/assets/src/components/v2/elevator/footer.tsx b/assets/src/components/v2/elevator/footer.tsx
index 58b6a0ae1..a6d0675a3 100644
--- a/assets/src/components/v2/elevator/footer.tsx
+++ b/assets/src/components/v2/elevator/footer.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { classWithModifier } from "Util/util";
 
-const Footer = ({ variant }: { variant?: string }) => {
+const Footer = ({ variant }: { variant: string | null }) => {
   return (
     <div className={classWithModifier("footer", variant)}>
       For more info and alternate paths: <b>mbta.com/alerts/access</b> or{" "}
diff --git a/assets/src/components/v2/elevator/normal_screen.tsx b/assets/src/components/v2/elevator/normal_screen.tsx
index 53de9338d..5d572cce2 100644
--- a/assets/src/components/v2/elevator/normal_screen.tsx
+++ b/assets/src/components/v2/elevator/normal_screen.tsx
@@ -3,15 +3,23 @@ import React from "react";
 import Widget, { WidgetData } from "Components/v2/widget";
 
 interface Props {
+  header: WidgetData;
   main_content: WidgetData;
+  footer: WidgetData;
 }
 
-const NormalScreen = ({ main_content: mainContent }: Props) => {
+const NormalScreen = ({ header, main_content: mainContent, footer }: Props) => {
   return (
     <div className="screen-normal">
+      <div className="screen-normal__header">
+        <Widget data={header} />
+      </div>
       <div className="screen-normal__body">
         <Widget data={mainContent} />
       </div>
+      <div className="screen-normal__footer">
+        <Widget data={footer} />
+      </div>
     </div>
   );
 };
diff --git a/assets/src/components/v2/normal_header.tsx b/assets/src/components/v2/normal_header.tsx
index da8397786..c0a69ec25 100644
--- a/assets/src/components/v2/normal_header.tsx
+++ b/assets/src/components/v2/normal_header.tsx
@@ -1,15 +1,9 @@
-import useTextResizer from "Hooks/v2/use_text_resizer";
 import React, { forwardRef, ComponentType } from "react";
-import { getDatasetValue } from "Util/dataset";
 
 import LiveDataSvg from "Images/svgr_bundled/live-data-small.svg";
-
-import {
-  classWithModifier,
-  classWithModifiers,
-  formatTimeString,
-  imagePath,
-} from "Util/util";
+import { getDatasetValue } from "Util/dataset";
+import { classWithModifiers, formatTimeString, imagePath } from "Util/util";
+import useTextResizer from "Hooks/v2/use_text_resizer";
 
 enum Icon {
   green_b = "green_b",
@@ -154,6 +148,7 @@ interface Props {
   fullName?: boolean;
   classModifiers?: string;
   accentPattern?: string;
+  variant?: string | null;
 }
 
 const NormalHeader: ComponentType<Props> = ({
@@ -167,6 +162,7 @@ const NormalHeader: ComponentType<Props> = ({
   fullName = false,
   classModifiers,
   accentPattern,
+  variant,
 }) => {
   const { ref: headerRef, size: headerSize } = useTextResizer({
     sizes: Object.keys(TitleSize),
@@ -174,7 +170,9 @@ const NormalHeader: ComponentType<Props> = ({
     resetDependencies: [text],
   });
   return (
-    <div className={classWithModifier("normal-header", classModifiers)}>
+    <div
+      className={classWithModifiers("normal-header", [classModifiers, variant])}
+    >
       <NormalHeaderTitle
         icon={icon}
         text={text}
diff --git a/assets/src/util/util.tsx b/assets/src/util/util.tsx
index 41d41811f..dbc8b8ffd 100644
--- a/assets/src/util/util.tsx
+++ b/assets/src/util/util.tsx
@@ -1,6 +1,7 @@
 import moment from "moment";
 import "moment-timezone";
 import { RefObject } from "react";
+import cx from "classnames";
 
 import { getDatasetValue } from "Util/dataset";
 import { isDup } from "Util/outfront";
@@ -17,8 +18,9 @@ export const classWithModifiers = (baseClass, modifiers) => {
   if (modifiers.length === 0) {
     return baseClass;
   } else {
-    return (
-      `${baseClass} ` + modifiers.map((m) => `${baseClass}--${m}`).join(" ")
+    return cx(
+      baseClass,
+      ...modifiers.filter((m) => m).map((m) => `${baseClass}--${m}`),
     );
   }
 };
diff --git a/lib/screens/v2/candidate_generator/elevator.ex b/lib/screens/v2/candidate_generator/elevator.ex
index 0e55af58e..01d6bcdaa 100644
--- a/lib/screens/v2/candidate_generator/elevator.ex
+++ b/lib/screens/v2/candidate_generator/elevator.ex
@@ -5,6 +5,9 @@ defmodule Screens.V2.CandidateGenerator.Elevator do
   alias Screens.V2.CandidateGenerator.Elevator.Closures, as: ElevatorClosures
   alias Screens.V2.CandidateGenerator.Widgets.Evergreen
   alias Screens.V2.Template.Builder
+  alias Screens.V2.WidgetInstance.{Footer, NormalHeader}
+  alias ScreensConfig.Screen
+  alias ScreensConfig.V2.Elevator
 
   @behaviour CandidateGenerator
 
@@ -12,7 +15,11 @@ defmodule Screens.V2.CandidateGenerator.Elevator do
     {
       :screen,
       %{
-        normal: [:main_content]
+        normal: [
+          :header,
+          :main_content,
+          :footer
+        ]
       }
     }
     |> Builder.build_template()
@@ -21,14 +28,26 @@ defmodule Screens.V2.CandidateGenerator.Elevator do
   def candidate_instances(
         config,
         now \\ DateTime.utc_now(),
-        elevator_closure_instances_fn \\ &ElevatorClosures.elevator_status_instances/2,
+        elevator_closure_instances_fn \\ &ElevatorClosures.elevator_status_instances/3,
         evergreen_content_instances_fn \\ &Evergreen.evergreen_content_instances/2
       ) do
     Enum.concat([
-      elevator_closure_instances_fn.(config, now),
+      elevator_closure_instances_fn.(
+        config,
+        header_instance(config, now),
+        footer_instance(config)
+      ),
       evergreen_content_instances_fn.(config, now)
     ])
   end
 
   def audio_only_instances(_widgets, _config), do: []
+
+  defp header_instance(%Screen{app_params: %Elevator{elevator_id: elevator_id}} = config, now) do
+    %NormalHeader{text: "Elevator #{elevator_id}", screen: config, time: now}
+  end
+
+  defp footer_instance(config) do
+    %Footer{screen: config}
+  end
 end
diff --git a/lib/screens/v2/candidate_generator/elevator/closures.ex b/lib/screens/v2/candidate_generator/elevator/closures.ex
index fea7e2d9c..c57e4cccb 100644
--- a/lib/screens/v2/candidate_generator/elevator/closures.ex
+++ b/lib/screens/v2/candidate_generator/elevator/closures.ex
@@ -6,7 +6,7 @@ defmodule Screens.V2.CandidateGenerator.Elevator.Closures do
   alias Screens.Alerts.{Alert, InformedEntity}
   alias Screens.Routes.Route
   alias Screens.Stops.Stop
-  alias Screens.V2.WidgetInstance.ElevatorClosures
+  alias Screens.V2.WidgetInstance.{ElevatorClosures, Footer, NormalHeader}
   alias Screens.V2.WidgetInstance.Serializer.RoutePill
   alias ScreensConfig.Screen
   alias ScreensConfig.V2.Elevator
@@ -18,10 +18,12 @@ defmodule Screens.V2.CandidateGenerator.Elevator.Closures do
   @route injected(Route)
   @stop injected(Stop)
 
-  @spec elevator_status_instances(Screen.t()) :: list(ElevatorClosures.t())
+  @spec elevator_status_instances(Screen.t(), NormalHeader.t(), Footer.t()) ::
+          list(ElevatorClosures.t())
   def elevator_status_instances(
         %Screen{app_params: %Elevator{elevator_id: elevator_id} = config},
-        now \\ DateTime.utc_now()
+        header_instance,
+        footer_instance
       ) do
     with {:ok, %Stop{id: stop_id}} <- @facility.fetch_stop_for_facility(elevator_id),
          {:ok, parent_station_map} <- @stop.fetch_parent_station_name_map(),
@@ -32,14 +34,24 @@ defmodule Screens.V2.CandidateGenerator.Elevator.Closures do
       {in_station_alerts, outside_alerts} =
         split_closures_by_location(elevator_alerts, stop_id)
 
+      in_station_closures =
+        Enum.map(in_station_alerts, &alert_to_elevator_closure/1)
+
+      header_footer_variant =
+        if(Enum.any?(in_station_closures, &(&1.elevator_id == elevator_id)),
+          do: :closed,
+          else: nil
+        )
+
       [
+        %NormalHeader{header_instance | variant: header_footer_variant},
         %ElevatorClosures{
-          in_station_closures: Enum.map(in_station_alerts, &alert_to_elevator_closure/1),
+          in_station_closures: in_station_closures,
           other_stations_with_closures:
             format_outside_closures(outside_alerts, parent_station_map, routes_map),
-          app_params: config,
-          now: now
-        }
+          app_params: config
+        },
+        %Footer{footer_instance | variant: header_footer_variant}
       ]
     else
       :error ->
diff --git a/lib/screens/v2/widget_instance/elevator_closures.ex b/lib/screens/v2/widget_instance/elevator_closures.ex
index 5e9cd6515..9f81a0262 100644
--- a/lib/screens/v2/widget_instance/elevator_closures.ex
+++ b/lib/screens/v2/widget_instance/elevator_closures.ex
@@ -5,13 +5,12 @@ defmodule Screens.V2.WidgetInstance.ElevatorClosures do
   alias Screens.Util.Assets
   alias ScreensConfig.V2.Elevator
 
-  defstruct ~w[app_params in_station_closures other_stations_with_closures now]a
+  defstruct ~w[app_params in_station_closures other_stations_with_closures]a
 
   @type t :: %__MODULE__{
           app_params: Elevator.t(),
           in_station_closures: list(__MODULE__.Closure.t()),
-          other_stations_with_closures: list(__MODULE__.Station.t()),
-          now: DateTime.t()
+          other_stations_with_closures: list(__MODULE__.Station.t())
         }
 
   defmodule Station do
@@ -57,8 +56,7 @@ defmodule Screens.V2.WidgetInstance.ElevatorClosures do
           accessible_path_image_here_coordinates: accessible_path_image_here_coordinates
         },
         in_station_closures: in_station_closures,
-        other_stations_with_closures: other_stations_with_closures,
-        now: now
+        other_stations_with_closures: other_stations_with_closures
       }),
       do: %{
         id: id,
@@ -71,14 +69,13 @@ defmodule Screens.V2.WidgetInstance.ElevatorClosures do
             do: nil,
             else: Assets.s3_asset_url(accessible_path_image_url)
           ),
-        accessible_path_image_here_coordinates: accessible_path_image_here_coordinates,
-        time: DateTime.to_iso8601(now)
+        accessible_path_image_here_coordinates: accessible_path_image_here_coordinates
       }
 
   defimpl Screens.V2.WidgetInstance do
     alias Screens.V2.WidgetInstance.ElevatorClosures
 
-    def priority(_instance), do: [0]
+    def priority(_instance), do: [1]
     def serialize(instance), do: ElevatorClosures.serialize(instance)
     def slot_names(_instance), do: [:main_content]
     def widget_type(_instance), do: :elevator_closures
diff --git a/lib/screens/v2/widget_instance/footer.ex b/lib/screens/v2/widget_instance/footer.ex
index 9a5f54904..a273c228e 100644
--- a/lib/screens/v2/widget_instance/footer.ex
+++ b/lib/screens/v2/widget_instance/footer.ex
@@ -3,16 +3,23 @@ defmodule Screens.V2.WidgetInstance.Footer do
 
   alias ScreensConfig.Screen
 
-  defstruct screen: nil
+  defstruct screen: nil, variant: nil
 
   @type t :: %__MODULE__{
-          screen: Screen.t()
+          screen: Screen.t(),
+          variant: atom() | nil
         }
 
+  def serialize(%__MODULE__{variant: variant}) do
+    %{variant: variant}
+  end
+
   defimpl Screens.V2.WidgetInstance do
+    alias Screens.V2.WidgetInstance.Footer
+
     def priority(_instance), do: [1]
 
-    def serialize(_instance), do: %{}
+    def serialize(instance), do: Footer.serialize(instance)
 
     def slot_names(_instance), do: [:footer]
 
diff --git a/lib/screens/v2/widget_instance/normal_header.ex b/lib/screens/v2/widget_instance/normal_header.ex
index 90ba5ad88..ecdcfe9d5 100644
--- a/lib/screens/v2/widget_instance/normal_header.ex
+++ b/lib/screens/v2/widget_instance/normal_header.ex
@@ -8,14 +8,16 @@ defmodule Screens.V2.WidgetInstance.NormalHeader do
   defstruct screen: nil,
             icon: nil,
             text: nil,
-            time: nil
+            time: nil,
+            variant: nil
 
   @type icon :: :logo | :green_b | :green_c | :green_d | :green_e
   @type t :: %__MODULE__{
           screen: ScreensConfig.Screen.t(),
           icon: icon | nil,
           text: String.t(),
-          time: DateTime.t()
+          time: DateTime.t(),
+          variant: atom() | nil
         }
 
   # Mercury adds their own time so we omit the time in the response.
@@ -24,8 +26,14 @@ defmodule Screens.V2.WidgetInstance.NormalHeader do
     %{icon: icon, text: text, show_to: showing_destination?(t)}
   end
 
-  def serialize(%__MODULE__{icon: icon, text: text, time: time} = t) do
-    %{icon: icon, text: text, time: DateTime.to_iso8601(time), show_to: showing_destination?(t)}
+  def serialize(%__MODULE__{icon: icon, text: text, time: time, variant: variant} = t) do
+    %{
+      icon: icon,
+      text: text,
+      time: DateTime.to_iso8601(time),
+      show_to: showing_destination?(t),
+      variant: variant
+    }
   end
 
   def slot_names(%__MODULE__{screen: %Screen{app_id: :dup_v2}}) do
diff --git a/test/screens/v2/candidate_generator/elevator/closures_test.exs b/test/screens/v2/candidate_generator/elevator/closures_test.exs
index 5cd56f596..28360d7a6 100644
--- a/test/screens/v2/candidate_generator/elevator/closures_test.exs
+++ b/test/screens/v2/candidate_generator/elevator/closures_test.exs
@@ -5,6 +5,7 @@ defmodule Screens.V2.CandidateGenerator.Elevator.ClosuresTest do
   alias Screens.Routes.Route
   alias Screens.Stops.Stop
   alias Screens.V2.CandidateGenerator.Elevator.Closures, as: ElevatorClosures
+  alias Screens.V2.WidgetInstance.{Footer, NormalHeader}
   alias ScreensConfig.Screen
   alias ScreensConfig.V2.Elevator
 
@@ -17,18 +18,31 @@ defmodule Screens.V2.CandidateGenerator.Elevator.ClosuresTest do
   @route injected(Route)
   @stop injected(Stop)
 
-  describe "elevator_status_instances/1" do
+  describe "elevator_status_instances/3" do
     setup do
+      config = %Elevator{
+        elevator_id: "111",
+        accessible_path_direction_arrow: :n,
+        alternate_direction_text: "Test"
+      }
+
       %{
-        config: %Elevator{
-          elevator_id: "111",
-          accessible_path_direction_arrow: :n,
-          alternate_direction_text: "Test"
-        }
+        config: config,
+        header_instance: %NormalHeader{
+          screen: config,
+          icon: nil,
+          text: "Elevator 1",
+          time: ~U[2020-04-06T10:00:00Z]
+        },
+        footer_instance: %Footer{screen: config}
       }
     end
 
-    test "Only returns alerts with effect of :elevator_closure", %{config: config} do
+    test "Only returns alerts with effect of :elevator_closure", %{
+      config: config,
+      header_instance: header_instance,
+      footer_instance: footer_instance
+    } do
       expect(@facility, :fetch_stop_for_facility, fn "111" -> {:ok, %Stop{id: "place-test"}} end)
 
       expect(@stop, :fetch_parent_station_name_map, fn ->
@@ -60,6 +74,7 @@ defmodule Screens.V2.CandidateGenerator.Elevator.ClosuresTest do
       end)
 
       [
+        ^header_instance,
         %Screens.V2.WidgetInstance.ElevatorClosures{
           app_params: ^config,
           in_station_closures: [
@@ -72,14 +87,21 @@ defmodule Screens.V2.CandidateGenerator.Elevator.ClosuresTest do
             }
           ],
           other_stations_with_closures: []
-        }
+        },
+        ^footer_instance
       ] =
         ElevatorClosures.elevator_status_instances(
-          struct(Screen, app_id: :elevator_v2, app_params: config)
+          struct(Screen, app_id: :elevator_v2, app_params: config),
+          header_instance,
+          footer_instance
         )
     end
 
-    test "Groups outside closures by station", %{config: config} do
+    test "Groups outside closures by station", %{
+      config: config,
+      header_instance: header_instance,
+      footer_instance: footer_instance
+    } do
       expect(@facility, :fetch_stop_for_facility, fn "111" -> {:ok, %Stop{id: "place-test"}} end)
 
       expect(@stop, :fetch_parent_station_name_map, fn ->
@@ -116,6 +138,7 @@ defmodule Screens.V2.CandidateGenerator.Elevator.ClosuresTest do
       end)
 
       [
+        ^header_instance,
         %Screens.V2.WidgetInstance.ElevatorClosures{
           app_params: ^config,
           in_station_closures: [],
@@ -142,14 +165,21 @@ defmodule Screens.V2.CandidateGenerator.Elevator.ClosuresTest do
               ]
             }
           ]
-        }
+        },
+        ^footer_instance
       ] =
         ElevatorClosures.elevator_status_instances(
-          struct(Screen, app_id: :elevator_v2, app_params: config)
+          struct(Screen, app_id: :elevator_v2, app_params: config),
+          header_instance,
+          footer_instance
         )
     end
 
-    test "Filters alerts with no facilities or more than one facility", %{config: config} do
+    test "Filters alerts with no facilities or more than one facility", %{
+      config: config,
+      header_instance: header_instance,
+      footer_instance: footer_instance
+    } do
       expect(@facility, :fetch_stop_for_facility, fn "111" -> {:ok, %Stop{id: "place-test"}} end)
 
       expect(@stop, :fetch_parent_station_name_map, fn ->
@@ -181,18 +211,26 @@ defmodule Screens.V2.CandidateGenerator.Elevator.ClosuresTest do
       end)
 
       [
+        ^header_instance,
         %Screens.V2.WidgetInstance.ElevatorClosures{
           app_params: ^config,
           in_station_closures: [],
           other_stations_with_closures: []
-        }
+        },
+        ^footer_instance
       ] =
         ElevatorClosures.elevator_status_instances(
-          struct(Screen, app_id: :elevator_v2, app_params: config)
+          struct(Screen, app_id: :elevator_v2, app_params: config),
+          header_instance,
+          footer_instance
         )
     end
 
-    test "Return empty routes on API error", %{config: config} do
+    test "Return empty routes on API error", %{
+      config: config,
+      header_instance: header_instance,
+      footer_instance: footer_instance
+    } do
       expect(@facility, :fetch_stop_for_facility, fn "111" -> {:ok, %Stop{id: "place-test"}} end)
 
       expect(@stop, :fetch_parent_station_name_map, fn ->
@@ -218,6 +256,7 @@ defmodule Screens.V2.CandidateGenerator.Elevator.ClosuresTest do
       end)
 
       [
+        ^header_instance,
         %Screens.V2.WidgetInstance.ElevatorClosures{
           app_params: ^config,
           in_station_closures: [
@@ -230,10 +269,13 @@ defmodule Screens.V2.CandidateGenerator.Elevator.ClosuresTest do
             }
           ],
           other_stations_with_closures: []
-        }
+        },
+        ^footer_instance
       ] =
         ElevatorClosures.elevator_status_instances(
-          struct(Screen, app_id: :elevator_v2, app_params: config)
+          struct(Screen, app_id: :elevator_v2, app_params: config),
+          header_instance,
+          footer_instance
         )
     end
   end
diff --git a/test/screens/v2/candidate_generator/elevator_test.exs b/test/screens/v2/candidate_generator/elevator_test.exs
index b3404abda..555459187 100644
--- a/test/screens/v2/candidate_generator/elevator_test.exs
+++ b/test/screens/v2/candidate_generator/elevator_test.exs
@@ -3,7 +3,7 @@ defmodule Screens.V2.CandidateGenerator.ElevatorTest do
 
   alias ScreensConfig.{Screen, V2}
   alias Screens.V2.CandidateGenerator.Elevator
-  alias Screens.V2.WidgetInstance.ElevatorClosures
+  alias Screens.V2.WidgetInstance.{Footer, NormalHeader}
 
   setup do
     config = %Screen{
@@ -25,25 +25,36 @@ defmodule Screens.V2.CandidateGenerator.ElevatorTest do
     test "returns template" do
       assert {:screen,
               %{
-                normal: [:main_content]
+                normal: [:header, :main_content, :footer]
               }} == Elevator.screen_template()
     end
   end
 
   describe "candidate_instances/4" do
-    test "returns expected content", %{config: config} do
+    test "returns expected header and footer", %{config: config} do
       now = ~U[2020-04-06T10:00:00Z]
-      elevator_instances = [struct(ElevatorClosures)]
-      elevator_closure_instances_fn = fn _, _ -> elevator_instances end
+
+      expected_header = %NormalHeader{
+        screen: config,
+        icon: nil,
+        text: "Elevator 1",
+        time: now
+      }
+
+      expected_footer = %Footer{screen: config}
+      elevator_closure_instances_fn = fn _, _, _ -> [expected_header, expected_footer] end
       evergreen_content_instances_fn = fn _, _ -> [] end
 
-      assert elevator_instances ==
-               Elevator.candidate_instances(
-                 config,
-                 now,
-                 elevator_closure_instances_fn,
-                 evergreen_content_instances_fn
-               )
+      actual_instances =
+        Elevator.candidate_instances(
+          config,
+          now,
+          elevator_closure_instances_fn,
+          evergreen_content_instances_fn
+        )
+
+      assert expected_header in actual_instances
+      assert expected_footer in actual_instances
     end
   end
 end
diff --git a/test/screens/v2/widget_instance/elevator_closures_test.exs b/test/screens/v2/widget_instance/elevator_closures_test.exs
index 8ed432d32..3564088e3 100644
--- a/test/screens/v2/widget_instance/elevator_closures_test.exs
+++ b/test/screens/v2/widget_instance/elevator_closures_test.exs
@@ -37,15 +37,14 @@ defmodule Screens.V2.WidgetInstance.ElevatorClosuresTest do
               }
             ]
           }
-        ],
-        now: ~U[2024-11-27T05:00:00Z]
+        ]
       }
     }
   end
 
   describe "priority/1" do
-    test "returns 0", %{instance: instance} do
-      assert [0] == WidgetInstance.priority(instance)
+    test "returns 1", %{instance: instance} do
+      assert [1] == WidgetInstance.priority(instance)
     end
   end
 
@@ -60,8 +59,7 @@ defmodule Screens.V2.WidgetInstance.ElevatorClosuresTest do
                  instance.app_params.accessible_path_image_here_coordinates,
                accessible_path_image_url: instance.app_params.accessible_path_image_url,
                alternate_direction_text: instance.app_params.alternate_direction_text,
-               id: instance.app_params.elevator_id,
-               time: "2024-11-27T05:00:00Z"
+               id: instance.app_params.elevator_id
              } == WidgetInstance.serialize(instance)
     end
   end
diff --git a/test/screens/v2/widget_instance/normal_header_test.exs b/test/screens/v2/widget_instance/normal_header_test.exs
index 1e828eaff..6fbc15408 100644
--- a/test/screens/v2/widget_instance/normal_header_test.exs
+++ b/test/screens/v2/widget_instance/normal_header_test.exs
@@ -52,7 +52,8 @@ defmodule Screens.V2.WidgetInstance.NormalHeaderTest do
                icon: :logo,
                text: "Ruggles",
                time: "2021-03-04T11:00:00Z",
-               show_to: false
+               show_to: false,
+               variant: nil
              } == WidgetInstance.serialize(instance)
     end
   end