From a2ef180e37211193f41ff5f02e18279e5242c219 Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Fri, 7 May 2021 14:21:22 -0400 Subject: renamed onboarding screens, fixed various minor issue, basic info onboarding working --- src/routes/onboarding/OnboardingStackNavigator.tsx | 6 ++---- src/routes/onboarding/OnboardingStackScreen.tsx | 24 ++++++++-------------- 2 files changed, 10 insertions(+), 20 deletions(-) (limited to 'src/routes') diff --git a/src/routes/onboarding/OnboardingStackNavigator.tsx b/src/routes/onboarding/OnboardingStackNavigator.tsx index 761efc91..7a74988b 100644 --- a/src/routes/onboarding/OnboardingStackNavigator.tsx +++ b/src/routes/onboarding/OnboardingStackNavigator.tsx @@ -1,12 +1,10 @@ import {createStackNavigator} from '@react-navigation/stack'; export type OnboardingStackParams = { - RevampedOnboarding: {isPhoneVerified: boolean}; InvitationCodeVerification: {userId: string; username: string}; Login: undefined; - OnboardingStepOne: undefined; - OnboardingStepThree: {userId: string; username: string}; - OnboardingStepTwo: {firstName: string}; + BasicInfoOnboarding: {isPhoneVerified: boolean}; + ProfileInfoOnboarding: {userId: string; username: string}; PasswordReset: {value: string}; PasswordResetRequest: undefined; PasswordVerification: {id: string}; diff --git a/src/routes/onboarding/OnboardingStackScreen.tsx b/src/routes/onboarding/OnboardingStackScreen.tsx index 458697ad..50fd52d6 100644 --- a/src/routes/onboarding/OnboardingStackScreen.tsx +++ b/src/routes/onboarding/OnboardingStackScreen.tsx @@ -1,18 +1,16 @@ import {StackCardInterpolationProps} from '@react-navigation/stack'; import React from 'react'; import { + BasicInfoOnboarding, InvitationCodeVerification, Login, - OnboardingStepThree, - OnboardingStepTwo, PasswordReset, PasswordResetRequest, PasswordVerification, PhoneVerification, + ProfileInfoOnboarding, WelcomeScreen, - RevampedOnboarding } from '../../screens'; -import OnboardingStepOne from '../../screens/onboarding/OnboardingStepOne'; import {modalStyle} from '../main'; import {OnboardingStack} from './OnboardingStackNavigator'; @@ -44,7 +42,10 @@ const Onboarding: React.FC = () => { }} /> - + { ...modalStyle, }} /> - -