From aefe924060812f2f7f21d9030e8016c55ced4c49 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 29 Jun 2023 06:30:49 -0400
Subject: [PATCH 1/4] swapped crypto with uuid() for generating ids for
 components when customId is not supplied

---
 .../button-question/button-question.spec.js          |  3 ---
 .../dropdown-question/dropdown-question.spec.js      |  4 +---
 .../dropdown-question/dropdown-question.vue          | 12 ++++++------
 src/digital-components/modal/modal.spec.js           |  4 +---
 src/digital-components/modal/modal.vue               |  5 ++++-
 .../textbox-question/textbox-question.spec.js        |  3 ---
 .../textbox-question/textbox-question.vue            |  7 ++++---
 .../content-group-modal/content-group-modal.spec.js  |  3 ---
 .../address-questions/address-questions.vue          |  4 ++--
 .../mobile-location-modal-questions.spec.js          |  5 -----
 .../mobile-location-modal-questions.vue              |  4 +++-
 .../service-zip-modal-question.spec.js               |  2 --
 12 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/src/digital-components/button-question/button-question.spec.js b/src/digital-components/button-question/button-question.spec.js
index ce8d87fab..e9e1d70a4 100644
--- a/src/digital-components/button-question/button-question.spec.js
+++ b/src/digital-components/button-question/button-question.spec.js
@@ -1,9 +1,6 @@
 import { shallowMount, mount } from "@vue/test-utils";
 import buttonQuestion from "./button-question";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
-import crypto from "crypto";
-
-global.crypto = crypto;
 
 describe("buttonQuestion.vue", () => {
     it("Should show overflow classes on fieldset if isOverflowScrollable is true", () => {
diff --git a/src/digital-components/dropdown-question/dropdown-question.spec.js b/src/digital-components/dropdown-question/dropdown-question.spec.js
index 654709926..8d7a28a85 100644
--- a/src/digital-components/dropdown-question/dropdown-question.spec.js
+++ b/src/digital-components/dropdown-question/dropdown-question.spec.js
@@ -1,6 +1,6 @@
 import { shallowMount } from "@vue/test-utils";
 import dropdownQuestion from "./dropdown-question";
-import crypto from "crypto";
+
 
 // Mock CMS content
 const questionText = "Question Text";
@@ -12,8 +12,6 @@ const mockMixin = {
     },
 };
 
-global.crypto = crypto;
-
 // TODO: Remove the following from dropdown-question.vue -> :class="(errors && errors.length) || hasError ? 'has-error' : ''"
 // It is not being used.
 describe("dropdownQuestion.vue", () => {
diff --git a/src/digital-components/dropdown-question/dropdown-question.vue b/src/digital-components/dropdown-question/dropdown-question.vue
index 5c32b298c..044b28a6c 100644
--- a/src/digital-components/dropdown-question/dropdown-question.vue
+++ b/src/digital-components/dropdown-question/dropdown-question.vue
@@ -30,27 +30,27 @@
 
 <script>
 import { useField } from "vee-validate";
+import { v4 as uuidv4 } from "uuid";
 
 export default {
     name: "dropdown-question",
     props: {
-        modelValue: String,
-        customInputId: String,
+        customDropdownId: String,
         options: {
             type: Object,
             required: true,
         },
+        modelValue: String,
         isDisabled: Boolean,
         isRequired: Boolean,
         validationRules: String,
         cmsWidgetName: String,
-        hasError: Boolean,
-        placeHolderText: String,
-        customDropdownId: String,
+        hasError: Boolean,     
     },
     setup(props) {
+        const uuid = uuidv4();
         const dropdownId = !props.customDropdownId
-            ? `dropdown-${crypto.randomUUID()}`
+            ? `dropdown-${uuid}`
             : props.customDropdownId;
 
         const propsClone = Object.assign({}, props);
diff --git a/src/digital-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
index e4d8692d4..73ad5e92f 100644
--- a/src/digital-components/modal/modal.spec.js
+++ b/src/digital-components/modal/modal.spec.js
@@ -7,15 +7,13 @@ const mockMeta = (returnValue) => jest.fn(async () => Promise.resolve(returnValu
 
 import { shallowMount } from "@vue/test-utils";
 import modal from "./modal";
-import crypto from "crypto";
+
 import { useForm } from "vee-validate";
 import { Modal } from "bootstrap";
 
 const footerButtonText = "Sample footer text here.";
 const headerText = "Sample header text here.";
 
-global.crypto = crypto;
-
 describe("modal.vue", () => {
     it("Should display modal header text when headerText is defined", async () => {
         // Arrange / Act
diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 0004be47e..e0add89dc 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -44,6 +44,7 @@
 import modalButtonMain from "@/digital-components/modal/ux-components/modal-button-main/modal-button-main";
 import { Modal } from "bootstrap";
 import { useForm } from "vee-validate";
+import { v4 as uuidv4 } from "uuid";
 
 export default {
     name: "modal",
@@ -58,7 +59,9 @@ export default {
         },
     },
     setup() {
-        const modalId = `modal-${crypto.randomUUID()}`;
+        const uuid = uuidv4(); 
+        const modalId = `modal-${uuid}`;
+
         const { meta, validate, resetForm } = useForm();
 
         return {
diff --git a/src/digital-components/textbox-question/textbox-question.spec.js b/src/digital-components/textbox-question/textbox-question.spec.js
index aea563624..be33230c2 100644
--- a/src/digital-components/textbox-question/textbox-question.spec.js
+++ b/src/digital-components/textbox-question/textbox-question.spec.js
@@ -1,6 +1,5 @@
 import { shallowMount } from "@vue/test-utils";
 import textboxQuestion from "./textbox-question";
-import crypto from "crypto";
 
 // Mock CMS content
 const questionText = "Question Text";
@@ -13,8 +12,6 @@ const mockMixin = {
 };
 const maska = jest.fn();
 
-global.crypto = crypto;
-
 describe("textboxQuestion.vue", () => {
     it("Should render a text input", async () => {
         // Arrange
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index a4de11254..ca182d348 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -77,13 +77,14 @@
 
 <script>
 import { useField, validate } from "vee-validate";
-import { storeActions } from "@/constants/store-actions";
 import loader from "@/ux-components/loader/loader.vue";
 import { ref } from "vue";
+import { v4 as uuidv4 } from "uuid";
 
 export default {
     name: "textbox-question",
     props: {
+        customInputId: String,
         type: {
             type: String,
             default: "text",
@@ -97,7 +98,6 @@ export default {
             default: true,
         },
         modelValue: String,
-        customInputId: String,
         isDisabled: Boolean,
         isRequired: Boolean,
         hasIcon: Boolean, // If input has an icon
@@ -120,7 +120,8 @@ export default {
         centerErrorMessage: Boolean,
     },
     setup(props) {
-        const inputId = !props.customInputId ? `input-${crypto.randomUUID()}` : props.customInputId;
+        const uuid = uuidv4(); 
+        const inputId = !props.customInputId ? `input-${uuid}` : props.customInputId;
 
         const propsClone = Object.assign({}, props);
         const modelValue = propsClone.modelValue;
diff --git a/src/fmg-components/content-group-modal/content-group-modal.spec.js b/src/fmg-components/content-group-modal/content-group-modal.spec.js
index cbdf6e182..a8058b2d5 100644
--- a/src/fmg-components/content-group-modal/content-group-modal.spec.js
+++ b/src/fmg-components/content-group-modal/content-group-modal.spec.js
@@ -1,8 +1,5 @@
 import { mount } from "@vue/test-utils";
 import contentGroupModal from "./content-group-modal";
-import crypto from "crypto";
-
-global.crypto = crypto;
 
 describe("content-group-modal.vue", () => {
     it("Should display header text when HeaderText is defined in the CMS", async () => {
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 3ad8a8df2..2505715bc 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -1,6 +1,6 @@
 <template>
-    <div class="address-questions" role="application">
-        <div class="row mb-4">
+    <div class="address-questions" >
+        <div class="row mb-4" aria-live="polite">
             <div class="col">
                 <textboxQuestion
                     id="streetAddressField"
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
index 66bd93799..7f9ba0656 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
@@ -2,11 +2,6 @@ import mobileLocationModalQuestions from "./mobile-location-modal-questions";
 import { mount, shallowMount } from "@vue/test-utils";
 import { storeActions } from "@/constants/store-actions";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
-import modal from "@/digital-components/modal/modal";
-
-import crypto from "crypto";
-
-global.crypto = crypto;
 
 const linkWidgetName = "linkWidgetName";
 const modalWidgetName = "modalWidgetName";
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index eebaaab07..8eab8d799 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -76,6 +76,7 @@ import {
 
 // Validation
 import { useField } from "vee-validate";
+import { v4 as uuidv4 } from "uuid";
 
 export default {
     name: "mobile-location-modal-questions",
@@ -89,8 +90,9 @@ export default {
         };
     },
     setup(props) {
+        const uuid = uuidv4(); 
         const componentId = !props.customComponentId
-            ? `component-${crypto.randomUUID()}`
+            ? `component-${uuid}`
             : props.customComponentId;
 
         // Integrate this component as a single field with an object for it's value into the page level validation
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
index 6c9cf42f5..c1ebd65af 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
@@ -1,7 +1,5 @@
 import { mount, shallowMount } from "@vue/test-utils";
 import serviceZipModalQuestion from "./service-zip-modal-question";
-import crypto from "crypto";
-global.crypto = crypto;
 
 jest.mock("@/digital-components/textbox-question/textbox-question", () => ({
     getCmsContent: jest.fn((widgetName, cmsFieldName) => {

From 6c313c151eaf445101c355f2aabb14738630a8d5 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 29 Jun 2023 07:02:54 -0400
Subject: [PATCH 2/4] Moved address-questions into fmg-components per tech
 review comments

---
 .../address-questions/address-questions.spec.js                | 2 +-
 .../address-questions/address-questions.vue                    | 0
 .../address-lookup/customer-questions/customer-questions.vue   | 2 +-
 .../mobile-location-modal-questions.vue                        | 3 +--
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename src/{layouts/address-lookup/customer-questions => fmg-components}/address-questions/address-questions.spec.js (99%)
 rename src/{layouts/address-lookup/customer-questions => fmg-components}/address-questions/address-questions.vue (100%)

diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js b/src/fmg-components/address-questions/address-questions.spec.js
similarity index 99%
rename from src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
rename to src/fmg-components/address-questions/address-questions.spec.js
index 26a81341a..f0d508943 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
+++ b/src/fmg-components/address-questions/address-questions.spec.js
@@ -1,5 +1,5 @@
 // Components
-import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
+import addressQuestions from "@/fmg-components/address-questions/address-questions";
 import alert from "@/ux-components/alert/alert";
 
 // Supporting Files
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/fmg-components/address-questions/address-questions.vue
similarity index 100%
rename from src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
rename to src/fmg-components/address-questions/address-questions.vue
diff --git a/src/layouts/address-lookup/customer-questions/customer-questions.vue b/src/layouts/address-lookup/customer-questions/customer-questions.vue
index 325f8c380..fcc70765a 100644
--- a/src/layouts/address-lookup/customer-questions/customer-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/customer-questions.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
+import addressQuestions from "@/fmg-components/address-questions/address-questions";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index ca286ef65..6fb92e2b8 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -65,7 +65,7 @@ import textLink from "@/ux-components/text-link/text-link";
 import textBlock from "@/digital-components/text-block/text-block";
 import modal from "@/digital-components/modal/modal";
 import alert from "@/ux-components/alert/alert";
-import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
+import addressQuestions from "@/fmg-components/address-questions/address-questions";
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
 
 // Helpers
@@ -85,7 +85,6 @@ export default {
         return {
             internalModel: deepClone(this.modelValue),
             displayInvalidZipAlert: false,
-            addressQuestionsKey: 0,
             isModalOpened: false,
         };
     },

From a0b699534709acaa0d6f94a21114a5c99efc3794 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 29 Jun 2023 09:01:19 -0400
Subject: [PATCH 3/4] Prettified

---
 .../dropdown-question/dropdown-question.spec.js             | 1 -
 .../dropdown-question/dropdown-question.vue                 | 6 ++----
 src/digital-components/modal/modal.vue                      | 2 +-
 .../textbox-question/textbox-question.vue                   | 2 +-
 .../address-questions/address-questions.vue                 | 2 +-
 .../mobile-location-modal-questions.vue                     | 2 +-
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/digital-components/dropdown-question/dropdown-question.spec.js b/src/digital-components/dropdown-question/dropdown-question.spec.js
index 8d7a28a85..52ed6e7a2 100644
--- a/src/digital-components/dropdown-question/dropdown-question.spec.js
+++ b/src/digital-components/dropdown-question/dropdown-question.spec.js
@@ -1,7 +1,6 @@
 import { shallowMount } from "@vue/test-utils";
 import dropdownQuestion from "./dropdown-question";
 
-
 // Mock CMS content
 const questionText = "Question Text";
 const mockMixin = {
diff --git a/src/digital-components/dropdown-question/dropdown-question.vue b/src/digital-components/dropdown-question/dropdown-question.vue
index 044b28a6c..0fc4a977c 100644
--- a/src/digital-components/dropdown-question/dropdown-question.vue
+++ b/src/digital-components/dropdown-question/dropdown-question.vue
@@ -45,13 +45,11 @@ export default {
         isRequired: Boolean,
         validationRules: String,
         cmsWidgetName: String,
-        hasError: Boolean,     
+        hasError: Boolean,
     },
     setup(props) {
         const uuid = uuidv4();
-        const dropdownId = !props.customDropdownId
-            ? `dropdown-${uuid}`
-            : props.customDropdownId;
+        const dropdownId = !props.customDropdownId ? `dropdown-${uuid}` : props.customDropdownId;
 
         const propsClone = Object.assign({}, props);
         const modelValue = propsClone.modelValue;
diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index e0add89dc..2956e7784 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -59,7 +59,7 @@ export default {
         },
     },
     setup() {
-        const uuid = uuidv4(); 
+        const uuid = uuidv4();
         const modalId = `modal-${uuid}`;
 
         const { meta, validate, resetForm } = useForm();
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index ca182d348..1c87a2ac5 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -120,7 +120,7 @@ export default {
         centerErrorMessage: Boolean,
     },
     setup(props) {
-        const uuid = uuidv4(); 
+        const uuid = uuidv4();
         const inputId = !props.customInputId ? `input-${uuid}` : props.customInputId;
 
         const propsClone = Object.assign({}, props);
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 2505715bc..27e86f6f9 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="address-questions" >
+    <div class="address-questions">
         <div class="row mb-4" aria-live="polite">
             <div class="col">
                 <textboxQuestion
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 8eab8d799..fc740441b 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -90,7 +90,7 @@ export default {
         };
     },
     setup(props) {
-        const uuid = uuidv4(); 
+        const uuid = uuidv4();
         const componentId = !props.customComponentId
             ? `component-${uuid}`
             : props.customComponentId;

From 0034c41c453e7f6b195d825666b028c975e1ba43 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Thu, 29 Jun 2023 15:33:09 -0400
Subject: [PATCH 4/4] Rename Provider Zip Code + Add ZipCtu

---
 src/layouts/schedule/schedule.vue             |  2 +-
 .../service-location-helper.spec.js           |  3 +-
 .../service-location/service-location.vue     |  4 +--
 src/store/index.js                            | 32 ++++++++++++++-----
 src/store/store.spec.js                       | 24 +++++++++-----
 5 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index c3ada3dcc..e26a6c76c 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -215,7 +215,7 @@ export default {
 
         const alertReasonsPromise = locationAlerts.methods.loadInitialData(
             store.getters.order.serviceLocation.zipCodeCtu,
-            store.getters.order.serviceLocation.provider?.address?.zipCtu
+            store.getters.order.serviceLocation.provider?.address?.zipCodeCtu
         );
         // Settle promises and get results
         const promiseResultMap = [
diff --git a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js
index 81d336968..c89ddf973 100644
--- a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js
+++ b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js
@@ -42,7 +42,8 @@ jest.mock("@/store", () => ({
                         streetAddress: null,
                         city: null,
                         state: null,
-                        zip: null,
+                        zipCode: null,
+                        zipCodeCtu: null,
                     },
                 },
             },
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 3b4cd4458..2c0e0619b 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -393,8 +393,8 @@ export default {
                             streetAddress: this.selectedProvider?.address?.streetAddress,
                             city: this.selectedProvider?.address?.city,
                             state: this.selectedProvider?.address?.state,
-                            zip: this.selectedProvider?.address?.zipCode,
-                            zipCtu: this.selectedProvider?.address?.zipCodeCtu,
+                            zipCode: this.selectedProvider?.address?.zipCode,
+                            zipCodeCtu: this.selectedProvider?.address?.zipCodeCtu,
                         },
                     },
                 },
diff --git a/src/store/index.js b/src/store/index.js
index 5c290b1cd..7e7dfffaf 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -54,7 +54,8 @@ const getDefaultState = () => {
                         streetAddress: null,
                         city: null,
                         state: null,
-                        zip: null,
+                        zipCode: null,
+                        zipCodeCtu: null,
                     },
                 },
             },
@@ -265,7 +266,8 @@ export const mutations = {
                 streetAddress: serviceLocationInfo.provider?.address?.streetAddress,
                 city: serviceLocationInfo.provider?.address?.city,
                 state: serviceLocationInfo.provider?.address?.state,
-                zip: serviceLocationInfo.provider?.address?.zip,
+                zipCode: serviceLocationInfo.provider?.address?.zipCode,
+                zipCodeCtu: serviceLocationInfo.provider?.address?.zipCodeCtu,
             },
         };
     },
@@ -380,7 +382,8 @@ export const mutations = {
                 streetAddress: null,
                 city: null,
                 state: null,
-                zip: null,
+                zipCode: null,
+                zipCodeCtu: null,
             },
         };
     },
@@ -469,8 +472,10 @@ export const mutations = {
             sessionInformation.order.serviceLocation.provider?.address?.city;
         state.order.serviceLocation.provider.address.state =
             sessionInformation.order.serviceLocation.provider?.address?.state;
-        state.order.serviceLocation.provider.address.zip =
-            sessionInformation.order.serviceLocation.provider?.address?.zip;
+        state.order.serviceLocation.provider.address.zipCode =
+            sessionInformation.order.serviceLocation.provider?.address?.zipCode;
+        state.order.serviceLocation.provider.address.zipCodeCtu =
+            sessionInformation.order.serviceLocation.provider?.address?.zipCodeCtu;
 
         state.order.payment.isInsurance = sessionInformation.order.payment.isInsurance;
         state.order.payment.insuranceCoverage.isVerified =
@@ -1406,8 +1411,8 @@ export const actions = {
                                     order.serviceLocation.provider?.address?.streetAddress,
                                 city: order.serviceLocation.provider?.address?.city,
                                 state: order.serviceLocation.provider?.address?.state,
-                                zip: order.serviceLocation.provider?.address?.zip,
-                                zipCtu: order.serviceLocation.provider?.address?.zipCtu,
+                                zipCode: order.serviceLocation.provider?.address?.zipCode,
+                                zipCodeCtu: order.serviceLocation.provider?.address?.zipCodeCtu,
                             },
                         },
                     },
@@ -1917,7 +1922,7 @@ export const actions = {
         if (context.state.order.serviceLocation) {
             if (
                 serviceLocationInfo.zipCode !== context.state.order.serviceLocation.zipCode ||
-                !deepEqual(
+                !providersEqual(
                     serviceLocationInfo.provider,
                     context.state.order.serviceLocation.provider
                 ) ||
@@ -2147,6 +2152,17 @@ function convertGlassPieceToBackEndCompatibleFormat(glassPieces) {
     });
 }
 
+function providersEqual(providerA, providerB) {
+    return (
+        providerA.providerNumber === providerB.providerNumber &&
+        providerA.address?.city === providerB.address?.city &&
+        providerA.address?.state === providerB.address?.state &&
+        providerA.address?.streetAddress === providerB.address?.streetAddress &&
+        providerA.address?.zipCode === providerB.address?.zipCode
+    );
+    //TODO: Change back to deepEqual once zipCodeCtu is added to saveSession.
+}
+
 // This function will verify schedule info is still valid.
 // check to see if we have an appointment date on the order object.
 // if so, make sure it's not in the past. if in the past, clear schedule info in store.
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index 0cc06cf3e..1ea0125b0 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -1071,7 +1071,8 @@ describe("Actions", () => {
                                 streetAddress: "123 Test Lane",
                                 city: "Columbus",
                                 state: "OH",
-                                zip: "43212",
+                                zipCode: "43212",
+                                zipCodeCtu: "01820",
                             },
                         },
                     },
@@ -1099,7 +1100,8 @@ describe("Actions", () => {
                     streetAddress: "123 Test Lane",
                     city: "Columbus",
                     state: "OH",
-                    zip: "43212",
+                    zipCode: "43212",
+                    zipCodeCtu: "01820",
                 },
             },
         };
@@ -1130,7 +1132,8 @@ describe("Actions", () => {
                                 streetAddress: "123 Test Lane",
                                 city: "Columbus",
                                 state: "OH",
-                                zip: "43212",
+                                zipCode: "43212",
+                                zipCodeCtu: "01820",
                             },
                         },
                     },
@@ -1158,7 +1161,8 @@ describe("Actions", () => {
                     streetAddress: "321 Test Lane",
                     city: "Columbus",
                     state: "OH",
-                    zip: "43212",
+                    zipCode: "43212",
+                    zipCodeCtu: "01820",
                 },
             },
         };
@@ -1189,7 +1193,8 @@ describe("Actions", () => {
                                 streetAddress: "123 Test Lane",
                                 city: "Columbus",
                                 state: "OH",
-                                zip: "43212",
+                                zipCode: "43212",
+                                zipCodeCtu: "01820",
                             },
                         },
                     },
@@ -1217,7 +1222,8 @@ describe("Actions", () => {
                     streetAddress: "123 Test Lane",
                     city: "Columbus",
                     state: "OH",
-                    zip: "43212",
+                    zipCode: "43212",
+                    zipCodeCtu: "01820",
                 },
             },
         };
@@ -1248,7 +1254,8 @@ describe("Actions", () => {
                                 streetAddress: "123 Test Lane",
                                 city: "Columbus",
                                 state: "OH",
-                                zip: "43212",
+                                zipCode: "43212",
+                                zipCodeCtu: "01820",
                             },
                         },
                     },
@@ -1276,7 +1283,8 @@ describe("Actions", () => {
                     streetAddress: "123 Test Lane",
                     city: "Columbus",
                     state: "OH",
-                    zip: "43212",
+                    zipCode: "43212",
+                    zipCodeCtu: "01820",
                 },
             },
         };