From 1fb01ffc11f7286cffd2360ee28f743cceb01490 Mon Sep 17 00:00:00 2001 From: bflatastic Date: Wed, 10 Jul 2024 23:51:29 +0700 Subject: [PATCH] redeem flow fix --- .../view/pages/beta_key/RedeemBetaKeyPage.tsx | 20 ++++++++++++++----- .../PostlaunchLanding/EmailSignUp.tsx | 13 ++++++++---- .../src/v2/view/pages/signup/SignupPage.tsx | 15 +++++++++++--- 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/beta_key/RedeemBetaKeyPage.tsx b/packages/fakeyou.com/src/v2/view/pages/beta_key/RedeemBetaKeyPage.tsx index 94c1fc8429..b11323d646 100644 --- a/packages/fakeyou.com/src/v2/view/pages/beta_key/RedeemBetaKeyPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/beta_key/RedeemBetaKeyPage.tsx @@ -1,10 +1,7 @@ import { Button, Container, Label, Panel, TempInput } from "components/common"; import React, { useEffect, useState } from "react"; import "./BetaKey.scss"; -import { - faKey, - faPersonWalkingArrowLoopLeft, -} from "@fortawesome/pro-solid-svg-icons"; +import { faArrowLeft, faKey } from "@fortawesome/pro-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { RedeemBetaKey } from "@storyteller/components/src/api/beta_key/RedeemBetaKey"; import { Link, useHistory, useParams } from "react-router-dom"; @@ -226,9 +223,22 @@ export default function RedeemBetaKeyPage() { /> + {/*

+ Don't have a beta key? Join the + + {" "} + waitlist + {" "} + now! +

*/}

- Back Home + + Back Home

diff --git a/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PostlaunchLanding/EmailSignUp.tsx b/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PostlaunchLanding/EmailSignUp.tsx index 38f0b55f05..09444a04e4 100644 --- a/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PostlaunchLanding/EmailSignUp.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PostlaunchLanding/EmailSignUp.tsx @@ -1,4 +1,4 @@ -import React, { useState } from "react"; +import React, { useCallback, useState } from "react"; import { Widget } from "@typeform/embed-react"; import ModalHeader from "components/modals/ModalHeader"; import { set } from "local-storage"; @@ -9,13 +9,16 @@ interface EmailSignUpProps { handleClose?: any; } -export default function EmailSignUp({ +export function EmailSignUp({ mobile, showHanashi = true, handleClose, }: EmailSignUpProps) { const [isHanashiHovered, setIsHanashiHovered] = useState(false); + const handleMouseEnter = useCallback(() => setIsHanashiHovered(true), []); + const handleMouseLeave = useCallback(() => setIsHanashiHovered(false), []); + return (
{handleClose && ( @@ -43,8 +46,8 @@ export default function EmailSignUp({ : "/images/landing/hanashi-demo-1.webp" } alt="Hanashi Demo" - onMouseEnter={() => setIsHanashiHovered(true)} - onMouseLeave={() => setIsHanashiHovered(false)} + onMouseEnter={handleMouseEnter} + onMouseLeave={handleMouseLeave} draggable="false" style={{ top: "-49%", @@ -67,3 +70,5 @@ export default function EmailSignUp({
); } + +export default React.memo(EmailSignUp); diff --git a/packages/fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx b/packages/fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx index c81a5009af..b4d9ed2d83 100644 --- a/packages/fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx @@ -262,15 +262,24 @@ function SignupPage(props: Props) { }; const redirectLink = queryParams.get("redirect"); + const redirectSignUpLink = "/beta-key/redeem?redirect=signup"; const afterSignupRedirect = async () => { const maybeInternalPlanKey = parsedQueryString["sub"] as string | undefined; - if (maybeInternalPlanKey !== undefined) { - return await BeginStripeCheckoutFlow(maybeInternalPlanKey); + if (domain.titlePart === "FakeYou") { + if (maybeInternalPlanKey !== undefined) { + return await BeginStripeCheckoutFlow(maybeInternalPlanKey); + } } - let redirectUrl = redirectLink || WebUrl.pricingPageWithReferer("signup"); + let redirectUrl = redirectLink || "/"; + if (domain.titlePart === "Storyteller AI") { + redirectUrl = redirectSignUpLink; + if (redirectUrl === redirectSignUpLink) { + sessionStorage.setItem("redirected", "true"); + } + } history.push(redirectUrl); return true;