From 5803b4dcbb7a0945830f1e0fce68adaff26562c4 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Wed, 30 Mar 2022 13:15:51 -0400
Subject: [PATCH] CSR-98 Cleanup

---
 src/helpers/heritage-integration/cookie-helper.js     | 8 ++------
 src/helpers/heritage-integration/navigation-helper.js | 3 ---
 src/helpers/heritage-integration/order-helper.spec.js | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/helpers/heritage-integration/cookie-helper.js b/src/helpers/heritage-integration/cookie-helper.js
index 18632fc51..f8cf05174 100644
--- a/src/helpers/heritage-integration/cookie-helper.js
+++ b/src/helpers/heritage-integration/cookie-helper.js
@@ -26,15 +26,11 @@ export function updateOrCreateFunnelCookie() {
     Returns null if cookie isn't valid JSON.
 */    
 export function getFunnelCookie() {
-    console.log("getConceptCookie")
-    console.log(document.cookie)
-    console.log(location.hostname)
-    console.log(getDomainWithoutSubdomain())
     const cookieJson = document.cookie
         ?.split("; ")
         ?.find(row => row.startsWith(`${cookieNames.FUNNEL_SESSION_INFO}=`))
         ?.split("=")[1];
-    console.log(cookieJson)
+        
     try {
         return JSON.parse(cookieJson);
     } catch (error) {
@@ -75,7 +71,7 @@ export function getCookieDomainValue() {
 
 function getDomainWithoutSubdomain() {
     let url = location.hostname;
-    if (url == "localhost") {
+    if (url.includes("localhost")) {
         return "localhost";
     }
 
diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index b6fd5a5b4..12207acf4 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -67,9 +67,6 @@ export async function navigateToHeritageFunnel() {
         {
             corid: store.getters.order.referralCorrelationId,
             src: "concept-funnel",
-            // TODO CSR-28, remove this
-            cns: "all",
-            experiments: "RemoveServiceAreaPage=ServAreaRemoval_V7=ServAreaNoRemove_V7_TEST=true,ConceptFunnel=ConceptFunnel_V1=ConceptFunnel_TEST=true"
         }
     );
 }
\ No newline at end of file
diff --git a/src/helpers/heritage-integration/order-helper.spec.js b/src/helpers/heritage-integration/order-helper.spec.js
index 382132bbe..d53afc232 100644
--- a/src/helpers/heritage-integration/order-helper.spec.js
+++ b/src/helpers/heritage-integration/order-helper.spec.js
@@ -19,7 +19,7 @@ describe("loadOrderIfPresent", () => {
             ShouldResetState: testShouldResetState
         }
 
-        document.cookie = `${cookieNames.ORDER_INFO}=${JSON.stringify(testCookieValue)}; path=/; domain=.safelite.com`;
+        document.cookie = `${cookieNames.ORDER_INFO}=${JSON.stringify(testCookieValue)}; path=/; ${cookieHelper.getCookieDomainValue()}`;
 
         // Act
         loadOrderIfPresent();