status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(newChat): fix sending messages in new ad hoc chat with new store 

Fixes #10523

The problem was that the CreateChatView now uses an isolated Chat RootStore, since we can't be sure if the personal chat section will be loaded yet.

To fix that, I created a new store that is only for storing the properties needed for that new chat. That way we are sure that it is created and shared to necessary components.
This commit is contained in:
Jonathan Rainville 2023-05-04 14:36:35 -04:00
parent 81a79327b6
commit 0e5c566dcd
8 changed files with 52 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/AppLayouts/Chat/ChatLayout.qml
View File

@ -16,6 +16,7 @@ StackLayout {
id: root id: root
property RootStore rootStore property RootStore rootStore
property var createChatPropertiesStore
readonly property var contactsStore: rootStore.contactsStore readonly property var contactsStore: rootStore.contactsStore
readonly property var permissionsStore: rootStore.permissionsStore readonly property var permissionsStore: rootStore.permissionsStore
@ -108,6 +109,7 @@ StackLayout {
stickersPopup: root.stickersPopup stickersPopup: root.stickersPopup
contactsStore: root.contactsStore contactsStore: root.contactsStore
rootStore: root.rootStore rootStore: root.rootStore
createChatPropertiesStore: root.createChatPropertiesStore
sectionItemModel: root.sectionItemModel sectionItemModel: root.sectionItemModel
onCommunityInfoButtonClicked: root.currentIndex = 1 onCommunityInfoButtonClicked: root.currentIndex = 1

22
ui/app/AppLayouts/Chat/stores/CreateChatPropertiesStore.qml Normal file
View File

@ -0,0 +1,22 @@
import QtQuick 2.15
QtObject {
id: root
property string createChatInitMessage: ""
property var createChatFileUrls: []
property bool createChatStartSendTransactionProcess: false
property bool createChatStartReceiveTransactionProcess: false
property string createChatStickerHashId: ""
property string createChatStickerPackId: ""
property string createChatStickerUrl: ""
function resetProperties() {
root.createChatInitMessage = "";
root.createChatFileUrls = [];
root.createChatStartSendTransactionProcess = false;
root.createChatStartReceiveTransactionProcess = false;
root.createChatStickerHashId = "";
root.createChatStickerPackId = "";
}
}

7
ui/app/AppLayouts/Chat/stores/RootStore.qml
View File

@ -19,13 +19,6 @@ QtObject {
} }
property bool openCreateChat: false property bool openCreateChat: false
property string createChatInitMessage: ""
property var createChatFileUrls: []
property bool createChatStartSendTransactionProcess: false
property bool createChatStartReceiveTransactionProcess: false
property string createChatStickerHashId: ""
property string createChatStickerPackId: ""
property string createChatStickerUrl: ""
property var contactsModel: root.contactsStore.myContactsModel property var contactsModel: root.contactsStore.myContactsModel

1
ui/app/AppLayouts/Chat/stores/qmldir
View File

@ -1,4 +1,5 @@
CommunitiesStore 1.0 CommunitiesStore.qml CommunitiesStore 1.0 CommunitiesStore.qml
CreateChatPropertiesStore 1.0 CreateChatPropertiesStore.qml
PermissionsStore 1.0 PermissionsStore.qml PermissionsStore 1.0 PermissionsStore.qml
RootStore 1.0 RootStore.qml RootStore 1.0 RootStore.qml
StickerData 1.0 StickerData.qml StickerData 1.0 StickerData.qml

33
ui/app/AppLayouts/Chat/views/ChatColumnView.qml
View File

@ -27,6 +27,7 @@ Item {
property var parentModule property var parentModule
property var rootStore property var rootStore
property var createChatPropertiesStore
property var contactsStore property var contactsStore
property var emojiPopup property var emojiPopup
property var stickersPopup property var stickersPopup
@ -63,43 +64,37 @@ Item {
// This function is called once `1:1` or `group` chat is created. // This function is called once `1:1` or `group` chat is created.
function checkForCreateChatOptions(chatId) { function checkForCreateChatOptions(chatId) {
if(root.rootStore.createChatStartSendTransactionProcess) { if(root.createChatPropertiesStore.createChatStartSendTransactionProcess) {
if (root.contactDetails.ensVerified) { if (root.contactDetails.ensVerified) {
Global.openPopup(cmpSendTransactionWithEns); Global.openPopup(cmpSendTransactionWithEns);
} else { } else {
Global.openPopup(cmpSendTransactionNoEns); Global.openPopup(cmpSendTransactionNoEns);
} }
} }
else if (root.rootStore.createChatStartSendTransactionProcess) { else if (root.createChatPropertiesStore.createChatStartSendTransactionProcess) {
Global.openPopup(cmpReceiveTransaction); Global.openPopup(cmpReceiveTransaction);
} }
else if (root.rootStore.createChatStickerHashId !== "" && else if (root.createChatPropertiesStore.createChatStickerHashId !== "" &&
root.rootStore.createChatStickerPackId !== "" && root.createChatPropertiesStore.createChatStickerPackId !== "" &&
root.rootStore.createChatStickerUrl !== "") { root.createChatPropertiesStore.createChatStickerUrl !== "") {
root.rootStore.sendSticker(chatId, root.rootStore.sendSticker(chatId,
root.rootStore.createChatStickerHashId, root.createChatPropertiesStore.createChatStickerHashId,
"", "",
root.rootStore.createChatStickerPackId, root.createChatPropertiesStore.createChatStickerPackId,
root.rootStore.createChatStickerUrl); root.createChatPropertiesStore.createChatStickerUrl);
} }
else if (root.rootStore.createChatInitMessage !== "" || else if (root.createChatPropertiesStore.createChatInitMessage !== "" ||
root.rootStore.createChatFileUrls.length > 0) { root.createChatPropertiesStore.createChatFileUrls.length > 0) {
root.rootStore.sendMessage(chatId, root.rootStore.sendMessage(chatId,
Qt.Key_Enter, Qt.Key_Enter,
root.rootStore.createChatInitMessage, root.createChatPropertiesStore.createChatInitMessage,
"", "",
root.rootStore.createChatFileUrls root.createChatPropertiesStore.createChatFileUrls
); );
} }
// Clear. root.createChatPropertiesStore.resetProperties()
root.rootStore.createChatInitMessage = "";
root.rootStore.createChatFileUrls = [];
root.rootStore.createChatStartSendTransactionProcess = false;
root.rootStore.createChatStartReceiveTransactionProcess = false;
root.rootStore.createChatStickerHashId = "";
root.rootStore.createChatStickerPackId = "";
} }
function updateContactDetails() { function updateContactDetails() {

2
ui/app/AppLayouts/Chat/views/ChatView.qml
View File

@ -28,6 +28,7 @@ StatusSectionLayout {
property bool hasAddedContacts: root.contactsStore.myContactsModel.count > 0 property bool hasAddedContacts: root.contactsStore.myContactsModel.count > 0
property RootStore rootStore property RootStore rootStore
property var createChatPropertiesStore
property var sectionItemModel property var sectionItemModel
property var emojiPopup property var emojiPopup
@ -80,6 +81,7 @@ StatusSectionLayout {
anchors.fill: parent anchors.fill: parent
parentModule: root.rootStore.chatCommunitySectionModule parentModule: root.rootStore.chatCommunitySectionModule
rootStore: root.rootStore rootStore: root.rootStore
createChatPropertiesStore: root.createChatPropertiesStore
contactsStore: root.contactsStore contactsStore: root.contactsStore
stickersLoaded: root.stickersLoaded stickersLoaded: root.stickersLoaded
emojiPopup: root.emojiPopup emojiPopup: root.emojiPopup

15
ui/app/AppLayouts/Chat/views/CreateChatView.qml
View File

@ -17,6 +17,7 @@ Page {
id: root id: root
property var rootStore property var rootStore
property var createChatPropertiesStore
property var emojiPopup: null property var emojiPopup: null
property var stickersPopup: null property var stickersPopup: null
@ -24,8 +25,8 @@ Page {
id: d id: d
function createChat() { function createChat() {
root.rootStore.createChatInitMessage = chatInput.textInput.text root.createChatPropertiesStore.createChatInitMessage = chatInput.textInput.text
root.rootStore.createChatFileUrls = chatInput.fileUrlsAndSources root.createChatPropertiesStore.createChatFileUrls = chatInput.fileUrlsAndSources
membersSelector.createChat() membersSelector.createChat()
membersSelector.cleanup() membersSelector.cleanup()
@ -161,17 +162,17 @@ Page {
usersModel: membersSelector.model usersModel: membersSelector.model
}) })
onSendTransactionCommandButtonClicked: { onSendTransactionCommandButtonClicked: {
root.rootStore.createChatStartSendTransactionProcess = true; root.createChatPropertiesStore.createChatStartSendTransactionProcess = true;
membersSelector.createChat(); membersSelector.createChat();
} }
onReceiveTransactionCommandButtonClicked: { onReceiveTransactionCommandButtonClicked: {
root.rootStore.createChatStartReceiveTransactionProcess = true; root.createChatPropertiesStore.createChatStartReceiveTransactionProcess = true;
membersSelector.createChat(); membersSelector.createChat();
} }
onStickerSelected: { onStickerSelected: {
root.rootStore.createChatStickerHashId = hashId; root.createChatPropertiesStore.createChatStickerHashId = hashId;
root.rootStore.createChatStickerPackId = packId; root.createChatPropertiesStore.createChatStickerPackId = packId;
root.rootStore.createChatStickerUrl = url; root.createChatPropertiesStore.createChatStickerUrl = url;
membersSelector.createChat(); membersSelector.createChat();
} }

3
ui/app/mainui/AppMain.qml
View File

@ -55,6 +55,7 @@ Item {
openCreateChat: createChatView.opened openCreateChat: createChatView.opened
networkConnectionStore: appMain.networkConnectionStore networkConnectionStore: appMain.networkConnectionStore
} }
property var createChatPropertiesStore: ChatStores.CreateChatPropertiesStore {}
property ActivityCenterStore activityCenterStore: ActivityCenterStore {} property ActivityCenterStore activityCenterStore: ActivityCenterStore {}
property NetworkConnectionStore networkConnectionStore: NetworkConnectionStore {} property NetworkConnectionStore networkConnectionStore: NetworkConnectionStore {}
property CommunityTokensStore communityTokensStore: CommunityTokensStore {} property CommunityTokensStore communityTokensStore: CommunityTokensStore {}
@ -926,6 +927,7 @@ Item {
chatCommunitySectionModule: appMain.rootStore.mainModuleInst.getChatSectionModule() chatCommunitySectionModule: appMain.rootStore.mainModuleInst.getChatSectionModule()
networkConnectionStore: appMain.networkConnectionStore networkConnectionStore: appMain.networkConnectionStore
} }
createChatPropertiesStore: appMain.createChatPropertiesStore
emojiPopup: statusEmojiPopup.item emojiPopup: statusEmojiPopup.item
stickersPopup: statusStickersPopupLoader.item stickersPopup: statusStickersPopupLoader.item
@ -1095,6 +1097,7 @@ Item {
openCreateChat: createChatView.opened openCreateChat: createChatView.opened
chatCommunitySectionModule: appMain.rootStore.mainModuleInst.getChatSectionModule() chatCommunitySectionModule: appMain.rootStore.mainModuleInst.getChatSectionModule()
} }
createChatPropertiesStore: appMain.createChatPropertiesStore
emojiPopup: statusEmojiPopup.item emojiPopup: statusEmojiPopup.item
stickersPopup: statusStickersPopupLoader.item stickersPopup: statusStickersPopupLoader.item
} }