From 3424f7e514ece5cb3cb96cb52a5735cb35c89122 Mon Sep 17 00:00:00 2001
From: Sneha <sneha.a@safelite.com>
Date: Tue, 21 May 2024 10:33:58 +0530
Subject: [PATCH] Fixing conflicts

---
 src/constants/cart-item-categories.js                         | 1 +
 src/fmg-components/cart/cart.vue                              | 4 ++--
 src/layouts/quote/quote.spec.js                               | 1 -
 .../service-package-question/service-package-question.vue     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/constants/cart-item-categories.js b/src/constants/cart-item-categories.js
index 509cc626b..6bbb960b9 100644
--- a/src/constants/cart-item-categories.js
+++ b/src/constants/cart-item-categories.js
@@ -3,6 +3,7 @@ const cartItemCategories = {
     GLASS_PARTS: "glassParts",
     SUPPORTING_ITEMS: "supportingItems",
     PROMOS: "promos",
+    SERVICE_PACKAGE_DISCOUNT: "servicePackageDiscount",
 };
 
 export { cartItemCategories };
diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index a8227036a..0cde7e160 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -272,7 +272,7 @@ export default {
 
         getLineItemAmount(amount, useVerifyingText, category) {
             if (useVerifyingText) return this.verifyingCoverageText;
-            return category == "promos"
+            return category == ("promos" && "servicePackageDiscount")
                 ? "(" + this.currencyFormatter.format(amount * -1) + ")"
                 : this.currencyFormatter.format(amount);
         },
@@ -799,7 +799,7 @@ export default {
                         Math.abs(
                             baseMixin.methods.getTotalLineItemPrice(servicePackageDiscountLineItem)
                         ),
-                    category: cartItemCategories.SUPPORTING_ITEMS,
+                    category: cartItemCategories.SERVICE_PACKAGE_DISCOUNT,
                     cartItemType: cartItemTypes.SERVICE_PACKAGE_DISCOUNT,
                     isDisplayed: true,
                     isRemovable: false,
diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js
index bce20d75c..56a8d66e6 100644
--- a/src/layouts/quote/quote.spec.js
+++ b/src/layouts/quote/quote.spec.js
@@ -8,7 +8,6 @@ import * as navigateToHeritage from "@/helpers/heritage-integration/navigation-h
 import { nextTick } from "vue";
 import { experimentSettings } from "@/constants/experiments";
 import baseMixin from "@/mixins/base-mixin.js";
-import { support } from "jquery";
 
 jest.mock("@/store", () => ({
     commit: jest.fn(),
diff --git a/src/layouts/quote/service-package-question/service-package-question.vue b/src/layouts/quote/service-package-question/service-package-question.vue
index 24e855511..c9e55ef3e 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -73,7 +73,7 @@ export default {
                 this.getServicePackageDiscountPartForSelectedPackage(newValue);
             let supportingItems = this.supportingLineItems;
             if (servicePackageDiscountPartInSelectedPackage?.length > 0) {
-                supportingItems.push(servicePackageDiscountPartInSelectedPackage[0]);
+                supportingItems?.push(servicePackageDiscountPartInSelectedPackage[0]);
             } else {
                 if (
                     supportingItems?.length > 0 &&