Show 'Off' text when disappearing messages are turned off

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>

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()}