Merge pull request #3981 from thematters/fix/Social-login

Fix/social login
thematters · Nov 8, 2023 · 7f8d362 · 7f8d362 · vercel · Nov 8, 2023
2 parents 25bac39 + 2c368d1
commit 7f8d362
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 15 deletions.
diff --git a/src/common/styles/mixins.css b/src/common/styles/mixins.css
@@ -144,7 +144,7 @@
 
   height: var(--input-height);
   padding: var(--spacing-tight);
-  font-size: var(--font-size-md);
+  font-size: var(--font-size-sm);
   line-height: 1.375rem;
   color: var(--color-black);
   background-color: var(--color-white);

diff --git a/src/common/utils/form/validate.ts b/src/common/utils/form/validate.ts
@@ -112,14 +112,7 @@ export const validatePaymentPointer = (value: string, lang: Language) => {
 }
 
 export const validateUserName = (value: string, lang: Language) => {
-  if (!value) {
-    return translate({ id: 'required', lang })
-  }
-
-  if (
-    value.length < MIN_USER_NAME_LENGTH ||
-    value.length > MAX_USER_NAME_LENGTH
-  ) {
+  if (value.length > MAX_USER_NAME_LENGTH) {
     return translate({
       zh_hant: `ID 字符數須介於 ${MIN_USER_NAME_LENGTH} 到 ${MAX_USER_NAME_LENGTH} 之間`,
       zh_hans: `ID 字符数须介于 ${MIN_USER_NAME_LENGTH} 到 ${MAX_USER_NAME_LENGTH} 之间`,

diff --git a/src/components/Dialogs/SetUserNameDialog/InputStep.tsx b/src/components/Dialogs/SetUserNameDialog/InputStep.tsx
@@ -106,7 +106,6 @@ const InputStep: React.FC<Props> = ({ userName, gotoConfirm }) => {
         type="text"
         // Why not use userName, userName will trigger auto fill feature in safari
         name="mattersID"
-        required
         autoFocus
         placeholder={intl.formatMessage({
           defaultMessage: 'English letters, numbers, and underscores',

diff --git a/src/components/Dialogs/SetUserNameDialog/styles.module.css b/src/components/Dialogs/SetUserNameDialog/styles.module.css
@@ -1,7 +1,7 @@
 .atFlag {
   display: inline-block;
   padding-right: var(--spacing-xx-tight);
-  font-size: var(--font-size-md);
+  font-size: var(--font-size-sm);
   line-height: 1.375rem;
   color: var(--color-grey-light);
 }
diff --git a/src/components/Form/AmountInput/styles.module.css b/src/components/Form/AmountInput/styles.module.css
@@ -10,7 +10,7 @@
   top: 0;
   left: var(--spacing-base);
   height: 100%;
-  font-size: var(--font-size-md);
+  font-size: var(--font-size-sm);
   line-height: var(--input-height);
   color: var(--color-black);
   pointer-events: none;

diff --git a/src/views/Me/Settings/Account/Socials/index.tsx b/src/views/Me/Settings/Account/Socials/index.tsx
@@ -11,6 +11,7 @@ import {
 import {
   // facebookOauthUrl,
   googleOauthUrl,
+  isSafari,
   sleep,
   storage,
   twitterOauthUrl,
@@ -92,6 +93,7 @@ const Socials = () => {
       return
     }
     const state = bindResult.state
+    const delay = isSafari() ? 2 * 1000 : 0
     if (state === OAUTH_STORAGE_BIND_STATE_SUCCESS) {
       setTimeout(() => {
         toast.success({
@@ -106,7 +108,7 @@ const Socials = () => {
             />
           ),
         })
-      })
+      }, delay)
       return
     }
 
@@ -124,7 +126,7 @@ const Socials = () => {
             />
           ),
         })
-      })
+      }, delay)
       return
     }
 
@@ -139,7 +141,7 @@ const Socials = () => {
             />
           ),
         })
-      })
+      }, delay)
       return
     }
   }, [])