fix: new user email uses onboarding data cache (#1921)

Author: jaredvu

src/providers/TurnkeyAuthProvider.tsx

@@ -27,7 +27,6 @@ import { appQueryClient } from '@/state/appQueryClient';
 import { useAppDispatch, useAppSelector } from '@/state/appTypes';
 import { forceOpenDialog, openDialog } from '@/state/dialogs';
 import {
-  clearTurnkeyEmailOnboardingData,
   setRequiresAddressUpload,
   setTurnkeyEmailOnboardingData,
   setWalletInfo,
@@ -163,12 +162,12 @@ const useTurnkeyAuthContext = () => {
           throw new Error('Current unsupported login method');
       }
     },
-    onError: (error, variables) => {
+    onError: async (error, variables) => {
       selectWallet(undefined);
       setEmailSignInStatus('error');
       const { errorMessage, shouldLog } = parseTurnkeyError(error.message, stringGetter);
       setEmailSignInError(errorMessage);
-      endTurnkeySession();
+      await endTurnkeySession();
 
       if (shouldLog) {
         logBonsaiError('TurnkeyOnboarding', 'Error during sign-in', { error });
@@ -366,16 +365,14 @@ const useTurnkeyAuthContext = () => {
             })
         );
 
-        endTurnkeySession();
+        await endTurnkeySession();
         setEmailSignInStatus('error');
       } finally {
         // Clear token from state after it has been consumed
         setEmailToken(undefined);
         // Remove the token from the search params after it has been saved to state
         searchParams.delete('token');
         setSearchParams(searchParams);
-        // Clear email sign in data
-        dispatch(clearTurnkeyEmailOnboardingData());
       }
     },
     [
@@ -387,7 +384,6 @@ const useTurnkeyAuthContext = () => {
       setWalletFromSignature,
       searchParams,
       setSearchParams,
-      dispatch,
       stringGetter,
       endTurnkeySession,
     ]

src/views/dialogs/EmailSignInStatusDialog.tsx

@@ -1,9 +1,10 @@
-import { useCallback, useMemo } from 'react';
+import { useCallback, useMemo, useRef } from 'react';
 
 import { ButtonAction, ButtonShape, ButtonSize, ButtonType } from '@/constants/buttons';
 import { DialogTypes } from '@/constants/dialogs';
 import { STRING_KEYS } from '@/constants/localization';
 import { ConnectorType } from '@/constants/wallets';
+import { LoginMethod } from '@/types/turnkey';
 
 import { useStringGetter } from '@/hooks/useStringGetter';
 import { useTurnkeyAuth } from '@/providers/TurnkeyAuthProvider';
@@ -18,7 +19,7 @@ import { useAppDispatch, useAppSelector } from '@/state/appTypes';
 import { AppTheme } from '@/state/appUiConfigs';
 import { getAppTheme, getChartDotBackground } from '@/state/appUiConfigsSelectors';
 import { openDialog } from '@/state/dialogs';
-import { getSourceAccount } from '@/state/walletSelectors';
+import { getSourceAccount, getTurnkeyEmailOnboardingData } from '@/state/walletSelectors';
 
 import { calc } from '@/lib/do';
 import { sleep } from '@/lib/timeUtils';
@@ -38,6 +39,16 @@ export const EmailSignInStatusDialog = ({
   const isLightMode = appTheme === AppTheme.Light;
   const isTurnkey = walletInfo?.connectorType === ConnectorType.Turnkey;
   const chartDotBackground = useAppSelector(getChartDotBackground);
+  const turnkeyEmailOnboardingData = useAppSelector(getTurnkeyEmailOnboardingData);
+  const hasNoUploadedAddress =
+    walletInfo?.connectorType === ConnectorType.Turnkey &&
+    walletInfo.loginMethod === LoginMethod.Email &&
+    !turnkeyEmailOnboardingData?.dydxAddress;
+
+  // Use cached turnkeyEmailOnboardingData to determine if we should show the welcome content
+  // turnkeyEmailOnboardingData is cleared after handling, so we only want initial state
+  const showWelcomeContentRef = useRef(hasNoUploadedAddress || isNewTurnkeyUser);
+  const showWelcomeContent = showWelcomeContentRef.current;
 
   const setIsOpenInner = useCallback(
     (isOpen: boolean) => {
@@ -173,7 +184,7 @@ export const EmailSignInStatusDialog = ({
             backgroundClip: 'text',
           }}
         >
-          {isNewTurnkeyUser
+          {showWelcomeContent
             ? stringGetter({ key: STRING_KEYS.WELCOME_DYDX })
             : stringGetter({ key: STRING_KEYS.WELCOME_BACK })}
         </span>
@@ -191,13 +202,13 @@ export const EmailSignInStatusDialog = ({
         onClick={async () => {
           setIsOpen(false);
 
-          if (isNewTurnkeyUser) {
+          if (showWelcomeContent) {
             await sleep(0);
             dispatch(openDialog(DialogTypes.Deposit2({})));
           }
         }}
       >
-        {isNewTurnkeyUser
+        {showWelcomeContent
           ? `${stringGetter({ key: STRING_KEYS.DEPOSIT_AND_TRADE })} →`
           : stringGetter({ key: STRING_KEYS.CONTINUE })}
       </Button>