Merge branch 'master' into tma698-api-profile

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

1 files changed, 6 insertions, 31 deletions

diff --git a/src/screens/main/NotificationsScreen.tsx b/src/screens/main/NotificationsScreen.tsx
index 501c44fc..68437f2b 100644
--- a/src/screens/main/NotificationsScreen.tsx
+++ b/src/screens/main/NotificationsScreen.tsx
@@ -21,7 +21,10 @@ import {TouchableOpacity} from 'react-native-gesture-handler';
 import {SafeAreaView} from 'react-native-safe-area-context';
 import {useDispatch, useSelector} from 'react-redux';
 import {TabsGradient, TaggPrompt} from '../../components';
-import {Notification} from '../../components/notifications';
+import {
+  InviteFriendsPrompt,
+  Notification,
+} from '../../components/notifications';
 import {
   loadUserNotifications,
   updateNewNotificationReceived,
@@ -252,30 +255,6 @@ const NotificationsScreen: React.FC = () => {
     return null;
   };
 
-  const SPPromptNotification: ReactElement = showSPNotifyPopUp ? (
-    <TaggPrompt
-      messageHeader={'New Suggested People Page!'}
-      messageBody={
-        <>
-          <Text>
-            A new page where you can discover new profiles. Just press the new{' '}
-          </Text>
-          <Image
-            style={styles.icon}
-            source={require('../../assets/navigationIcons/home.png')}
-          />
-          <Text> button on the tab bar to check it out!</Text>
-        </>
-      }
-      logoType={'tagg'}
-      hideCloseButton={true}
-      noPadding={true}
-      onClose={() => {}}
-    />
-  ) : (
-    <Fragment />
-  );
-
   return (
     <View style={styles.background}>
       <SafeAreaView>
@@ -285,12 +264,13 @@ const NotificationsScreen: React.FC = () => {
         </View>
         <SectionList
           contentContainerStyle={styles.container}
+          stickySectionHeadersEnabled={false}
           sections={sectionedNotifications}
           keyExtractor={(_item, index) => index.toString()}
           renderItem={renderNotification}
           renderSectionHeader={renderSectionHeader}
           renderSectionFooter={renderSectionFooter}
-          ListHeaderComponent={SPPromptNotification}
+          ListHeaderComponent={<InviteFriendsPrompt />}
           refreshControl={
             <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
           }
@@ -358,11 +338,6 @@ const styles = StyleSheet.create({
     flex: 1,
     justifyContent: 'center',
   },
-  icon: {
-    width: 20,
-    height: 20,
-    tintColor: 'grey',
-  },
 });
 
 export default NotificationsScreen;