Merge Conflict

CASH-341 to 2025.07.17

src/fmg-components/cart/cart.vue

@@ -1309,8 +1309,10 @@ export default {
         .sub-total,
         .sales-tax,
         .amount-due,
-        .amount-paid {
-            font-weight: 500;
+        .amount-paid,
+        .donation-amount {
+            font-family:
+                UrbanistSemibold, AvertaSemibold; /* Okay to remove AvertaSemibold after 2025.06.19 merge/release */
             color: $black;
         }
         .sub-total {

src/layouts/schedule/schedule.vue

@@ -542,10 +542,17 @@ export default {
         forwardButtonAction() {
             this.updateSupportingItems();
 
-            if (this.waitListRequested) {
-                var gaLabel = store.getters.isMobileAppointment
-                    ? "checked_mobile"
-                    : "checked_inshop";
+            if (this.displayWaitList) {
+                let gaLabel = "";
+                let status = this.waitListRequested ? "checked" : "unchecked";
+                if (
+                    this.waitListRequested === null &&
+                    this.$store.state.order.customer.waitListRequested === true
+                ) {
+                    status = "checked";
+                }
+                const type = store.getters.isMobileAppointment ? "mobile" : "inshop";
+                gaLabel = `${status}_${type}`;
 
                 const currentDate = new Date();
                 const dateString = this.selectableDatesData.days[0].date;

src/styles/common-typography-styles.scss

@@ -133,4 +133,4 @@ caption,
         url("@/assets/fonts/Urbanist-BoldItalic.woff2") format("woff");
     font-weight: normal;
     font-style: normal;
-}
+}

src/styles/ux-variables.scss

@@ -121,8 +121,8 @@ $body-color: $gray-600;
 
 //Fonts
 $font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif;
-$font-family-monospace: UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
-    monospace;
+$font-family-monospace:
+    UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 // stylelint-enable value-keyword-case
 $font-family-base: $font-family-sans-serif;
 $font-family-code: $font-family-monospace;