Merge pull request #4089 from thematters/feat/email-sign-up-referral

fix(referral): fix referral via email signup
thematters · Dec 14, 2023 · 8110b3e · 8110b3e
2 parents 7c74c93 + 73d91eb
commit 8110b3e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/common/utils/oauth.ts b/src/common/utils/oauth.ts
@@ -7,6 +7,7 @@ import {
   OAUTH_SESSSION_STORAGE_OAUTH_TYPE,
   OAUTH_TYPE,
   PATHS,
+  REFERRAL_QUERY_REFERRAL_KEY,
 } from '~/common/enums'
 
 export const toReadableScope = ({
@@ -96,10 +97,12 @@ export const facebookOauthUrl = async (type: OauthType) => {
   return url
 }
 
-export const signupCallbackUrl = (email: string) => {
+export const signupCallbackUrl = (email: string, referralCode: string) => {
   return `https://${process.env.NEXT_PUBLIC_SITE_DOMAIN}/callback/${
     CALLBACK_PROVIDERS.EmailSignup
-  }?email=${encodeURIComponent(email)}`
+  }?email=${encodeURIComponent(
+    email
+  )}&${REFERRAL_QUERY_REFERRAL_KEY}=${encodeURIComponent(referralCode)}`
 }
 
 export const signinCallbackUrl = (email: string) => {

diff --git a/src/components/Forms/EmailSignUpForm/Init.tsx b/src/components/Forms/EmailSignUpForm/Init.tsx
@@ -4,10 +4,15 @@ import _pickBy from 'lodash/pickBy'
 import { useContext, useRef, useState } from 'react'
 import { FormattedMessage, useIntl } from 'react-intl'
 
-import { ERROR_CODES } from '~/common/enums'
+import {
+  ERROR_CODES,
+  REFERRAL_QUERY_REFERRAL_KEY,
+  REFERRAL_STORAGE_REFERRAL_CODE,
+} from '~/common/enums'
 import {
   parseFormSubmitErrors,
   signupCallbackUrl,
+  storage,
   validateEmail,
 } from '~/common/utils'
 import { WalletType } from '~/common/utils'
@@ -26,6 +31,7 @@ import {
   // TURNSTILE_DEFAULT_SCRIPT_ID,
   TurnstileInstance,
   useMutation,
+  useRoute,
   ViewerContext,
 } from '~/components'
 import SEND_CODE from '~/components/GQL/mutations/sendCode'
@@ -79,6 +85,12 @@ const Init: React.FC<FormProps> = ({
     }
   )
   const intl = useIntl()
+  const { getQuery } = useRoute()
+  const referralCode =
+    getQuery(REFERRAL_QUERY_REFERRAL_KEY) ||
+    storage.get(REFERRAL_STORAGE_REFERRAL_CODE)?.referralCode ||
+    undefined
+
   const {
     values,
     errors,
@@ -99,7 +111,7 @@ const Init: React.FC<FormProps> = ({
       }),
     onSubmit: async ({ email }, { setFieldError, setSubmitting }) => {
       try {
-        const redirectUrl = signupCallbackUrl(email)
+        const redirectUrl = signupCallbackUrl(email, referralCode)
         await sendCode({
           variables: {
             input: {