fix position of unread banner on conversation (search for first read)

ts/components/session/conversation/SessionConversation.tsx

@@ -154,7 +154,6 @@ export class SessionConversation extends React.Component<Props, State> {
 
   public async componentWillMount() {
     await this.loadInitialMessages();
-    this.setState({ initialFetchComplete: true });
   }
 
   public componentWillUnmount() {
@@ -331,15 +330,20 @@ export class SessionConversation extends React.Component<Props, State> {
     // After the inital fetch, all new messages are automatically added from onNewMessage
     // in the conversation model.
     // The only time we need to call getMessages() is to grab more messages on scroll.
-    const { initialFetchComplete } = this.state;
+    if (this.state.initialFetchComplete) {
-    if (initialFetchComplete) {
       return;
     }
 
-    return this.getMessages(Constants.CONVERSATION.DEFAULT_MESSAGE_FETCH_COUNT);
+    return this.getMessages(
+      Constants.CONVERSATION.DEFAULT_MESSAGE_FETCH_COUNT,
+      () => {
+        this.setState({ initialFetchComplete: true });
+      }
+    );
   }
 
-  public async getMessages(numMessages?: number) {
+  // tslint:disable-next-line: no-empty
+  public async getMessages(numMessages?: number, callback: any = () => {}) {
     const { unreadCount } = this.state;
     const { conversationKey } = this.props;
     let msgCount =
@@ -365,7 +369,7 @@ export class SessionConversation extends React.Component<Props, State> {
     const messages = [];
     // no need to do that `firstMessageOfSeries` on a private chat
     if (this.props.conversation.type === 'direct') {
-      this.setState({ messages: messageSet.models });
+      this.setState({ messages: messageSet.models }, callback);
       return;
     }
 
@@ -386,7 +390,7 @@ export class SessionConversation extends React.Component<Props, State> {
       messages.push({ ...messageModels[i], firstMessageOfSeries });
     }
 
-    this.setState({ messages });
+    this.setState({ messages }, callback);
   }
 
   public getHeaderProps() {
@@ -494,19 +498,13 @@ export class SessionConversation extends React.Component<Props, State> {
 
   public getMessagesListProps() {
     const { conversation } = this.props;
-    const {
+    const { messages, quotedMessageTimestamp, selectedMessages } = this.state;
-      messages,
-      initialFetchComplete,
-      quotedMessageTimestamp,
-      selectedMessages,
-    } = this.state;
 
     return {
       selectedMessages,
       conversationKey: conversation.id,
       messages,
       resetSelection: this.resetSelection,
-      initialFetchComplete,
       quotedMessageTimestamp,
       conversation,
       selectMessage: this.selectMessage,

ts/components/session/conversation/SessionConversationMessagesList.tsx

@@ -27,7 +27,6 @@ interface Props {
   selectedMessages: Array<string>;
   conversationKey: string;
   messages: Array<MessageModel>;
-  initialFetchComplete: boolean;
   conversation: ConversationType;
   messageContainerRef: React.RefObject<any>;
   selectMessage: (messageId: string) => void;
@@ -116,12 +115,16 @@ export class SessionConversationMessagesList extends React.Component<
   }
 
   public renderMessages(messages: Array<MessageModel>) {
-    const { conversation } = this.props;
     const { isScrolledToBottom } = this.state;
 
-    const { unreadCount } = conversation;
     const multiSelectMode = Boolean(this.props.selectedMessages.length);
     let currentMessageIndex = 0;
+    // find the first unread message in the list of messages. We use this to display the
+    // unread banner so this is at all times at the correct index.
+    const findFirstUnreadIndex = messages.findIndex(
+      message =>
+        !(message?.attributes?.unread && message?.attributes?.unread !== false)
+    );
     return (
       <>
         {messages.map((message: MessageModel) => {
@@ -134,16 +137,18 @@ export class SessionConversationMessagesList extends React.Component<
           const propsForGroupInvitation = message.propsForGroupInvitation;
 
           const groupNotificationProps = message.propsForGroupNotification;
-          let unreadIndicator = null;
+
-
+          // if there are some unread messages
-          // if there is some unread messages
+          const showUnreadIndicator =
-          if (
+            !isScrolledToBottom &&
-            unreadCount > 0 &&
+            findFirstUnreadIndex > 0 &&
-            currentMessageIndex === unreadCount &&
+            currentMessageIndex === findFirstUnreadIndex;
-            !isScrolledToBottom
+          const unreadIndicator = (
-          ) {
+            <SessionLastSeenIndicator
-            unreadIndicator = <SessionLastSeenIndicator count={unreadCount} />;
+              count={findFirstUnreadIndex} // count is used for the 118n of the string
-          }
+              show={showUnreadIndicator}
+            />
+          );
 
           currentMessageIndex = currentMessageIndex + 1;
 
@@ -391,6 +396,15 @@ export class SessionConversationMessagesList extends React.Component<
 
     if (scrollOffsetPc === 0 && this.state.doneInitialScroll) {
       this.setState({ isScrolledToBottom: true });
+    } else if (
+      scrollHeight !== 0 &&
+      scrollHeight === clientHeight &&
+      !this.state.isScrolledToBottom
+    ) {
+      this.setState({ isScrolledToBottom: true }, () => {
+        // Mark messages read
+        this.updateReadMessages();
+      });
     }
   }
 

ts/components/session/conversation/SessionLastSeedIndicator.tsx

@@ -1,11 +1,17 @@
 import React from 'react';
 import styled from 'styled-components';
 
-const LastSeenBarContainer = styled.div`
+interface LastSeenProps {
-  padding-top: 25px;
+  show: boolean;
-  padding-bottom: 35px;
+}
+
+const LastSeenBarContainer = styled.div<LastSeenProps>`
+  padding-bottom: ${props => (props.show ? '35px' : 0)};
   margin-inline-start: 28px;
-  padding-top: 28px;
+  padding-top: ${props => (props.show ? '28px' : 0)};
+  transition: ${props => props.theme.common.animations.defaultDuration};
+  overflow: hidden;
+  height: ${props => (props.show ? 'auto' : 0)};
 `;
 
 const LastSeenBar = styled.div`
@@ -25,12 +31,18 @@ const LastSeenText = styled.div`
   color: ${props => props.theme.colors.lastSeenIndicatorTextColor};
 `;
 
-export const SessionLastSeenIndicator = ({ count }: { count: number }) => {
+export const SessionLastSeenIndicator = ({
+  count,
+  show,
+}: {
+  count: number;
+  show: boolean;
+}) => {
   const { i18n } = window;
   const text =
     count > 1 ? i18n('unreadMessages', count) : i18n('unreadMessage', count);
   return (
-    <LastSeenBarContainer>
+    <LastSeenBarContainer show={show}>
       <LastSeenBar>
         <LastSeenText>{text}</LastSeenText>
       </LastSeenBar>