diff --git a/public/funnels/soulmate.json b/public/funnels/soulmate.json index 9046fcd..6b46418 100644 --- a/public/funnels/soulmate.json +++ b/public/funnels/soulmate.json @@ -2360,7 +2360,7 @@ }, "trustedByOver": { "text": { - "text": "Trusted by over **355,000 people." + "text": "Trusted by over **355,000** people." } }, "findingOneGuide": { @@ -2373,7 +2373,7 @@ } }, "text": { - "text": "You’re special — you have imagination and energy that not everyone can understand. You deserve more than to be “half-understood” — you deserve to meet someone who sees the world as deeply and vividly as you do. This guide will help you recognize the signs of destiny, trust your path, and find the one whose heart is already connected to yours." + "text": "You’re special — you have imagination and energy that not everyone can understand. You deserve more than to be “half-understood” — you deserve to meet someone who sees the world as deeply and vividly as you do. This guide will help you recognize the signs of destiny, trust your path, and find the one whose heart is already connected to yours.\nThey may already be closer than you think — drawn to your light, searching for the same rare connection. Stay open, follow your intuition, and notice the quiet moments that feel like fate. Every step you take brings you nearer to the soul that was always meant to walk beside you." }, "blur": { "text": { diff --git a/src/components/domains/TrialPayment/Legal/Legal.tsx b/src/components/domains/TrialPayment/Legal/Legal.tsx index d21ba58..3247bca 100644 --- a/src/components/domains/TrialPayment/Legal/Legal.tsx +++ b/src/components/domains/TrialPayment/Legal/Legal.tsx @@ -45,7 +45,7 @@ export default function Legal({ link.className )} > - {link.children} + {link.children} ))} diff --git a/src/components/funnel/templates/DateTemplate/DateTemplate.tsx b/src/components/funnel/templates/DateTemplate/DateTemplate.tsx index a567150..5356e3a 100644 --- a/src/components/funnel/templates/DateTemplate/DateTemplate.tsx +++ b/src/components/funnel/templates/DateTemplate/DateTemplate.tsx @@ -9,18 +9,19 @@ import { TemplateLayout } from "../layouts/TemplateLayout"; import { createTemplateLayoutProps } from "@/lib/funnel/templateHelpers"; // Утилита для форматирования даты на основе паттерна -function formatDateByPattern(date: Date, pattern: string): string { +// Принимает год, месяц, день как числа (без зависимости от часовых зон) +function formatDateByPattern(year: number, month: number, day: number, pattern: string): string { const monthNames = [ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" ]; return pattern - .replace("MMMM", monthNames[date.getMonth()]) - .replace("MMM", monthNames[date.getMonth()].substring(0, 3)) - .replace("yyyy", date.getFullYear().toString()) - .replace("dd", date.getDate().toString().padStart(2, '0')) - .replace("d", date.getDate().toString()); + .replace("MMMM", monthNames[month - 1]) + .replace("MMM", monthNames[month - 1].substring(0, 3)) + .replace("yyyy", year.toString()) + .replace("dd", day.toString().padStart(2, '0')) + .replace("d", day.toString()); } interface DateTemplateProps { @@ -83,12 +84,21 @@ export function DateTemplate({ // Форматированная дата для отображения const formattedDate = useMemo(() => { - if (!isoDate) return null; + const { month, day, year } = selectedDate; + if (!month || !day || !year) return null; - const date = new Date(isoDate); - const pattern = screen.dateInput?.selectedDateFormat || "MMMM d, yyyy"; - return formatDateByPattern(date, pattern); - }, [isoDate, screen.dateInput?.selectedDateFormat]); + const monthNum = parseInt(month); + const dayNum = parseInt(day); + const yearNum = parseInt(year); + + // Валидация даты + if (monthNum >= 1 && monthNum <= 12 && dayNum >= 1 && dayNum <= 31 && yearNum > 1900) { + const pattern = screen.dateInput?.selectedDateFormat || "MMMM d, yyyy"; + return formatDateByPattern(yearNum, monthNum, dayNum, pattern); + } + + return null; + }, [selectedDate, screen.dateInput?.selectedDateFormat]); // Компонент отображения выбранной даты над кнопкой const selectedDateDisplay = formattedDate && screen.dateInput?.showSelectedDate !== false ? ( @@ -138,7 +148,6 @@ export function DateTemplate({ onChange={handleDateChange} maxYear={new Date().getFullYear() - 11} yearsRange={100} - locale="en" /> {defaultTexts?.privacyBanner && ( diff --git a/src/components/funnel/templates/TrialPaymentTemplate/TrialPaymentTemplate.tsx b/src/components/funnel/templates/TrialPaymentTemplate/TrialPaymentTemplate.tsx index b074cb6..f387f1c 100644 --- a/src/components/funnel/templates/TrialPaymentTemplate/TrialPaymentTemplate.tsx +++ b/src/components/funnel/templates/TrialPaymentTemplate/TrialPaymentTemplate.tsx @@ -689,8 +689,6 @@ export function TrialPaymentTemplate({ By clicking Continue, you agree to our{" "} Terms of Use & Service @@ -698,8 +696,6 @@ export function TrialPaymentTemplate({ and{" "} Privacy Policy diff --git a/src/components/templates/QuestionDateAnswers/QuestionDateAnswers.stories.tsx b/src/components/templates/QuestionDateAnswers/QuestionDateAnswers.stories.tsx index ae2ac58..b6ba595 100644 --- a/src/components/templates/QuestionDateAnswers/QuestionDateAnswers.stories.tsx +++ b/src/components/templates/QuestionDateAnswers/QuestionDateAnswers.stories.tsx @@ -34,7 +34,6 @@ const meta: Meta = { onChange: fn(), maxYear: new Date().getFullYear() - 11, yearsRange: 100, - locale: "en", }, bottomActionButtonProps: { actionButtonProps: { @@ -72,7 +71,6 @@ export const WithInitialValue = { onChange: fn(), maxYear: new Date().getFullYear() - 11, yearsRange: 100, - locale: "en", }, }, } satisfies Story; @@ -84,7 +82,6 @@ export const WithError = { onChange: fn(), maxYear: new Date().getFullYear() - 11, yearsRange: 100, - locale: "en", }, }, } satisfies Story; @@ -96,7 +93,6 @@ export const WithCustomLocale = { onChange: fn(), maxYear: new Date().getFullYear() - 11, yearsRange: 100, - locale: "ru", }, }, } satisfies Story; @@ -108,7 +104,6 @@ export const WithCustomYearRange = { onChange: fn(), maxYear: 2000, yearsRange: 50, - locale: "en", }, }, } satisfies Story; @@ -120,7 +115,6 @@ export const WithoutBottomButton = { onChange: fn(), maxYear: new Date().getFullYear() - 11, yearsRange: 100, - locale: "en", }, bottomActionButtonProps: undefined, }, diff --git a/src/components/ui/ActionButton/ActionButton.tsx b/src/components/ui/ActionButton/ActionButton.tsx index 2a111bc..7f4d30c 100644 --- a/src/components/ui/ActionButton/ActionButton.tsx +++ b/src/components/ui/ActionButton/ActionButton.tsx @@ -12,7 +12,7 @@ const buttonVariants = cva( "font-inter text-xl/[24px] font-bold text-primary-foreground", "px-[27px] py-5", "transition-all", - "disabled:opacity-50", + "disabled:opacity-30", "shadow-blue-glow" ), { diff --git a/src/components/ui/MainButton/MainButton.tsx b/src/components/ui/MainButton/MainButton.tsx index a4e6308..a82d121 100644 --- a/src/components/ui/MainButton/MainButton.tsx +++ b/src/components/ui/MainButton/MainButton.tsx @@ -16,7 +16,7 @@ const buttonVariants = cva( "pl-[26px] pr-[18px] py-[18px]", "transition-[background-color,border-color,color]", "duration-200", - "disabled:opacity-50", + "disabled:opacity-30", "border-2", "[-webkit-tap-highlight-color:transparent]", "[transform:translateZ(0)]" @@ -78,7 +78,7 @@ function MainButton({