Merge pull request #405 from grusuTagg/tma823-onboarding-revamp

[TMA-823] Onboarding Revamp

2 files changed, 10 insertions, 17 deletions

diff --git a/src/routes/onboarding/OnboardingStackNavigator.tsx b/src/routes/onboarding/OnboardingStackNavigator.tsx
index 4726a47d..7a74988b 100644
--- a/src/routes/onboarding/OnboardingStackNavigator.tsx
+++ b/src/routes/onboarding/OnboardingStackNavigator.tsx
@@ -3,9 +3,8 @@ import {createStackNavigator} from '@react-navigation/stack';
 export type OnboardingStackParams = {
   InvitationCodeVerification: {userId: string; username: string};
   Login: undefined;
-  OnboardingStepOne: undefined;
-  OnboardingStepThree: {userId: string; username: string};
-  OnboardingStepTwo: {firstName: string; lastName: string; phone: 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 339c3d0d..50fd52d6 100644
--- a/src/routes/onboarding/OnboardingStackScreen.tsx
+++ b/src/routes/onboarding/OnboardingStackScreen.tsx
@@ -1,17 +1,16 @@
 import {StackCardInterpolationProps} from '@react-navigation/stack';
 import React from 'react';
 import {
+  BasicInfoOnboarding,
   InvitationCodeVerification,
   Login,
-  OnboardingStepThree,
-  OnboardingStepTwo,
   PasswordReset,
   PasswordResetRequest,
   PasswordVerification,
   PhoneVerification,
+  ProfileInfoOnboarding,
   WelcomeScreen,
 } from '../../screens';
-import OnboardingStepOne from '../../screens/onboarding/OnboardingStepOne';
 import {modalStyle} from '../main';
 import {OnboardingStack} from './OnboardingStackNavigator';
 
@@ -44,6 +43,10 @@ const Onboarding: React.FC = () => {
       />
       <OnboardingStack.Screen name="WelcomeScreen" component={WelcomeScreen} />
       <OnboardingStack.Screen
+        name="BasicInfoOnboarding"
+        component={BasicInfoOnboarding}
+      />
+      <OnboardingStack.Screen
         name="PasswordReset"
         component={PasswordReset}
         options={{
@@ -59,22 +62,13 @@ const Onboarding: React.FC = () => {
         }}
       />
       <OnboardingStack.Screen
-        name="OnboardingStepOne"
-        component={OnboardingStepOne}
-      />
-      <OnboardingStack.Screen
         name="PhoneVerification"
         component={PhoneVerification}
         options={{...modalStyle}}
       />
       <OnboardingStack.Screen
-        name="OnboardingStepTwo"
-        component={OnboardingStepTwo}
-        options={{...modalStyle}}
-      />
-      <OnboardingStack.Screen
-        name="OnboardingStepThree"
-        component={OnboardingStepThree}
+        name="ProfileInfoOnboarding"
+        component={ProfileInfoOnboarding}
         options={{...modalStyle}}
       />
       <OnboardingStack.Screen