Merge pull request #3863 from thematters/feat/sign-up-lang

fix(signup): pass langauge to sign up mutations

src/components/Forms/EmailLoginForm/index.tsx

@@ -127,7 +127,9 @@ export const EmailLoginForm: React.FC<FormProps> = ({
       try {
         setIsSubmitting(true)
         const { data } = await login({
-          variables: { input: { email, passwordOrCode: password } },
+          variables: {
+            input: { email, passwordOrCode: password, language: lang },
+          },
         })
 
         const token = data?.emailLogin.token || ''

src/components/Forms/WalletAuthForm/Connect.tsx

@@ -189,7 +189,7 @@ const Connect: React.FC<FormProps> = ({
         if (isLogin) {
           // confirm auth
           const { data: loginData } = await walletLogin({
-            variables,
+            variables: { input: { ...variables.input, language: lang } },
           })
 
           const token = loginData?.walletLogin.token || ''
@@ -216,9 +216,7 @@ const Connect: React.FC<FormProps> = ({
         }
 
         if (isConnect) {
-          await addWalletLogin({
-            variables: variables,
-          })
+          await addWalletLogin({ variables })
 
           toast.success({
             message: (

src/views/Callback/LoginCallback.tsx

@@ -1,12 +1,12 @@
-import { useEffect, useState } from 'react'
+import { useContext, useEffect, useState } from 'react'
 
 import {
   COOKIE_LANGUAGE,
   COOKIE_TOKEN_NAME,
   COOKIE_USER_GROUP,
 } from '~/common/enums'
 import { redirectToTarget, setCookies } from '~/common/utils'
-import { useMutation, useRoute } from '~/components'
+import { LanguageContext, useMutation, useRoute } from '~/components'
 import { EMAIL_LOGIN } from '~/components/GQL/mutations/emailLogin'
 import { EmailLoginMutation } from '~/gql/graphql'
 
@@ -19,6 +19,7 @@ const LoginCallback = () => {
     showToast: false,
   })
 
+  const { lang } = useContext(LanguageContext)
   const [hasError, setHasError] = useState(false)
   const { getQuery } = useRoute()
   const email = getQuery('email')
@@ -32,6 +33,7 @@ const LoginCallback = () => {
             input: {
               email,
               passwordOrCode: code,
+              language: lang,
             },
           },
         })

src/views/Callback/SocialCallback.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react'
+import { useContext, useEffect, useState } from 'react'
 
 import {
   COOKIE_LANGUAGE,
@@ -14,7 +14,12 @@ import {
   OAUTH_TYPE,
 } from '~/common/enums'
 import { analytics, setCookies, storage } from '~/common/utils'
-import { getErrorCodes, useMutation, useRoute } from '~/components'
+import {
+  getErrorCodes,
+  LanguageContext,
+  useMutation,
+  useRoute,
+} from '~/components'
 import {
   AddSocialLoginMutation,
   SocialAccountType,
@@ -41,6 +46,8 @@ const SocialCallback = ({ type }: Props) => {
       showToast: false,
     }
   )
+  const { lang } = useContext(LanguageContext)
+
   const [hasError, setHasError] = useState(false)
   const { getQuery } = useRoute()
   const state = getQuery('state')
@@ -73,6 +80,7 @@ const SocialCallback = ({ type }: Props) => {
                 nonce: localNonce,
                 codeVerifier: localCodeVerifier,
                 authorizationCode: code,
+                language: lang,
               },
             },
           })