From 2c7c86feb9aee9ebb81bb489668784a712125513 Mon Sep 17 00:00:00 2001
From: Tim Smith <tim.smith@shopify.com>
Date: Mon, 24 Nov 2025 11:24:54 -0500
Subject: [PATCH 1/2] Check deployment checks before CD delayed

---
 app/views/shipit/stacks/_banners.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/shipit/stacks/_banners.html.erb b/app/views/shipit/stacks/_banners.html.erb
index 9d829026f..7daee7532 100644
--- a/app/views/shipit/stacks/_banners.html.erb
+++ b/app/views/shipit/stacks/_banners.html.erb
@@ -62,7 +62,7 @@
   </div>
 <% end %>
 
-<% if stack.continuous_delivery_delayed? %>
+<% if !stack.deployment_checks_passed? %>
   <div class="banner">
     <div class="banner__inner wrapper">
       <div class="banner__content">
@@ -76,7 +76,7 @@
       </div>
     </div>
   </div>
-<% elsif !stack.deployment_checks_passed? %>
+<% elsif stack.continuous_delivery_delayed? %>
   <div class="banner banner--orange">
     <div class="banner__inner wrapper">
       <div class="banner__content">

From 4f939f26151621af7177ca009eb0804463d90807 Mon Sep 17 00:00:00 2001
From: Tim Smith <tim.smith@shopify.com>
Date: Mon, 24 Nov 2025 12:13:19 -0500
Subject: [PATCH 2/2] move code around

---
 app/views/shipit/stacks/_banners.html.erb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/shipit/stacks/_banners.html.erb b/app/views/shipit/stacks/_banners.html.erb
index 7daee7532..47a674e8b 100644
--- a/app/views/shipit/stacks/_banners.html.erb
+++ b/app/views/shipit/stacks/_banners.html.erb
@@ -63,26 +63,26 @@
 <% end %>
 
 <% if !stack.deployment_checks_passed? %>
-  <div class="banner">
+<div class="banner banner--orange">
     <div class="banner__inner wrapper">
       <div class="banner__content">
-        <h2 class="banner__title">Continuous Delivery Delayed!</h2>
-        <p class="banner__text">
-          Continuous Delivery for this stack is currently paused because
-
-          <%= link_to_if stack.deployment_checks_passed?, 'the pre-deploy checks failed', stack_commit_checks_path(stack, sha: stack.next_commit_to_deploy.sha) %>.
-          You can either wait for them to pass, or trigger a deploy manually.
+        <h2 class="banner__title">Stack has been locked by external system!</h2>
+        <p class = "banner__text">
+          <%= simple_format(deployment_checks_message(stack)) %>
         </p>
       </div>
     </div>
   </div>
 <% elsif stack.continuous_delivery_delayed? %>
-  <div class="banner banner--orange">
+  <div class="banner">
     <div class="banner__inner wrapper">
       <div class="banner__content">
-        <h2 class="banner__title">Stack has been locked by external system!</h2>
-        <p class = "banner__text">
-          <%= simple_format(deployment_checks_message(stack)) %>
+        <h2 class="banner__title">Continuous Delivery Delayed!</h2>
+        <p class="banner__text">
+          Continuous Delivery for this stack is currently paused because
+
+          <%= link_to_if stack.deployment_checks_passed?, 'the pre-deploy checks failed', stack_commit_checks_path(stack, sha: stack.next_commit_to_deploy.sha) %>.
+          You can either wait for them to pass, or trigger a deploy manually.
         </p>
       </div>
     </div>