Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions packages/shared/src/components/marketing/cta/common.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ interface MarketingCtaTargets {
webapp: boolean;
extension: boolean;
ios: boolean;
android: boolean;
}

export interface MarketingCta {
Expand All @@ -50,19 +51,29 @@ export interface MarketingCta {
targets?: MarketingCtaTargets;
}

const platformToMarketingCtaTarget = (): keyof MarketingCtaTargets => {
// Android has no runtime bridge like `isIOSNative()`; it's only known via boot
// data (`?android` param), so callers must pass the flag in from boot context.
const platformToMarketingCtaTarget = (
isAndroidApp = false,
): keyof MarketingCtaTargets => {
if (isIOSNative()) {
return 'ios';
}
if (isAndroidApp) {
return 'android';
}
if (isExtension) {
return 'extension';
}
return 'webapp';
};

export const isMarketingCtaTarget = (targets: MarketingCtaTargets): boolean =>
export const isMarketingCtaTarget = (
targets: MarketingCtaTargets,
isAndroidApp = false,
): boolean =>
isNullOrUndefined(targets) ||
targets[platformToMarketingCtaTarget()] === true;
targets[platformToMarketingCtaTarget(isAndroidApp)] === true;

type HeaderProps = Pick<MarketingCtaFlags, 'tagText' | 'tagColor'> & {
onClose?: (e?: React.MouseEvent | React.KeyboardEvent) => void;
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/graphql/marketingCta.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export const MARKETING_CTAS_BY_VARIANT_QUERY = gql`
webapp
extension
ios
android
}
}
}
Expand Down
7 changes: 6 additions & 1 deletion packages/shared/src/hooks/useBoot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,12 @@ export const useBoot = (): UseBoot => {
return null;
}

if (isMarketingCtaTarget(bootData?.marketingCta?.targets) === false) {
if (
isMarketingCtaTarget(
bootData?.marketingCta?.targets,
bootData?.isAndroidApp,
) === false
) {
return null;
}

Expand Down
3 changes: 2 additions & 1 deletion packages/shared/src/hooks/useMarketingCtas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ export function useMarketingCtas(
});

const targetedCtas = (data ?? []).filter(
(cta) => !cta.targets || isMarketingCtaTarget(cta.targets),
(cta) =>
!cta.targets || isMarketingCtaTarget(cta.targets, bootData?.isAndroidApp),
);

const dismissMutation = useMutation({
Expand Down
Loading