Merge pull request #773 from Bilb/fix-open-conversation-accepted-friend-request

open the conversation when accepting a friend request
pull/780/head
Vince 5 years ago committed by GitHub
commit b3fca524b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -233,6 +233,12 @@
const lastMessageModel = messages.at(0); const lastMessageModel = messages.at(0);
if (lastMessageModel) { if (lastMessageModel) {
lastMessageModel.acceptFriendRequest(); lastMessageModel.acceptFriendRequest();
await this.markRead();
window.Whisper.events.trigger(
'showConversation',
this.id,
lastMessageModel.id
);
} }
}, },
async declineFriendRequest() { async declineFriendRequest() {

Loading…
Cancel
Save