2 files changed, 9 insertions, 3 deletions
diff --git a/src/screens/main/NotificationsScreen.tsx b/src/screens/main/NotificationsScreen.tsx
index d6d47b02..8aa47299 100644
--- a/src/screens/main/NotificationsScreen.tsx
+++ b/src/screens/main/NotificationsScreen.tsx
@@ -17,6 +17,7 @@ import {NotificationType, ScreenType} from '../../types';
 import {getDateAge, SCREEN_HEIGHT} from '../../utils';
 
 const NotificationsScreen: React.FC = () => {
+  const {user: loggedInUser} = useSelector((state: RootState) => state.user);
   const [refreshing, setRefreshing] = useState(false);
   // used for figuring out which ones are unread
   const [lastViewed, setLastViewed] = useState<moment.Moment | undefined>(
@@ -95,7 +96,13 @@ const NotificationsScreen: React.FC = () => {
   }, [lastViewed, notifications]);
 
   const renderNotification = ({item}: {item: NotificationType}) => (
-    <Notification item={item} screenType={ScreenType.Notifications} />
+    <Notification
+      item={item}
+      userXId={
+        item.actor.id === loggedInUser.userId ? undefined : item.actor.id
+      }
+      screenType={ScreenType.Notifications}
+    />
   );
 
   const renderSectionHeader = ({section: {title, data}}) =>
diff --git a/src/screens/profile/IndividualMoment.tsx b/src/screens/profile/IndividualMoment.tsx
index f13e1295..9e6704d1 100644
--- a/src/screens/profile/IndividualMoment.tsx
+++ b/src/screens/profile/IndividualMoment.tsx
@@ -36,8 +36,7 @@ const IndividualMoment: React.FC<IndividualMomentProps> = ({
   route,
   navigation,
 }) => {
-  const {moment_category, moment_id} = route.params.moment;
-  const {userXId, screenType} = route.params;
+  const {moment_category, moment_id, userXId, screenType} = route.params.moment;
   const {username: loggedInUsername} = useSelector(
     (state: RootState) => state.user.user,
   );