From 5823ae395140ce67923b56179a6e8bf3cb769485 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Fri, 13 Jul 2018 09:55:12 -0700 Subject: [PATCH] Ensure disabled timer notification is 'to off' not 'to seconds' --- js/views/message_view.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/views/message_view.js b/js/views/message_view.js index 3b4a48505..8972d8af5 100644 --- a/js/views/message_view.js +++ b/js/views/message_view.js @@ -101,7 +101,9 @@ let timerMessage; const timerUpdate = this.model.get('expirationTimerUpdate'); - const prettySeconds = Whisper.ExpirationTimerOptions.getName(seconds); + const prettySeconds = Whisper.ExpirationTimerOptions.getName( + seconds || 0 + ); if ( timerUpdate &&