Merge branch 'master' into hotfix-linting-fixup

# Conflicts:
#	.eslintrc.js
#	src/components/notifications/Notification.tsx
#	src/screens/onboarding/legacy/SocialMedia.tsx
#	src/screens/onboarding/legacy/WaitlistSuccessScreen.tsx
#	src/screens/profile/CategorySelection.tsx

2 files changed, 10 insertions, 44 deletions

diff --git a/src/routes/onboarding/OnboardingStackNavigator.tsx b/src/routes/onboarding/OnboardingStackNavigator.tsx
index a51a6c86..4726a47d 100644
--- a/src/routes/onboarding/OnboardingStackNavigator.tsx
+++ b/src/routes/onboarding/OnboardingStackNavigator.tsx
@@ -1,41 +1,16 @@
 import {createStackNavigator} from '@react-navigation/stack';
-import {TaggPopupType, VerificationScreenType} from '../../types';
 
 export type OnboardingStackParams = {
+  InvitationCodeVerification: {userId: string; username: string};
   Login: undefined;
-  WelcomeScreen: undefined;
-  PasswordResetRequest: undefined;
-  PasswordReset: {value: string};
-  Verification: {id: string; screenType: VerificationScreenType};
-  // RegistrationOne: undefined;
-  // RegistrationTwo: {phone: string};
-  // RegistrationThree: {
-  //   firstName: string;
-  //   lastName: string;
-  //   phone: string;
-  //   email: string;
-  // };
-  // Checkpoint: {username: string; userId: string};
-  // ProfileOnboarding: {username: string; userId: string};
-  // SocialMedia: {username: string; userId: string};
-  // CategorySelection: {
-  //   screenType: CategorySelectionScreenType;
-  //   user: UserType;
-  //   newCustomCategory: string | undefined;
-  // };
-  // CreateCustomCategory: {
-  //   screenType: CategorySelectionScreenType;
-  //   user: UserType;
-  //   existingCategories: string[];
-  // };
-  TaggPopup: {
-    popupProps: TaggPopupType;
-  };
   OnboardingStepOne: undefined;
-  PhoneVerification: {firstName: string; lastName: string; phone: string};
-  OnboardingStepTwo: {firstName: string; lastName: string; phone: string};
   OnboardingStepThree: {userId: string; username: string};
-  InvitationCodeVerification: {userId: string; username: string};
+  OnboardingStepTwo: {firstName: string; lastName: string; phone: string};
+  PasswordReset: {value: string};
+  PasswordResetRequest: undefined;
+  PasswordVerification: {id: string};
+  PhoneVerification: {firstName: string; lastName: string; phone: string};
+  WelcomeScreen: undefined;
 };
 
 export const OnboardingStack = createStackNavigator<OnboardingStackParams>();
diff --git a/src/routes/onboarding/OnboardingStackScreen.tsx b/src/routes/onboarding/OnboardingStackScreen.tsx
index 79171efd..339c3d0d 100644
--- a/src/routes/onboarding/OnboardingStackScreen.tsx
+++ b/src/routes/onboarding/OnboardingStackScreen.tsx
@@ -1,6 +1,5 @@
 import {StackCardInterpolationProps} from '@react-navigation/stack';
 import React from 'react';
-import TaggPopup from '../../components/common/TaggPopup';
 import {
   InvitationCodeVerification,
   Login,
@@ -8,8 +7,8 @@ import {
   OnboardingStepTwo,
   PasswordReset,
   PasswordResetRequest,
+  PasswordVerification,
   PhoneVerification,
-  Verification,
   WelcomeScreen,
 } from '../../screens';
 import OnboardingStepOne from '../../screens/onboarding/OnboardingStepOne';
@@ -45,14 +44,6 @@ const Onboarding: React.FC = () => {
       />
       <OnboardingStack.Screen name="WelcomeScreen" component={WelcomeScreen} />
       <OnboardingStack.Screen
-        name="TaggPopup"
-        component={TaggPopup}
-        options={{
-          gestureEnabled: false,
-          ...modalStyle,
-        }}
-      />
-      <OnboardingStack.Screen
         name="PasswordReset"
         component={PasswordReset}
         options={{
@@ -61,8 +52,8 @@ const Onboarding: React.FC = () => {
         }}
       />
       <OnboardingStack.Screen
-        name="Verification"
-        component={Verification}
+        name="PasswordVerification"
+        component={PasswordVerification}
         options={{
           ...modalStyle,
         }}