From 19ff050b3a5e5326cd90a78b7c3c86997e13f224 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Wed, 1 Aug 2018 09:24:05 -0700
Subject: [PATCH] Show 'Off' text when disappearing messages are turned off

---
 ts/components/conversation/TimerNotification.md  | 6 +++---
 ts/components/conversation/TimerNotification.tsx | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ts/components/conversation/TimerNotification.md b/ts/components/conversation/TimerNotification.md
index a69c4db3b..b899b1bea 100644
--- a/ts/components/conversation/TimerNotification.md
+++ b/ts/components/conversation/TimerNotification.md
@@ -14,7 +14,7 @@
     phoneNumber="(202) 555-1000"
     profileName="Mr. Fire"
     disabled={true}
-    timespan="1 hour"
+    timespan="Off"
     i18n={util.i18n}
   />
 </util.ConversationContext>
@@ -34,7 +34,7 @@
     type="fromMe"
     phoneNumber="(202) 555-1000"
     disabled={true}
-    timespan="1 hour"
+    timespan="Off"
     i18n={util.i18n}
   />
 </util.ConversationContext>
@@ -54,7 +54,7 @@
     type="fromSync"
     phoneNumber="(202) 555-1000"
     disabled={true}
-    timespan="1 hour"
+    timespan="Off"
     i18n={util.i18n}
   />
 </util.ConversationContext>
diff --git a/ts/components/conversation/TimerNotification.tsx b/ts/components/conversation/TimerNotification.tsx
index 6298eca85..ced6c3997 100644
--- a/ts/components/conversation/TimerNotification.tsx
+++ b/ts/components/conversation/TimerNotification.tsx
@@ -74,11 +74,9 @@ export class TimerNotification extends React.Component<Props> {
               disabled ? 'module-timer-notification__icon--disabled' : null
             )}
           />
-          {disabled ? null : (
-            <div className="module-timer-notification__icon-label">
-              {timespan}
-            </div>
-          )}
+          <div className="module-timer-notification__icon-label">
+            {timespan}
+          </div>
         </div>
         <div className="module-timer-notification__message">
           {this.renderContents()}