From 016461f5064e390739b0fcaeb5fea99d3461ea50 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 8 Jul 2021 13:30:09 +1000
Subject: [PATCH] mark message as read on click on scroll to bottom button

---
 .../session/conversation/SessionConversation.tsx         | 3 ---
 .../session/conversation/SessionMessagesList.tsx         | 9 ++++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ts/components/session/conversation/SessionConversation.tsx b/ts/components/session/conversation/SessionConversation.tsx
index b6d67e03f..6bdfdef6a 100644
--- a/ts/components/session/conversation/SessionConversation.tsx
+++ b/ts/components/session/conversation/SessionConversation.tsx
@@ -54,7 +54,6 @@ interface State {
 
   unreadCount: number;
   selectedMessages: Array<string>;
-  displayScrollToBottomButton: boolean;
 
   showOverlay: boolean;
   showRecordingView: boolean;
@@ -106,7 +105,6 @@ export class SessionConversation extends React.Component<Props, State> {
       sendingProgressStatus: 0,
       unreadCount,
       selectedMessages: [],
-      displayScrollToBottomButton: false,
       showOverlay: false,
       showRecordingView: false,
       showOptionsPane: false,
@@ -176,7 +174,6 @@ export class SessionConversation extends React.Component<Props, State> {
       this.setState({
         showOptionsPane: false,
         selectedMessages: [],
-        displayScrollToBottomButton: false,
         showOverlay: false,
         showRecordingView: false,
         stagedAttachments: [],
diff --git a/ts/components/session/conversation/SessionMessagesList.tsx b/ts/components/session/conversation/SessionMessagesList.tsx
index 4c27410b8..be573cab0 100644
--- a/ts/components/session/conversation/SessionMessagesList.tsx
+++ b/ts/components/session/conversation/SessionMessagesList.tsx
@@ -559,7 +559,14 @@ export class SessionMessagesList extends React.Component<Props, State> {
       return;
     }
     messageContainer.scrollTop = messageContainer.scrollHeight - messageContainer.clientHeight;
-    this.updateReadMessages();
+    const { messagesProps, conversationKey } = this.props;
+
+    if (!messagesProps || messagesProps.length === 0) {
+      return;
+    }
+
+    const conversation = getConversationController().getOrThrow(conversationKey);
+    void conversation.markRead(messagesProps[0].propsForMessage.receivedAt);
   }
 
   private async scrollToQuoteMessage(options: QuoteClickOptions) {