From e8b3bb61d9e7c2daf8bab9f1631b76683e850111 Mon Sep 17 00:00:00 2001 From: Luca Pagliaro Date: Tue, 22 Apr 2025 10:21:27 +0200 Subject: [PATCH 1/2] feat: add support for conditional cookie consent banner display --- .../shared/src/features/onboarding/shared/FunnelStepper.tsx | 3 ++- packages/shared/src/features/onboarding/types/funnel.ts | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/shared/src/features/onboarding/shared/FunnelStepper.tsx b/packages/shared/src/features/onboarding/shared/FunnelStepper.tsx index 87304fa9309..0b88aa40a54 100644 --- a/packages/shared/src/features/onboarding/shared/FunnelStepper.tsx +++ b/packages/shared/src/features/onboarding/shared/FunnelStepper.tsx @@ -103,6 +103,7 @@ export const FunnelStepper = ({ defaultOpen: showCookieBanner, trackFunnelEvent, }); + const isCookieBannerActive = !!funnel?.parameters?.cookieConsent?.show; useInitFunnelPaddle(); useWindowScroll({ @@ -146,7 +147,7 @@ export const FunnelStepper = ({ onScrollCapture={trackOnScroll} className="flex min-h-dvh flex-col" > - {showBanner && ( + {isCookieBannerActive && showBanner && ( )} diff --git a/packages/shared/src/features/onboarding/types/funnel.ts b/packages/shared/src/features/onboarding/types/funnel.ts index bf69682317a..e6289bd935f 100644 --- a/packages/shared/src/features/onboarding/types/funnel.ts +++ b/packages/shared/src/features/onboarding/types/funnel.ts @@ -260,7 +260,11 @@ export type FunnelPosition = { export interface FunnelJSON { id: string; version: number; - parameters: FunnelStepParameters; + parameters: FunnelStepParameters<{ + cookieConsent: { + show: boolean; + }; + }>; entryPoint: FunnelStep['id']; chapters: Array; } From 170c00eefd9261b77f626009f2201b867c189ff2 Mon Sep 17 00:00:00 2001 From: Luca Pagliaro Date: Tue, 22 Apr 2025 10:48:47 +0200 Subject: [PATCH 2/2] feat: add support for conditional cookie consent banner display --- .../shared/src/features/onboarding/shared/FunnelStepper.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shared/src/features/onboarding/shared/FunnelStepper.tsx b/packages/shared/src/features/onboarding/shared/FunnelStepper.tsx index 0b88aa40a54..2393f444d52 100644 --- a/packages/shared/src/features/onboarding/shared/FunnelStepper.tsx +++ b/packages/shared/src/features/onboarding/shared/FunnelStepper.tsx @@ -99,11 +99,11 @@ export const FunnelStepper = ({ onNavigation: trackOnNavigate, }); const { transition: sendTransition } = useStepTransition(session.id); + const isCookieBannerActive = !!funnel?.parameters?.cookieConsent?.show; const { showBanner, ...cookieConsentProps } = useFunnelCookies({ defaultOpen: showCookieBanner, trackFunnelEvent, }); - const isCookieBannerActive = !!funnel?.parameters?.cookieConsent?.show; useInitFunnelPaddle(); useWindowScroll({