Skip to content

Commit 28d57d9

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/webpack-c6d235ecac
2 parents 432cf01 + dc1c7ec commit 28d57d9

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

dotcom-rendering/src/components/marketing/epics/ThreeTierChoiceCardData.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export const ChoiceCardTestData_REGULAR = (
1111
isDiscountActive
1212
? `Support ${currencySymbol}${amount}/year`
1313
: `Support ${currencySymbol}${amount}/month`,
14-
benefitsLabel: 'Support',
14+
benefitsLabel: longerBenefits ? 'Support' : undefined,
1515
benefits: () => [
1616
'Exclusive newsletter for supporters, sent every week from the Guardian newsroom',
1717
],
@@ -40,7 +40,7 @@ export const ChoiceCardTestData_REGULAR = (
4040
return `Support ${currencySymbol}${amount}/month`;
4141
}
4242
},
43-
benefitsLabel: 'All-access digital',
43+
benefitsLabel: longerBenefits ? 'All-access digital' : undefined,
4444
benefits: () =>
4545
longerBenefits
4646
? fullSupporterPlusBenefits
@@ -66,7 +66,7 @@ export const ChoiceCardTestData_US = (
6666
isDiscountActive
6767
? `Support ${currencySymbol}${amount}/year`
6868
: `Support ${currencySymbol}${amount}/month`,
69-
benefitsLabel: 'Support',
69+
benefitsLabel: longerBenefits ? 'Support' : undefined,
7070
benefits: () => [
7171
'Exclusive newsletter for supporters, sent every week from the Guardian newsroom',
7272
],
@@ -95,7 +95,7 @@ export const ChoiceCardTestData_US = (
9595
return `Support ${currencySymbol}${amount}/month`;
9696
}
9797
},
98-
benefitsLabel: 'All-access digital',
98+
benefitsLabel: longerBenefits ? 'All-access digital' : undefined,
9999
benefits: () =>
100100
longerBenefits
101101
? fullSupporterPlusBenefits
@@ -125,5 +125,4 @@ const fullSupporterPlusBenefits = [
125125
const shorterSupporterPlusBenefits = [
126126
'Unlimited access to the Guardian app and Feast app',
127127
'Ad-free reading on all your devices',
128-
'Exclusive supporter newsletter',
129128
];

dotcom-rendering/src/components/marketing/epics/ThreeTierChoiceCards.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,12 @@ function getChoiceAmount(
145145
const SupportingBenefits = ({
146146
benefitsLabel,
147147
benefits,
148+
showTicks,
148149
}: {
149150
benefitsLabel: string | undefined;
150151
benefits: string[];
152+
showTicks: boolean;
151153
}) => {
152-
const isBenefit = !!benefitsLabel;
153154
return (
154155
<div css={supportingTextStyles}>
155156
{!!benefitsLabel && (
@@ -160,7 +161,7 @@ const SupportingBenefits = ({
160161
<ul css={benefitsStyles}>
161162
{benefits.map((benefit) => (
162163
<li key={benefit}>
163-
{isBenefit && <SvgTickRound size="xsmall" />}
164+
{showTicks && <SvgTickRound size="xsmall" />}
164165
{benefit}
165166
</li>
166167
))}
@@ -276,6 +277,9 @@ export const ThreeTierChoiceCards = ({
276277
benefits={benefits(
277278
currencySymbol,
278279
)}
280+
showTicks={
281+
supportTier !== 'OneOff'
282+
}
279283
/>
280284
) : undefined
281285
}

0 commit comments

Comments
 (0)