From c3dc9732ef1edfbe4b8733cf11cb91d008603064 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Thu, 25 May 2017 19:08:21 -0700
Subject: [PATCH] Fix: Don't scroll to last seen indicator on focus

FREEBIE
---
 js/views/conversation_view.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 08a24f5c2ba..f6e9160fa4c 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -116,7 +116,7 @@
 
             var onFocus = function() {
                 if (this.$el.css('display') !== 'none') {
-                    this.updateUnread();
+                    this.updateUnread({scroll: false});
                 }
             }.bind(this);
             this.window.addEventListener('focus', onFocus);
@@ -206,8 +206,8 @@
             this.$('.bottom-bar form').addClass('active');
         },
 
-        updateUnread: function() {
-            this.updateLastSeenIndicator();
+        updateUnread: function(options) {
+            this.updateLastSeenIndicator(options);
             this.model.markRead();
         },