Merge branch 'master' into TMA-579-Redesign-Snapchat-Tiktok

# Conflicts:
#	src/components/common/TaggSquareButton.tsx

1 files changed, 4 insertions, 1 deletions

diff --git a/src/screens/main/NotificationsScreen.tsx b/src/screens/main/NotificationsScreen.tsx
index d9952aa8..f35bb22c 100644
--- a/src/screens/main/NotificationsScreen.tsx
+++ b/src/screens/main/NotificationsScreen.tsx
@@ -35,6 +35,9 @@ const NotificationsScreen: React.FC = () => {
   const {notifications} = useSelector(
     (state: RootState) => state.notifications,
   );
+
+  const {user: loggedInUser} = useSelector((state: RootState) => state.user);
+
   const [sectionedNotifications, setSectionedNotifications] = useState<
     {title: 'Today' | 'Yesterday' | 'This Week'; data: NotificationType[]}[]
   >([]);
@@ -130,7 +133,7 @@ const NotificationsScreen: React.FC = () => {
     <Notification
       item={item}
       screenType={ScreenType.Notifications}
-      moments={item.notification_type === 'CMT' ? loggedInUserMoments : []}
+      loggedInUser={loggedInUser}
     />
   );