mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Add "new conversation" composer for direct messages

Browse source
This commit is contained in:
Evan Hahn 2021-02-23 14:34:28 -06:00 • committed by Josh Perez
parent 84dc166b63
commit 06fb4fd0bc
61 changed files with 5960 additions and 3887 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ts/groups/joinViaLink.ts
View file

@ -58,9 +58,9 @@ export async function joinViaLink(hash: string): Promise<void> {
window.log.warn(
`joinViaLink/${logId}: Already a member of group, opening conversation`
);
window.reduxActions.conversations.openConversationInternal(
existingConversation.id
);
window.reduxActions.conversations.openConversationInternal({
conversationId: existingConversation.id,
});
window.window.Whisper.ToastView.show(
window.Whisper.AlreadyGroupMemberToast,
document.getElementsByClassName('conversation-stack')[0]
@ -132,9 +132,9 @@ export async function joinViaLink(hash: string): Promise<void> {
window.log.warn(
`joinViaLink/${logId}: Already awaiting approval, opening conversation`
);
window.reduxActions.conversations.openConversationInternal(
existingConversation.id
);
window.reduxActions.conversations.openConversationInternal({
conversationId: existingConversation.id,
});
window.Whisper.ToastView.show(
window.Whisper.AlreadyRequestedToJoinToast,
@ -221,9 +221,9 @@ export async function joinViaLink(hash: string): Promise<void> {
window.log.warn(
`joinViaLink/${logId}: User is part of group on second check, opening conversation`
);
window.reduxActions.conversations.openConversationInternal(
targetConversation.id
);
window.reduxActions.conversations.openConversationInternal({
conversationId: targetConversation.id,
});
return;
}
@ -302,9 +302,9 @@ export async function joinViaLink(hash: string): Promise<void> {
);
}
window.reduxActions.conversations.openConversationInternal(
targetConversation.id
);
window.reduxActions.conversations.openConversationInternal({
conversationId: targetConversation.id,
});
} catch (error) {
// Delete newly-created conversation if we encountered any errors
if (tempConversation) {