Merge pull request #3890 from thematters/fix/social-login

Fix/social login

src/components/Dialogs/SetPasswordDialog/Content.tsx

@@ -1,7 +1,7 @@
 import { useFormik } from 'formik'
 import gql from 'graphql-tag'
 import _pickBy from 'lodash/pickBy'
-import React, { useContext, useEffect, useState } from 'react'
+import React, { useContext } from 'react'
 import { FormattedMessage, useIntl } from 'react-intl'
 
 import { KEYVALUE } from '~/common/enums'
@@ -48,7 +48,6 @@ const SetPasswordDialogContent: React.FC<FormProps> = ({ closeDialog }) => {
   const [set] = useMutation<SetPasswordMutation>(SET_PASSWORD, undefined, {
     showToast: false,
   })
-  const [inputType, setInputType] = useState<'password' | 'text'>('password')
 
   const { lang } = useContext(LanguageContext)
 
@@ -99,15 +98,10 @@ const SetPasswordDialogContent: React.FC<FormProps> = ({ closeDialog }) => {
     },
   })
 
-  useEffect(() => {
-    // Switch back to plaintext display
-    setInputType('text')
-  }, [])
-
   const InnerForm = (
     <Form id={formId} onSubmit={handleSubmit}>
       <Form.Input
-        type={inputType}
+        type="text"
         name="password"
         autoFocus
         required

src/components/Forms/PaymentForm/PayTo/Confirm/index.tsx

@@ -240,8 +240,8 @@ const Confirm: React.FC<FormProps> = ({
           <>
             <p className={styles.hint}>
               <Translate
-                zh_hant="输入六位數字交易密碼即可完成："
-                zh_hans="輸入六位数字交易密码即可完成："
+                zh_hant="輸入六位數字交易密碼即可完成："
+                zh_hans="输入六位数字交易密码即可完成："
                 en="Please Enter a 6-digit payment password"
               />
             </p>

src/components/GlobalDialogs/index.tsx

@@ -1,22 +1,31 @@
 import { useContext, useEffect } from 'react'
 
 import { OPEN_SET_USER_NAME_DIALOG } from '~/common/enums'
-import { LikeCoinDialog, SetUserNameDialog, ViewerContext } from '~/components'
+import {
+  LikeCoinDialog,
+  SetUserNameDialog,
+  useRoute,
+  ViewerContext,
+} from '~/components'
 
 import UniversalAuthDialog from './UniversalAuthDialog'
 
 const GlobalDialogs = () => {
   const viewer = useContext(ViewerContext)
+  const { router, isInPath } = useRoute()
 
   useEffect(() => {
     if (!viewer.isAuthed) {
       return
     }
 
-    if (!viewer.userName || viewer.info.userNameEditable) {
+    if (
+      (!viewer.userName || viewer.info.userNameEditable) &&
+      !isInPath('CALLBACK_PROVIDER')
+    ) {
       window.dispatchEvent(new CustomEvent(OPEN_SET_USER_NAME_DIALOG))
     }
-  }, [])
+  }, [router.pathname])
 
   return (
     <>

src/views/Me/Settings/Account/Socials/index.tsx

@@ -1,4 +1,4 @@
-import { useContext, useLayoutEffect, useState } from 'react'
+import { useContext, useEffect, useState } from 'react'
 import { FormattedMessage } from 'react-intl'
 
 import {
@@ -69,7 +69,7 @@ const Socials = () => {
     router.push(url)
   }
 
-  useLayoutEffect(() => {
+  useEffect(() => {
     const bindResult = storage.remove(OAUTH_STORAGE_BIND_STATE)
     if (!bindResult) {
       return