From 94edc455e4a89d7b0484d50044344723cecb79d0 Mon Sep 17 00:00:00 2001
From: Charlie Parker <charlie.parker@ideacrew.com>
Date: Fri, 17 May 2024 16:33:49 -0400
Subject: [PATCH] adds @bs4 arguments for render_flash calls and restores
 horizontal status in bs4 layout

---
 app/views/layouts/bootstrap_4.html.erb            | 6 +++++-
 app/views/layouts/bootstrap_4_two_column.html.erb | 2 +-
 app/views/layouts/progress.html.erb               | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/bootstrap_4.html.erb b/app/views/layouts/bootstrap_4.html.erb
index 9561057641b..7720dd9b829 100644
--- a/app/views/layouts/bootstrap_4.html.erb
+++ b/app/views/layouts/bootstrap_4.html.erb
@@ -47,7 +47,11 @@
         <%= render 'users/security_question_responses/modal' %>
       <% end %>
 
-      <%= render_flash(use_bs4: @bs4) %>
+      <%= render_flash use_bs4: @bs4 %>
+
+      <aside class="container">
+        <%= yield :horizontal_status %>
+      </aside>
 
       <% if content_for? :content %>
         <%= yield :content %>
diff --git a/app/views/layouts/bootstrap_4_two_column.html.erb b/app/views/layouts/bootstrap_4_two_column.html.erb
index 3bf95e26fa7..0510949a778 100644
--- a/app/views/layouts/bootstrap_4_two_column.html.erb
+++ b/app/views/layouts/bootstrap_4_two_column.html.erb
@@ -40,7 +40,7 @@
         </div>
         <div class="col-md-10">
           <div class="col-xs-12 notice">
-            <%= render_flash %>
+            <%= render_flash use_bs4: @bs4 %>
           </div>
           <%= yield %>
         </div>
diff --git a/app/views/layouts/progress.html.erb b/app/views/layouts/progress.html.erb
index 1b4154056c9..3aac7f06523 100644
--- a/app/views/layouts/progress.html.erb
+++ b/app/views/layouts/progress.html.erb
@@ -45,7 +45,7 @@
       <% end %>
 
       <div class="mt-4 mb-4">
-        <%= render_flash(use_bs4: true) %>
+        <%= render_flash use_bs4: @bs4 %>
         <div class="container mt-4">
           <div class="row">
             <div class="col-sm-12 col-md-12 col-lg-3 mr-auto p-0">