Merge with master

1 files changed, 4 insertions, 2 deletions

diff --git a/src/screens/main/NotificationsScreen.tsx b/src/screens/main/NotificationsScreen.tsx
index ebcccc8e..03842b0a 100644
--- a/src/screens/main/NotificationsScreen.tsx
+++ b/src/screens/main/NotificationsScreen.tsx
@@ -19,6 +19,7 @@ import {SafeAreaView} from 'react-native-safe-area-context';
 import {useDispatch, useSelector} from 'react-redux';
 import FindFriendsBlueIcon from '../../assets/icons/findFriends/find-friends-blue-icon.svg';
 import {TabsGradient} from '../../components';
+import EmptyContentView from '../../components/common/EmptyContentView';
 import {Notification} from '../../components/notifications';
 import {NewChatPrompt} from '../../components/notifications/NotificationPrompts';
 import {
@@ -28,7 +29,6 @@ import {
 import {RootState} from '../../store/rootReducer';
 import {NotificationType, ScreenType} from '../../types';
 import {getDateAge, normalize, SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils';
-import EmptyContentView from '../../components/common/EmptyContentView';
 
 const NotificationsScreen: React.FC = () => {
   const {newNotificationReceived} = useSelector(
@@ -290,7 +290,9 @@ const NotificationsScreen: React.FC = () => {
           contentContainerStyle={styles.container}
           stickySectionHeadersEnabled={false}
           sections={sectionedNotifications}
-          keyExtractor={(_item, index) => index.toString()}
+          keyExtractor={(item, index) =>
+            item.timestamp.toString() + index.toString()
+          }
           renderItem={renderNotification}
           renderSectionHeader={renderSectionHeader}
           renderSectionFooter={renderSectionFooter}