Merge branch 'master' into tma694-edit-badges

# Conflicts:
#	src/components/search/SearchCategories.tsx

2 files changed, 1 insertions, 3 deletions

diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx
index c60c8602..252ece3b 100644
--- a/src/routes/main/MainStackNavigator.tsx
+++ b/src/routes/main/MainStackNavigator.tsx
@@ -23,7 +23,6 @@ export type MainStackParams = {
     screenType: ScreenType;
   };
   DiscoverUsers: {
-    type: 'badges' | 'categories' | 'users';
     searchCategory: SearchCategoryType;
   };
   Profile: {
diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx
index 068748b1..0a75dd22 100644
--- a/src/routes/main/MainStackScreen.tsx
+++ b/src/routes/main/MainStackScreen.tsx
@@ -4,11 +4,9 @@ import {StackNavigationOptions} from '@react-navigation/stack';
 import React, {useState} from 'react';
 import {StyleSheet, Text} from 'react-native';
 import {normalize} from 'react-native-elements';
-import MutualBadgeHolders from '../../screens/suggestedPeople/MutualBadgeHolders';
 import BackIcon from '../../assets/icons/back-arrow.svg';
 import {
   AnimatedTutorial,
-  BadgeSelection,
   CaptionScreen,
   CategorySelection,
   CreateCustomCategory,
@@ -26,6 +24,7 @@ import {
   SuggestedPeopleScreen,
   SuggestedPeopleUploadPictureScreen,
 } from '../../screens';
+import MutualBadgeHolders from '../../screens/suggestedPeople/MutualBadgeHolders';
 import {ScreenType} from '../../types';
 import {AvatarHeaderHeight, SCREEN_WIDTH} from '../../utils';
 import {MainStack, MainStackParams} from './MainStackNavigator';