From f572abf57d834a56b6af17db8157070f7b2bcbcb Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Thu, 14 Apr 2022 11:06:37 -0700
Subject: [PATCH] Show expiration timer for incoming messages even if unread

---
 ts/components/conversation/Message.stories.tsx | 2 +-
 ts/components/conversation/Message.tsx         | 7 ++-----
 ts/components/conversation/MessageMetadata.tsx | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ts/components/conversation/Message.stories.tsx b/ts/components/conversation/Message.stories.tsx
index ad9965c23..0dfb3574a 100644
--- a/ts/components/conversation/Message.stories.tsx
+++ b/ts/components/conversation/Message.stories.tsx
@@ -390,7 +390,7 @@ story.add('Will expire but still sending', () => {
   const props = createProps({
     status: 'sending',
     expirationLength: 30 * 1000,
-    text: 'For outgoing messages, we show timer immediately. Incoming, we wait until expirationStartTimestamp is present.',
+    text: 'We always show the timer if a message has an expiration length, even if unread or still sending.',
   });
 
   return renderBothDirections(props);
diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index 774181fde..88ca0cc04 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -599,14 +599,11 @@ export class Message extends React.PureComponent<Props, State> {
    * because it can reduce layout jumpiness.
    */
   private guessMetadataWidth(): number {
-    const { direction, expirationLength, expirationTimestamp, status } =
-      this.props;
+    const { direction, expirationLength, status } = this.props;
 
     let result = GUESS_METADATA_WIDTH_TIMESTAMP_SIZE;
 
-    const hasExpireTimer = Boolean(
-      expirationLength && (expirationTimestamp || direction === 'outgoing')
-    );
+    const hasExpireTimer = Boolean(expirationLength);
     if (hasExpireTimer) {
       result += GUESS_METADATA_WIDTH_EXPIRE_TIMER_SIZE;
     }
diff --git a/ts/components/conversation/MessageMetadata.tsx b/ts/components/conversation/MessageMetadata.tsx
index 923ca3e72..3bf646e2a 100644
--- a/ts/components/conversation/MessageMetadata.tsx
+++ b/ts/components/conversation/MessageMetadata.tsx
@@ -126,7 +126,7 @@ export const MessageMetadata = ({
   const children = (
     <>
       {timestampNode}
-      {expirationLength && (expirationTimestamp || direction === 'outgoing') ? (
+      {expirationLength ? (
         <ExpireTimer
           direction={metadataDirection}
           deletedForEveryone={deletedForEveryone}