Merge branch 'master' into hotfix-badge-name-fix

# Conflicts:
#	src/screens/suggestedPeople/SPBody.tsx

3 files changed, 4 insertions, 4 deletions

diff --git a/src/components/search/SearchCategories.tsx b/src/components/search/SearchCategories.tsx
index 2883a541..c3c4c518 100644
--- a/src/components/search/SearchCategories.tsx
+++ b/src/components/search/SearchCategories.tsx
@@ -4,7 +4,7 @@ import {StyleSheet, Text, View} from 'react-native';
 import {TouchableOpacity} from 'react-native-gesture-handler';
 import LinearGradient from 'react-native-linear-gradient';
 import {getButtons} from '../../services/ExploreService';
-import {SearchCategoryType} from 'src/types';
+import {SearchCategoryType} from '../../types';
 import {TAGG_LIGHT_BLUE_2, TAGG_PURPLE} from '../../constants';
 import {SCREEN_WIDTH} from '../../utils';
 
diff --git a/src/components/search/SearchResultList.tsx b/src/components/search/SearchResultList.tsx
index 613ab734..d8cf02d9 100644
--- a/src/components/search/SearchResultList.tsx
+++ b/src/components/search/SearchResultList.tsx
@@ -1,7 +1,7 @@
 import React, {useEffect, useState} from 'react';
 import {SectionList, StyleSheet, Text, View} from 'react-native';
 import {useSelector} from 'react-redux';
-import {RootState} from 'src/store/rootreducer';
+import {RootState} from '../../store/rootreducer';
 import {NO_RESULTS_FOUND} from '../../constants/strings';
 import {PreviewType, ScreenType} from '../../types';
 import {normalize, SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils';
diff --git a/src/components/search/SearchResults.tsx b/src/components/search/SearchResults.tsx
index fbeae1d8..277b3454 100644
--- a/src/components/search/SearchResults.tsx
+++ b/src/components/search/SearchResults.tsx
@@ -5,10 +5,10 @@ import {
   ScreenType,
   CategoryPreviewType,
 } from '../../types';
-import {StyleSheet, View} from 'react-native';
+import {View} from 'react-native';
 import SearchResultsCell from './SearchResultCell';
 import {useSelector} from 'react-redux';
-import {RootState} from 'src/store/rootReducer';
+import {RootState} from '../../store/rootReducer';
 interface SearchResultsProps {
   results: ProfilePreviewType[];
   previewType: PreviewType;