From c6aa4561181d4824aa6d8a103a0b49932074d9ae Mon Sep 17 00:00:00 2001 From: Vaggelis Yfantis Date: Thu, 31 Oct 2024 22:57:25 +0200 Subject: [PATCH 1/9] chore(types,elements,clerk-js): Make legalAccepted stable --- integration/testUtils/commonPageObject.ts | 2 +- packages/clerk-js/src/core/clerk.ts | 6 ++-- .../clerk-js/src/core/resources/SignUp.ts | 31 ++++++------------- .../ui/components/SignUp/SignUpContinue.tsx | 2 +- .../src/ui/components/SignUp/SignUpForm.tsx | 8 ++--- .../components/SignUp/SignUpSocialButtons.tsx | 4 +-- .../src/ui/components/SignUp/SignUpStart.tsx | 10 +++--- .../ui/components/SignUp/signUpFormHelpers.ts | 6 ++-- .../src/ui/elements/LegalConsentCheckbox.tsx | 2 +- .../internals/machines/form/form.machine.ts | 2 +- .../sign-up/utils/fields-to-params.ts | 2 +- .../third-party/third-party.machine.ts | 6 ++-- packages/types/src/clerk.ts | 8 ++--- packages/types/src/elementIds.ts | 2 +- packages/types/src/redirects.ts | 2 +- packages/types/src/signUp.ts | 4 +-- packages/ui/src/common/legal-accepted.tsx | 2 +- 17 files changed, 42 insertions(+), 57 deletions(-) diff --git a/integration/testUtils/commonPageObject.ts b/integration/testUtils/commonPageObject.ts index 3b2acdb91c3..db778b1cf91 100644 --- a/integration/testUtils/commonPageObject.ts +++ b/integration/testUtils/commonPageObject.ts @@ -42,7 +42,7 @@ export const common = ({ page }: TestArgs) => { return page.locator('input[name=password]'); }, getLegalAccepted: () => { - return page.locator('input[name=__experimental_legalAccepted]'); + return page.locator('input[name=legalAccepted]'); }, getFirstNameInput: () => { return page.locator('input[name=firstName]'); diff --git a/packages/clerk-js/src/core/clerk.ts b/packages/clerk-js/src/core/clerk.ts index a6bf1255c37..d2901141cb7 100644 --- a/packages/clerk-js/src/core/clerk.ts +++ b/packages/clerk-js/src/core/clerk.ts @@ -1480,7 +1480,7 @@ export class Clerk implements ClerkInterface { return this.client?.signUp.create({ strategy: 'google_one_tap', token: params.token, - __experimental_legalAccepted: params.__experimental_legalAccepted, + legalAccepted: params.legalAccepted, }); } throw err; @@ -1501,7 +1501,7 @@ export class Clerk implements ClerkInterface { customNavigate, unsafeMetadata, strategy, - __experimental_legalAccepted, + legalAccepted, }: ClerkAuthenticateWithWeb3Params): Promise => { if (!this.client || !this.environment) { return; @@ -1524,7 +1524,7 @@ export class Clerk implements ClerkInterface { generateSignature, unsafeMetadata, strategy, - __experimental_legalAccepted, + legalAccepted, }); if ( diff --git a/packages/clerk-js/src/core/resources/SignUp.ts b/packages/clerk-js/src/core/resources/SignUp.ts index 5f25c7def5b..747c2ffeff1 100644 --- a/packages/clerk-js/src/core/resources/SignUp.ts +++ b/packages/clerk-js/src/core/resources/SignUp.ts @@ -112,12 +112,6 @@ export class SignUp extends BaseResource implements SignUpResource { paramsWithCaptcha.strategy = SignUp.clerk.client?.signIn.firstFactorVerification.strategy; } - // TODO(@vaggelis): Remove this once the legalAccepted is stable - if (typeof params.__experimental_legalAccepted !== 'undefined') { - paramsWithCaptcha.legalAccepted = params.__experimental_legalAccepted; - paramsWithCaptcha.__experimental_legalAccepted = undefined; - } - return this._basePost({ path: this.pathRoot, body: normalizeUnsafeMetadata(paramsWithCaptcha), @@ -199,7 +193,7 @@ export class SignUp extends BaseResource implements SignUpResource { public authenticateWithWeb3 = async ( params: AuthenticateWithWeb3Params & { unsafeMetadata?: SignUpUnsafeMetadata; - __experimental_legalAccepted?: boolean; + legalAccepted?: boolean; }, ): Promise => { const { @@ -207,7 +201,7 @@ export class SignUp extends BaseResource implements SignUpResource { identifier, unsafeMetadata, strategy = 'web3_metamask_signature', - __experimental_legalAccepted, + legalAccepted, } = params || {}; const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider; @@ -216,7 +210,7 @@ export class SignUp extends BaseResource implements SignUpResource { } const web3Wallet = identifier || this.web3wallet!; - await this.create({ web3Wallet, unsafeMetadata, __experimental_legalAccepted: __experimental_legalAccepted }); + await this.create({ web3Wallet, unsafeMetadata, legalAccepted: legalAccepted }); await this.prepareWeb3WalletVerification({ strategy }); const { message } = this.verifications.web3Wallet; @@ -247,7 +241,7 @@ export class SignUp extends BaseResource implements SignUpResource { public authenticateWithMetamask = async ( params?: SignUpAuthenticateWithWeb3Params & { - __experimental_legalAccepted?: boolean; + legalAccepted?: boolean; }, ): Promise => { const identifier = await getMetamaskIdentifier(); @@ -256,13 +250,13 @@ export class SignUp extends BaseResource implements SignUpResource { generateSignature: generateSignatureWithMetamask, unsafeMetadata: params?.unsafeMetadata, strategy: 'web3_metamask_signature', - __experimental_legalAccepted: params?.__experimental_legalAccepted, + legalAccepted: params?.legalAccepted, }); }; public authenticateWithCoinbaseWallet = async ( params?: SignUpAuthenticateWithWeb3Params & { - __experimental_legalAccepted?: boolean; + legalAccepted?: boolean; }, ): Promise => { const identifier = await getCoinbaseWalletIdentifier(); @@ -271,7 +265,7 @@ export class SignUp extends BaseResource implements SignUpResource { generateSignature: generateSignatureWithCoinbaseWallet, unsafeMetadata: params?.unsafeMetadata, strategy: 'web3_coinbase_wallet_signature', - __experimental_legalAccepted: params?.__experimental_legalAccepted, + legalAccepted: params?.legalAccepted, }); }; @@ -282,7 +276,7 @@ export class SignUp extends BaseResource implements SignUpResource { continueSignUp = false, unsafeMetadata, emailAddress, - __experimental_legalAccepted, + legalAccepted, }: AuthenticateWithRedirectParams & { unsafeMetadata?: SignUpUnsafeMetadata; }): Promise => { @@ -293,7 +287,7 @@ export class SignUp extends BaseResource implements SignUpResource { actionCompleteRedirectUrl: redirectUrlComplete, unsafeMetadata, emailAddress, - __experimental_legalAccepted, + legalAccepted, }; return continueSignUp && this.id ? this.update(params) : this.create(params); }; @@ -320,13 +314,6 @@ export class SignUp extends BaseResource implements SignUpResource { }; update = (params: SignUpUpdateParams): Promise => { - // TODO(@vaggelis): Remove this once the legalAccepted is stable - if (typeof params.__experimental_legalAccepted !== 'undefined') { - // @ts-expect-error - We need to remove the __experimental_legalAccepted key from the params - params.legalAccepted = params.__experimental_legalAccepted; - params.__experimental_legalAccepted = undefined; - } - return this._basePatch({ body: normalizeUnsafeMetadata(params), }); diff --git a/packages/clerk-js/src/ui/components/SignUp/SignUpContinue.tsx b/packages/clerk-js/src/ui/components/SignUp/SignUpContinue.tsx index 156a73db389..fdfd2a1ce75 100644 --- a/packages/clerk-js/src/ui/components/SignUp/SignUpContinue.tsx +++ b/packages/clerk-js/src/ui/components/SignUp/SignUpContinue.tsx @@ -71,7 +71,7 @@ function _SignUpContinue() { placeholder: localizationKeys('formFieldInputPlaceholder__password'), validatePassword: true, }), - __experimental_legalAccepted: useFormControl('__experimental_legalAccepted', '', { + legalAccepted: useFormControl('legalAccepted', '', { type: 'checkbox', label: '', defaultChecked: false, diff --git a/packages/clerk-js/src/ui/components/SignUp/SignUpForm.tsx b/packages/clerk-js/src/ui/components/SignUp/SignUpForm.tsx index e23778e1843..2bd85057e71 100644 --- a/packages/clerk-js/src/ui/components/SignUp/SignUpForm.tsx +++ b/packages/clerk-js/src/ui/components/SignUp/SignUpForm.tsx @@ -120,11 +120,11 @@ export const SignUpForm = (props: SignUpFormProps) => { width: '100%', }} > - {shouldShow('__experimental_legalAccepted') && ( - + {shouldShow('legalAccepted') && ( + )} diff --git a/packages/clerk-js/src/ui/components/SignUp/SignUpSocialButtons.tsx b/packages/clerk-js/src/ui/components/SignUp/SignUpSocialButtons.tsx index c9483fb51a6..9ae045a8a6b 100644 --- a/packages/clerk-js/src/ui/components/SignUp/SignUpSocialButtons.tsx +++ b/packages/clerk-js/src/ui/components/SignUp/SignUpSocialButtons.tsx @@ -35,7 +35,7 @@ export const SignUpSocialButtons = React.memo((props: SignUpSocialButtonsProps) redirectUrlComplete, strategy, unsafeMetadata: ctx.unsafeMetadata, - __experimental_legalAccepted: props.legalAccepted, + legalAccepted: props.legalAccepted, }) .catch(err => handleError(err, [], card.setError)); }} @@ -47,7 +47,7 @@ export const SignUpSocialButtons = React.memo((props: SignUpSocialButtonsProps) signUpContinueUrl: 'continue', unsafeMetadata: ctx.unsafeMetadata, strategy, - __experimental_legalAccepted: props.legalAccepted, + legalAccepted: props.legalAccepted, }) .catch(err => handleError(err, [], card.setError)); }} diff --git a/packages/clerk-js/src/ui/components/SignUp/SignUpStart.tsx b/packages/clerk-js/src/ui/components/SignUp/SignUpStart.tsx index 805cc006564..2c5d0ab4794 100644 --- a/packages/clerk-js/src/ui/components/SignUp/SignUpStart.tsx +++ b/packages/clerk-js/src/ui/components/SignUp/SignUpStart.tsx @@ -81,7 +81,7 @@ function _SignUpStart(): JSX.Element { label: localizationKeys('formFieldLabel__phoneNumber'), placeholder: localizationKeys('formFieldInputPlaceholder__phoneNumber'), }), - __experimental_legalAccepted: useFormControl('__experimental_legalAccepted', '', { + legalAccepted: useFormControl('legalAccepted', '', { type: 'checkbox', label: '', defaultChecked: false, @@ -281,7 +281,7 @@ function _SignUpStart(): JSX.Element { enableOAuthProviders={showOauthProviders} enableWeb3Providers={showWeb3Providers} continueSignUp={missingRequirementsWithTicket} - legalAccepted={Boolean(formState.__experimental_legalAccepted.checked) || undefined} + legalAccepted={Boolean(formState.legalAccepted.checked) || undefined} /> )} {shouldShowForm && ( @@ -295,10 +295,10 @@ function _SignUpStart(): JSX.Element { )} {!shouldShowForm && isLegalConsentEnabled && ( - + )} diff --git a/packages/clerk-js/src/ui/components/SignUp/signUpFormHelpers.ts b/packages/clerk-js/src/ui/components/SignUp/signUpFormHelpers.ts index f67db1f55f0..a2f9ae591c9 100644 --- a/packages/clerk-js/src/ui/components/SignUp/signUpFormHelpers.ts +++ b/packages/clerk-js/src/ui/components/SignUp/signUpFormHelpers.ts @@ -16,7 +16,7 @@ const FieldKeys = [ 'lastName', 'password', 'ticket', - '__experimental_legalAccepted', + 'legalAccepted', ] as const; export type FieldKey = (typeof FieldKeys)[number]; @@ -91,7 +91,7 @@ export function minimizeFieldsForExistingSignup(fields: Fields, signUp: SignUpRe } if (hasLegalAccepted) { - delete fields.__experimental_legalAccepted; + delete fields.legalAccepted; } // Hide any non-required fields @@ -148,7 +148,7 @@ function getField(fieldKey: FieldKey, fieldProps: FieldDeterminationProps): Fiel return getPasswordField(fieldProps.attributes); case 'ticket': return getTicketField(fieldProps.hasTicket); - case '__experimental_legalAccepted': + case 'legalAccepted': return getLegalAcceptedField(fieldProps.legalConsentRequired); case 'username': case 'firstName': diff --git a/packages/clerk-js/src/ui/elements/LegalConsentCheckbox.tsx b/packages/clerk-js/src/ui/elements/LegalConsentCheckbox.tsx index 005688be4c2..593d341f8f8 100644 --- a/packages/clerk-js/src/ui/elements/LegalConsentCheckbox.tsx +++ b/packages/clerk-js/src/ui/elements/LegalConsentCheckbox.tsx @@ -71,7 +71,7 @@ export const LegalCheckbox = ( = { - legalAccepted: '__experimental_legalAccepted', + legalAccepted: 'legalAccepted', }; const fieldName = fieldsNameMap[params.name] || params.name; diff --git a/packages/elements/src/internals/machines/sign-up/utils/fields-to-params.ts b/packages/elements/src/internals/machines/sign-up/utils/fields-to-params.ts index 80bfc16cac3..06d96ece74c 100644 --- a/packages/elements/src/internals/machines/sign-up/utils/fields-to-params.ts +++ b/packages/elements/src/internals/machines/sign-up/utils/fields-to-params.ts @@ -9,7 +9,7 @@ const SignUpAdditionalKeys = [ 'username', 'password', 'phoneNumber', - '__experimental_legalAccepted', + 'legalAccepted', ] as const; type SignUpAdditionalKeys = (typeof SignUpAdditionalKeys)[number]; diff --git a/packages/elements/src/internals/machines/third-party/third-party.machine.ts b/packages/elements/src/internals/machines/third-party/third-party.machine.ts index ad2d7d05cd7..fbefe674277 100644 --- a/packages/elements/src/internals/machines/third-party/third-party.machine.ts +++ b/packages/elements/src/internals/machines/third-party/third-party.machine.ts @@ -77,16 +77,14 @@ export const ThirdPartyMachine = setup({ input: ({ context, event }) => { assertEvent(event, 'REDIRECT'); - const legalAcceptedField = context.formRef - .getSnapshot() - .context.fields.get('__experimental_legalAccepted')?.checked; + const legalAcceptedField = context.formRef.getSnapshot().context.fields.get('legalAccepted')?.checked; return { basePath: context.basePath, flow: context.flow, params: { ...event.params, - __experimental_legalAccepted: legalAcceptedField || undefined, + legalAccepted: legalAcceptedField || undefined, }, parent: context.parent, }; diff --git a/packages/types/src/clerk.ts b/packages/types/src/clerk.ts index ffc92d5a403..3a4e7ac4ad4 100644 --- a/packages/types/src/clerk.ts +++ b/packages/types/src/clerk.ts @@ -1364,7 +1364,7 @@ export interface ClerkAuthenticateWithWeb3Params { signUpContinueUrl?: string; unsafeMetadata?: SignUpUnsafeMetadata; strategy: Web3Strategy; - __experimental_legalAccepted?: boolean; + legalAccepted?: boolean; } export type JoinWaitlistParams = { @@ -1376,7 +1376,7 @@ export interface AuthenticateWithMetamaskParams { redirectUrl?: string; signUpContinueUrl?: string; unsafeMetadata?: SignUpUnsafeMetadata; - __experimental_legalAccepted?: boolean; + legalAccepted?: boolean; } export interface AuthenticateWithCoinbaseWalletParams { @@ -1384,12 +1384,12 @@ export interface AuthenticateWithCoinbaseWalletParams { redirectUrl?: string; signUpContinueUrl?: string; unsafeMetadata?: SignUpUnsafeMetadata; - __experimental_legalAccepted?: boolean; + legalAccepted?: boolean; } export interface AuthenticateWithGoogleOneTapParams { token: string; - __experimental_legalAccepted?: boolean; + legalAccepted?: boolean; } export interface LoadedClerk extends Clerk { diff --git a/packages/types/src/elementIds.ts b/packages/types/src/elementIds.ts index dea1a17bfb4..546fea1d955 100644 --- a/packages/types/src/elementIds.ts +++ b/packages/types/src/elementIds.ts @@ -21,7 +21,7 @@ export type FieldId = | 'enrollmentMode' | 'affiliationEmailAddress' | 'deleteExistingInvitationsSuggestions' - | '__experimental_legalAccepted'; + | 'legalAccepted'; export type ProfileSectionId = | 'profile' | 'username' diff --git a/packages/types/src/redirects.ts b/packages/types/src/redirects.ts index 9e9137d67be..ece1d6abf83 100644 --- a/packages/types/src/redirects.ts +++ b/packages/types/src/redirects.ts @@ -83,7 +83,7 @@ export type AuthenticateWithRedirectParams = { /** * Whether the user has accepted the legal requirements. */ - __experimental_legalAccepted?: boolean; + legalAccepted?: boolean; }; export type RedirectUrlProp = { diff --git a/packages/types/src/signUp.ts b/packages/types/src/signUp.ts index ed269259c13..5b9d183c9de 100644 --- a/packages/types/src/signUp.ts +++ b/packages/types/src/signUp.ts @@ -92,7 +92,7 @@ export interface SignUpResource extends ClerkResource { authenticateWithWeb3: ( params: AuthenticateWithWeb3Params & { unsafeMetadata?: SignUpUnsafeMetadata; - __experimental_legalAccepted?: boolean; + legalAccepted?: boolean; }, ) => Promise; @@ -165,7 +165,7 @@ export type SignUpCreateParams = Partial< unsafeMetadata: SignUpUnsafeMetadata; ticket: string; token: string; - __experimental_legalAccepted: boolean; + legalAccepted: boolean; } & Omit>, 'legalAccepted'> >; diff --git a/packages/ui/src/common/legal-accepted.tsx b/packages/ui/src/common/legal-accepted.tsx index d95ca069237..c079a228a00 100644 --- a/packages/ui/src/common/legal-accepted.tsx +++ b/packages/ui/src/common/legal-accepted.tsx @@ -38,7 +38,7 @@ export function LegalAcceptedField({ return ( From f14d7d05627cd7bd37530f8ac5a8298333648c45 Mon Sep 17 00:00:00 2001 From: Vaggelis Yfantis Date: Mon, 4 Nov 2024 16:37:16 +0200 Subject: [PATCH 2/9] wip --- .../src/ui/components/SignUp/SignUpContinue.tsx | 4 ++-- .../src/ui/elements/LegalConsentCheckbox.tsx | 15 ++++++--------- .../src/internals/machines/form/form.machine.ts | 6 +----- packages/elements/src/react/common/form/types.ts | 3 ++- packages/localizations/src/ar-SA.ts | 11 +++++++++++ packages/localizations/src/be-BY.ts | 11 +++++++++++ packages/localizations/src/bg-BG.ts | 11 +++++++++++ packages/localizations/src/cs-CZ.ts | 11 +++++++++++ packages/localizations/src/da-DK.ts | 11 +++++++++++ packages/localizations/src/de-DE.ts | 11 +++++++++++ packages/localizations/src/el-GR.ts | 11 +++++++++++ packages/localizations/src/en-US.ts | 12 ++++++++++++ packages/localizations/src/es-ES.ts | 11 +++++++++++ packages/localizations/src/es-MX.ts | 11 +++++++++++ packages/localizations/src/fi-FI.ts | 11 +++++++++++ packages/localizations/src/fr-FR.ts | 11 +++++++++++ packages/localizations/src/he-IL.ts | 11 +++++++++++ packages/localizations/src/hu-HU.ts | 11 +++++++++++ packages/localizations/src/is-IS.ts | 11 +++++++++++ packages/localizations/src/it-IT.ts | 11 +++++++++++ packages/localizations/src/ja-JP.ts | 11 +++++++++++ packages/localizations/src/ko-KR.ts | 11 +++++++++++ packages/localizations/src/mn-MN.ts | 11 +++++++++++ packages/localizations/src/nb-NO.ts | 11 +++++++++++ packages/localizations/src/nl-NL.ts | 11 +++++++++++ packages/localizations/src/pl-PL.ts | 11 +++++++++++ packages/localizations/src/pt-BR.ts | 11 +++++++++++ packages/localizations/src/pt-PT.ts | 11 +++++++++++ packages/localizations/src/ro-RO.ts | 11 +++++++++++ packages/localizations/src/ru-RU.ts | 11 +++++++++++ packages/localizations/src/sk-SK.ts | 11 +++++++++++ packages/localizations/src/sr-RS.ts | 11 +++++++++++ packages/localizations/src/sv-SE.ts | 11 +++++++++++ packages/localizations/src/th-TH.ts | 11 +++++++++++ packages/localizations/src/tr-TR.ts | 11 +++++++++++ packages/localizations/src/uk-UA.ts | 11 +++++++++++ packages/localizations/src/vi-VN.ts | 11 +++++++++++ packages/localizations/src/zh-CN.ts | 11 +++++++++++ packages/localizations/src/zh-TW.ts | 11 +++++++++++ packages/types/src/localization.ts | 2 +- packages/ui/src/common/legal-accepted.tsx | 6 +++--- 41 files changed, 401 insertions(+), 21 deletions(-) diff --git a/packages/clerk-js/src/ui/components/SignUp/SignUpContinue.tsx b/packages/clerk-js/src/ui/components/SignUp/SignUpContinue.tsx index fdfd2a1ce75..c08478e2990 100644 --- a/packages/clerk-js/src/ui/components/SignUp/SignUpContinue.tsx +++ b/packages/clerk-js/src/ui/components/SignUp/SignUpContinue.tsx @@ -171,11 +171,11 @@ function _SignUpContinue() { const headerTitle = !onlyLegalConsentMissing ? localizationKeys('signUp.continue.title') - : localizationKeys('signUp.__experimental_legalConsent.continue.title'); + : localizationKeys('signUp.legalConsent.continue.title'); const headerSubtitle = !onlyLegalConsentMissing ? localizationKeys('signUp.continue.subtitle') - : localizationKeys('signUp.__experimental_legalConsent.continue.subtitle'); + : localizationKeys('signUp.legalConsent.continue.subtitle'); return ( diff --git a/packages/clerk-js/src/ui/elements/LegalConsentCheckbox.tsx b/packages/clerk-js/src/ui/elements/LegalConsentCheckbox.tsx index 593d341f8f8..2aaaa8e9196 100644 --- a/packages/clerk-js/src/ui/elements/LegalConsentCheckbox.tsx +++ b/packages/clerk-js/src/ui/elements/LegalConsentCheckbox.tsx @@ -19,19 +19,16 @@ const LegalCheckboxLabel = (props: { termsUrl?: string; privacyPolicyUrl?: strin let localizationKey: LocalizationKey | undefined; if (termsUrl && privacyPolicyUrl) { - localizationKey = localizationKeys( - 'signUp.__experimental_legalConsent.checkbox.label__termsOfServiceAndPrivacyPolicy', - { - termsOfServiceLink: props.termsUrl, - privacyPolicyLink: props.privacyPolicyUrl, - }, - ); + localizationKey = localizationKeys('signUp.legalConsent.checkbox.label__termsOfServiceAndPrivacyPolicy', { + termsOfServiceLink: props.termsUrl, + privacyPolicyLink: props.privacyPolicyUrl, + }); } else if (termsUrl) { - localizationKey = localizationKeys('signUp.__experimental_legalConsent.checkbox.label__onlyTermsOfService', { + localizationKey = localizationKeys('signUp.legalConsent.checkbox.label__onlyTermsOfService', { termsOfServiceLink: props.termsUrl, }); } else if (privacyPolicyUrl) { - localizationKey = localizationKeys('signUp.__experimental_legalConsent.checkbox.label__onlyPrivacyPolicy', { + localizationKey = localizationKeys('signUp.legalConsent.checkbox.label__onlyPrivacyPolicy', { privacyPolicyLink: props.privacyPolicyUrl, }); } diff --git a/packages/elements/src/internals/machines/form/form.machine.ts b/packages/elements/src/internals/machines/form/form.machine.ts index ed25660a6e0..71c1cfb5bbc 100644 --- a/packages/elements/src/internals/machines/form/form.machine.ts +++ b/packages/elements/src/internals/machines/form/form.machine.ts @@ -74,11 +74,7 @@ export const FormMachine = setup({ throw new Error('Field name is required'); } - const fieldsNameMap: Record = { - legalAccepted: 'legalAccepted', - }; - const fieldName = fieldsNameMap[params.name] || params.name; - + const fieldName = params.name; if (context.fields.has(fieldName)) { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion context.fields.get(fieldName)!.feedback = params.feedback; diff --git a/packages/elements/src/react/common/form/types.ts b/packages/elements/src/react/common/form/types.ts index 5131e50105c..1096a13a7c5 100644 --- a/packages/elements/src/react/common/form/types.ts +++ b/packages/elements/src/react/common/form/types.ts @@ -16,7 +16,8 @@ export type ClerkFieldId = | 'newPassword' | 'password' | 'phoneNumber' - | 'username'; + | 'username' + | 'legalAccepted'; /** * Possible types for the Clerk input element, several 'special' input types are included. diff --git a/packages/localizations/src/ar-SA.ts b/packages/localizations/src/ar-SA.ts index 7415c345db4..ad9b88bf1e2 100644 --- a/packages/localizations/src/ar-SA.ts +++ b/packages/localizations/src/ar-SA.ts @@ -515,6 +515,17 @@ export const arSA: LocalizationResource = { title: 'تم التحقق بنجاح من البريد الإلكتروني', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'أدخل رمز التحقق المرسل إلى هاتفك', formTitle: 'رمز التحقق', diff --git a/packages/localizations/src/be-BY.ts b/packages/localizations/src/be-BY.ts index 12463ad91b1..d9c5102143f 100644 --- a/packages/localizations/src/be-BY.ts +++ b/packages/localizations/src/be-BY.ts @@ -519,6 +519,17 @@ export const beBY: LocalizationResource = { title: 'Пошта верыфікавана', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Увядзіце верыфікацыйны код, адправлены на Ваш тэлефон', formTitle: 'Верыфікацыйны код', diff --git a/packages/localizations/src/bg-BG.ts b/packages/localizations/src/bg-BG.ts index 19633386399..65f5df8538a 100644 --- a/packages/localizations/src/bg-BG.ts +++ b/packages/localizations/src/bg-BG.ts @@ -516,6 +516,17 @@ export const bgBG: LocalizationResource = { title: 'Успешно потвърден имейл', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Въведете кода за потвърждение, изпратен на вашия телефонен номер', formTitle: 'Код за потвърждение', diff --git a/packages/localizations/src/cs-CZ.ts b/packages/localizations/src/cs-CZ.ts index 174e3323c8c..b2d4746369c 100644 --- a/packages/localizations/src/cs-CZ.ts +++ b/packages/localizations/src/cs-CZ.ts @@ -514,6 +514,17 @@ export const csCZ: LocalizationResource = { title: 'Email úspěšně ověřen', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Zadejte ověřovací kód poslaný na vaše telefonní číslo', formTitle: 'Ověřovací kód', diff --git a/packages/localizations/src/da-DK.ts b/packages/localizations/src/da-DK.ts index 672bb779361..642c0fa17d5 100644 --- a/packages/localizations/src/da-DK.ts +++ b/packages/localizations/src/da-DK.ts @@ -515,6 +515,17 @@ export const daDK: LocalizationResource = { title: 'E-mail er bekræftet', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Indtast bekræftelseskoden sendt til dit telefonnummer', formTitle: 'Bekræftelseskode', diff --git a/packages/localizations/src/de-DE.ts b/packages/localizations/src/de-DE.ts index 6b48d267226..f50d6204aba 100644 --- a/packages/localizations/src/de-DE.ts +++ b/packages/localizations/src/de-DE.ts @@ -523,6 +523,17 @@ export const deDE: LocalizationResource = { title: 'E-Mail erfolgreich verifiziert', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Geben Sie den Bestätigungscode ein, der an Ihre Telefonnummer gesendet wurde', formTitle: 'Bestätigungscode', diff --git a/packages/localizations/src/el-GR.ts b/packages/localizations/src/el-GR.ts index 150a9c945c5..aa6f2c84b6c 100644 --- a/packages/localizations/src/el-GR.ts +++ b/packages/localizations/src/el-GR.ts @@ -516,6 +516,17 @@ export const elGR: LocalizationResource = { title: 'Επιτυχής επαλήθευση email', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Εισαγάγετε τον κωδικό επαλήθευσης που απεστάλη στον αριθμό τηλεφώνου σας', formTitle: 'Κωδικός επαλήθευσης', diff --git a/packages/localizations/src/en-US.ts b/packages/localizations/src/en-US.ts index 4374b2ac11e..0289d4fa687 100644 --- a/packages/localizations/src/en-US.ts +++ b/packages/localizations/src/en-US.ts @@ -507,6 +507,18 @@ export const enUS: LocalizationResource = { title: 'Successfully verified email', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: 'I agree to the {{ privacyPolicyLink || link("Privacy Policy") }}', + label__onlyTermsOfService: 'I agree to the {{ termsOfServiceLink || link("Terms of Service") }}', + label__termsOfServiceAndPrivacyPolicy: + 'I agree to the {{ termsOfServiceLink || link("Terms of Service") }} and {{ privacyPolicyLink || link("Privacy Policy") }}', + }, + continue: { + subtitle: 'Please read and accept the terms to continue', + title: 'Legal consent', + }, + }, phoneCode: { formSubtitle: 'Enter the verification code sent to your phone number', formTitle: 'Verification code', diff --git a/packages/localizations/src/es-ES.ts b/packages/localizations/src/es-ES.ts index aff577d4a64..33bcf69d274 100644 --- a/packages/localizations/src/es-ES.ts +++ b/packages/localizations/src/es-ES.ts @@ -516,6 +516,17 @@ export const esES: LocalizationResource = { title: 'Correo electrónico verificado con éxito', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Introduzca el código de verificación enviado a su número de teléfono', formTitle: 'Código de verificación', diff --git a/packages/localizations/src/es-MX.ts b/packages/localizations/src/es-MX.ts index 88d9de85ac4..8e89419a017 100644 --- a/packages/localizations/src/es-MX.ts +++ b/packages/localizations/src/es-MX.ts @@ -520,6 +520,17 @@ export const esMX: LocalizationResource = { title: 'Correo electrónico verificado con éxito', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Introduzca el código de verificación enviado a su número de teléfono.', formTitle: 'Código de verificación', diff --git a/packages/localizations/src/fi-FI.ts b/packages/localizations/src/fi-FI.ts index 613d56536a9..2da11924df6 100644 --- a/packages/localizations/src/fi-FI.ts +++ b/packages/localizations/src/fi-FI.ts @@ -517,6 +517,17 @@ export const fiFI: LocalizationResource = { title: 'Rekisteröitynyt toiseen välilehteen', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Syötä puhelimeesi lähetetty koodi', formTitle: 'Vahvistuskoodi', diff --git a/packages/localizations/src/fr-FR.ts b/packages/localizations/src/fr-FR.ts index 4b77a75971c..e1742d63a9e 100644 --- a/packages/localizations/src/fr-FR.ts +++ b/packages/localizations/src/fr-FR.ts @@ -519,6 +519,17 @@ export const frFR: LocalizationResource = { title: 'Courriel vérifié avec succès', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Entrez le code de vérification envoyé à votre numéro de téléphone', formTitle: 'Le code de vérification', diff --git a/packages/localizations/src/he-IL.ts b/packages/localizations/src/he-IL.ts index e1cafb27cb2..ab41a5fe23a 100644 --- a/packages/localizations/src/he-IL.ts +++ b/packages/localizations/src/he-IL.ts @@ -509,6 +509,17 @@ export const heIL: LocalizationResource = { title: 'אימות דוא"ל הצליח', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'הכנס את קוד האימות שנשלח למספר הטלפון שלך', formTitle: 'קוד אימות', diff --git a/packages/localizations/src/hu-HU.ts b/packages/localizations/src/hu-HU.ts index 0ddc9c9e16b..f1d18c95dd1 100644 --- a/packages/localizations/src/hu-HU.ts +++ b/packages/localizations/src/hu-HU.ts @@ -516,6 +516,17 @@ export const huHU: LocalizationResource = { title: 'Sikeresen megerősítetted az email címed', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Írd be a visszaigazoló kódot, amit a telefondra kaptál', formTitle: 'Visszaigazoló kód', diff --git a/packages/localizations/src/is-IS.ts b/packages/localizations/src/is-IS.ts index 953ca878163..f1bece4f404 100644 --- a/packages/localizations/src/is-IS.ts +++ b/packages/localizations/src/is-IS.ts @@ -519,6 +519,17 @@ export const isIS: LocalizationResource = { title: 'Tókst að staðfesta netfang', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Sláðu inn staðfestingarkóðann sem sendur var á símanúmerið þitt', formTitle: 'Staðfestingarkóði', diff --git a/packages/localizations/src/it-IT.ts b/packages/localizations/src/it-IT.ts index 3e183f2f6e6..58d6ab92a62 100644 --- a/packages/localizations/src/it-IT.ts +++ b/packages/localizations/src/it-IT.ts @@ -516,6 +516,17 @@ export const itIT: LocalizationResource = { title: 'Email verificata con successo', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Inserisci il codice di verifica inviato al tuo numero di telefono', formTitle: 'Codice di verifica', diff --git a/packages/localizations/src/ja-JP.ts b/packages/localizations/src/ja-JP.ts index 9864237246e..91ec2caf9b9 100644 --- a/packages/localizations/src/ja-JP.ts +++ b/packages/localizations/src/ja-JP.ts @@ -516,6 +516,17 @@ export const jaJP: LocalizationResource = { title: 'メールアドレスが正常に確認されました', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: '電話番号に送信された確認コードを入力してください', formTitle: '確認コード', diff --git a/packages/localizations/src/ko-KR.ts b/packages/localizations/src/ko-KR.ts index 17278bd7f1a..935bd9672ef 100644 --- a/packages/localizations/src/ko-KR.ts +++ b/packages/localizations/src/ko-KR.ts @@ -511,6 +511,17 @@ export const koKR: LocalizationResource = { title: '이메일 인증 성공', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: '휴대폰 번호로 전송된 인증 코드를 입력하세요.', formTitle: '인증 코드', diff --git a/packages/localizations/src/mn-MN.ts b/packages/localizations/src/mn-MN.ts index a6d579dda56..5d33e6b8931 100644 --- a/packages/localizations/src/mn-MN.ts +++ b/packages/localizations/src/mn-MN.ts @@ -517,6 +517,17 @@ export const mnMN: LocalizationResource = { title: 'Имэйлийг амжилттай баталгаажууллаа', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Таны утасны дугаар руу илгээсэн баталгаажуулах кодыг оруулна уу', formTitle: 'Баталгаажуулах код', diff --git a/packages/localizations/src/nb-NO.ts b/packages/localizations/src/nb-NO.ts index 42d014b9b52..ad33975adf0 100644 --- a/packages/localizations/src/nb-NO.ts +++ b/packages/localizations/src/nb-NO.ts @@ -516,6 +516,17 @@ export const nbNO: LocalizationResource = { title: 'E-posten ble verifisert', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Skriv inn verifiseringskoden som er sendt til telefonnummeret ditt', formTitle: 'Verifiseringskode', diff --git a/packages/localizations/src/nl-NL.ts b/packages/localizations/src/nl-NL.ts index c60f3932b2f..4c0a1b82800 100644 --- a/packages/localizations/src/nl-NL.ts +++ b/packages/localizations/src/nl-NL.ts @@ -516,6 +516,17 @@ export const nlNL: LocalizationResource = { title: 'E-mail bevestigd', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Voer de verificatiecode in die verzonden is naar je telefoonnummer', formTitle: 'Verificatiecode', diff --git a/packages/localizations/src/pl-PL.ts b/packages/localizations/src/pl-PL.ts index 4547abf0065..ec0ce88a670 100644 --- a/packages/localizations/src/pl-PL.ts +++ b/packages/localizations/src/pl-PL.ts @@ -515,6 +515,17 @@ export const plPL: LocalizationResource = { title: 'Adres e-mail został pomyślnie zweryfikowany', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Wprowadź kod weryfikacyjny wysłany na Twój numer telefonu', formTitle: 'Kod weryfikacyjny', diff --git a/packages/localizations/src/pt-BR.ts b/packages/localizations/src/pt-BR.ts index 21d2bc23c36..3714e0070d5 100644 --- a/packages/localizations/src/pt-BR.ts +++ b/packages/localizations/src/pt-BR.ts @@ -517,6 +517,17 @@ export const ptBR: LocalizationResource = { title: 'E-mail verificado com sucesso', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Insira o código enviado para seu telefone', formTitle: 'Código de verificação', diff --git a/packages/localizations/src/pt-PT.ts b/packages/localizations/src/pt-PT.ts index bf66ab24324..61957bc46e6 100644 --- a/packages/localizations/src/pt-PT.ts +++ b/packages/localizations/src/pt-PT.ts @@ -514,6 +514,17 @@ export const ptPT: LocalizationResource = { title: 'E-mail verificado com sucesso', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Insira o código enviado para o seu telemóvel', formTitle: 'Código de verificação', diff --git a/packages/localizations/src/ro-RO.ts b/packages/localizations/src/ro-RO.ts index 6ca11a07029..c405a45b2f6 100644 --- a/packages/localizations/src/ro-RO.ts +++ b/packages/localizations/src/ro-RO.ts @@ -518,6 +518,17 @@ export const roRO: LocalizationResource = { title: 'E-mail verificat cu succes', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Introduceți codul de verificare trimis la numărul dvs. de telefon', formTitle: 'Cod de verificare', diff --git a/packages/localizations/src/ru-RU.ts b/packages/localizations/src/ru-RU.ts index 4be67b586a5..6c643fe867d 100644 --- a/packages/localizations/src/ru-RU.ts +++ b/packages/localizations/src/ru-RU.ts @@ -527,6 +527,17 @@ export const ruRU: LocalizationResource = { title: 'Почта верифицирована', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Введите верификационный код, отправленный на Ваш телефон', formTitle: 'Верификационный код', diff --git a/packages/localizations/src/sk-SK.ts b/packages/localizations/src/sk-SK.ts index e971bf5ef24..e8d4915e833 100644 --- a/packages/localizations/src/sk-SK.ts +++ b/packages/localizations/src/sk-SK.ts @@ -514,6 +514,17 @@ export const skSK: LocalizationResource = { title: 'Email úspešne overený', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Zadajte overovací kód poslaný na vaše telefónne číslo', formTitle: 'Overovací kód', diff --git a/packages/localizations/src/sr-RS.ts b/packages/localizations/src/sr-RS.ts index 37e5d87e15f..4d5f72005ae 100644 --- a/packages/localizations/src/sr-RS.ts +++ b/packages/localizations/src/sr-RS.ts @@ -515,6 +515,17 @@ export const srRS: LocalizationResource = { title: 'Uspešno verifikovan e-mail', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Unesi verifikacioni kod poslat na tvoj telefonski broj', formTitle: 'Verifikacioni kod', diff --git a/packages/localizations/src/sv-SE.ts b/packages/localizations/src/sv-SE.ts index dade3f9e5dd..d3eb516269b 100644 --- a/packages/localizations/src/sv-SE.ts +++ b/packages/localizations/src/sv-SE.ts @@ -519,6 +519,17 @@ export const svSE: LocalizationResource = { title: 'E-posten har verifierats', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Ange verifieringskoden som skickades till ditt telefonnummer', formTitle: 'Verifieringskod', diff --git a/packages/localizations/src/th-TH.ts b/packages/localizations/src/th-TH.ts index e080659fc68..c9eacc2dbc1 100644 --- a/packages/localizations/src/th-TH.ts +++ b/packages/localizations/src/th-TH.ts @@ -512,6 +512,17 @@ export const thTH: LocalizationResource = { title: 'ยืนยันอีเมลสำเร็จ', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'ใส่รหัสยืนยันที่ส่งไปยังหมายเลขโทรศัพท์ของคุณ', formTitle: 'รหัสยืนยัน', diff --git a/packages/localizations/src/tr-TR.ts b/packages/localizations/src/tr-TR.ts index 8aafd0f4a6e..95845ecef46 100644 --- a/packages/localizations/src/tr-TR.ts +++ b/packages/localizations/src/tr-TR.ts @@ -517,6 +517,17 @@ export const trTR: LocalizationResource = { title: 'E-posta adresiniz başarıyla doğrulandı', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Telefon numaranıza gönderdiğimiz doğrulama kodunu giriniz', formTitle: 'Doğrulama kodu', diff --git a/packages/localizations/src/uk-UA.ts b/packages/localizations/src/uk-UA.ts index ddb55d32fbe..8443c7c926c 100644 --- a/packages/localizations/src/uk-UA.ts +++ b/packages/localizations/src/uk-UA.ts @@ -514,6 +514,17 @@ export const ukUA: LocalizationResource = { title: 'Успішно перевірено email', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Введіть код підтвердження, надісланий на ваш номер телефону', formTitle: 'Код підтвердження', diff --git a/packages/localizations/src/vi-VN.ts b/packages/localizations/src/vi-VN.ts index 326d82cb3cd..e72434085bb 100644 --- a/packages/localizations/src/vi-VN.ts +++ b/packages/localizations/src/vi-VN.ts @@ -514,6 +514,17 @@ export const viVN: LocalizationResource = { title: 'Xác minh email thành công', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: 'Nhập mã xác minh đã được gửi đến số điện thoại của bạn', formTitle: 'Mã xác minh', diff --git a/packages/localizations/src/zh-CN.ts b/packages/localizations/src/zh-CN.ts index bf16f185535..3dc9a956618 100644 --- a/packages/localizations/src/zh-CN.ts +++ b/packages/localizations/src/zh-CN.ts @@ -505,6 +505,17 @@ export const zhCN: LocalizationResource = { title: '成功验证电子邮件', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: '输入发送到您的电话号码的验证码', formTitle: '验证码', diff --git a/packages/localizations/src/zh-TW.ts b/packages/localizations/src/zh-TW.ts index f28d3dd4847..c0eeeceb7f1 100644 --- a/packages/localizations/src/zh-TW.ts +++ b/packages/localizations/src/zh-TW.ts @@ -511,6 +511,17 @@ export const zhTW: LocalizationResource = { title: '成功驗證電子郵件', }, }, + legalConsent: { + checkbox: { + label__onlyPrivacyPolicy: undefined, + label__onlyTermsOfService: undefined, + label__termsOfServiceAndPrivacyPolicy: undefined, + }, + continue: { + subtitle: undefined, + title: undefined, + }, + }, phoneCode: { formSubtitle: '輸入發送到您的電話號碼的驗證碼', formTitle: '驗證碼', diff --git a/packages/types/src/localization.ts b/packages/types/src/localization.ts index 99b8780e4c7..14f008942b1 100644 --- a/packages/types/src/localization.ts +++ b/packages/types/src/localization.ts @@ -153,7 +153,7 @@ type _LocalizationResource = { blockButton__emailSupport: LocalizationValue; blockButton__joinWaitlist: LocalizationValue; }; - __experimental_legalConsent: { + legalConsent: { continue: { title: LocalizationValue; subtitle: LocalizationValue; diff --git a/packages/ui/src/common/legal-accepted.tsx b/packages/ui/src/common/legal-accepted.tsx index c079a228a00..70d5b264ba9 100644 --- a/packages/ui/src/common/legal-accepted.tsx +++ b/packages/ui/src/common/legal-accepted.tsx @@ -22,16 +22,16 @@ export function LegalAcceptedField({ let localizedText: string | undefined; if (termsUrl && privacyPolicyUrl) { - localizedText = t('signUp.__experimental_legalConsent.checkbox.label__termsOfServiceAndPrivacyPolicy', { + localizedText = t('signUp.legalConsent.checkbox.label__termsOfServiceAndPrivacyPolicy', { termsOfServiceLink: termsUrl, privacyPolicyLink: privacyPolicyUrl, }); } else if (termsUrl) { - localizedText = t('signUp.__experimental_legalConsent.checkbox.label__onlyTermsOfService', { + localizedText = t('signUp.legalConsent.checkbox.label__onlyTermsOfService', { termsOfServiceLink: termsUrl, }); } else if (privacyPolicyUrl) { - localizedText = t('signUp.__experimental_legalConsent.checkbox.label__onlyPrivacyPolicy', { + localizedText = t('signUp.legalConsent.checkbox.label__onlyPrivacyPolicy', { privacyPolicyLink: privacyPolicyUrl, }); } From d54114a7ee664ed1b55b8809272bae564e5c94c5 Mon Sep 17 00:00:00 2001 From: Vaggelis Yfantis Date: Wed, 6 Nov 2024 17:41:18 +0200 Subject: [PATCH 3/9] chore(repo): Add changeset --- .changeset/twenty-rules-boil.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .changeset/twenty-rules-boil.md diff --git a/.changeset/twenty-rules-boil.md b/.changeset/twenty-rules-boil.md new file mode 100644 index 00000000000..01f287dd4b3 --- /dev/null +++ b/.changeset/twenty-rules-boil.md @@ -0,0 +1,9 @@ +--- +'@clerk/localizations': minor +'@clerk/clerk-js': minor +'@clerk/elements': minor +'@clerk/types': minor +'@clerk/ui': patch +--- + +Make legal consent feature stable From 07ab714037701632614f0bd8f67a4937e1c56064 Mon Sep 17 00:00:00 2001 From: Vaggelis Yfantis Date: Wed, 6 Nov 2024 21:36:47 +0200 Subject: [PATCH 4/9] fix(localizaions): Remove experimenal legal consent --- packages/localizations/src/ar-SA.ts | 11 ----------- packages/localizations/src/be-BY.ts | 11 ----------- packages/localizations/src/bg-BG.ts | 11 ----------- packages/localizations/src/cs-CZ.ts | 11 ----------- packages/localizations/src/da-DK.ts | 11 ----------- packages/localizations/src/el-GR.ts | 11 ----------- packages/localizations/src/en-US.ts | 12 ------------ packages/localizations/src/es-ES.ts | 11 ----------- packages/localizations/src/es-MX.ts | 11 ----------- packages/localizations/src/fi-FI.ts | 11 ----------- packages/localizations/src/fr-FR.ts | 11 ----------- packages/localizations/src/he-IL.ts | 11 ----------- packages/localizations/src/hu-HU.ts | 11 ----------- packages/localizations/src/is-IS.ts | 11 ----------- packages/localizations/src/it-IT.ts | 11 ----------- packages/localizations/src/ja-JP.ts | 11 ----------- packages/localizations/src/ko-KR.ts | 11 ----------- packages/localizations/src/mn-MN.ts | 11 ----------- packages/localizations/src/nb-NO.ts | 11 ----------- packages/localizations/src/nl-NL.ts | 11 ----------- packages/localizations/src/pl-PL.ts | 11 ----------- packages/localizations/src/pt-BR.ts | 11 ----------- packages/localizations/src/pt-PT.ts | 11 ----------- packages/localizations/src/ro-RO.ts | 11 ----------- packages/localizations/src/ru-RU.ts | 23 ++++++----------------- packages/localizations/src/sk-SK.ts | 11 ----------- packages/localizations/src/sr-RS.ts | 11 ----------- packages/localizations/src/sv-SE.ts | 11 ----------- packages/localizations/src/th-TH.ts | 11 ----------- packages/localizations/src/tr-TR.ts | 11 ----------- packages/localizations/src/uk-UA.ts | 11 ----------- packages/localizations/src/vi-VN.ts | 11 ----------- packages/localizations/src/zh-CN.ts | 11 ----------- packages/localizations/src/zh-TW.ts | 11 ----------- 34 files changed, 6 insertions(+), 381 deletions(-) diff --git a/packages/localizations/src/ar-SA.ts b/packages/localizations/src/ar-SA.ts index ad9b88bf1e2..14339709d0e 100644 --- a/packages/localizations/src/ar-SA.ts +++ b/packages/localizations/src/ar-SA.ts @@ -469,17 +469,6 @@ export const arSA: LocalizationResource = { }, signInEnterPasswordTitle: 'إدخل كلمة المرور', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'تسجيل الدخول', actionText: 'ليس لديك حساب؟', diff --git a/packages/localizations/src/be-BY.ts b/packages/localizations/src/be-BY.ts index d9c5102143f..8cc8c9749bf 100644 --- a/packages/localizations/src/be-BY.ts +++ b/packages/localizations/src/be-BY.ts @@ -473,17 +473,6 @@ export const beBY: LocalizationResource = { }, signInEnterPasswordTitle: 'Увядзіце ваш пароль', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Увайсці', actionText: 'Ужо ёсць уліковы запіс?', diff --git a/packages/localizations/src/bg-BG.ts b/packages/localizations/src/bg-BG.ts index 65f5df8538a..7f4dd3176d1 100644 --- a/packages/localizations/src/bg-BG.ts +++ b/packages/localizations/src/bg-BG.ts @@ -470,17 +470,6 @@ export const bgBG: LocalizationResource = { }, signInEnterPasswordTitle: 'Въведете вашата парола', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Влезте', actionText: 'Вече имате акаунт?', diff --git a/packages/localizations/src/cs-CZ.ts b/packages/localizations/src/cs-CZ.ts index b2d4746369c..26e92e8a5d0 100644 --- a/packages/localizations/src/cs-CZ.ts +++ b/packages/localizations/src/cs-CZ.ts @@ -468,17 +468,6 @@ export const csCZ: LocalizationResource = { }, signInEnterPasswordTitle: 'Zadejte své heslo', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Přihlásit se', actionText: 'Máte účet?', diff --git a/packages/localizations/src/da-DK.ts b/packages/localizations/src/da-DK.ts index 642c0fa17d5..916db9b0354 100644 --- a/packages/localizations/src/da-DK.ts +++ b/packages/localizations/src/da-DK.ts @@ -469,17 +469,6 @@ export const daDK: LocalizationResource = { }, signInEnterPasswordTitle: 'Indtast din adgangskode', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Log ind', actionText: 'Har du en konto?', diff --git a/packages/localizations/src/el-GR.ts b/packages/localizations/src/el-GR.ts index aa6f2c84b6c..333554a0765 100644 --- a/packages/localizations/src/el-GR.ts +++ b/packages/localizations/src/el-GR.ts @@ -470,17 +470,6 @@ export const elGR: LocalizationResource = { }, signInEnterPasswordTitle: 'Εισαγωγή κωδικού πρόσβασης', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Σύνδεση', actionText: 'Έχετε ήδη λογαριασμό;', diff --git a/packages/localizations/src/en-US.ts b/packages/localizations/src/en-US.ts index 0289d4fa687..4775dfd6cff 100644 --- a/packages/localizations/src/en-US.ts +++ b/packages/localizations/src/en-US.ts @@ -459,18 +459,6 @@ export const enUS: LocalizationResource = { }, signInEnterPasswordTitle: 'Enter your password', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: 'I agree to the {{ privacyPolicyLink || link("Privacy Policy") }}', - label__onlyTermsOfService: 'I agree to the {{ termsOfServiceLink || link("Terms of Service") }}', - label__termsOfServiceAndPrivacyPolicy: - 'I agree to the {{ termsOfServiceLink || link("Terms of Service") }} and {{ privacyPolicyLink || link("Privacy Policy") }}', - }, - continue: { - subtitle: 'Please read and accept the terms to continue', - title: 'Legal consent', - }, - }, continue: { actionLink: 'Sign in', actionText: 'Already have an account?', diff --git a/packages/localizations/src/es-ES.ts b/packages/localizations/src/es-ES.ts index 33bcf69d274..b621c74641d 100644 --- a/packages/localizations/src/es-ES.ts +++ b/packages/localizations/src/es-ES.ts @@ -470,17 +470,6 @@ export const esES: LocalizationResource = { }, signInEnterPasswordTitle: 'Ingresa tu contraseña', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Entrar', actionText: '¿Tiene una cuenta?', diff --git a/packages/localizations/src/es-MX.ts b/packages/localizations/src/es-MX.ts index 8e89419a017..f208064746e 100644 --- a/packages/localizations/src/es-MX.ts +++ b/packages/localizations/src/es-MX.ts @@ -474,17 +474,6 @@ export const esMX: LocalizationResource = { }, signInEnterPasswordTitle: 'Ingresa tu contraseña', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Entrar', actionText: '¿Tiene una cuenta?', diff --git a/packages/localizations/src/fi-FI.ts b/packages/localizations/src/fi-FI.ts index 2da11924df6..a09fa89bf23 100644 --- a/packages/localizations/src/fi-FI.ts +++ b/packages/localizations/src/fi-FI.ts @@ -471,17 +471,6 @@ export const fiFI: LocalizationResource = { }, signInEnterPasswordTitle: 'Syötä salasanasi', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Kirjaudu sisään', actionText: 'Onko sinulla jo tili?', diff --git a/packages/localizations/src/fr-FR.ts b/packages/localizations/src/fr-FR.ts index e1742d63a9e..0d772633ca5 100644 --- a/packages/localizations/src/fr-FR.ts +++ b/packages/localizations/src/fr-FR.ts @@ -473,17 +473,6 @@ export const frFR: LocalizationResource = { }, signInEnterPasswordTitle: 'Tapez votre mot de passe', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: "S'identifier", actionText: 'Vous avez déjà un compte ?', diff --git a/packages/localizations/src/he-IL.ts b/packages/localizations/src/he-IL.ts index ab41a5fe23a..75d3a8b5e1f 100644 --- a/packages/localizations/src/he-IL.ts +++ b/packages/localizations/src/he-IL.ts @@ -463,17 +463,6 @@ export const heIL: LocalizationResource = { }, signInEnterPasswordTitle: 'הזן את הסיסמה שלך', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'התחבר', actionText: 'יש לך חשבון?', diff --git a/packages/localizations/src/hu-HU.ts b/packages/localizations/src/hu-HU.ts index f1d18c95dd1..1d54e4b419d 100644 --- a/packages/localizations/src/hu-HU.ts +++ b/packages/localizations/src/hu-HU.ts @@ -470,17 +470,6 @@ export const huHU: LocalizationResource = { }, signInEnterPasswordTitle: 'Írd be a jelszavad', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Bejelentkezés', actionText: 'Van már fiókod?', diff --git a/packages/localizations/src/is-IS.ts b/packages/localizations/src/is-IS.ts index f1bece4f404..5340dd1cd09 100644 --- a/packages/localizations/src/is-IS.ts +++ b/packages/localizations/src/is-IS.ts @@ -472,17 +472,6 @@ export const isIS: LocalizationResource = { }, signInEnterPasswordTitle: 'Sláðu inn lykilorðið þitt', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Skrá inn', actionText: 'Ertu með reikning?', diff --git a/packages/localizations/src/it-IT.ts b/packages/localizations/src/it-IT.ts index 58d6ab92a62..f6b9d6fecce 100644 --- a/packages/localizations/src/it-IT.ts +++ b/packages/localizations/src/it-IT.ts @@ -470,17 +470,6 @@ export const itIT: LocalizationResource = { }, signInEnterPasswordTitle: 'Inserisci la tua password', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Accedi', actionText: 'Hai un account?', diff --git a/packages/localizations/src/ja-JP.ts b/packages/localizations/src/ja-JP.ts index 91ec2caf9b9..8d874cd52c8 100644 --- a/packages/localizations/src/ja-JP.ts +++ b/packages/localizations/src/ja-JP.ts @@ -470,17 +470,6 @@ export const jaJP: LocalizationResource = { }, signInEnterPasswordTitle: 'パスワードを入力してください', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'サインイン', actionText: 'アカウントをお持ちですか？', diff --git a/packages/localizations/src/ko-KR.ts b/packages/localizations/src/ko-KR.ts index 935bd9672ef..db9c329bd0e 100644 --- a/packages/localizations/src/ko-KR.ts +++ b/packages/localizations/src/ko-KR.ts @@ -465,17 +465,6 @@ export const koKR: LocalizationResource = { }, signInEnterPasswordTitle: '비밀번호를 입력하세요', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: '로그인', actionText: '계정이 있으신가요?', diff --git a/packages/localizations/src/mn-MN.ts b/packages/localizations/src/mn-MN.ts index 5d33e6b8931..6063b5b0df9 100644 --- a/packages/localizations/src/mn-MN.ts +++ b/packages/localizations/src/mn-MN.ts @@ -471,17 +471,6 @@ export const mnMN: LocalizationResource = { }, signInEnterPasswordTitle: 'Нууц үгээ оруулна уу', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Нэвтрэх', actionText: 'Бүртгэлтэй юу?', diff --git a/packages/localizations/src/nb-NO.ts b/packages/localizations/src/nb-NO.ts index ad33975adf0..4be9bf34559 100644 --- a/packages/localizations/src/nb-NO.ts +++ b/packages/localizations/src/nb-NO.ts @@ -470,17 +470,6 @@ export const nbNO: LocalizationResource = { }, signInEnterPasswordTitle: 'Skriv inn passordet ditt', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Logg inn', actionText: 'Har du allerede en konto?', diff --git a/packages/localizations/src/nl-NL.ts b/packages/localizations/src/nl-NL.ts index 4c0a1b82800..adea79d9c5b 100644 --- a/packages/localizations/src/nl-NL.ts +++ b/packages/localizations/src/nl-NL.ts @@ -470,17 +470,6 @@ export const nlNL: LocalizationResource = { }, signInEnterPasswordTitle: 'Vul je wachtwoord in', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Inloggen', actionText: 'Heb je een account?', diff --git a/packages/localizations/src/pl-PL.ts b/packages/localizations/src/pl-PL.ts index ec0ce88a670..59b3c48d95c 100644 --- a/packages/localizations/src/pl-PL.ts +++ b/packages/localizations/src/pl-PL.ts @@ -469,17 +469,6 @@ export const plPL: LocalizationResource = { }, signInEnterPasswordTitle: 'Wprowadź swoje hasło', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Zaloguj się', actionText: 'Masz już konto?', diff --git a/packages/localizations/src/pt-BR.ts b/packages/localizations/src/pt-BR.ts index 3714e0070d5..6c5be5442eb 100644 --- a/packages/localizations/src/pt-BR.ts +++ b/packages/localizations/src/pt-BR.ts @@ -470,17 +470,6 @@ export const ptBR: LocalizationResource = { }, signInEnterPasswordTitle: 'Insira sua senha', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Entrar', actionText: 'Possui uma conta?', diff --git a/packages/localizations/src/pt-PT.ts b/packages/localizations/src/pt-PT.ts index 61957bc46e6..9dd30c63b20 100644 --- a/packages/localizations/src/pt-PT.ts +++ b/packages/localizations/src/pt-PT.ts @@ -468,17 +468,6 @@ export const ptPT: LocalizationResource = { }, signInEnterPasswordTitle: 'Insira a sua palavra-passe', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Entrar', actionText: 'Já possui uma conta?', diff --git a/packages/localizations/src/ro-RO.ts b/packages/localizations/src/ro-RO.ts index c405a45b2f6..bf78cb0be38 100644 --- a/packages/localizations/src/ro-RO.ts +++ b/packages/localizations/src/ro-RO.ts @@ -472,17 +472,6 @@ export const roRO: LocalizationResource = { }, signInEnterPasswordTitle: 'Introduceți parola dvs', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Conectați-vă', actionText: 'Aveți un cont?', diff --git a/packages/localizations/src/ru-RU.ts b/packages/localizations/src/ru-RU.ts index 6c643fe867d..96a47e8e674 100644 --- a/packages/localizations/src/ru-RU.ts +++ b/packages/localizations/src/ru-RU.ts @@ -479,18 +479,6 @@ export const ruRU: LocalizationResource = { }, signInEnterPasswordTitle: 'Введите Ваш пароль', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: 'Я согласен с {{ privacyPolicyLink || link("Политика конфиденциальности") }}', - label__onlyTermsOfService: 'Я согласен с {{ termsOfServiceLink || link("Условия обслуживания") }}', - label__termsOfServiceAndPrivacyPolicy: - 'Я согласен с {{ termsOfServiceLink || link("Условия обслуживания") }} и {{ privacyPolicyLink || link("Политика конфиденциальности") }}', - }, - continue: { - subtitle: 'Пожалуйста, прочитайте и примите условия, чтобы продолжить.', - title: 'Юридическое согласие', - }, - }, continue: { actionLink: 'Войти', actionText: 'Уже есть учетная запись?', @@ -529,13 +517,14 @@ export const ruRU: LocalizationResource = { }, legalConsent: { checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, + label__onlyPrivacyPolicy: 'Я согласен с {{ privacyPolicyLink || link("Политика конфиденциальности") }}', + label__onlyTermsOfService: 'Я согласен с {{ termsOfServiceLink || link("Условия обслуживания") }}', + label__termsOfServiceAndPrivacyPolicy: + 'Я согласен с {{ termsOfServiceLink || link("Условия обслуживания") }} и {{ privacyPolicyLink || link("Политика конфиденциальности") }}', }, continue: { - subtitle: undefined, - title: undefined, + subtitle: 'Пожалуйста, прочитайте и примите условия, чтобы продолжить.', + title: 'Юридическое согласие', }, }, phoneCode: { diff --git a/packages/localizations/src/sk-SK.ts b/packages/localizations/src/sk-SK.ts index e8d4915e833..edd8f5e9fec 100644 --- a/packages/localizations/src/sk-SK.ts +++ b/packages/localizations/src/sk-SK.ts @@ -468,17 +468,6 @@ export const skSK: LocalizationResource = { }, signInEnterPasswordTitle: 'Zadajte svoje heslo', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Prihlásiť sa', actionText: 'Máte účet?', diff --git a/packages/localizations/src/sr-RS.ts b/packages/localizations/src/sr-RS.ts index 4d5f72005ae..f27e5261025 100644 --- a/packages/localizations/src/sr-RS.ts +++ b/packages/localizations/src/sr-RS.ts @@ -469,17 +469,6 @@ export const srRS: LocalizationResource = { }, signInEnterPasswordTitle: 'Unesi svoju lozinku', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Prijavi se', actionText: 'Već imaš nalog?', diff --git a/packages/localizations/src/sv-SE.ts b/packages/localizations/src/sv-SE.ts index d3eb516269b..cde0f91ac2f 100644 --- a/packages/localizations/src/sv-SE.ts +++ b/packages/localizations/src/sv-SE.ts @@ -472,17 +472,6 @@ export const svSE: LocalizationResource = { }, signInEnterPasswordTitle: 'Ange ditt lösenord', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Logga in', actionText: 'Har du redan ett konto?', diff --git a/packages/localizations/src/th-TH.ts b/packages/localizations/src/th-TH.ts index c9eacc2dbc1..a5b92f23b8d 100644 --- a/packages/localizations/src/th-TH.ts +++ b/packages/localizations/src/th-TH.ts @@ -466,17 +466,6 @@ export const thTH: LocalizationResource = { }, signInEnterPasswordTitle: 'ใส่รหัสผ่านของคุณ', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'เข้าสู่ระบบ', actionText: 'มีบัญชีอยู่แล้วใช่หรือไม่?', diff --git a/packages/localizations/src/tr-TR.ts b/packages/localizations/src/tr-TR.ts index 95845ecef46..60e3d2d17a3 100644 --- a/packages/localizations/src/tr-TR.ts +++ b/packages/localizations/src/tr-TR.ts @@ -471,17 +471,6 @@ export const trTR: LocalizationResource = { }, signInEnterPasswordTitle: 'Şifrenizi girin', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Giriş yap', actionText: 'Hesabınız var mı?', diff --git a/packages/localizations/src/uk-UA.ts b/packages/localizations/src/uk-UA.ts index 8443c7c926c..73ac9ed74e4 100644 --- a/packages/localizations/src/uk-UA.ts +++ b/packages/localizations/src/uk-UA.ts @@ -468,17 +468,6 @@ export const ukUA: LocalizationResource = { }, signInEnterPasswordTitle: 'Введіть Ваш пароль', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Увійти', actionText: 'Уже є акаунт?', diff --git a/packages/localizations/src/vi-VN.ts b/packages/localizations/src/vi-VN.ts index e72434085bb..421c311f63d 100644 --- a/packages/localizations/src/vi-VN.ts +++ b/packages/localizations/src/vi-VN.ts @@ -468,17 +468,6 @@ export const viVN: LocalizationResource = { }, signInEnterPasswordTitle: 'Nhập mật khẩu của bạn', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: 'Đăng nhập', actionText: 'Đã có tài khoản?', diff --git a/packages/localizations/src/zh-CN.ts b/packages/localizations/src/zh-CN.ts index 3dc9a956618..5fba3e89c6a 100644 --- a/packages/localizations/src/zh-CN.ts +++ b/packages/localizations/src/zh-CN.ts @@ -459,17 +459,6 @@ export const zhCN: LocalizationResource = { }, signInEnterPasswordTitle: '输入您的密码', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: '登录', actionText: '已经有账户了？', diff --git a/packages/localizations/src/zh-TW.ts b/packages/localizations/src/zh-TW.ts index c0eeeceb7f1..8ced64c75bd 100644 --- a/packages/localizations/src/zh-TW.ts +++ b/packages/localizations/src/zh-TW.ts @@ -465,17 +465,6 @@ export const zhTW: LocalizationResource = { }, signInEnterPasswordTitle: '輸入您的密碼', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, - }, - continue: { - subtitle: undefined, - title: undefined, - }, - }, continue: { actionLink: '登錄', actionText: '已經有帳戶了？', From 056b15c92d7a44cbc5f45e8fd045797616772cf5 Mon Sep 17 00:00:00 2001 From: Vaggelis Yfantis Date: Thu, 7 Nov 2024 09:33:35 +0200 Subject: [PATCH 5/9] fix(clerk-js): Dim legal consent checkbox on card loading --- .../src/ui/elements/LegalConsentCheckbox.tsx | 54 ++++++++++--------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/packages/clerk-js/src/ui/elements/LegalConsentCheckbox.tsx b/packages/clerk-js/src/ui/elements/LegalConsentCheckbox.tsx index 2aaaa8e9196..d5d35ee0413 100644 --- a/packages/clerk-js/src/ui/elements/LegalConsentCheckbox.tsx +++ b/packages/clerk-js/src/ui/elements/LegalConsentCheckbox.tsx @@ -1,4 +1,5 @@ import { useEnvironment } from '../../ui/contexts'; +import { sanitizeInputProps, useFormField } from '../../ui/primitives/hooks'; import type { LocalizationKey } from '../customizables'; import { descriptors, @@ -16,6 +17,8 @@ import { LinkRenderer } from './LinkRenderer'; const LegalCheckboxLabel = (props: { termsUrl?: string; privacyPolicyUrl?: string }) => { const { termsUrl, privacyPolicyUrl } = props; const { t } = useLocalizations(); + const formField = useFormField(); + const { placeholder, ...inputProps } = sanitizeInputProps(formField); let localizationKey: LocalizationKey | undefined; if (termsUrl && privacyPolicyUrl) { @@ -34,19 +37,29 @@ const LegalCheckboxLabel = (props: { termsUrl?: string; privacyPolicyUrl?: strin } return ( - ({ + paddingLeft: t.space.$1x5, + textAlign: 'left', + })} > - ({ - textDecoration: 'underline', - textUnderlineOffset: t.space.$1, - })} - /> - + + ({ + textDecoration: 'underline', + textUnderlineOffset: t.space.$1, + })} + /> + + ); }; @@ -70,19 +83,10 @@ export const LegalCheckbox = ( elementDescriptor={descriptors.formFieldCheckboxInput} elementId={descriptors.formFieldInput.setId('legalAccepted')} /> - ({ - paddingLeft: t.space.$1x5, - textAlign: 'left', - })} - > - - + ); From a2f876ab8c80874e38dfef0bb4aa03c5c2f0bed8 Mon Sep 17 00:00:00 2001 From: Vaggelis Yfantis Date: Thu, 7 Nov 2024 15:59:56 +0200 Subject: [PATCH 6/9] chore(localization): Update de-DE translations --- packages/localizations/src/de-DE.ts | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/packages/localizations/src/de-DE.ts b/packages/localizations/src/de-DE.ts index f50d6204aba..a8b48707be2 100644 --- a/packages/localizations/src/de-DE.ts +++ b/packages/localizations/src/de-DE.ts @@ -476,18 +476,6 @@ export const deDE: LocalizationResource = { }, signInEnterPasswordTitle: 'Geben Sie Ihr Passwort ein', signUp: { - __experimental_legalConsent: { - checkbox: { - label__onlyPrivacyPolicy: 'Ich stimme der {{ privacyPolicyLink || link("Datenschutzerklärung") }} zu', - label__onlyTermsOfService: 'Ich stimme den {{ termsOfServiceLink || link("Nutzungsbedingungen") }} zu', - label__termsOfServiceAndPrivacyPolicy: - 'Ich stimme den {{ termsOfServiceLink || link("Nutzungsbedingungen") }} und der {{ privacyPolicyLink || link("Datenschutzerklärung") }} zu', - }, - continue: { - subtitle: 'Bitte lesen und akzeptieren Sie die Bedingungen, um fortzufahren', - title: 'Rechtliche Einwilligung', - }, - }, continue: { actionLink: 'Einloggen', actionText: 'Haben Sie ein Konto?', @@ -525,13 +513,14 @@ export const deDE: LocalizationResource = { }, legalConsent: { checkbox: { - label__onlyPrivacyPolicy: undefined, - label__onlyTermsOfService: undefined, - label__termsOfServiceAndPrivacyPolicy: undefined, + label__onlyPrivacyPolicy: 'Ich stimme der {{ privacyPolicyLink || link("Datenschutzerklärung") }} zu', + label__onlyTermsOfService: 'Ich stimme den {{ termsOfServiceLink || link("Nutzungsbedingungen") }} zu', + label__termsOfServiceAndPrivacyPolicy: + 'Ich stimme den {{ termsOfServiceLink || link("Nutzungsbedingungen") }} und der {{ privacyPolicyLink || link("Datenschutzerklärung") }} zu', }, continue: { - subtitle: undefined, - title: undefined, + subtitle: 'Bitte lesen und akzeptieren Sie die Bedingungen, um fortzufahren', + title: 'Rechtliche Einwilligung', }, }, phoneCode: { From 361557a19d6bd9d78e3073c51e3d2956dbdeb724 Mon Sep 17 00:00:00 2001 From: Vaggelis Yfantis Date: Thu, 7 Nov 2024 16:25:15 +0200 Subject: [PATCH 7/9] Update .changeset/twenty-rules-boil.md Co-authored-by: Stefanos Anagnostou --- .changeset/twenty-rules-boil.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.changeset/twenty-rules-boil.md b/.changeset/twenty-rules-boil.md index 01f287dd4b3..2a07b9d73d5 100644 --- a/.changeset/twenty-rules-boil.md +++ b/.changeset/twenty-rules-boil.md @@ -6,4 +6,6 @@ '@clerk/ui': patch --- -Make legal consent feature stable +The Legal consent feature is now stable. + +Removed the `__experimental_` preffix. From a159739042e9fce43a1ea271b21c27c840eb61ee Mon Sep 17 00:00:00 2001 From: Vaggelis Yfantis Date: Thu, 7 Nov 2024 16:25:37 +0200 Subject: [PATCH 8/9] Update packages/clerk-js/src/core/resources/SignUp.ts Co-authored-by: Stefanos Anagnostou --- packages/clerk-js/src/core/resources/SignUp.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/clerk-js/src/core/resources/SignUp.ts b/packages/clerk-js/src/core/resources/SignUp.ts index 747c2ffeff1..d003904bcf6 100644 --- a/packages/clerk-js/src/core/resources/SignUp.ts +++ b/packages/clerk-js/src/core/resources/SignUp.ts @@ -210,7 +210,7 @@ export class SignUp extends BaseResource implements SignUpResource { } const web3Wallet = identifier || this.web3wallet!; - await this.create({ web3Wallet, unsafeMetadata, legalAccepted: legalAccepted }); + await this.create({ web3Wallet, unsafeMetadata, legalAccepted }); await this.prepareWeb3WalletVerification({ strategy }); const { message } = this.verifications.web3Wallet; From ad198a39577ae97a1f6cb78b622c6c9c1efae200 Mon Sep 17 00:00:00 2001 From: Vaggelis Yfantis Date: Thu, 7 Nov 2024 16:44:15 +0200 Subject: [PATCH 9/9] chore(clerk-js): Use correct id for legal consent label --- packages/clerk-js/src/ui/elements/LegalConsentCheckbox.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/clerk-js/src/ui/elements/LegalConsentCheckbox.tsx b/packages/clerk-js/src/ui/elements/LegalConsentCheckbox.tsx index d5d35ee0413..4b57f248354 100644 --- a/packages/clerk-js/src/ui/elements/LegalConsentCheckbox.tsx +++ b/packages/clerk-js/src/ui/elements/LegalConsentCheckbox.tsx @@ -39,7 +39,7 @@ const LegalCheckboxLabel = (props: { termsUrl?: string; privacyPolicyUrl?: strin return ( ({ paddingLeft: t.space.$1x5,