fix(SocialLogin): revise error copy

thematters · Oct 9, 2023 · 1c0168a · 1c0168a
1 parent 42d158b
commit 1c0168a
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 8 deletions.
diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json
@@ -1835,4 +1835,4 @@
     "defaultMessage": "{subscriber, plural, =1 {人} other {人}}",
     "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   }
-}
+}
diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json
@@ -1835,4 +1835,4 @@
     "defaultMessage": "{subscriber, plural, =1 {人} other {人}}",
     "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   }
-}
+}
diff --git a/src/components/Dialogs/SetEmailDialog/Content.tsx b/src/components/Dialogs/SetEmailDialog/Content.tsx
@@ -5,6 +5,7 @@ import React, { useContext } from 'react'
 import { FormattedMessage, useIntl } from 'react-intl'
 
 import {
+  ERROR_CODES,
   KEYVALUE,
   MAX_CHANGE_EMAIL_TIME_DAILY,
   TOAST_SEND_EMAIL_VERIFICATION,
@@ -117,7 +118,17 @@ const SetEmailDialogContent: React.FC<FormProps> = ({ closeDialog }) => {
       } catch (error) {
         const [messages, codes] = parseFormSubmitErrors(error as any)
         codes.forEach((code) => {
-          setFieldError('email', intl.formatMessage(messages[code]))
+          if (code.includes(ERROR_CODES.FORBIDDEN_BY_STATE)) {
+            setFieldError(
+              'email',
+              intl.formatMessage({
+                defaultMessage: 'Unavailable',
+                description: 'FORBIDDEN_BY_STATE',
+              })
+            )
+          } else {
+            setFieldError('email', intl.formatMessage(messages[code]))
+          }
         })
         setSubmitting(false)
       }

diff --git a/src/components/Forms/EmailLoginForm/index.tsx b/src/components/Forms/EmailLoginForm/index.tsx
@@ -179,6 +179,14 @@ export const EmailLoginForm: React.FC<FormProps> = ({
                   'This login code has expired, please try to resend',
               })
             )
+          } else if (code.includes(ERROR_CODES.FORBIDDEN_BY_STATE)) {
+            setFieldError(
+              'email',
+              intl.formatMessage({
+                defaultMessage: 'Unavailable',
+                description: 'FORBIDDEN_BY_STATE',
+              })
+            )
           } else {
             setFieldError('password', intl.formatMessage(messages[code]))
           }
@@ -220,10 +228,16 @@ export const EmailLoginForm: React.FC<FormProps> = ({
         passwordRef.current.focus()
       }
     } catch (error) {
-      const [messages, codes] = parseFormSubmitErrors(error as any)
+      const [, codes] = parseFormSubmitErrors(error as any)
       codes.forEach((code) => {
         if (code.includes(ERROR_CODES.FORBIDDEN_BY_STATE)) {
-          setFieldError('password', intl.formatMessage(messages[code]))
+          setFieldError(
+            'email',
+            intl.formatMessage({
+              defaultMessage: 'Unavailable',
+              description: 'FORBIDDEN_BY_STATE',
+            })
+          )
         }
       })
     }

diff --git a/src/components/Forms/EmailSignUpForm/Init.tsx b/src/components/Forms/EmailSignUpForm/Init.tsx
@@ -4,6 +4,7 @@ import _pickBy from 'lodash/pickBy'
 import { useContext, useRef, useState } from 'react'
 import { FormattedMessage, useIntl } from 'react-intl'
 
+import { ERROR_CODES } from '~/common/enums'
 import {
   parseFormSubmitErrors,
   signupCallbackUrl,
@@ -122,7 +123,17 @@ const Init: React.FC<FormProps> = ({
         setSubmitting(false)
 
         const [messages, codes] = parseFormSubmitErrors(error as any)
-        setFieldError('email', intl.formatMessage(messages[codes[0]]))
+        if (codes[0].includes(ERROR_CODES.FORBIDDEN_BY_STATE)) {
+          setFieldError(
+            'email',
+            intl.formatMessage({
+              defaultMessage: 'Unavailable',
+              description: 'FORBIDDEN_BY_STATE',
+            })
+          )
+        } else {
+          setFieldError('email', intl.formatMessage(messages[codes[0]]))
+        }
 
         refreshToken?.()
         turnstileRef.current?.reset()

diff --git a/src/views/Callback/SocialCallback.tsx b/src/views/Callback/SocialCallback.tsx
@@ -19,7 +19,6 @@ import {
 } from '~/common/enums'
 import { analytics, setCookies, storage } from '~/common/utils'
 import {
-  ERROR_MESSAGES,
   getErrorCodes,
   LanguageContext,
   toast,
@@ -113,7 +112,8 @@ const SocialCallback = ({ type }: Props) => {
               toast.error({
                 message: (
                   <FormattedMessage
-                    {...ERROR_MESSAGES[ERROR_CODES.FORBIDDEN_BY_STATE]}
+                    defaultMessage="Unavailable"
+                    description="FORBIDDEN_BY_STATE"
                   />
                 ),
               })
-Original file line number
+Diff line change
@@ Expand Up / @@ -1835,4 +1835,4 @@ @@
         "defaultMessage": "{subscriber, plural, =1 {人} other {人}}",
         "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
       }
-    }
+    }