From 444263a8b2f9e0078c109a41537b2c8a1e3b0276 Mon Sep 17 00:00:00 2001
From: Developer <>
Date: Thu, 25 Feb 2021 10:40:52 -0500
Subject: [PATCH] Updated Notification timestamp to link to
 status/mention/comment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Updated:
- Notification timestamp to link to status/mention/comment
---
 .../gabsocial/components/notification.js       | 18 ++++++++++++++----
 .../containers/notification_container.js       |  4 ++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/javascript/gabsocial/components/notification.js b/app/javascript/gabsocial/components/notification.js
index 899fccb9..5801c0ce 100644
--- a/app/javascript/gabsocial/components/notification.js
+++ b/app/javascript/gabsocial/components/notification.js
@@ -17,6 +17,7 @@ import Text from './text'
 import DotTextSeperator from './dot_text_seperator'
 import RelativeTimestamp from './relative_timestamp'
 import DisplayName from './display_name'
+import Dummy from './dummy'
 
 class Notification extends ImmutablePureComponent {
 
@@ -30,13 +31,14 @@ class Notification extends ImmutablePureComponent {
       accounts,
       createdAt,
       type,
-      statusId,
+      status,
       isHidden,
       isUnread,
       isDeckConnected,
     } = this.props
     
     const count = !!accounts ? accounts.size : 0
+    const statusId = !!status ? status.get('id') : undefined
 
     let message
     let icon
@@ -91,6 +93,9 @@ class Notification extends ImmutablePureComponent {
       )
     }
 
+    const DateWrapperContainer = !!status ? NavLink : Dummy
+    const statusUrl = !!status ? status.get('uri') : '/'
+
     const containerClasses = CX({
       d: 1,
       px10: !isDeckConnected,
@@ -146,9 +151,14 @@ class Notification extends ImmutablePureComponent {
                     !!createdAt &&
                     <React.Fragment>
                       <DotTextSeperator />
-                      <Text size='small' color='tertiary' className={_s.ml5}>
-                        <RelativeTimestamp timestamp={createdAt} />
-                      </Text>
+                      <DateWrapperContainer
+                        to={statusUrl}
+                        className={[_s.noUnderline, _s.text].join(' ')}
+                      >
+                        <Text size='small' color='tertiary' className={_s.ml5}>
+                          <RelativeTimestamp timestamp={createdAt} />
+                        </Text>
+                      </DateWrapperContainer>
                     </React.Fragment>
                   }
                 </div>
diff --git a/app/javascript/gabsocial/containers/notification_container.js b/app/javascript/gabsocial/containers/notification_container.js
index 65457cde..53074008 100644
--- a/app/javascript/gabsocial/containers/notification_container.js
+++ b/app/javascript/gabsocial/containers/notification_container.js
@@ -63,7 +63,7 @@ const makeMapStateToProps = () => {
         accounts: accounts,
         createdAt: lastUpdated,
         isUnread: isUnread,
-        statusId: list.get('status'),
+        status: state.getIn(['statuses', list.get('status')], null),
         isDeckConnected,
       }
     } else if (!isGrouped) {
@@ -76,7 +76,7 @@ const makeMapStateToProps = () => {
         accounts: !!account ? ImmutableList([account]) : ImmutableList(),
         createdAt: notification.get('created_at'),
         isUnread: lastReadId < notification.get('id'),
-        statusId: statusId || undefined,
+        status: state.getIn(['statuses', statusId], null),
         isDeckConnected,
       }
     }