Fix chat selection on create chat/verified group

deltachat · Dec 9, 2019 · d69cf7a · d69cf7a
1 parent a5926d4
commit d69cf7a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/renderer/components/chat/ChatList.js b/src/renderer/components/chat/ChatList.js
@@ -6,15 +6,14 @@ import { PseudoListItemAddContact } from '../helpers/PseudoListItem'
 import C from 'deltachat-node/constants'
 import { isValidEmail } from '../dialogs/CreateChat'
 import { callDcMethodAsync } from '../../ipc'
-import { useChatStore } from '../../stores/chat'
+import { selectChat } from '../../stores/chat'
 
 export default function ChatList (props) {
   const { selectedChatId, showArchivedChats, onShowArchivedChats, queryStr } = props
   const queryStrIsEmail = isValidEmail(queryStr)
   const { chatListIds, setQueryStr, setListFlags } = useChatListIds()
   const { chatItems, onChatListScroll, scrollRef } = useLazyChatListItems(chatListIds)
   const realOpenContextMenu = useRef(null)
-  const chatStoreDispatch = useChatStore()[1]
 
   const onChatClick = chatId => {
     if (chatId === C.DC_CHAT_ID_ARCHIVED_LINK) return onShowArchivedChats()
@@ -35,7 +34,7 @@ export default function ChatList (props) {
 
     const contactId = await callDcMethodAsync('contacts.createContact', [queryStr, queryStr])
     const chatId = await callDcMethodAsync('contacts.createChatByContactId', contactId)
-    chatStoreDispatch({ type: 'SELECT_CHAT', payload: chatId })
+    selectChat(chatId)
   }
 
   const renderAddContactIfNeeded = () => {

diff --git a/src/renderer/components/dialogs/CreateChat.js b/src/renderer/components/dialogs/CreateChat.js
@@ -6,6 +6,7 @@ import C from 'deltachat-node/constants'
 
 import { callDcMethodAsync } from '../../ipc'
 import ScreenContext from '../../contexts/ScreenContext'
+import { selectChat } from '../../stores/chat'
 import { useContacts, ContactList2 } from '../contact/ContactList'
 import {
   PseudoListItem,
@@ -41,9 +42,9 @@ export default function CreateChat (props) {
   const [queryStr, onSearchChange] = useContactSearch(updateContacts)
   const queryStrIsEmail = isValidEmail(queryStr)
 
-  const closeDialogAndSelectChat = async chatId => {
+  const closeDialogAndSelectChat = chatId => {
+    selectChat(chatId)
     onClose()
-    await callDcMethodAsync('chatList.selectChat', [chatId])
   }
 
   const chooseContact = async ({ id }) => {
@@ -267,7 +268,7 @@ export const useCreateGroup = (verified, groupName, groupImage, groupMembers, on
     if (groupName === '') return
     const gId = await lazilyCreateOrUpdateGroup(true)
     onClose()
-    await callDcMethodAsync('chatList.selectChat', [gId])
+    selectChat(gId)
   }
   return [groupId, lazilyCreateOrUpdateGroup, finishCreateGroup]
 }

diff --git a/src/renderer/stores/chat.js b/src/renderer/stores/chat.js
@@ -234,4 +234,6 @@ ipcBackend.on('DC_EVENT_MSGS_CHANGED', async (_, [id, messageId]) => {
 })
 
 export const useChatStore = () => useStore(chatStore)
+export const selectChat = chatId => chatStore.dispatch({ type: 'SELECT_CHAT', payload: chatId })
+
 export default chatStore