From d6c9952a8cf87d9eccbf91734b12930d6c4426a0 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Fri, 6 Jan 2023 12:03:57 -0500
Subject: [PATCH] Move timestamp back to Account

---
 app/soapbox/components/status.tsx                     | 10 +++-------
 .../features/status/components/detailed-status.tsx    | 11 +----------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx
index bfbd1b4dc1..2386dd2142 100644
--- a/app/soapbox/components/status.tsx
+++ b/app/soapbox/components/status.tsx
@@ -310,13 +310,7 @@ const Status: React.FC<IStatus> = (props) => {
     react: handleHotkeyReact,
   };
 
-  const timestampEl = (
-    <Link to={statusUrl} className='hover:underline' onClick={(event) => event.stopPropagation()}>
-      <RelativeTimestamp timestamp={actualStatus.created_at} theme='muted' size='sm' className='whitespace-nowrap' />
-    </Link>
-  );
-
-  const accountAction = props.accountAction || timestampEl;
+  const accountAction = props.accountAction;
 
   const isUnderReview = actualStatus.visibility === 'self';
   const isSensitive = actualStatus.hidden;
@@ -347,6 +341,8 @@ const Status: React.FC<IStatus> = (props) => {
           <AccountContainer
             key={String(actualStatus.getIn(['account', 'id']))}
             id={String(actualStatus.getIn(['account', 'id']))}
+            timestamp={actualStatus.created_at}
+            timestampUrl={statusUrl}
             action={accountAction}
             hideActions={!accountAction}
             showEdit={!!actualStatus.edited_at}
diff --git a/app/soapbox/features/status/components/detailed-status.tsx b/app/soapbox/features/status/components/detailed-status.tsx
index c6ffa63619..2f1806954f 100644
--- a/app/soapbox/features/status/components/detailed-status.tsx
+++ b/app/soapbox/features/status/components/detailed-status.tsx
@@ -59,15 +59,6 @@ const DetailedStatus: React.FC<IDetailedStatus> = ({
   const isUnderReview = actualStatus.visibility === 'self';
   const isSensitive = actualStatus.hidden;
 
-  const timestampEl = (
-    <RelativeTimestamp
-      timestamp={actualStatus.created_at}
-      theme='muted'
-      size='sm'
-      className='whitespace-nowrap'
-    />
-  );
-
   let statusTypeIcon = null;
 
   let quote;
@@ -97,7 +88,7 @@ const DetailedStatus: React.FC<IDetailedStatus> = ({
           <Account
             key={account.id}
             account={account}
-            action={timestampEl}
+            timestamp={actualStatus.created_at}
             avatarSize={42}
             hideActions
           />