From f2f930fbf16deaa1e00d6d592770f867ce5817cb Mon Sep 17 00:00:00 2001 From: talksik Date: Sat, 11 Jun 2022 13:24:49 -0500 Subject: [PATCH] fixing bug with selecting for one on one and closing dialog --- packages/desktop/src/providers/ConversationProvider.tsx | 4 ++-- packages/desktop/src/tree/NewConversationDialog.tsx | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/desktop/src/providers/ConversationProvider.tsx b/packages/desktop/src/providers/ConversationProvider.tsx index f6bf4ec..0fb35d4 100644 --- a/packages/desktop/src/providers/ConversationProvider.tsx +++ b/packages/desktop/src/providers/ConversationProvider.tsx @@ -115,7 +115,7 @@ export function ConversationProvider({ children }: { children: React.ReactNode } if (!otherUsers || otherUsers.length === 0) { toast.error('Must provider users'); - return; + return false; } // todo: check to make sure that the other user is not the user himself, although backend should error out @@ -128,7 +128,7 @@ export function ConversationProvider({ children }: { children: React.ReactNode } toast.success('already have this user...quick dialing'); selectConversation(conversationDmCheck.data, true); - return; + return true; } } diff --git a/packages/desktop/src/tree/NewConversationDialog.tsx b/packages/desktop/src/tree/NewConversationDialog.tsx index d414254..c2ca704 100644 --- a/packages/desktop/src/tree/NewConversationDialog.tsx +++ b/packages/desktop/src/tree/NewConversationDialog.tsx @@ -99,9 +99,10 @@ export default function NewConversationDialog() { // clear form for next time if (succeeded) { + toast('succeeded'); setSelectedUsers([]); setConversationName(''); - handleSetPage('SELECTED_CONVERSATION'); + handleSetPage('SELECTED_CONVERSATION')(); } setIsSubmitting(false);