Merge pull request #3831 from thematters/fix/user-settings-copies

fix(user): fix password copy of unverified email user
thematters · Sep 20, 2023 · 1576e9d · 1576e9d · vercel · Sep 20, 2023
2 parents c2f41e3 + 51ccf39
commit 1576e9d
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 4 deletions.
diff --git a/lang/default.json b/lang/default.json
@@ -1,4 +1,8 @@
 {
+  "+51DoZ": {
+    "defaultMessage": "Please verify email first",
+    "description": "src/views/Me/Settings/Settings/Password/index.tsx"
+  },
   "+63O1f": {
     "defaultMessage": "Incorrect email or password",
     "description": "USER_PASSWORD_INVALID"

diff --git a/lang/en.json b/lang/en.json
@@ -1,4 +1,8 @@
 {
+  "+51DoZ": {
+    "defaultMessage": "Please verify email first",
+    "description": "src/views/Me/Settings/Settings/Password/index.tsx"
+  },
   "+63O1f": {
     "defaultMessage": "Incorrect email or password",
     "description": "USER_PASSWORD_INVALID"

diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json
@@ -1,4 +1,8 @@
 {
+  "+51DoZ": {
+    "defaultMessage": "请先验证邮箱",
+    "description": "src/views/Me/Settings/Settings/Password/index.tsx"
+  },
   "+63O1f": {
     "defaultMessage": "邮箱或密码错误",
     "description": "USER_PASSWORD_INVALID"

diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json
@@ -1,4 +1,8 @@
 {
+  "+51DoZ": {
+    "defaultMessage": "請先驗證郵箱",
+    "description": "src/views/Me/Settings/Settings/Password/index.tsx"
+  },
   "+63O1f": {
     "defaultMessage": "郵件地址或密碼錯誤",
     "description": "USER_PASSWORD_INVALID"

diff --git a/src/views/Me/Settings/Account/Password/index.tsx b/src/views/Me/Settings/Account/Password/index.tsx
@@ -7,7 +7,8 @@ import { SettingsButton } from '../../Button'
 
 const Password = () => {
   const viewer = useContext(ViewerContext)
-  const hasEmail = !!viewer.info.email && !!viewer.info.emailVerified
+  const hasEmail = !!viewer.info.email
+  const isEmailVerified = !!viewer.info.emailVerified
   const hasPassword = !!viewer.status?.hasEmailLoginPassword
 
   return (
@@ -23,7 +24,12 @@ const Password = () => {
             }
             rightText={
               hasEmail ? (
-                hasPassword ? (
+                !isEmailVerified ? (
+                  <FormattedMessage
+                    defaultMessage="Please verify email first"
+                    description="src/views/Me/Settings/Settings/Password/index.tsx"
+                  />
+                ) : hasPassword ? (
                   <FormattedMessage defaultMessage="Change" />
                 ) : undefined
               ) : (
@@ -34,9 +40,13 @@ const Password = () => {
               )
             }
             rightTextColor={!hasEmail ? 'grey' : undefined}
-            onClick={hasEmail && hasPassword ? openDialog : undefined}
+            onClick={
+              hasEmail && isEmailVerified && !hasPassword
+                ? openDialog
+                : undefined
+            }
             right={
-              hasEmail && !hasPassword ? (
+              hasEmail && isEmailVerified && !hasPassword ? (
                 <SettingsButton onClick={openDialog}>
                   <FormattedMessage defaultMessage="Set" />
                 </SettingsButton>