Onboarding: Fix - Ensure proper flow for skipped Pin and Notifications interactions

src/components/modal/pin/PinModal.tsx

@@ -192,6 +192,7 @@ const Pin = gestureHandlerRootHOC(
             dispatch(AppActions.lockAuthorizedUntil(authorizedUntil));
 
             if (context === 'onboarding') {
+              dispatch(AppActions.setPinInteractionDone());
               gotoCreateKeyRef.current();
             } else {
               dispatch(AppActions.dismissPinModal());

src/navigation/onboarding/screens/Notifications.tsx

@@ -15,7 +15,7 @@ import {
   TitleContainer,
 } from '../../../components/styled/Containers';
 import {H3, Paragraph, TextAlign} from '../../../components/styled/Text';
-import {AppEffects} from '../../../store/app';
+import {AppActions, AppEffects} from '../../../store/app';
 import {useAppDispatch} from '../../../utils/hooks';
 import {useThemeType} from '../../../utils/hooks/useThemeType';
 import {OnboardingGroupParamList, OnboardingScreens} from '../OnboardingGroup';
@@ -63,6 +63,7 @@ const NotificationsScreen = ({
 
   const onSkipPressRef = useRef(async () => {
     haptic('impactLight');
+    dispatch(AppActions.setNotificationsInteractionDone());
     dispatch(
       Analytics.track('Clicked Skip Notifications', {
         context: 'onboarding',
@@ -93,6 +94,7 @@ const NotificationsScreen = ({
   const onSetNotificationsPress = async (notificationsAccepted: boolean) => {
     const setAndNavigate = (accepted: boolean) => {
       haptic('impactLight');
+      dispatch(AppActions.setNotificationsInteractionDone());
       dispatch(AppEffects.setNotifications(accepted));
       if (notificationsAccepted) {
         dispatch(

src/navigation/onboarding/screens/OnboardingStart.tsx

@@ -135,6 +135,10 @@ const OnboardingStart = ({navigation}: OnboardingStartScreenProps) => {
   const {t} = useTranslation();
   const dispatch = useAppDispatch();
   const themeType = useThemeType();
+  const notificationsInteractionDone = useAppSelector(
+    ({APP}) => APP.notificationsInteractionDone,
+  );
+  const pinInteractionDone = useAppSelector(({APP}) => APP.pinInteractionDone);
   const isPaired = useAppSelector(
     ({APP, BITPAY_ID}) => !!BITPAY_ID.apiToken[APP.network],
   );
@@ -197,16 +201,6 @@ const OnboardingStart = ({navigation}: OnboardingStartScreenProps) => {
   const progressValue = useSharedValue<number>(0);
 
   const onboardingSlides = [
-    // {
-    //   title: t('Turn crypto into dollars with our BitPay Card'),
-    //   text: t(
-    //     'Instantly reload your card balance with no conversion fees. Powered by our competitive exchange rates.',
-    //   ),
-    //   subText: t(
-    //     '*Currently available in the USA. More countries coming soon.',
-    //   ),
-    //   img: () => OnboardingImages.card[themeType],
-    // },
     {
       title: t('Seamlessly buy & swap'),
       text: t(
@@ -230,6 +224,17 @@ const OnboardingStart = ({navigation}: OnboardingStartScreenProps) => {
     },
   ];
 
+  const continueWithoutAnAccount = () => {
+    haptic('impactLight');
+    if (!notificationsInteractionDone) {
+      navigation.navigate('Notifications');
+    } else if (!pinInteractionDone) {
+      navigation.navigate('Pin');
+    } else {
+      navigation.navigate('CreateKey');
+    }
+  };
+
   return (
     <OnboardingContainer testID="onboarding-start-view">
       <ScrollView scrollEnabled={isNarrowHeight}>
@@ -309,8 +314,12 @@ const OnboardingStart = ({navigation}: OnboardingStartScreenProps) => {
                 accessibilityLabel="Continue"
                 buttonStyle={'primary'}
                 onPress={() => {
-                  haptic('impactLight');
-                  navigation.navigate('Notifications');
+                  dispatch(
+                    Analytics.track('Clicked Continue', {
+                      context: 'onboarding',
+                    }),
+                  );
+                  continueWithoutAnAccount();
                 }}>
                 {t('Continue')}
               </Button>
@@ -330,7 +339,7 @@ const OnboardingStart = ({navigation}: OnboardingStartScreenProps) => {
                       context: 'onboarding',
                     }),
                   );
-                  navigation.navigate('Notifications');
+                  continueWithoutAnAccount();
                 }}>
                 <LinkText>{t('Continue without an account')}</LinkText>
               </Button>

src/navigation/onboarding/screens/Pin.tsx

@@ -63,6 +63,7 @@ const PinScreen = ({
 
   const onSkipPressRef = useRef(async () => {
     haptic('impactLight');
+    dispatch(AppActions.setPinInteractionDone());
     dispatch(
       Analytics.track('Clicked Skip Protect Wallet', {
         context: 'onboarding',
@@ -108,6 +109,7 @@ const PinScreen = ({
       if (available) {
         logger.debug(`[Biometrics] ${biometryType} is supported`);
         dispatch(AppActions.biometricLockActive(true));
+        dispatch(AppActions.setPinInteractionDone());
         navigation.navigate('CreateKey');
       } else {
         dispatch(

src/store/app/app.actions.ts

@@ -143,6 +143,10 @@ export const setNotificationsAccepted = (
   payload: notificationsAccepted,
 });
 
+export const setNotificationsInteractionDone = (): AppActionType => ({
+  type: AppActionTypes.SET_NOTIFICATIONS_INTERACTION_DONE,
+});
+
 export const setConfirmedTxAccepted = (
   confirmedTxAccepted: boolean,
 ): AppActionType => ({
@@ -157,6 +161,10 @@ export const setAnnouncementsAccepted = (
   payload: announcementsAccepted,
 });
 
+export const setPinInteractionDone = (): AppActionType => ({
+  type: AppActionTypes.SET_PIN_INTERACTION_DONE,
+});
+
 export const setEmailNotificationsAccepted = (
   accepted: boolean,
   email: string | null,

src/store/app/app.reducer.ts

@@ -112,8 +112,10 @@ export interface AppState {
   showChainSelectorModal: boolean;
   chainSelectorModalConfig: ChainSelectorConfig | undefined;
   notificationsAccepted: boolean;
+  notificationsInteractionDone: boolean;
   confirmedTxAccepted: boolean;
   announcementsAccepted: boolean;
+  pinInteractionDone: boolean;
   emailNotifications: {
     accepted: boolean;
     email: string | null;
@@ -211,8 +213,10 @@ const initialState: AppState = {
   showChainSelectorModal: false,
   chainSelectorModalConfig: undefined,
   notificationsAccepted: false,
+  notificationsInteractionDone: false,
   confirmedTxAccepted: false,
   announcementsAccepted: false,
+  pinInteractionDone: false,
   emailNotifications: {
     accepted: false,
     email: null,
@@ -427,6 +431,12 @@ export const appReducer = (
         notificationsAccepted: action.payload,
       };
 
+    case AppActionTypes.SET_NOTIFICATIONS_INTERACTION_DONE:
+      return {
+        ...state,
+        notificationsInteractionDone: true,
+      };
+
     case AppActionTypes.SET_CONFIRMED_TX_ACCEPTED:
       return {
         ...state,
@@ -439,6 +449,12 @@ export const appReducer = (
         announcementsAccepted: action.payload,
       };
 
+    case AppActionTypes.SET_PIN_INTERACTION_DONE:
+      return {
+        ...state,
+        pinInteractionDone: true,
+      };
+
     case AppActionTypes.SET_EMAIL_NOTIFICATIONS_ACCEPTED:
       return {
         ...state,

src/store/app/app.types.ts

@@ -46,8 +46,10 @@ export enum AppActionTypes {
   SUCCESS_GENERATE_APP_IDENTITY = 'APP/SUCCESS_GENERATE_APP_IDENTITY',
   FAILED_GENERATE_APP_IDENTITY = 'APP/FAILED_GENERATE_APP_IDENTITY',
   SET_NOTIFICATIONS_ACCEPTED = 'APP/SET_NOTIFICATIONS_ACCEPTED',
+  SET_NOTIFICATIONS_INTERACTION_DONE = 'APP/SET_NOTIFICATIONS_INTERACTION_DONE',
   SET_CONFIRMED_TX_ACCEPTED = 'APP/SET_CONFIRMED_TX_ACCEPTED',
   SET_ANNOUNCEMENTS_ACCEPTED = 'APP/SET_ANNOUNCEMENTS_ACCEPTED',
+  SET_PIN_INTERACTION_DONE = 'APP/SET_PIN_INTERACTION_DONE',
   SET_EMAIL_NOTIFICATIONS_ACCEPTED = 'APP/SET_EMAIL_NOTIFICATIONS_ACCEPTED',
   SHOW_ONBOARDING_FINISH_MODAL = 'APP/SHOW_ONBOARDING_FINISH_MODAL',
   DISMISS_ONBOARDING_FINISH_MODAL = 'APP/DISMISS_ONBOARDING_FINISH_MODAL',
@@ -212,6 +214,10 @@ interface SetNotificationsAccepted {
   payload: boolean;
 }
 
+interface SetNotificationsInteractionDone {
+  type: typeof AppActionTypes.SET_NOTIFICATIONS_INTERACTION_DONE;
+}
+
 interface SetConfirmedTxAccepted {
   type: typeof AppActionTypes.SET_CONFIRMED_TX_ACCEPTED;
   payload: boolean;
@@ -222,6 +228,10 @@ interface SetAnnouncementsAccepted {
   payload: boolean;
 }
 
+interface SetPinInteractionDone {
+  type: typeof AppActionTypes.SET_PIN_INTERACTION_DONE;
+}
+
 interface SetEmailNotificationsAccepted {
   type: typeof AppActionTypes.SET_EMAIL_NOTIFICATIONS_ACCEPTED;
   payload: {accepted: boolean; email: string | null};
@@ -465,8 +475,10 @@ export type AppActionType =
   | SuccessGenerateAppIdentity
   | FailedGenerateAppIdentity
   | SetNotificationsAccepted
+  | SetNotificationsInteractionDone
   | SetConfirmedTxAccepted
   | SetAnnouncementsAccepted
+  | SetPinInteractionDone
   | SetEmailNotificationsAccepted
   | ShowOnboardingFinishModal
   | DismissOnboardingFinishModal