oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

remove unread top banner on scroll to bottom

Browse source
This commit is contained in:
audric 2021-07-26 11:30:53 +10:00
parent 5f994851d1
commit dbf6a0183f
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ts/components/session/conversation/SessionMessagesListContainer.tsx
View file

@ -6,6 +6,7 @@ import _ from 'lodash';
import { contextMenu } from 'react-contexify';
import {
fetchMessagesForConversation,
markConversationFullyRead,
quotedMessageToAnimate,
ReduxConversationType,
setNextMessageToPlay,
@ -173,7 +174,9 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
}
if ((forceIsOnBottom || this.getScrollOffsetBottomPx() === 0) && isElectronWindowFocused()) {
void conversation.markRead(messagesProps[0].propsForMessage.receivedAt || 0);
void conversation.markRead(messagesProps[0].propsForMessage.receivedAt || 0).then(() => {
window.inboxStore?.dispatch(markConversationFullyRead(conversationKey));
});
}
}
@ -369,7 +372,9 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
const conversation = getConversationController().get(conversationKey);
if (isElectronWindowFocused()) {
void conversation.markRead(messagesProps[0].propsForMessage.receivedAt || 0);
void conversation.markRead(messagesProps[0].propsForMessage.receivedAt || 0).then(() => {
window.inboxStore?.dispatch(markConversationFullyRead(conversationKey));
});
}
}

12
ts/state/ducks/conversations.ts
View file

@ -601,6 +601,17 @@ const conversationsSlice = createSlice({
return handleConversationReset(state, action);
},
markConversationFullyRead(state: ConversationsStateType, action: PayloadAction<string>) {
if (state.selectedConversation !== action.payload) {
return state;
}
return {
...state,
firstUnreadMessageId: undefined,
};
},
openConversationExternal(
state: ConversationsStateType,
action: PayloadAction<{
@ -711,6 +722,7 @@ export const {
messageChanged,
messagesChanged,
openConversationExternal,
markConversationFullyRead,
// layout stuff
showMessageDetailsView,
closeMessageDetailsView,