Skip to content
Open
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
2 changes: 1 addition & 1 deletion dotcom-rendering/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@emotion/server": "11.11.0",
"@guardian/ab-testing-config": "workspace:ab-testing-config",
"@guardian/braze-components": "23.0.2",
"@guardian/bridget": "8.13.1",
"@guardian/bridget": "8.14.0",
"@guardian/browserslist-config": "6.1.0",
"@guardian/cdk": "catalog:",
"@guardian/commercial-core": "34.0.0",
Expand Down
43 changes: 32 additions & 11 deletions dotcom-rendering/src/lib/useNewsletterSignupForm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import type React from 'react';
import { useCallback, useEffect, useRef, useState } from 'react';
import type ReactGoogleRecaptcha from 'react-google-recaptcha';
import type { RenderingTarget } from '../types/renderingTarget';
import { getNewslettersClient } from './bridgetApi';
import { lazyFetchEmailWithTimeout } from './fetchEmail';
import {
getEffectiveMarketingOptIn,
Expand Down Expand Up @@ -305,18 +306,38 @@ export const useNewsletterSignupForm = (
useEffect(() => {
setCaptchaSiteKey(window.guardian.config.page.googleRecaptchaSiteKey);
}, []);

useEffect(() => {
if (emailFetchStartedRef.current) return;
if (isSignedIn === 'Pending') return;
emailFetchStartedRef.current = true;

void resolveUserEmail(isSignedIn).then((email) => {
if (!isString(email)) return;
setUserEmail(email);
setHasPrefilledEmail(true);
setIsInteracted(true);
});
}, [isSignedIn]);
if (renderingTarget === 'Apps') {
// Fill in email using apps bridget API
void getNewslettersClient()
.getLoggedInUserEmail()
.then((maybeEmail) => {
const email = maybeEmail.emailAddress;
if (!email) return;
setUserEmail(email);
setHasPrefilledEmail(true);
setIsInteracted(true);
})
.catch((reason) => {
console.log(
'Failed to getLoggedInUserEmail from bridget ',
reason,
);
});
} else {
if (emailFetchStartedRef.current) return;
if (isSignedIn === 'Pending') return;
emailFetchStartedRef.current = true;

void resolveUserEmail(isSignedIn).then((email) => {
if (!isString(email)) return;
setUserEmail(email);
setHasPrefilledEmail(true);
setIsInteracted(true);
});
}
}, [isSignedIn, renderingTarget]);

const submitForm = useCallback(
async (emailAddress: string, token: string): Promise<void> => {
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading