diff --git a/ui/app/AppLayouts/Chat/stores/RootStore.qml b/ui/app/AppLayouts/Chat/stores/RootStore.qml index d9246f42cc..b86b58cf25 100644 --- a/ui/app/AppLayouts/Chat/stores/RootStore.qml +++ b/ui/app/AppLayouts/Chat/stores/RootStore.qml @@ -677,29 +677,7 @@ QtObject { //Update oneToOneChatContact when the contact is updated readonly property var myContactsModelConnection: Connections { - target: root.contactsStore.myContactsModel ?? null - enabled: d.activeChatType === Constants.chatType.oneToOne - - function onItemChanged(pubKey) { - if (pubKey === d.activeChatId) { - d.oneToOneChatContact = Utils.getContactDetailsAsJson(pubKey, false) - } - } - } - - readonly property var receivedContactsReqModelConnection: Connections { - target: root.contactsStore.receivedContactRequestsModel ?? null - enabled: d.activeChatType === Constants.chatType.oneToOne - - function onItemChanged(pubKey) { - if (pubKey === d.activeChatId) { - d.oneToOneChatContact = Utils.getContactDetailsAsJson(pubKey, false) - } - } - } - - readonly property var sentContactReqModelConnection: Connections { - target: root.contactsStore.sentContactRequestsModel ?? null + target: root.contactsStore.contactsModel ?? null enabled: d.activeChatType === Constants.chatType.oneToOne function onItemChanged(pubKey) { diff --git a/ui/app/AppLayouts/Chat/views/ChatColumnView.qml b/ui/app/AppLayouts/Chat/views/ChatColumnView.qml index 2e9c81a731..ff76d33239 100644 --- a/ui/app/AppLayouts/Chat/views/ChatColumnView.qml +++ b/ui/app/AppLayouts/Chat/views/ChatColumnView.qml @@ -53,11 +53,7 @@ Item { property bool stickersLoaded: false property bool canPost: true property var viewAndPostHoldingsModel - - readonly property var contactDetails: rootStore ? rootStore.oneToOneChatContact : null - readonly property bool isUserAdded: !!root.contactDetails && root.contactDetails.isContactRequestSent property bool amISectionAdmin: false - property bool sendViaPersonalChatEnabled signal openStickerPackPopup(string stickerPackId) diff --git a/ui/app/AppLayouts/Profile/stores/ProfileStore.qml b/ui/app/AppLayouts/Profile/stores/ProfileStore.qml index 2ac8427329..cca7456df9 100644 --- a/ui/app/AppLayouts/Profile/stores/ProfileStore.qml +++ b/ui/app/AppLayouts/Profile/stores/ProfileStore.qml @@ -45,8 +45,6 @@ QtObject { readonly property bool isFirstShowcaseInteraction: localAccountSettings.isFirstShowcaseInteraction - property var details: Utils.getContactDetailsAsJson(pubkey) - // The following signals wrap the settings / preferences save request responses in one unique result (identity + preferences result) signal profileSettingsSaveSucceeded() signal profileSettingsSaveFailed() diff --git a/ui/app/mainui/activitycenter/views/ActivityNotificationContactRemoved.qml b/ui/app/mainui/activitycenter/views/ActivityNotificationContactRemoved.qml index 881122539f..47b7dfe76d 100644 --- a/ui/app/mainui/activitycenter/views/ActivityNotificationContactRemoved.qml +++ b/ui/app/mainui/activitycenter/views/ActivityNotificationContactRemoved.qml @@ -17,27 +17,6 @@ import "../stores" ActivityNotificationMessage { id: root - function checkAndUpdateContactDetails(pubKey) { - if (pubKey === root.contactId) - root.updateContactDetails() - } - - Connections { - target: root.store.contactsStore.sentContactRequestsModel - - function onItemChanged(pubKey) { - root.checkAndUpdateContactDetails(pubKey) - } - } - - Connections { - target: root.store.contactsStore.receivedContactRequestsModel - - function onItemChanged(pubKey) { - root.checkAndUpdateContactDetails(pubKey) - } - } - messageSubheaderComponent: StatusBaseText { text: qsTr("Removed you as a contact") font.italic: true diff --git a/ui/app/mainui/activitycenter/views/ActivityNotificationContactRequest.qml b/ui/app/mainui/activitycenter/views/ActivityNotificationContactRequest.qml index 35decb7115..9bc8f596e0 100644 --- a/ui/app/mainui/activitycenter/views/ActivityNotificationContactRequest.qml +++ b/ui/app/mainui/activitycenter/views/ActivityNotificationContactRequest.qml @@ -22,16 +22,6 @@ ActivityNotificationMessage { readonly property string contactRequestId: notification && notification.message ? notification.message.id : "" - Connections { - target: root.isOutgoingMessage ? root.store.contactsStore.sentContactRequestsModel : - root.store.contactsStore.receivedContactRequestsModel - - function onItemChanged(pubKey) { - if (pubKey === root.contactId) - root.updateContactDetails() - } - } - maximumLineCount: 5 messageDetails.messageText: !root.isOutgoingMessage && notification ? notification.message.messageText : "" diff --git a/ui/app/mainui/activitycenter/views/ActivityNotificationMessage.qml b/ui/app/mainui/activitycenter/views/ActivityNotificationMessage.qml index fa66c321bf..5155115977 100644 --- a/ui/app/mainui/activitycenter/views/ActivityNotificationMessage.qml +++ b/ui/app/mainui/activitycenter/views/ActivityNotificationMessage.qml @@ -62,7 +62,7 @@ ActivityNotificationBase { onContactIdChanged: root.updateContactDetails() Connections { - target: root.store.contactsStore.myContactsModel + target: root.store.contactsStore.contactsModel function onItemChanged(pubKey) { if (pubKey === root.contactId)