From 5cc17824f35864826e10fc6440b617c15ddfe99f Mon Sep 17 00:00:00 2001 From: Daniil Chemerkin Date: Fri, 12 Sep 2025 15:46:08 +0000 Subject: [PATCH] AW-483-484-485-fix-bugs --- .../locales/compatibility-v2/en/male_en.json | 6 ++ public/locales/v1/en/male_en.json | 14 +++ .../CompatibilityV2/pages/Birthdate/index.tsx | 21 ++-- .../pages/BirthdatePartner/index.tsx | 6 ++ .../CompatibilityV2/pages/DateEvent/index.tsx | 6 ++ .../pages/TrialChoice/index.tsx | 74 ++++++++----- .../pages/TrialChoice/styles.module.scss | 100 +++++++++++++++++- src/components/DateTimePicker/DateInput.tsx | 21 ++-- src/components/DateTimePicker/DatePicker.tsx | 19 +++- .../v1/components/PriceItem/index.tsx | 11 +- .../v1/components/PriceItem/styles.module.css | 40 ------- .../components/PriceItem/styles.module.scss | 58 ++++++++++ .../v1/components/PriceList/index.tsx | 16 ++- .../v1/components/PriceList/styles.module.css | 32 ++++++ src/hooks/ab/unleash/useUnleash.ts | 4 +- src/utils/monthNames.ts | 49 +++++++++ 16 files changed, 385 insertions(+), 92 deletions(-) delete mode 100644 src/components/pages/ABDesign/v1/components/PriceItem/styles.module.css create mode 100644 src/components/pages/ABDesign/v1/components/PriceItem/styles.module.scss create mode 100644 src/utils/monthNames.ts diff --git a/public/locales/compatibility-v2/en/male_en.json b/public/locales/compatibility-v2/en/male_en.json index a6a9c53..0636f39 100644 --- a/public/locales/compatibility-v2/en/male_en.json +++ b/public/locales/compatibility-v2/en/male_en.json @@ -664,6 +664,12 @@ "title": "Bought today: ", "description": " people are buying now:" } + }, + "price-descriptions": { + "1": "Basic", + "2": "Standard", + "3": "Popular", + "4": "Premium" } }, "/scan-hand": { diff --git a/public/locales/v1/en/male_en.json b/public/locales/v1/en/male_en.json index 7755a0e..d388592 100644 --- a/public/locales/v1/en/male_en.json +++ b/public/locales/v1/en/male_en.json @@ -7,6 +7,20 @@ "day": "Day", "year": "Year", "month": "Month", + "months": { + "january": "January", + "february": "February", + "march": "March", + "april": "April", + "may": "May", + "june": "June", + "july": "July", + "august": "August", + "september": "September", + "october": "October", + "november": "November", + "december": "December" + }, "aura_paywall_redesign_main": { "text_0": "We've helped millions of people to have happier lives and better relationships, and we want to help you too.", "text_0_color": "millions", diff --git a/src/components/CompatibilityV2/pages/Birthdate/index.tsx b/src/components/CompatibilityV2/pages/Birthdate/index.tsx index 82bbf40..55999e2 100644 --- a/src/components/CompatibilityV2/pages/Birthdate/index.tsx +++ b/src/components/CompatibilityV2/pages/Birthdate/index.tsx @@ -14,6 +14,7 @@ import { useSession } from "@/hooks/session/useSession"; import { ESourceAuthorization } from "@/api/resources/User"; import { usePreloadImages } from "@/hooks/preload/images"; import { getZodiacSignByDate, ZODIACS } from "@/services/zodiac-sign"; +import { EUnleashFlags, useUnleash } from "@/hooks/ab/unleash/useUnleash"; function Birthdate() { const { translate } = useTranslations(ELocalesPlacement.CompatibilityV2); @@ -26,14 +27,19 @@ function Birthdate() { const { gender } = useSelector(selectors.selectQuestionnaire); const zodiacSign = getZodiacSignByDate(birthdate); + const { variant: dateMonth = "v0" } = useUnleash({ + flag: EUnleashFlags.v2CompatibilityDateMonth, + }); + usePreloadImages( - !!zodiacSign?.length ? - [ - `/zodiac-signs/${gender?.toLowerCase()}/${zodiacSign?.toLowerCase()}.svg` - ] : - ZODIACS.map( - (zodiac) => `/zodiac-signs/${gender?.toLowerCase()}/${zodiac?.toLowerCase()}.svg` - ) + zodiacSign?.length + ? [ + `/zodiac-signs/${gender?.toLowerCase()}/${zodiacSign?.toLowerCase()}.svg`, + ] + : ZODIACS.map( + (zodiac) => + `/zodiac-signs/${gender?.toLowerCase()}/${zodiac?.toLowerCase()}.svg` + ) ); const handleValid = (_birthdate: string) => { @@ -82,6 +88,7 @@ function Birthdate() { onValid={handleValid} onInvalid={() => setIsDisabled(true)} inputClassName="date-picker-input" + monthsDisplay={dateMonth === "v1" ? "name" : "number"} />