From 8001539a0bd54a5f095e73e293cb73018481b3d8 Mon Sep 17 00:00:00 2001
From: Matt Stover <mcs@mcstover.com>
Date: Mon, 22 Nov 2021 17:50:26 -0800
Subject: [PATCH] fix: ensure richText content shows for globalPromo banners
 and hide disclaimer link when not present

---
 .../PromotionalBanner/Banners/GenericPromoBanner.vue      | 8 ++++----
 .../GlobalPromotionalBannerContentful.vue                 | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/WwwFrame/PromotionalBanner/Banners/GenericPromoBanner.vue b/src/components/WwwFrame/PromotionalBanner/Banners/GenericPromoBanner.vue
index 656028cff0..b519a8584a 100644
--- a/src/components/WwwFrame/PromotionalBanner/Banners/GenericPromoBanner.vue
+++ b/src/components/WwwFrame/PromotionalBanner/Banners/GenericPromoBanner.vue
@@ -9,9 +9,8 @@
 				:target="isExternalLink ? '_blank' : '_self'"
 				:class="{ 'banner-link' : trimmedLink, 'banner-wrapper' : !trimmedLink}"
 				v-kv-track-event="handleTracking"
-			>
-				{{ processedContent }}
-			</component>
+				v-html="processedContent"
+			/>
 			<a
 				v-if="hasDisclaimer"
 				@click="scrollToSection('#disclaimers')"
@@ -95,7 +94,8 @@ export default {
 			return this.promoBannerContent?.link?.trim() ?? '';
 		},
 		hasDisclaimer() {
-			return this.promoBannerContent.disclaimer !== '';
+			const disclaimer = this.promoBannerContent?.disclaimer ?? '';
+			return disclaimer !== '';
 		}
 	},
 };
diff --git a/src/components/WwwFrame/PromotionalBanner/GlobalPromotionalBannerContentful.vue b/src/components/WwwFrame/PromotionalBanner/GlobalPromotionalBannerContentful.vue
index 1af599bd66..d85ededccf 100644
--- a/src/components/WwwFrame/PromotionalBanner/GlobalPromotionalBannerContentful.vue
+++ b/src/components/WwwFrame/PromotionalBanner/GlobalPromotionalBannerContentful.vue
@@ -117,10 +117,11 @@ export default {
 						// Promo Banner
 						// parse the contentful richText into an html string
 						this.promoBannerContent = {
+							disclaimer: activePromoBanner?.fields?.disclaimers?.content?.[0] ?? null,
 							kvTrackEvent: activePromoBanner.fields.kvTrackEvent,
 							link: activePromoBanner.fields.link,
 							richText: documentToHtmlString(activePromoBanner.fields.richText),
-							iconKey: _get(activePromoBanner, 'fields.iconKey', 'present')
+							iconKey: _get(activePromoBanner, 'fields.iconKey', 'present'),
 						};
 						this.isPromoEnabled = true;
 					}