From 9db86a9f20c4e24dda8ef08b8b8705d043b7bd53 Mon Sep 17 00:00:00 2001
From: bmauger <mauger.bryan@gmail.com>
Date: Tue, 19 Apr 2022 15:38:02 -0400
Subject: [PATCH 1/6] CSR-499 fix validation error style.

---
 src/styles/common-error-styles.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/styles/common-error-styles.scss b/src/styles/common-error-styles.scss
index 530f9c392..1602778d3 100644
--- a/src/styles/common-error-styles.scss
+++ b/src/styles/common-error-styles.scss
@@ -7,6 +7,9 @@
     input[type=radio]:focus + label {
       box-shadow: 0 0 0 2.5px $red;
     }
+    input[type=checkbox]:checked + label {
+      box-shadow: 0 0 0 1px $red !important;
+    }
     &:hover {
       box-shadow: 0px 0px 0px 4px $red-200;
       border-radius: 10px !important;

From 79487043240e45d9ac4436c1ac9782ae9cbbe8c1 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Tue, 19 Apr 2022 15:54:01 -0400
Subject: [PATCH 2/6] CSR-495 defect

---
 src/ux-components/alert/alert.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue
index c20ec74f0..c32f22d78 100644
--- a/src/ux-components/alert/alert.vue
+++ b/src/ux-components/alert/alert.vue
@@ -10,10 +10,10 @@
         <span v-if="copy.includes('routerLink:')" class="m-0 text-body small">
           <router-link :to="{query: {fmgPage: `${copy.split(':')[1].split(',')[0]}`}, name: 'root'}">{{ copy.split(':')[1].split(',')[1] }}</router-link>
         </span>
-        <span v-else class="m-0 text-body small">{{ copy }}</span>
+        <span v-else class="m-0 text-body small" v-html="copy"></span>
       </template>
     </p>
-    <p v-else class="m-0 text-body small">{{ alertCopy }}</p>
+    <p v-else class="m-0 text-body small" v-html="alertCopy"></p>
     <button
       type="button"
       class="btn-close p-2"
@@ -128,5 +128,8 @@ export default {
       height: 1rem;
     }
   }
+  & p {
+    margin-bottom: 0px;
+  }
 }
 </style>

From 65f69f3beba88f85afd7ff4b37830fca57107a64 Mon Sep 17 00:00:00 2001
From: Mark Harris <mark.harris@safelite.com>
Date: Tue, 19 Apr 2022 16:25:44 -0400
Subject: [PATCH 3/6] Temporary code for forcing experiments for TESTING

---
 src/router/index.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/router/index.js b/src/router/index.js
index 1759dec68..aba26be63 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -200,6 +200,13 @@ function navigateToUrl(url, optionalQuery = {}) {
     externalUrl.searchParams.append(queryKey, optionalQuery[queryKey]);
   }
 
+  /////////////////////////////////////////////////////
+  // TEMP CODE FOR TESTING WITH SPECIFIC EXPERIMENTS //
+  /////////////////////////////////////////////////////
+  if (externalUrl.search.indexOf("corid=") != -1)
+    externalUrl.search = externalUrl.search + '&experiments=CollectEmailOnQuote=CollectEmailOnQuote_V1=YesCollectEmail_TEST1=true,RemoveServiceAreaPage=ServAreaRemoval_V7=ServAreaNoRemove_V7_TEST=true,VINeducationV2=VINeducation_V2=NoShowVINmodalV2_CONTROL=true,ServicePackages=ServicePackages_V1=NoShowPackages_CONTROL=true,PhotoUploadRedesign=PhotoUploadRedesign_V1=CurrentPhotoUpload_CONTROL=true';
+  ///////////// END TEMP CODE /////////////////////////
+
   window.location.assign(externalUrl);
 }
 

From 17d436f7a7e75dd0f6371fc9ce0428393fe64a5b Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Wed, 20 Apr 2022 08:50:13 -0400
Subject: [PATCH 4/6] CSR-490 alert font-size is 14

---
 src/ux-components/alert/alert.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue
index c32f22d78..7cd719ba7 100644
--- a/src/ux-components/alert/alert.vue
+++ b/src/ux-components/alert/alert.vue
@@ -129,6 +129,7 @@ export default {
     }
   }
   & p {
+    font-size: 14px;
     margin-bottom: 0px;
   }
 }

From c640cea1cb194084af3042ad39b7cb567ec7c438 Mon Sep 17 00:00:00 2001
From: FrankRua <frank.rua@safelite.com>
Date: Wed, 20 Apr 2022 12:02:54 -0400
Subject: [PATCH 5/6] RegEx support for Safari

---
 src/helpers/heritage-integration/cookie-helper.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/helpers/heritage-integration/cookie-helper.js b/src/helpers/heritage-integration/cookie-helper.js
index 8f0a99709..bf1c56b72 100644
--- a/src/helpers/heritage-integration/cookie-helper.js
+++ b/src/helpers/heritage-integration/cookie-helper.js
@@ -67,9 +67,9 @@ export function getDeviceIdValue(){
         return cookieValuesSplit[1];
     }
 
-    const cookieValueMatch = cookieValue.match("(?<=did=).*?(?=&)");
+    const cookieValueMatch = cookieValue.match("^did=[a-f0-9]{8}(?:-[a-f0-9]{4}){3}-[a-f0-9]{12}");
     if(cookieValueMatch){
-        return cookieValueMatch[0];
+        return cookieValueMatch[0].split('=')[1];
     }
 
     return '';

From 6ac8bd1eeeecf218530baf90f3447745408084e2 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Wed, 20 Apr 2022 15:44:29 -0400
Subject: [PATCH 6/6] Edit temporary experiment forcing url for testing

---
 src/router/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/index.js b/src/router/index.js
index aba26be63..ace5b43cc 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -204,7 +204,7 @@ function navigateToUrl(url, optionalQuery = {}) {
   // TEMP CODE FOR TESTING WITH SPECIFIC EXPERIMENTS //
   /////////////////////////////////////////////////////
   if (externalUrl.search.indexOf("corid=") != -1)
-    externalUrl.search = externalUrl.search + '&experiments=CollectEmailOnQuote=CollectEmailOnQuote_V1=YesCollectEmail_TEST1=true,RemoveServiceAreaPage=ServAreaRemoval_V7=ServAreaNoRemove_V7_TEST=true,VINeducationV2=VINeducation_V2=NoShowVINmodalV2_CONTROL=true,ServicePackages=ServicePackages_V1=NoShowPackages_CONTROL=true,PhotoUploadRedesign=PhotoUploadRedesign_V1=CurrentPhotoUpload_CONTROL=true';
+    externalUrl.search = externalUrl.search + '&experiments=CollectEmailOnQuote=CollectEmailOnQuote_V1=YesCollectEmail_TEST1=true,RemoveServiceAreaPage=ServAreaRemoval_V7=ServAreaNoRemove_V7_TEST=true,VINeducationV2=VINeducation_V2=NoShowVINmodalV2_CONTROL=true,ServicePackages=ServicePackages_V1=NoShowPackages_CONTROL=true,PhotoUploadRedesign=PhotoUploadRedesign_V1=CurrentPhotoUpload_CONTROL=true,ScheduleDetailsServiceType=ScheduleBeforeServiceType_V1=ServTypeThenSched_CONTROL=true';
   ///////////// END TEMP CODE /////////////////////////
 
   window.location.assign(externalUrl);