fix: V2

Author: limichange

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

@@ -13,7 +13,7 @@ export function PrimeLoginEmailDialogV2(props: {
   const intl = useIntl();
 
   const form = useForm<{ email: string }>({
-    defaultValues: { email: 'limichange@hotmail.com' },
+    defaultValues: { email: 'yao.hou@onekey.so' },
   });
 
   const submit = useCallback(

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

@@ -1,4 +1,4 @@
-import { useEffect } from 'react';
+import { useEffect, useRef } from 'react';
 
 import type { IDialogInstance } from '@onekeyhq/components';
 import { Dialog, Toast } from '@onekeyhq/components';
@@ -11,8 +11,11 @@ import { usePrivyUniversalV2 } from './usePrivyUniversalV2';
 
 export function usePrimeAuthV2() {
   const [primePersistAtom] = usePrimePersistAtom();
+  const emailDialogRef = useRef<IDialogInstance | undefined>(undefined);
+  const emailCodeDialogRef = useRef<IDialogInstance | undefined>(undefined);
 
-  const { useLoginWithEmail, logout } = usePrivyUniversalV2();
+  const { useLoginWithEmail, logout, getAccessToken, isReady, authenticated } =
+    usePrivyUniversalV2();
   const { sendCode, loginWithCode, state } = useLoginWithEmail({
     onComplete: () => {
       console.log('🔑 ✅ User successfully logged in with email');
@@ -22,10 +25,35 @@ export function usePrimeAuthV2() {
     },
   });
 
+  async function closeDialogs() {
+    await emailDialogRef.current?.close();
+    await emailCodeDialogRef.current?.close();
+  }
+
   useEffect(() => {
-    Toast.success({
-      title: JSON.stringify(state),
-    });
+    if (state.status === 'sending-code') {
+      Toast.success({
+        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 === 'done') {
+      Toast.success({
+        title: '🔑 ✅ User successfully logged in with email',
+      });
+
+      closeDialogs();
+    } else if (state.status === 'error') {
+      Toast.error({
+        title: '🔑 ❌ User failed to log in with email',
+      });
+    }
   }, [state]);
 
   const loginWithEmail = async () => {
@@ -36,7 +64,7 @@ export function usePrimeAuthV2() {
           // 2. on email submitted
           onEmailSubmitted={async (email) => {
             // 3. open code dialog
-            Dialog.show({
+            emailCodeDialogRef.current = Dialog.show({
               renderContent: (
                 // 4. input code
                 <PrimeLoginEmailCodeDialogV2
@@ -51,8 +79,15 @@ export function usePrimeAuthV2() {
       ),
     });
 
-    console.log('dialog', dialog);
+    emailDialogRef.current = dialog;
   };
 
-  return { loginWithEmail, user: primePersistAtom, logout };
+  return {
+    loginWithEmail,
+    user: primePersistAtom,
+    logout,
+    getAccessToken,
+    isReady,
+    authenticated,
+  };
 }

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

@@ -1,8 +1,9 @@
 import { useLoginWithEmail, usePrivy } from '@privy-io/expo';
 
-import type { IUsePrivyUniversalV2 } from './usePrivyUniversalV2Types';
 import { Toast } from '@onekeyhq/components';
 
+import type { IUsePrivyUniversalV2 } from './usePrivyUniversalV2Types';
+
 export function usePrivyUniversalV2(): IUsePrivyUniversalV2 {
   const { logout, isReady, getAccessToken, user } = usePrivy();
   const authenticated = !!user;

packages/kit/src/views/Prime/pages/PrimeDashboard/PrimeDashboard.tsx

@@ -28,7 +28,6 @@ import openUrlUtils from '@onekeyhq/shared/src/utils/openUrlUtils';
 import timerUtils from '@onekeyhq/shared/src/utils/timerUtils';
 
 import { useFetchPrimeUserInfo } from '../../hooks/useFetchPrimeUserInfo';
-import { usePrimeAuth } from '../../hooks/usePrimeAuth';
 import { usePrimeAuthV2 } from '../../hooks/usePrimeAuthV2';
 import { usePrimePayment } from '../../hooks/usePrimePayment';
 
@@ -67,9 +66,15 @@ function PrimeBanner() {
 
 export default function PrimeDashboard() {
   const intl = useIntl();
-  const { loginWithEmail } = usePrimeAuthV2();
+  const {
+    getAccessToken,
+    user,
+    loginWithEmail,
+    logout,
+    isReady,
+    authenticated,
+  } = usePrimeAuthV2();
   const { top } = useSafeAreaInsets();
-  const { logout, privy, getAccessToken, user } = usePrimeAuth();
   const navigation = useAppNavigation();
   const { fetchPrimeUserInfo } = useFetchPrimeUserInfo();
   useEffect(() => {
@@ -261,10 +266,8 @@ export default function PrimeDashboard() {
               <Button
                 onPress={() => {
                   showDebugMessageByDialog({
-                    ready: privy.isReady,
-                    authenticated: privy.authenticated,
-                    nativeUser: privy?.native?.user,
-                    webUser: privy?.web?.user,
+                    ready: isReady,
+                    authenticated,
                   });
                 }}
               >

packages/kit/src/views/Prime/pages/PrimeDashboard/PrimeUserInfo.tsx

@@ -2,7 +2,7 @@ import { StyleSheet } from 'react-native';
 
 import { Badge, Icon, SizableText, XStack } from '@onekeyhq/components';
 
-import { usePrimeAuth } from '../../hooks/usePrimeAuth';
+import { usePrimeAuthV2 } from '../../hooks/usePrimeAuthV2';
 
 import { PrimeUserInfoMoreButton } from './PrimeUserInfoMoreButton';
 
@@ -11,7 +11,7 @@ export function PrimeUserInfo({
 }: {
   doPurchase?: () => Promise<void>;
 }) {
-  const { user, privy } = usePrimeAuth();
+  const { user } = usePrimeAuthV2();
   const isPrime = user?.primeSubscription?.isActive;
 
   return (
@@ -31,8 +31,8 @@ export function PrimeUserInfo({
       <Icon name="PeopleOutline" color="$iconSubdued" size="$5" />
       <SizableText
         onPress={() => {
-          console.log(privy?.web?.user);
-          console.log(privy?.native?.user);
+          // console.log(privy?.web?.user);
+          // console.log(privy?.native?.user);
         }}
         flex={1}
         size="$bodyMdMedium"