feat: watch state

Author: limichange

packages/kit/src/views/Prime/components/PrimeLoginEmailCodeDialogV2/PrimeLoginEmailCodeDialogV2.tsx

@@ -14,15 +14,18 @@ import {
 } from '@onekeyhq/components';
 import { ETranslations } from '@onekeyhq/shared/src/locale';
 
+import type { IPrivyState } from '../../hooks/usePrivyUniversalV2/usePrivyUniversalV2Types';
+
 const COUNTDOWN_TIME = 60;
 
 export function PrimeLoginEmailCodeDialogV2(props: {
   email: string;
+  state: IPrivyState;
   loginWithCode: (args: { code: string; email?: string }) => Promise<void>;
   sendCode: (args: { email: string }) => void;
   onLoginSuccess: () => void;
 }) {
-  const { email, loginWithCode, sendCode, onLoginSuccess } = props;
+  const { email, loginWithCode, sendCode, onLoginSuccess, state } = props;
   const [countdown, setCountdown] = useState(COUNTDOWN_TIME);
   const [isResending, setIsResending] = useState(false);
   const [verificationCode, setVerificationCode] = useState('');
@@ -128,13 +131,25 @@ export function PrimeLoginEmailCodeDialogV2(props: {
               email,
             });
 
-            onLoginSuccess?.();
-
-            Toast.success({
-              title: intl.formatMessage({
-                id: ETranslations.login_welcome_message,
-              }),
-            });
+            if (state.status === 'done') {
+              Toast.success({
+                title: intl.formatMessage({
+                  id: ETranslations.login_welcome_message,
+                }),
+              });
+
+              onLoginSuccess?.();
+            }
+
+            if (state.status === 'error') {
+              Toast.error({
+                title: intl.formatMessage({
+                  id: ETranslations.auth_error_passcode_incorrect,
+                }),
+              });
+
+              preventClose();
+            }
           } catch (error) {
             console.log('error', error);
 

packages/kit/src/views/Prime/hooks/usePrimeAuthV2.tsx

@@ -33,20 +33,16 @@ export function usePrimeAuthV2() {
   useEffect(() => {
     if (state.status === 'sending-code') {
       Toast.success({
-        title: '🔑 ✅ send code',
+        title: 'send code',
       });
     } else if (state.status === 'awaiting-code-input') {
       Toast.success({
-        title: '🔑 ✅ awaiting code input',
-      });
-    } else if (state.status === 'submitting-code') {
-      Toast.success({
-        title: '🔑 ✅ submitting code',
-      });
-    } else if (state.status === 'error') {
-      Toast.error({
-        title: '🔑 ❌ User failed to log in with email',
+        title: 'awaiting code input',
       });
+      // } else if (state.status === 'submitting-code') {
+      //   Toast.success({
+      //     title: 'submitting code',
+      //   });
     }
   }, [state.status]);
 
@@ -63,6 +59,7 @@ export function usePrimeAuthV2() {
                 renderContent: (
                   // 4. input code
                   <PrimeLoginEmailCodeDialogV2
+                    state={state}
                     sendCode={sendCode}
                     loginWithCode={loginWithCode}
                     email={email}

packages/kit/src/views/Prime/hooks/usePrivyUniversalV2/usePrivyUniversalV2Types.ts

@@ -1,4 +1,4 @@
-type IState =
+export type IPrivyState =
   | { status: 'initial' }
   | {
       status: 'error';
@@ -17,7 +17,7 @@ export interface IUsePrivyUniversalV2 {
     onComplete?: () => void;
     onError?: (error: any) => void;
   }) => {
-    state: IState;
+    state: IPrivyState;
     sendCode: (args: { email: string }) => Promise<void>;
     loginWithCode: (args: { code: string; email?: string }) => Promise<void>;
   };