diff --git a/.ebstalk.apps.env/webapp.env b/.ebstalk.apps.env/webapp.env
index 8c4cdbd8c4..79142f4090 100644
--- a/.ebstalk.apps.env/webapp.env
+++ b/.ebstalk.apps.env/webapp.env
@@ -19,7 +19,6 @@ GOOGLE_OAUTH_CLIENT_SECRET_SENSITIVE="{{pull:secretsmanager:/io.cv.app/prd/googl
GOOGLE_OAUTH_ENCRYPTION_SECRET="{{pull:secretsmanager:/io.cv.app/prd/google-auth:SecretString:google_oauth_encryption_secret}}"
FIREBASE_PRIVATE_KEY="{{pull:secretsmanager:/io.cv.app/prd/firebase:SecretString:private_key}}"
FIREBASE_CLIENT_EMAIL="{{pull:secretsmanager:/io.cv.app/prd/firebase:SecretString:client_email}}"
-LOOPS_EMAIL_API_KEY="{{pull:secretsmanager:/io.cv.app/prd/loops-email:SecretString:loops_email_api_key}}"
MAILGUN_DOMAIN="{{pull:secretsmanager:/io.cv.app/prd/mailgun:SecretString:mailgun_domain}}"
MAILGUN_API_KEY="{{pull:secretsmanager:/io.cv.app/prd/mailgun:SecretString:mailgun_api_key}}"
MIXPANEL_API_KEY="{{pull:secretsmanager:/io.cv.app/prd/mixpanel:SecretString:webapp_api_key}}"
diff --git a/apps/webapp/components/_app/components/OnboardingEmailForm.tsx b/apps/webapp/components/_app/components/OnboardingEmailForm.tsx
index 1cdf1e8a15..8f5ab55bff 100644
--- a/apps/webapp/components/_app/components/OnboardingEmailForm.tsx
+++ b/apps/webapp/components/_app/components/OnboardingEmailForm.tsx
@@ -13,13 +13,12 @@ import { useUser } from 'hooks/useUser';
const emailSchema = yup.string().email().ensure().trim();
export const schema = yup.object({
- email: emailSchema.when(['emailNewsletter', 'emailNotifications'], {
- is: (emailNewsletter: boolean, emailNotifications: boolean) => emailNewsletter || emailNotifications,
+ email: emailSchema.when(['emailNotifications'], {
+ is: (emailNotifications: boolean) => emailNotifications,
then: () => emailSchema.required('Unselect email options to proceed without email'),
otherwise: () => emailSchema
}),
emailNotifications: yup.boolean(),
- emailNewsletter: yup.boolean(),
agreeTermsConditions: yup.boolean().oneOf([true], 'You must agree to the terms and privacy policy to continue')
});
@@ -46,7 +45,6 @@ export function OnboardingEmailForm({ onClick, spaceId }: { onClick: VoidFunctio
resolver: yupResolver(schema)
});
- const emailNewsletter = getValues('emailNewsletter');
const emailNotifications = getValues('emailNotifications');
const agreeTermsConditions = getValues('agreeTermsConditions');
@@ -58,14 +56,13 @@ export function OnboardingEmailForm({ onClick, spaceId }: { onClick: VoidFunctio
const onSubmit = async (values: FormValues) => {
// eslint-disable-next-line @typescript-eslint/no-shadow
- const { email, emailNewsletter, emailNotifications } = values;
+ const { email, emailNotifications } = values;
await saveForm({
email: email || undefined,
- emailNewsletter,
emailNotifications,
spaceId
});
- updateUser({ ...user, email, emailNewsletter, emailNotifications });
+ updateUser({ ...user, email, emailNotifications });
onClick();
};
@@ -97,10 +94,6 @@ export function OnboardingEmailForm({ onClick, spaceId }: { onClick: VoidFunctio
}
label='Notify me about key activities (e.g., proposal feedback, reward status, mentions, comments)'
/>
- }
- label='Receive tips and examples how to use CharmVerse.'
- />