gofnnp/w-aura
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/fix-trialDuration' into 'main'

Browse Source 
hotfix-fix-trialDuration

See merge request witapp/aura-webapp!228
This commit is contained in:
Daniil Chemerkin 2024-07-08 16:30:59 +00:00
commit e86f71e1c7
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/PaymentModal/index.tsx
View File

@ -151,7 +151,7 @@ function PaymentModal({
You will be charged only{" "} You will be charged only{" "}
<b> <b>
${getPrice(_activeProduct)} for your{" "} ${getPrice(_activeProduct)} for your{" "}
{_activeProduct.trialDuration}-day trial. {_activeProduct?.trialDuration}-day trial.
</b> </b>
</p> </p>
<p className={styles["sub-plan-description"]}> <p className={styles["sub-plan-description"]}>

4
src/components/pages/ABDesign/v1/pages/TrialChoice/index.tsx
View File

@ -108,8 +108,8 @@ function TrialChoicePage() {
replacement: { replacement: {
target: "${trialDuration}", target: "${trialDuration}",
replacement: replacement:
activeProduct?.trialDuration.toString() || activeProduct?.trialDuration?.toString() ||
products[0].trialDuration.toString() || products[0]?.trialDuration?.toString() ||
"3", "3",
}, },
})} })}

2
src/components/pages/ABDesign/v1/pages/TrialPayment/components/PaymentTable/index.tsx
View File

@ -87,7 +87,7 @@ function PaymentTable({
<GuardPayments /> <GuardPayments />
<p className={styles.policy}> <p className={styles.policy}>
You are enrolling in 2 weeks subscription. By continuing you agree that You are enrolling in 2 weeks subscription. By continuing you agree that
if you don't cancel prior to the end of the {product.trialDuration}-day if you don't cancel prior to the end of the {product?.trialDuration}-day
trial for the ${getPrice(product)} you will automatically be charged $ trial for the ${getPrice(product)} you will automatically be charged $
{product.price / 100}{" "} {product.price / 100}{" "}
every 2 weeks until you cancel in settings. Learn more about every 2 weeks until you cancel in settings. Learn more about

2
src/hooks/authentication/use-authentication.ts
View File

@ -67,7 +67,7 @@ export const useAuthentication = () => {
}, [partnerBirthdateFromForm, partnerBirthdateFromQuestionnaire, partnerBirthtime]) }, [partnerBirthdateFromForm, partnerBirthdateFromQuestionnaire, partnerBirthtime])
const formatDate = useCallback((date: string) => { const formatDate = useCallback((date: string) => {
const _date = moment(date).format("YYYY-MM-DD HH:mm"); const _date = moment(new Date(date)).format("YYYY-MM-DD HH:mm");
if (_date === "Invalid date") { if (_date === "Invalid date") {
return null; return null;
} }