Skip to content

Commit 9e85150

Browse files
author
Juarez Mota
committed
Merge branch 'main' of github.com:guardian/dotcom-rendering into jm/feat-sign-in-gate-v2
2 parents e36cabe + 17939b2 commit 9e85150

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

dotcom-rendering/src/components/Carousel.importable.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,10 @@ const getDataLinkNameCarouselButton = (
425425
return `${isVideoContainer ? 'video-container' : arrowName}-${direction}`;
426426
};
427427

428+
const cleanTitle = (title: string) => {
429+
return title.replace('More', '').trimStart();
430+
};
431+
428432
const Title = ({
429433
title,
430434
isCuratedContent,
@@ -453,7 +457,9 @@ const Title = ({
453457
) : (
454458
<h2 css={headerStyles}>
455459
{isCuratedContent ? 'More from ' : ''}
456-
<span css={titleStyle(isCuratedContent)}>{title}</span>
460+
<span css={titleStyle(isCuratedContent)}>
461+
{isCuratedContent ? cleanTitle(title) : title}
462+
</span>
457463
</h2>
458464
);
459465

dotcom-rendering/src/components/OnwardsUpper.importable.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@ const containerUrls = {
103103
EUR: 'uk/commentisfree/regular-stories',
104104
},
105105
culture: {
106-
UK: 'uk/culture/regular-stories',
106+
UK: '2771a8ab-952a-4bbc-9aa0-6863fed77712',
107107
US: 'us/culture/regular-stories',
108108
AU: 'au/culture/regular-stories',
109-
INT: 'uk/culture/regular-stories',
110-
EUR: 'uk/culture/regular-stories',
109+
INT: '2771a8ab-952a-4bbc-9aa0-6863fed77712',
110+
EUR: '2771a8ab-952a-4bbc-9aa0-6863fed77712',
111111
},
112112
lifestyle: {
113113
UK: '5011-3940-8793-33a9',

dotcom-rendering/src/components/SignInGate/SignInGate.stories.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ import { SignInGateCustomizableText } from './gateDesigns/SignInGateCustomizable
77
import { SignInGateFakeSocial } from './gateDesigns/SignInGateFakeSocial';
88
import { SignInGateMain } from './gateDesigns/SignInGateMain';
99
import { SignInGateMainCheckoutComplete } from './gateDesigns/SignInGateMainCheckoutComplete';
10-
import type { CheckoutCompleteCookieData } from './types';
10+
import type {
11+
AuxiaAPIResponseDataUserTreatment,
12+
CheckoutCompleteCookieData,
13+
} from './types';
1114
import { ALL_PRODUCTS, ALL_USER_TYPES } from './types';
1215

1316
export default {
@@ -266,7 +269,7 @@ signInGateSelectorStoryNoTreatment.storyName =
266269
'sign_in_gate_selector_no_treatment';
267270

268271
export const auxiaV2Modal = () => {
269-
const mockUserTreatment = {
272+
const mockUserTreatment: AuxiaAPIResponseDataUserTreatment = {
270273
treatmentId: 'test-treatment-id',
271274
treatmentTrackingId: 'test-tracking-id',
272275
surface: 'test-surface',
@@ -278,7 +281,7 @@ export const auxiaV2Modal = () => {
278281
first_cta_link: 'https://profile.theguardian.com/register',
279282
second_cta_name: 'Not now',
280283
}),
281-
rank: 1,
284+
rank: '1',
282285
contentLanguageCode: 'en',
283286
treatmentType: 'test-type',
284287
};
@@ -305,6 +308,7 @@ export const auxiaV2Modal = () => {
305308
actionName,
306309
);
307310
}}
311+
guUrl="https://www.theguardian.com/"
308312
/>
309313
</Section>
310314
);

dotcom-rendering/src/components/SignInGateSelector.importable.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { retrieveDismissedCount } from './SignInGate/dismissGate';
2121
import { pageIdIsAllowedForGating } from './SignInGate/displayRules';
2222
import { SignInGateAuxiaV1 } from './SignInGate/gateDesigns/SignInGateAuxiaV1';
2323
import { SignInGateAuxiaV2 } from './SignInGate/gateDesigns/SignInGateAuxiaV2';
24+
import { signInGateComponent as gateLegacyComponent } from './SignInGate/gates/main-control';
2425
import type {
2526
AuxiaAPIResponseDataUserTreatment,
2627
AuxiaGateDisplayData,

0 commit comments

Comments
 (0)