From 59dfb0c4fb5067006f08e7b0813d4ed0c21b74ad Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Tue, 28 Nov 2023 15:30:35 -0500
Subject: [PATCH 1/2] CSR-1841 | Ensure saving promos cleans up inactivePromos

---
 src/store/index.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/store/index.js b/src/store/index.js
index efaf5b428..1d350a143 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2130,6 +2130,17 @@ export const actions = {
     },
     // Manage promo saving to ensure a promoCode never ends up in both active and inactive
     saveActiveAndOrInactivePromos(context, { activePromos = null, inactivePromos = null }) {
+        if (inactivePromos) {
+            // Clean up inactivePromos
+            // Remove bundle identifier
+            inactivePromos = inactivePromos.map((promoCode) =>
+                getPromoCodeWithoutBundleIdentifier(promoCode)
+            );
+            // Remove duplicates
+            inactivePromos = inactivePromos.filter(
+                (promoCode, index) => inactivePromos.indexOf(promoCode) === index
+            );
+        }
         activePromos = activePromos?.slice(0);
         inactivePromos = inactivePromos?.slice(0);
         let activePromosToSave;

From 5ea8c3901e49128ac6fda857e275f6018ae8d1cb Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Thu, 30 Nov 2023 16:32:57 -0500
Subject: [PATCH 2/2] CSR-1860 fix font size and color for payment page.

---
 public/css/hop-styling.css   | 5 ++++-
 public/scss/hop-styling.scss | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/public/css/hop-styling.css b/public/css/hop-styling.css
index 1c0b155a0..cd94e3024 100644
--- a/public/css/hop-styling.css
+++ b/public/css/hop-styling.css
@@ -5,7 +5,7 @@
 body {
   font-family: Roboto;
   font-weight: 400;
-  color: #4D5151;
+  color: #000;
   margin: 0;
   background-color: white;
   padding: 8px;
@@ -33,6 +33,7 @@ body .headerlinecontainer .headerline1 {
   line-height: 32px;
   font-weight: 400;
   margin: 24px 0;
+  text-align: center;
 }
 body input,
 body select {
@@ -42,6 +43,8 @@ body input {
   border-radius: 8px;
   border: 1px solid #8E9292;
   padding: 16px;
+  font-size: 16px;
+  color: #000;
 }
 body input:focus, body input:focus-visible {
   box-shadow: 0 0 0 2.5px #1574a1;
diff --git a/public/scss/hop-styling.scss b/public/scss/hop-styling.scss
index badab0912..5f21c46dd 100644
--- a/public/scss/hop-styling.scss
+++ b/public/scss/hop-styling.scss
@@ -5,7 +5,7 @@
 body {
     font-family: Roboto;
     font-weight: 400;
-    color: #4D5151;
+    color: #000;
     margin: 0;
     background-color: white;
     padding: 8px;
@@ -39,6 +39,7 @@ body {
             line-height: 32px;
             font-weight: 400;
             margin: 24px 0;
+            text-align: center;
         }
     }
 
@@ -51,6 +52,8 @@ body {
         border-radius: 8px;
         border: 1px solid #8E9292;
         padding: 16px;
+        font-size: 16px;
+        color: #000;
         &:focus,
         &:focus-visible {
             box-shadow: 0 0 0 2.5px #1574a1;