Merge branch 'develop' into feature/CSR-478

src/helpers/heritage-integration/navigation-helper.js

@@ -66,9 +66,6 @@ export async function navigateToHeritageFunnel() {
         {
             corid: store.getters.order.referralCorrelationId,
             src: "concept-funnel",
-            // TODO CSR-28, remove this
-            cns: "all",
-            experiments: "RemoveServiceAreaPage=ServAreaRemoval_V7=NoShowPackages_CONTROL=true,ConceptFunnel=ConceptFunnel_V1=ConceptFunnel_TEST=true"
         }
     );
 }

src/layouts/vehicle-damage/vehicle-damage.vue

@@ -278,7 +278,7 @@ export default {
 
     navigateForward(partsData){
       // CSR-98 TEMP
-      const vehicleYearsToShowHeritageFunnel = [ "2001", "2002", "2010" ];
+      const vehicleYearsToShowHeritageFunnel = [ 2001, 2002, 2010 ];
       if (vehicleYearsToShowHeritageFunnel.includes(store.getters.vehicle.year)) {
         navigateToHeritageFunnel();
         return;

src/layouts/vehicle-year/vehicle-year.vue

@@ -64,8 +64,8 @@ export default {
 
   watch: {
     selectedYear(year) {
-
-      this.$store.commit(this.storeMutations.UPDATE_YEAR, year);
+      const parsedYear = parseInt(year);
+      this.$store.commit(this.storeMutations.UPDATE_YEAR, parsedYear);
       this.$router.navigateAfterSave(
         this.navigationScenarios.SELECTED_YEAR,
         this.$route

src/ux-components/alert/alert.vue

@@ -5,7 +5,7 @@
     :class="[isDismissible ? 'alert-dismissible' : '', this.alertClass]"
   >
     <p class="m-0 fw-bold small alert-heading">{{ alertHeadline }}</p>
-    <p class="m-0 text-body small">{{ alertCopy }}</p>
+    <p class="m-0 text-body small" v-html="alertCopy"></p>
     <button
       type="button"
       class="btn-close p-2"